diff --git a/include/boost/unordered/detail/map.hpp b/include/boost/unordered/detail/map.hpp
index a11d35ef..1d6c0682 100644
--- a/include/boost/unordered/detail/map.hpp
+++ b/include/boost/unordered/detail/map.hpp
@@ -41,23 +41,6 @@ namespace boost {
         typedef typename table::iterator iterator;
         typedef boost::unordered::insert_return_type_map<iterator, node_type> insert_return_type;
       };
-
-      template <typename K, typename M, typename H, typename P, typename A>
-      class instantiate_map
-      {
-        typedef boost::unordered_map<K, M, H, P, A> container;
-        container x;
-        typename container::node_type node_type;
-        typename container::insert_return_type insert_return_type;
-      };
-
-      template <typename K, typename M, typename H, typename P, typename A>
-      class instantiate_multimap
-      {
-        typedef boost::unordered_multimap<K, M, H, P, A> container;
-        container x;
-        typename container::node_type node_type;
-      };
     }
   }
 }
diff --git a/include/boost/unordered/detail/set.hpp b/include/boost/unordered/detail/set.hpp
index 6025e40e..7ae3b307 100644
--- a/include/boost/unordered/detail/set.hpp
+++ b/include/boost/unordered/detail/set.hpp
@@ -39,23 +39,6 @@ namespace boost {
         typedef boost::unordered::insert_return_type_set<iterator, node_type>
           insert_return_type;
       };
-
-      template <typename T, typename H, typename P, typename A>
-      class instantiate_set
-      {
-        typedef boost::unordered_set<T, H, P, A> container;
-        container x;
-        typename container::node_type node_type;
-        typename container::insert_return_type insert_return_type;
-      };
-
-      template <typename T, typename H, typename P, typename A>
-      class instantiate_multiset
-      {
-        typedef boost::unordered_multiset<T, H, P, A> container;
-        container x;
-        typename container::node_type node_type;
-      };
     }
   }
 }
diff --git a/test/unordered/compile_map.cpp b/test/unordered/compile_map.cpp
index b929ced8..c6464ec4 100644
--- a/test/unordered/compile_map.cpp
+++ b/test/unordered/compile_map.cpp
@@ -52,23 +52,39 @@ template class instantiate_node_map<test::minimal::assignable const,
   test::minimal::allocator<int> >;
 
 #else
-#define INSTANTIATE(type)                                                      \
-  template class boost::unordered::detail::instantiate_##type
 
-INSTANTIATE(map)<int, int, boost::hash<int>, std::equal_to<int>,
+template <typename K, typename M, typename H, typename P, typename A>
+class instantiate_map
+{
+  typedef boost::unordered_map<K, M, H, P, A> container;
+  container x;
+  typename container::node_type node_type;
+  typename container::insert_return_type insert_return_type;
+};
+
+template <typename K, typename M, typename H, typename P, typename A>
+class instantiate_multimap
+{
+  typedef boost::unordered_multimap<K, M, H, P, A> container;
+  container x;
+  typename container::node_type node_type;
+};
+
+template class instantiate_map<int, int, boost::hash<int>, std::equal_to<int>,
   test::minimal::allocator<int> >;
-INSTANTIATE(multimap)<int const, int const, boost::hash<int>,
+template class instantiate_multimap<int const, int const, boost::hash<int>,
   std::equal_to<int>, test::minimal::allocator<int> >;
 
-INSTANTIATE(
-  map)<test::minimal::assignable const, test::minimal::default_assignable const,
+template class instantiate_map<test::minimal::assignable const,
+  test::minimal::default_assignable const,
   test::minimal::hash<test::minimal::assignable>,
   test::minimal::equal_to<test::minimal::assignable>,
   test::minimal::allocator<int> >;
-INSTANTIATE(multimap)<test::minimal::assignable, test::minimal::assignable,
-  test::minimal::hash<test::minimal::assignable>,
+template class instantiate_multimap<test::minimal::assignable,
+  test::minimal::assignable, test::minimal::hash<test::minimal::assignable>,
   test::minimal::equal_to<test::minimal::assignable>,
   test::minimal::allocator<int> >;
+
 #endif
 
 template <template <class Key, class T, class H = boost::hash<Key>,
diff --git a/test/unordered/compile_set.cpp b/test/unordered/compile_set.cpp
index 40601d90..47b4ff46 100644
--- a/test/unordered/compile_set.cpp
+++ b/test/unordered/compile_set.cpp
@@ -52,19 +52,32 @@ template class instantiate_node_set<test::minimal::assignable const,
 
 #else
 
-#define INSTANTIATE(type)                                                      \
-  template class boost::unordered::detail::instantiate_##type
+template <typename T, typename H, typename P, typename A> class instantiate_set
+{
+  typedef boost::unordered_set<T, H, P, A> container;
+  container x;
+  typename container::node_type node_type;
+  typename container::insert_return_type insert_return_type;
+};
 
-INSTANTIATE(set)<int, boost::hash<int>, std::equal_to<int>,
-  test::minimal::allocator<int> >;
-INSTANTIATE(multiset)<int const, boost::hash<int>, std::equal_to<int>,
-  test::minimal::allocator<int> >;
+template <typename T, typename H, typename P, typename A>
+class instantiate_multiset
+{
+  typedef boost::unordered_multiset<T, H, P, A> container;
+  container x;
+  typename container::node_type node_type;
+};
 
-INSTANTIATE(set)<test::minimal::assignable const,
+template class instantiate_set<int, boost::hash<int>, std::equal_to<int>,
+  test::minimal::allocator<int> >;
+template class instantiate_multiset<int const, boost::hash<int>,
+  std::equal_to<int>, test::minimal::allocator<int> >;
+
+template class instantiate_set<test::minimal::assignable const,
   test::minimal::hash<test::minimal::assignable>,
   test::minimal::equal_to<test::minimal::assignable>,
   test::minimal::allocator<int> >;
-INSTANTIATE(multiset)<test::minimal::assignable,
+template class instantiate_multiset<test::minimal::assignable,
   test::minimal::hash<test::minimal::assignable>,
   test::minimal::equal_to<test::minimal::assignable>,
   test::minimal::allocator<int> >;