diff --git a/include/boost/dynamic_bitset/dynamic_bitset.hpp b/include/boost/dynamic_bitset/dynamic_bitset.hpp
index a2fd868..32fb582 100644
--- a/include/boost/dynamic_bitset/dynamic_bitset.hpp
+++ b/include/boost/dynamic_bitset/dynamic_bitset.hpp
@@ -19,31 +19,15 @@
 #ifndef BOOST_DYNAMIC_BITSET_DYNAMIC_BITSET_HPP
 #define BOOST_DYNAMIC_BITSET_DYNAMIC_BITSET_HPP
 
-#include "boost/assert.hpp"
-#include "boost/core/bit.hpp"
-#include "boost/core/no_exceptions_support.hpp"
 #include "boost/dynamic_bitset/config.hpp"
 #include "boost/dynamic_bitset/detail/dynamic_bitset.hpp"
-#include "boost/dynamic_bitset/detail/lowest_bit.hpp"
 #include "boost/dynamic_bitset_fwd.hpp"
-#include "boost/functional/hash/hash.hpp"
 #include "boost/limits.hpp"
-#include "boost/move/move.hpp"
 #include "boost/static_assert.hpp"
-#include "boost/throw_exception.hpp"
-#include <algorithm>
-#include <climits>
-#include <istream>
-#include <iterator>
-#include <ostream>
-#include <stdexcept>
+#include <iosfwd>
 #include <string>
 #include <vector>
 
-#ifndef BOOST_NO_STD_LOCALE
-#    include <locale>
-#endif
-
 namespace boost {
 
 //!     The `dynamic_bitset` template represents a set of bits.
diff --git a/include/boost/dynamic_bitset/impl/dynamic_bitset.tpp b/include/boost/dynamic_bitset/impl/dynamic_bitset.tpp
index 455c914..1c08c18 100644
--- a/include/boost/dynamic_bitset/impl/dynamic_bitset.tpp
+++ b/include/boost/dynamic_bitset/impl/dynamic_bitset.tpp
@@ -16,6 +16,24 @@
 //
 // -----------------------------------------------------------
 
+#include "boost/assert.hpp"
+#include "boost/core/bit.hpp"
+#include "boost/core/no_exceptions_support.hpp"
+#include "boost/dynamic_bitset/detail/lowest_bit.hpp"
+#include "boost/functional/hash/hash.hpp"
+#include "boost/move/move.hpp"
+#include "boost/throw_exception.hpp"
+#include <algorithm>
+#include <climits>
+#include <istream>
+#include <iterator>
+#include <ostream>
+#include <stdexcept>
+
+#ifndef BOOST_NO_STD_LOCALE
+#    include <locale>
+#endif
+
 namespace boost {
 
 template< typename Block, typename Allocator >