diff --git a/include/boost/detail/iterator.hpp b/include/boost/detail/iterator.hpp
index 2498ef4..95ec737 100644
--- a/include/boost/detail/iterator.hpp
+++ b/include/boost/detail/iterator.hpp
@@ -6,7 +6,11 @@
 #ifndef ITERATOR_DWA122600_HPP_
 #define ITERATOR_DWA122600_HPP_
 
-// This header is obsolete and will be deprecated.
+// This header is obsolete and deprecated.
+
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<iterator>")
 
 #include <iterator>
 #if defined(__SUNPRO_CC) && (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
diff --git a/include/boost/detail/no_exceptions_support.hpp b/include/boost/detail/no_exceptions_support.hpp
index 7d17454..2cf0938 100644
--- a/include/boost/detail/no_exceptions_support.hpp
+++ b/include/boost/detail/no_exceptions_support.hpp
@@ -12,6 +12,10 @@
 // The header file at this path is deprecated;
 // use boost/core/no_exceptions_support.hpp instead.
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/core/no_exceptions_support.hpp>")
+
 #include <boost/core/no_exceptions_support.hpp>
 
 #endif
diff --git a/include/boost/detail/scoped_enum_emulation.hpp b/include/boost/detail/scoped_enum_emulation.hpp
index 1c7bc23..6e47c0f 100644
--- a/include/boost/detail/scoped_enum_emulation.hpp
+++ b/include/boost/detail/scoped_enum_emulation.hpp
@@ -12,6 +12,10 @@
 // The header file at this path is deprecated;
 // use boost/core/scoped_enum.hpp instead.
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/core/scoped_enum.hpp>")
+
 #include <boost/core/scoped_enum.hpp>
 
 #endif
diff --git a/test/detail_iterator_test.cpp b/test/detail_iterator_test.cpp
index a6ca7d7..13eef58 100644
--- a/test/detail_iterator_test.cpp
+++ b/test/detail_iterator_test.cpp
@@ -8,6 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
+#define BOOST_ALLOW_DEPRECATED_HEADERS
 #include <boost/detail/iterator.hpp>
 #include <boost/core/is_same.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
diff --git a/test/quick.cpp b/test/quick.cpp
index 7f266c3..f82d77b 100644
--- a/test/quick.cpp
+++ b/test/quick.cpp
@@ -12,7 +12,6 @@
 #include <boost/core/addressof.hpp>
 #include <boost/core/checked_delete.hpp>
 #include <boost/core/demangle.hpp>
-#include <boost/detail/iterator.hpp>
 #include <boost/core/enable_if.hpp>
 #include <boost/core/explicit_operator_bool.hpp>
 #include <boost/get_pointer.hpp>