1 files changed, 17 insertions, 25 deletions
diff --git a/boost/interprocess/interprocess_fwd.hpp b/boost/interprocess/interprocess_fwd.hpp
index 6c9675b401..14b7c2ba96 100644
--- a/boost/interprocess/interprocess_fwd.hpp
+++ b/boost/interprocess/interprocess_fwd.hpp
@@ -11,10 +11,16 @@
 #ifndef BOOST_INTERPROCESS_FWD_HPP
 #define BOOST_INTERPROCESS_FWD_HPP
 
-#if defined(_MSC_VER)
+#ifndef BOOST_CONFIG_HPP
+#  include <boost/config.hpp>
+#endif
+#
+#if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
 #endif
 
+#include <boost/interprocess/detail/std_fwd.hpp>
+
 //! \file
 //! This header file forward declares the basic interprocess types:
 //!   - boost::interprocess::offset_ptr;
@@ -123,20 +129,8 @@
 //                        Standard predeclarations
 //////////////////////////////////////////////////////////////////////////////
 
-namespace boost{
-namespace intrusive{
-}}
-
-namespace boost{
-namespace interprocess{
-namespace bi = boost::intrusive;
-}}
-
-#include <utility>
-#include <memory>
-#include <functional>
-#include <iosfwd>
-#include <string>
+namespace boost{  namespace intrusive{ }  }
+namespace boost{  namespace interprocess{ namespace bi = boost::intrusive; }  }
 
 namespace boost { namespace interprocess {
 
@@ -225,19 +219,16 @@ class private_node_allocator;
 template<class T, class SegmentManager, std::size_t NodesPerBlock = 64>
 class cached_node_allocator;
 
-template<class T, class SegmentManager, std::size_t NodesPerBlock = 64, std::size_t MaxFreeBlocks = 2
-         , unsigned char OverheadPercent = 5
->
+template< class T, class SegmentManager, std::size_t NodesPerBlock = 64
+        , std::size_t MaxFreeBlocks = 2, unsigned char OverheadPercent = 5 >
 class adaptive_pool;
 
-template<class T, class SegmentManager, std::size_t NodesPerBlock = 64, std::size_t MaxFreeBlocks = 2
-         , unsigned char OverheadPercent = 5
->
+template< class T, class SegmentManager, std::size_t NodesPerBlock = 64
+        , std::size_t MaxFreeBlocks = 2, unsigned char OverheadPercent = 5 >
 class private_adaptive_pool;
 
-template<class T, class SegmentManager, std::size_t NodesPerBlock = 64, std::size_t MaxFreeBlocks = 2
-         , unsigned char OverheadPercent = 5
->
+template< class T, class SegmentManager, std::size_t NodesPerBlock = 64
+        , std::size_t MaxFreeBlocks = 2, unsigned char OverheadPercent = 5 >
 class cached_adaptive_pool;
 
 
@@ -247,7 +238,8 @@ class cached_adaptive_pool;
 
 static const std::size_t offset_type_alignment = 0;
 
-template <class T, class DifferenceType = std::ptrdiff_t, class OffsetType = std::size_t, std::size_t Alignment = offset_type_alignment>
+template < class T, class DifferenceType = std::ptrdiff_t
+         , class OffsetType = std::size_t, std::size_t Alignment = offset_type_alignment>
 class offset_ptr;
 
 //////////////////////////////////////////////////////////////////////////////