diff --git a/include/boost/container/detail/alloc_lib_auto_link.hpp b/include/boost/container/detail/alloc_lib_auto_link.hpp
index e424890f..e0a01b60 100644
--- a/include/boost/container/detail/alloc_lib_auto_link.hpp
+++ b/include/boost/container/detail/alloc_lib_auto_link.hpp
@@ -10,6 +10,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_BOOST_CONT_EXT_AUTO_LINK_HPP
 #define BOOST_CONTAINER_DETAIL_BOOST_CONT_EXT_AUTO_LINK_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/auto_link.hpp>
 #include <boost/container/detail/alloc_lib.h>
 
diff --git a/include/boost/container/detail/function_detector.hpp b/include/boost/container/detail/function_detector.hpp
index 1fe6731a..242eb413 100644
--- a/include/boost/container/detail/function_detector.hpp
+++ b/include/boost/container/detail/function_detector.hpp
@@ -22,6 +22,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_FUNCTION_DETECTOR_HPP
 #define BOOST_CONTAINER_DETAIL_FUNCTION_DETECTOR_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 
 namespace boost {
diff --git a/include/boost/container/detail/math_functions.hpp b/include/boost/container/detail/math_functions.hpp
index b27cfb4a..6853b9c5 100644
--- a/include/boost/container/detail/math_functions.hpp
+++ b/include/boost/container/detail/math_functions.hpp
@@ -16,6 +16,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_MATH_FUNCTIONS_HPP
 #define BOOST_CONTAINER_DETAIL_MATH_FUNCTIONS_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
diff --git a/include/boost/container/detail/multiallocation_chain.hpp b/include/boost/container/detail/multiallocation_chain.hpp
index 4e4a8c61..96f62026 100644
--- a/include/boost/container/detail/multiallocation_chain.hpp
+++ b/include/boost/container/detail/multiallocation_chain.hpp
@@ -11,6 +11,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_MULTIALLOCATION_CHAIN_HPP
 #define BOOST_CONTAINER_DETAIL_MULTIALLOCATION_CHAIN_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
diff --git a/include/boost/container/detail/mutex.hpp b/include/boost/container/detail/mutex.hpp
index bbbcbf10..c53afa1f 100644
--- a/include/boost/container/detail/mutex.hpp
+++ b/include/boost/container/detail/mutex.hpp
@@ -19,6 +19,10 @@
 #ifndef BOOST_CONTAINER_MUTEX_HPP
 #define BOOST_CONTAINER_MUTEX_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 //#define BOOST_CONTAINER_NO_MT
 //#define BOOST_CONTAINER_NO_SPINLOCKS
 
diff --git a/include/boost/container/detail/pool_common_alloc.hpp b/include/boost/container/detail/pool_common_alloc.hpp
index 37186a6a..dfae7efd 100644
--- a/include/boost/container/detail/pool_common_alloc.hpp
+++ b/include/boost/container/detail/pool_common_alloc.hpp
@@ -11,6 +11,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_POOL_COMMON_ALLOC_HPP
 #define BOOST_CONTAINER_DETAIL_POOL_COMMON_ALLOC_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 #include <boost/container/throw_exception.hpp>
diff --git a/include/boost/container/detail/singleton.hpp b/include/boost/container/detail/singleton.hpp
index 0843319a..a2372c3a 100644
--- a/include/boost/container/detail/singleton.hpp
+++ b/include/boost/container/detail/singleton.hpp
@@ -22,6 +22,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_SINGLETON_DETAIL_HPP
 #define BOOST_CONTAINER_DETAIL_SINGLETON_DETAIL_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
diff --git a/include/boost/container/detail/tree.hpp b/include/boost/container/detail/tree.hpp
index b5600dd2..e59bca08 100644
--- a/include/boost/container/detail/tree.hpp
+++ b/include/boost/container/detail/tree.hpp
@@ -11,6 +11,10 @@
 #ifndef BOOST_CONTAINER_TREE_HPP
 #define BOOST_CONTAINER_TREE_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 #include <boost/container/container_fwd.hpp>
diff --git a/include/boost/container/detail/utilities.hpp b/include/boost/container/detail/utilities.hpp
index eeac7d1a..25f035df 100644
--- a/include/boost/container/detail/utilities.hpp
+++ b/include/boost/container/detail/utilities.hpp
@@ -11,6 +11,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_UTILITIES_HPP
 #define BOOST_CONTAINER_DETAIL_UTILITIES_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
diff --git a/include/boost/container/detail/version_type.hpp b/include/boost/container/detail/version_type.hpp
index 548fe3bf..2eabc624 100644
--- a/include/boost/container/detail/version_type.hpp
+++ b/include/boost/container/detail/version_type.hpp
@@ -16,6 +16,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_VERSION_TYPE_HPP
 #define BOOST_CONTAINER_DETAIL_VERSION_TYPE_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
diff --git a/include/boost/container/detail/workaround.hpp b/include/boost/container/detail/workaround.hpp
index bee4c1a6..55ebe339 100644
--- a/include/boost/container/detail/workaround.hpp
+++ b/include/boost/container/detail/workaround.hpp
@@ -11,6 +11,10 @@
 #ifndef BOOST_CONTAINER_DETAIL_WORKAROUND_HPP
 #define BOOST_CONTAINER_DETAIL_WORKAROUND_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 
 #if    !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)\
diff --git a/include/boost/container/options.hpp b/include/boost/container/options.hpp
index 11bf9dee..c36ad301 100644
--- a/include/boost/container/options.hpp
+++ b/include/boost/container/options.hpp
@@ -13,6 +13,10 @@
 #ifndef BOOST_CONTAINER_OPTIONS_HPP
 #define BOOST_CONTAINER_OPTIONS_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/container_fwd.hpp>
 #include <boost/intrusive/pack_options.hpp>
diff --git a/include/boost/container/string.hpp b/include/boost/container/string.hpp
index bb0cc05d..1c3cf3bb 100644
--- a/include/boost/container/string.hpp
+++ b/include/boost/container/string.hpp
@@ -11,6 +11,10 @@
 #ifndef BOOST_CONTAINER_STRING_HPP
 #define BOOST_CONTAINER_STRING_HPP
 
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
diff --git a/include/boost/container/throw_exception.hpp b/include/boost/container/throw_exception.hpp
index ab01c30f..02768856 100644
--- a/include/boost/container/throw_exception.hpp
+++ b/include/boost/container/throw_exception.hpp
@@ -11,13 +11,13 @@
 #ifndef BOOST_CONTAINER_THROW_EXCEPTION_HPP
 #define BOOST_CONTAINER_THROW_EXCEPTION_HPP
 
-#include <boost/container/detail/config_begin.hpp>
-#include <boost/container/detail/workaround.hpp>
-
 #if defined(_MSC_VER)
 #  pragma once
 #endif
 
+#include <boost/container/detail/config_begin.hpp>
+#include <boost/container/detail/workaround.hpp>
+
 #ifndef BOOST_NO_EXCEPTIONS
    #include <stdexcept> //for std exception types
    #include <new>       //for std::bad_alloc