diff --git a/include/boost/typeof/incr_registration_group.hpp b/include/boost/typeof/incr_registration_group.hpp
index 6f4803a..6b21ed4 100644
--- a/include/boost/typeof/incr_registration_group.hpp
+++ b/include/boost/typeof/incr_registration_group.hpp
@@ -2,13 +2,4 @@
 // Use, modification and distribution is subject to the Boost Software
 // License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt)
 
-// Inclusion of this file increments BOOST_TYPEOF_REGISTRATION_GROUP 
-// This method was suggested by Paul Mensonides
-
-#ifdef BOOST_TYPEOF_EMULATION
-#   undef BOOST_TYPEOF_REGISTRATION_GROUP
-
-#   include <boost/preprocessor/slot/counter.hpp>
-#   include BOOST_PP_UPDATE_COUNTER()
-#   define BOOST_TYPEOF_REGISTRATION_GROUP BOOST_PP_COUNTER
-#endif
+// This header is no longer useful and is only retained for compatibility
diff --git a/include/boost/typeof/std/bitset.hpp b/include/boost/typeof/std/bitset.hpp
index bdc6ae9..d816d47 100644
--- a/include/boost/typeof/std/bitset.hpp
+++ b/include/boost/typeof/std/bitset.hpp
@@ -5,11 +5,9 @@
 #ifndef BOOST_TYPEOF_STD_bitset_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_bitset_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <bitset>
 #include <boost/typeof/typeof.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::bitset, (BOOST_TYPEOF_INTEGRAL(std::size_t)))
-
 #endif//BOOST_TYPEOF_STD_bitset_hpp_INCLUDED
diff --git a/include/boost/typeof/std/complex.hpp b/include/boost/typeof/std/complex.hpp
index 1265294..d18a721 100644
--- a/include/boost/typeof/std/complex.hpp
+++ b/include/boost/typeof/std/complex.hpp
@@ -5,11 +5,9 @@
 #ifndef BOOST_TYPEOF_STD_complex_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_complex_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <complex>
 #include <boost/typeof/typeof.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::complex, 1)
-
 #endif//BOOST_TYPEOF_STD_complex_hpp_INCLUDED
diff --git a/include/boost/typeof/std/deque.hpp b/include/boost/typeof/std/deque.hpp
index 643e1b2..0c6246b 100644
--- a/include/boost/typeof/std/deque.hpp
+++ b/include/boost/typeof/std/deque.hpp
@@ -5,13 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_deque_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_deque_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <deque>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/memory.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::deque, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::deque, 2)
-
 #endif//BOOST_TYPEOF_STD_deque_hpp_INCLUDED
diff --git a/include/boost/typeof/std/fstream.hpp b/include/boost/typeof/std/fstream.hpp
index 4ce8cbf..57f296a 100644
--- a/include/boost/typeof/std/fstream.hpp
+++ b/include/boost/typeof/std/fstream.hpp
@@ -5,23 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_fstream_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_fstream_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <fstream>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/string.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_filebuf, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_filebuf, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ifstream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ifstream, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ofstream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ofstream, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_fstream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_fstream, 2)
-BOOST_TYPEOF_REGISTER_TYPE(std::filebuf)
-BOOST_TYPEOF_REGISTER_TYPE(std::ifstream)
-BOOST_TYPEOF_REGISTER_TYPE(std::ofstream)
-BOOST_TYPEOF_REGISTER_TYPE(std::fstream)
-
 #endif//BOOST_TYPEOF_STD_fstream_hpp_INCLUDED
diff --git a/include/boost/typeof/std/functional.hpp b/include/boost/typeof/std/functional.hpp
index 9fdbba4..2fc306d 100644
--- a/include/boost/typeof/std/functional.hpp
+++ b/include/boost/typeof/std/functional.hpp
@@ -5,62 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_functional_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_functional_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <boost/typeof/typeof.hpp>
 #include <boost/config.hpp>
 #include <functional>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-#ifndef BOOST_NO_CXX98_FUNCTION_BASE
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::unary_function, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::binary_function, 3)
-#endif//BOOST_NO_CXX98_FUNCTION_BASE
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::plus, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::minus, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::multiplies, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::divides, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::modulus, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::negate, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::equal_to, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::not_equal_to, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::greater, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::less, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::greater_equal, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::less_equal, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::logical_and, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::logical_or, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::logical_not, 1)
-
-#if BOOST_CXX_VERSION < 202000L
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::unary_negate, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::binary_negate, 1)
-#endif
-
-#ifndef BOOST_NO_CXX98_BINDERS
-
-#if defined(__MWERKS__) && defined(_MSL_EXTENDED_BINDERS)
-    BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder1st, 2)
-    BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder2nd, 2)
-#else
-    BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder1st, 1)
-    BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder2nd, 1)
-#endif
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::pointer_to_unary_function, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::pointer_to_binary_function, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun_t, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun1_t, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun_ref_t, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun1_ref_t, 3)
-
-#if !BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
-    BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun_t, 2)
-    BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun1_t, 3)
-    BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun_ref_t, 2)
-    BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun1_ref_t, 3)
-#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
-
-#endif//BOOST_NO_CXX98_BINDERS
-
 #endif//BOOST_TYPEOF_STD_functional_hpp_INCLUDED
diff --git a/include/boost/typeof/std/iostream.hpp b/include/boost/typeof/std/iostream.hpp
index 559a0ce..166b5c1 100644
--- a/include/boost/typeof/std/iostream.hpp
+++ b/include/boost/typeof/std/iostream.hpp
@@ -5,14 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_iostream_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_iostream_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <iostream>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/string.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::fpos, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ios, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ios, 2)
-
 #endif//BOOST_TYPEOF_STD_iostream_hpp_INCLUDED
diff --git a/include/boost/typeof/std/istream.hpp b/include/boost/typeof/std/istream.hpp
index c2457f1..ab87104 100644
--- a/include/boost/typeof/std/istream.hpp
+++ b/include/boost/typeof/std/istream.hpp
@@ -5,17 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_istream_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_istream_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <istream>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/string.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_istream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_istream, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_iostream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_iostream, 2)
-BOOST_TYPEOF_REGISTER_TYPE(std::istream)
-BOOST_TYPEOF_REGISTER_TYPE(std::iostream)
-
 #endif//BOOST_TYPEOF_STD_istream_hpp_INCLUDED
diff --git a/include/boost/typeof/std/iterator.hpp b/include/boost/typeof/std/iterator.hpp
index ac7bcbc..b4f59f8 100644
--- a/include/boost/typeof/std/iterator.hpp
+++ b/include/boost/typeof/std/iterator.hpp
@@ -5,54 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_iterator_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_iterator_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <iterator>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/string.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::iterator_traits, 1)
-#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::iterator, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::iterator, 3)
-#else
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::iterator, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::iterator, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::iterator, 4)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::iterator, 5)
-#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
-BOOST_TYPEOF_REGISTER_TYPE(std::input_iterator_tag)
-BOOST_TYPEOF_REGISTER_TYPE(std::output_iterator_tag)
-BOOST_TYPEOF_REGISTER_TYPE(std::forward_iterator_tag)
-BOOST_TYPEOF_REGISTER_TYPE(std::bidirectional_iterator_tag)
-BOOST_TYPEOF_REGISTER_TYPE(std::random_access_iterator_tag)
-#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::reverse_iterator, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::reverse_iterator, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::reverse_iterator, 4)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::reverse_iterator, 5)
-#else
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::reverse_iterator, 1)
-#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::back_insert_iterator, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::front_insert_iterator, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::insert_iterator, 1)
-#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istream_iterator, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istream_iterator, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istream_iterator, 3)
-#else
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istream_iterator, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istream_iterator, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istream_iterator, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istream_iterator, 4)
-#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::ostream_iterator, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::ostream_iterator, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::ostream_iterator, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istreambuf_iterator, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::istreambuf_iterator, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::ostreambuf_iterator, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::ostreambuf_iterator, 2)
-
 #endif//BOOST_TYPEOF_STD_iterator_hpp_INCLUDED
diff --git a/include/boost/typeof/std/list.hpp b/include/boost/typeof/std/list.hpp
index 7557d5e..a0762d8 100644
--- a/include/boost/typeof/std/list.hpp
+++ b/include/boost/typeof/std/list.hpp
@@ -5,13 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_list_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_list_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <list>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/memory.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::list, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::list, 2)
-
 #endif//BOOST_TYPEOF_STD_list_hpp_INCLUDED
diff --git a/include/boost/typeof/std/locale.hpp b/include/boost/typeof/std/locale.hpp
index 9a21c22..d3f39ec 100644
--- a/include/boost/typeof/std/locale.hpp
+++ b/include/boost/typeof/std/locale.hpp
@@ -5,36 +5,9 @@
 #ifndef BOOST_TYPEOF_STD_locale_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_locale_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <locale>
 #include <boost/typeof/typeof.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TYPE(std::locale)
-BOOST_TYPEOF_REGISTER_TYPE(std::ctype_base)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::ctype, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::ctype_byname, 1)
-BOOST_TYPEOF_REGISTER_TYPE(std::codecvt_base)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::codecvt, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::codecvt_byname, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::num_get, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::num_put, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::numpunct, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::numpunct_byname, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::collate, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::collate_byname, 1)
-BOOST_TYPEOF_REGISTER_TYPE(std::time_base)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::time_get, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::time_get_byname, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::time_put, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::time_put_byname, 2)
-BOOST_TYPEOF_REGISTER_TYPE(std::money_base)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::money_get, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::money_put, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::moneypunct, (class)(bool))
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::moneypunct_byname, (class)(bool))
-BOOST_TYPEOF_REGISTER_TYPE(std::messages_base)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::messages, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::messages_byname, 1)
-
 #endif//BOOST_TYPEOF_STD_locale_hpp_INCLUDED
diff --git a/include/boost/typeof/std/map.hpp b/include/boost/typeof/std/map.hpp
index 77839e3..af04729 100644
--- a/include/boost/typeof/std/map.hpp
+++ b/include/boost/typeof/std/map.hpp
@@ -5,19 +5,12 @@
 #ifndef BOOST_TYPEOF_STD_map_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_map_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <map>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/memory.hpp>
 #include <boost/typeof/std/functional.hpp>
 #include <boost/typeof/std/utility.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::map, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::map, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::map, 4)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::multimap, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::multimap, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::multimap, 4)
-
 #endif//BOOST_TYPEOF_STD_map_hpp_INCLUDED
diff --git a/include/boost/typeof/std/memory.hpp b/include/boost/typeof/std/memory.hpp
index 7c1510f..6aa3191 100644
--- a/include/boost/typeof/std/memory.hpp
+++ b/include/boost/typeof/std/memory.hpp
@@ -5,20 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_memory_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_memory_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <boost/typeof/typeof.hpp>
 #include <boost/config.hpp>
 #include <memory>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::allocator, 1)
-
-#if BOOST_CXX_VERSION < 202000L
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::raw_storage_iterator, 2)
-#endif
-
-#ifndef BOOST_NO_AUTO_PTR
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::auto_ptr, 1)
-#endif//BOOST_NO_AUTO_PTR
-
 #endif//BOOST_TYPEOF_STD_memory_hpp_INCLUDED
diff --git a/include/boost/typeof/std/ostream.hpp b/include/boost/typeof/std/ostream.hpp
index a792446..30fbc47 100644
--- a/include/boost/typeof/std/ostream.hpp
+++ b/include/boost/typeof/std/ostream.hpp
@@ -5,14 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_ostream_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_ostream_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <ostream>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/string.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ostream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ostream, 2)
-BOOST_TYPEOF_REGISTER_TYPE(std::ostream)
-
 #endif//BOOST_TYPEOF_STD_ostream_hpp_INCLUDED
diff --git a/include/boost/typeof/std/queue.hpp b/include/boost/typeof/std/queue.hpp
index d44e24e..fecb7e4 100644
--- a/include/boost/typeof/std/queue.hpp
+++ b/include/boost/typeof/std/queue.hpp
@@ -5,13 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_queue_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_queue_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <queue>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/memory.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::queue, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::queue, 2)
-
 #endif//BOOST_TYPEOF_STD_queue_hpp_INCLUDED
diff --git a/include/boost/typeof/std/set.hpp b/include/boost/typeof/std/set.hpp
index 6ff6311..79485d2 100644
--- a/include/boost/typeof/std/set.hpp
+++ b/include/boost/typeof/std/set.hpp
@@ -5,18 +5,11 @@
 #ifndef BOOST_TYPEOF_STD_set_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_set_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <set>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/memory.hpp>
 #include <boost/typeof/std/functional.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::set, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::set, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::set, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::multiset, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::multiset, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::multiset, 3)
-
 #endif//BOOST_TYPEOF_STD_set_hpp_INCLUDED
diff --git a/include/boost/typeof/std/sstream.hpp b/include/boost/typeof/std/sstream.hpp
index cb92dae..b6ed4df 100644
--- a/include/boost/typeof/std/sstream.hpp
+++ b/include/boost/typeof/std/sstream.hpp
@@ -5,28 +5,11 @@
 #ifndef BOOST_TYPEOF_STD_sstream_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_sstream_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <sstream>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/string.hpp>
 #include <boost/typeof/std/memory.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_stringbuf, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_stringbuf, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_stringbuf, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_istringstream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_istringstream, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_istringstream, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ostringstream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ostringstream, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_ostringstream, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_stringstream, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_stringstream, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_stringstream, 3)
-BOOST_TYPEOF_REGISTER_TYPE(std::stringbuf)
-BOOST_TYPEOF_REGISTER_TYPE(std::istringstream)
-BOOST_TYPEOF_REGISTER_TYPE(std::ostringstream)
-BOOST_TYPEOF_REGISTER_TYPE(std::stringstream)
-
 #endif//BOOST_TYPEOF_STD_sstream_hpp_INCLUDED
diff --git a/include/boost/typeof/std/stack.hpp b/include/boost/typeof/std/stack.hpp
index 0282678..aff1351 100644
--- a/include/boost/typeof/std/stack.hpp
+++ b/include/boost/typeof/std/stack.hpp
@@ -5,13 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_stack_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_stack_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <stack>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/memory.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::stack, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::stack, 2)
-
 #endif//BOOST_TYPEOF_STD_stack_hpp_INCLUDED
diff --git a/include/boost/typeof/std/streambuf.hpp b/include/boost/typeof/std/streambuf.hpp
index dd89b88..4a214fa 100644
--- a/include/boost/typeof/std/streambuf.hpp
+++ b/include/boost/typeof/std/streambuf.hpp
@@ -5,13 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_streambuf_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_streambuf_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <streambuf>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/string.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_streambuf, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_streambuf, 2)
-
 #endif//BOOST_TYPEOF_STD_streambuf_hpp_INCLUDED
diff --git a/include/boost/typeof/std/string.hpp b/include/boost/typeof/std/string.hpp
index be7f16f..50153f7 100644
--- a/include/boost/typeof/std/string.hpp
+++ b/include/boost/typeof/std/string.hpp
@@ -5,20 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_string_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_string_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <string>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/memory.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::char_traits, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_string, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_string, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::basic_string, 3)
-
-#ifndef BOOST_BORLANDC
-//Borland chokes on this "double definition" of string
-BOOST_TYPEOF_REGISTER_TYPE(std::string)
-#endif
-
 #endif//BOOST_TYPEOF_STD_string_hpp_INCLUDED
diff --git a/include/boost/typeof/std/utility.hpp b/include/boost/typeof/std/utility.hpp
index 2647fb6..1c2bcf2 100644
--- a/include/boost/typeof/std/utility.hpp
+++ b/include/boost/typeof/std/utility.hpp
@@ -5,11 +5,9 @@
 #ifndef BOOST_TYPEOF_STD_utility_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_utility_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <utility>
 #include <boost/typeof/typeof.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::pair, 2)
-
 #endif//BOOST_TYPEOF_STD_utility_hpp_INCLUDED
diff --git a/include/boost/typeof/std/valarray.hpp b/include/boost/typeof/std/valarray.hpp
index 99d4eed..f233f7b 100644
--- a/include/boost/typeof/std/valarray.hpp
+++ b/include/boost/typeof/std/valarray.hpp
@@ -5,17 +5,9 @@
 #ifndef BOOST_TYPEOF_STD_valarray_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_valarray_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <valarray>
 #include <boost/typeof/typeof.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::valarray, 1)
-BOOST_TYPEOF_REGISTER_TYPE(std::slice)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::slice_array, 1)
-BOOST_TYPEOF_REGISTER_TYPE(std::gslice)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::gslice_array, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::mask_array, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::indirect_array, 1)
-
 #endif//BOOST_TYPEOF_STD_valarray_hpp_INCLUDED
diff --git a/include/boost/typeof/std/vector.hpp b/include/boost/typeof/std/vector.hpp
index 4a5be5f..8a681c0 100644
--- a/include/boost/typeof/std/vector.hpp
+++ b/include/boost/typeof/std/vector.hpp
@@ -5,13 +5,10 @@
 #ifndef BOOST_TYPEOF_STD_vector_hpp_INCLUDED
 #define BOOST_TYPEOF_STD_vector_hpp_INCLUDED
 
+// This header is no longer useful and is only retained for compatibility
+
 #include <vector>
 #include <boost/typeof/typeof.hpp>
 #include <boost/typeof/std/memory.hpp>
 
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::vector, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(std::vector, 2)
-
 #endif//BOOST_TYPEOF_STD_vector_hpp_INCLUDED