diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 8a751a4..f472b6a 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -25,6 +25,7 @@ project.pop-current ;
 
 # Windows libs
 lib psapi ;
+lib advapi32 ;
 lib ws2_32 ;
 lib mswsock ;
 
@@ -184,10 +185,16 @@ project boost/log
         <threading>multi:<library>/boost/atomic//boost_atomic
         <threading>multi:<library>/boost/thread//boost_thread
 
+        <target-os>windows:<define>NOMINMAX
+        <target-os>windows:<define>WIN32_LEAN_AND_MEAN
+        <target-os>windows:<define>BOOST_USE_WINDOWS_H
         <target-os>windows:<library>ws2_32
         <target-os>windows:<library>mswsock
 
+        <target-os>cygwin:<define>NOMINMAX
+        <target-os>cygwin:<define>WIN32_LEAN_AND_MEAN
         <target-os>cygwin:<define>__USE_W32_SOCKETS
+        <target-os>cygwin:<define>BOOST_USE_WINDOWS_H
         <target-os>cygwin:<library>ws2_32
         <target-os>cygwin:<library>mswsock
 
@@ -395,6 +402,7 @@ rule select-log-api-specific-sources ( properties * )
         result = <source>simple_event_log.mc ;
         result += <source>event_log_backend.cpp ;
         result += <library>psapi ;
+        result += <library>advapi32 ;
 
         DEPENDS event_log_backend.cpp : simple_event_log.mc ;
     }
diff --git a/include/boost/log/detail/config.hpp b/include/boost/log/detail/config.hpp
index a8edde7..ce9aeb2 100644
--- a/include/boost/log/detail/config.hpp
+++ b/include/boost/log/detail/config.hpp
@@ -23,6 +23,13 @@
 #define __MSVCRT_VERSION__ 0x0700
 #endif
 
+#include <boost/predef/os.h>
+
+// Try including WinAPI config as soon as possible so that any other headers don't include Windows SDK headers
+#if defined(BOOST_OS_WINDOWS_AVAILABLE)
+#include <boost/detail/winapi/config.hpp>
+#endif
+
 #include <limits.h> // To bring in libc macros
 #include <boost/config.hpp>
 
@@ -31,10 +38,6 @@
 #   error Boost.Log: RTTI is required by the library
 #endif
 
-#if defined(BOOST_WINDOWS)
-#include <boost/detail/winapi/config.hpp>
-#endif
-
 #if defined(_MSC_VER) && _MSC_VER >= 1600
 #   define BOOST_LOG_HAS_PRAGMA_DETECT_MISMATCH
 #endif
diff --git a/src/alignment_gap_between.hpp b/src/alignment_gap_between.hpp
index d46c253..cc16a9f 100644
--- a/src/alignment_gap_between.hpp
+++ b/src/alignment_gap_between.hpp
@@ -16,8 +16,8 @@
 #ifndef BOOST_LOG_ALIGNMENT_GAP_BETWEEN_HPP_INCLUDED_
 #define BOOST_LOG_ALIGNMENT_GAP_BETWEEN_HPP_INCLUDED_
 
-#include <boost/type_traits/alignment_of.hpp>
 #include <boost/log/detail/config.hpp>
+#include <boost/type_traits/alignment_of.hpp>
 #include <boost/log/detail/header.hpp>
 
 namespace boost {
diff --git a/src/attribute_name.cpp b/src/attribute_name.cpp
index 9c73212..a804fed 100644
--- a/src/attribute_name.cpp
+++ b/src/attribute_name.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <cstring>
 #include <deque>
 #include <ostream>
diff --git a/src/attribute_set.cpp b/src/attribute_set.cpp
index bfd5d0e..27379e1 100644
--- a/src/attribute_set.cpp
+++ b/src/attribute_set.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <deque>
 #include <boost/assert.hpp>
 #include <boost/intrusive/options.hpp>
diff --git a/src/attribute_set_impl.hpp b/src/attribute_set_impl.hpp
index 0391519..e9de28e 100644
--- a/src/attribute_set_impl.hpp
+++ b/src/attribute_set_impl.hpp
@@ -16,6 +16,7 @@
 #ifndef BOOST_LOG_ATTRIBUTE_SET_IMPL_HPP_INCLUDED_
 #define BOOST_LOG_ATTRIBUTE_SET_IMPL_HPP_INCLUDED_
 
+#include <boost/log/detail/config.hpp>
 #include <new>
 #include <memory>
 #include <limits>
diff --git a/src/attribute_value_set.cpp b/src/attribute_value_set.cpp
index 918109a..14d9752 100644
--- a/src/attribute_value_set.cpp
+++ b/src/attribute_value_set.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <new>
 #include <memory>
 #include <boost/array.hpp>
diff --git a/src/code_conversion.cpp b/src/code_conversion.cpp
index 0be9cd4..3b05f21 100644
--- a/src/code_conversion.cpp
+++ b/src/code_conversion.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <cstddef>
 #include <locale>
 #include <string>
diff --git a/src/core.cpp b/src/core.cpp
index ddbc66a..afec66e 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <cstddef>
 #include <new>
 #include <vector>
diff --git a/src/date_time_format_parser.cpp b/src/date_time_format_parser.cpp
index d7af7cd..0ad8694 100644
--- a/src/date_time_format_parser.cpp
+++ b/src/date_time_format_parser.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <cstring>
 #include <string>
 #include <algorithm>
diff --git a/src/debug_output_backend.cpp b/src/debug_output_backend.cpp
index ebf8259..105dd68 100644
--- a/src/debug_output_backend.cpp
+++ b/src/debug_output_backend.cpp
@@ -14,7 +14,7 @@
 
 #ifndef BOOST_LOG_WITHOUT_DEBUG_OUTPUT
 
-#include "windows_version.hpp"
+#include <boost/log/detail/config.hpp>
 #include <string>
 #include <boost/log/sinks/debug_output_backend.hpp>
 #include <windows.h>
diff --git a/src/default_attribute_names.cpp b/src/default_attribute_names.cpp
index 9bd3cbe..81bce3b 100644
--- a/src/default_attribute_names.cpp
+++ b/src/default_attribute_names.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/detail/default_attribute_names.hpp>
 #include <boost/log/detail/singleton.hpp>
diff --git a/src/default_filter_factory.cpp b/src/default_filter_factory.cpp
index 5182ae0..225e5d4 100644
--- a/src/default_filter_factory.cpp
+++ b/src/default_filter_factory.cpp
@@ -15,6 +15,7 @@
 
 #if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
 
+#include <boost/log/detail/setup_config.hpp>
 #include <string>
 #include <boost/mpl/vector.hpp>
 #include <boost/preprocessor/seq/enum.hpp>
diff --git a/src/default_filter_factory.hpp b/src/default_filter_factory.hpp
index e1e063d..455eb42 100644
--- a/src/default_filter_factory.hpp
+++ b/src/default_filter_factory.hpp
@@ -16,6 +16,7 @@
 #ifndef BOOST_DEFAULT_FILTER_FACTORY_HPP_INCLUDED_
 #define BOOST_DEFAULT_FILTER_FACTORY_HPP_INCLUDED_
 
+#include <boost/log/detail/setup_config.hpp>
 #include <cstddef>
 #include <boost/log/attributes/attribute_name.hpp>
 #include <boost/log/attributes/value_visitation.hpp>
diff --git a/src/default_formatter_factory.cpp b/src/default_formatter_factory.cpp
index da55108..5e137ea 100644
--- a/src/default_formatter_factory.cpp
+++ b/src/default_formatter_factory.cpp
@@ -15,6 +15,7 @@
 
 #if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
 
+#include <boost/log/detail/setup_config.hpp>
 #include <cstddef>
 #include <ctime>
 #include <boost/mpl/vector.hpp>
diff --git a/src/default_formatter_factory.hpp b/src/default_formatter_factory.hpp
index 9cd8321..6359b3b 100644
--- a/src/default_formatter_factory.hpp
+++ b/src/default_formatter_factory.hpp
@@ -16,6 +16,7 @@
 #ifndef BOOST_DEFAULT_FORMATTER_FACTORY_HPP_INCLUDED_
 #define BOOST_DEFAULT_FORMATTER_FACTORY_HPP_INCLUDED_
 
+#include <boost/log/detail/setup_config.hpp>
 #include <boost/log/attributes/attribute_name.hpp>
 #include <boost/log/utility/setup/formatter_parser.hpp>
 #include <boost/log/detail/header.hpp>
diff --git a/src/default_sink.cpp b/src/default_sink.cpp
index 8de0f0e..9258754 100644
--- a/src/default_sink.cpp
+++ b/src/default_sink.cpp
@@ -13,9 +13,9 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <cstdio>
 #include <boost/optional/optional.hpp>
-#include <boost/log/detail/config.hpp>
 #if !defined(BOOST_LOG_NO_THREADS)
 #include <boost/thread/locks.hpp>
 #include <boost/log/detail/thread_id.hpp>
diff --git a/src/dump.cpp b/src/dump.cpp
index 6b9b83b..60f5489 100644
--- a/src/dump.cpp
+++ b/src/dump.cpp
@@ -13,11 +13,11 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <ostream>
 #include <boost/cstdint.hpp>
 #include <boost/log/utility/manipulators/dump.hpp>
 #if defined(_MSC_VER) && (defined(BOOST_LOG_USE_SSSE3) || defined(BOOST_LOG_USE_AVX2))
-#include "windows_version.hpp"
 #include <boost/detail/winapi/dll.hpp>
 #include <intrin.h> // __cpuid
 #endif
diff --git a/src/dump_avx2.cpp b/src/dump_avx2.cpp
index ad403ca..4ab1250 100644
--- a/src/dump_avx2.cpp
+++ b/src/dump_avx2.cpp
@@ -16,10 +16,10 @@
 // NOTE: You should generally avoid including headers as much as possible here, because this file
 //       is compiled with special compiler options, and any included header may result in generation of
 //       unintended code with these options and violation of ODR.
+#include <boost/log/detail/config.hpp>
 #include <ostream>
 #include <immintrin.h>
 #include <boost/cstdint.hpp>
-#include <boost/log/detail/config.hpp>
 #include <boost/log/detail/header.hpp>
 
 #if defined(__x86_64) || defined(__x86_64__) || \
diff --git a/src/dump_ssse3.cpp b/src/dump_ssse3.cpp
index e3aede5..1325b49 100644
--- a/src/dump_ssse3.cpp
+++ b/src/dump_ssse3.cpp
@@ -16,10 +16,10 @@
 // NOTE: You should generally avoid including headers as much as possible here, because this file
 //       is compiled with special compiler options, and any included header may result in generation of
 //       unintended code with these options and violation of ODR.
+#include <boost/log/detail/config.hpp>
 #include <ostream>
 #include <tmmintrin.h>
 #include <boost/cstdint.hpp>
-#include <boost/log/detail/config.hpp>
 #include <boost/log/detail/header.hpp>
 
 #if defined(__x86_64) || defined(__x86_64__) || \
diff --git a/src/event.cpp b/src/event.cpp
index 487bafa..e3bb152 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -60,7 +60,6 @@
 
 #elif defined(BOOST_LOG_EVENT_USE_WINAPI)
 
-#include "windows_version.hpp"
 #include <windows.h>
 #include <boost/detail/interlocked.hpp>
 
diff --git a/src/event_log_backend.cpp b/src/event_log_backend.cpp
index ea9471c..a2edb24 100644
--- a/src/event_log_backend.cpp
+++ b/src/event_log_backend.cpp
@@ -15,7 +15,7 @@
 
 #ifndef BOOST_LOG_WITHOUT_EVENT_LOG
 
-#include "windows_version.hpp"
+#include <boost/log/detail/config.hpp>
 #include <string>
 #include <vector>
 #include <ostream>
@@ -34,16 +34,6 @@
 #include <windows.h>
 #include <psapi.h>
 #include "simple_event_log.h"
-
-#if defined(_MSC_VER) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_LOG_NO_LIB)
-# define BOOST_AUTO_LINK_NOMANGLE
-# define BOOST_LIB_NAME "psapi"
-# include <boost/config/auto_link.hpp>
-# define BOOST_LIB_NAME "advapi32"
-# include <boost/config/auto_link.hpp>
-# undef BOOST_AUTO_LINK_NOMANGLE
-#endif
-
 #include <boost/log/detail/header.hpp>
 
 namespace boost {
diff --git a/src/event_log_registry.hpp b/src/event_log_registry.hpp
index b87555d..e38d200 100644
--- a/src/event_log_registry.hpp
+++ b/src/event_log_registry.hpp
@@ -16,15 +16,14 @@
 #ifndef BOOST_LOG_EVENT_LOG_REGISTRY_HPP_INCLUDED_
 #define BOOST_LOG_EVENT_LOG_REGISTRY_HPP_INCLUDED_
 
-#include "windows_version.hpp"
+#include <boost/log/detail/config.hpp>
 #include <cwchar>
 #include <cstring>
 #include <string>
 #include <sstream>
 #include <stdexcept>
 #include <boost/version.hpp>
-#include <boost/optional.hpp>
-#include <boost/log/detail/config.hpp>
+#include <boost/optional/optional.hpp>
 #include <boost/log/detail/code_conversion.hpp>
 #include <boost/log/exceptions.hpp>
 #include <windows.h>
diff --git a/src/exceptions.cpp b/src/exceptions.cpp
index 0adcef4..a7915b7 100644
--- a/src/exceptions.cpp
+++ b/src/exceptions.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/exception/exception.hpp>
 #include <boost/exception/errinfo_at_line.hpp>
diff --git a/src/filter_parser.cpp b/src/filter_parser.cpp
index d46c5df..6327cef 100644
--- a/src/filter_parser.cpp
+++ b/src/filter_parser.cpp
@@ -15,6 +15,7 @@
 
 #ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS
 
+#include <boost/log/detail/setup_config.hpp>
 #include <cstddef>
 #include <map>
 #include <stack>
diff --git a/src/format_parser.cpp b/src/format_parser.cpp
index 587b1d8..7afbda8 100644
--- a/src/format_parser.cpp
+++ b/src/format_parser.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <string>
 #include <algorithm>
 #include <boost/throw_exception.hpp>
diff --git a/src/formatter_parser.cpp b/src/formatter_parser.cpp
index 0b40545..e84f157 100644
--- a/src/formatter_parser.cpp
+++ b/src/formatter_parser.cpp
@@ -15,6 +15,7 @@
 
 #ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS
 
+#include <boost/log/detail/setup_config.hpp>
 #include <map>
 #include <string>
 #include <sstream>
diff --git a/src/global_logger_storage.cpp b/src/global_logger_storage.cpp
index 1cd026a..6ddcc1b 100644
--- a/src/global_logger_storage.cpp
+++ b/src/global_logger_storage.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <map>
 #include <string>
 #include <boost/limits.hpp>
diff --git a/src/id_formatting.hpp b/src/id_formatting.hpp
index 799f1d0..b42c512 100644
--- a/src/id_formatting.hpp
+++ b/src/id_formatting.hpp
@@ -16,8 +16,8 @@
 #ifndef BOOST_LOG_ID_FORMATTING_HPP_INCLUDED_
 #define BOOST_LOG_ID_FORMATTING_HPP_INCLUDED_
 
-#include <cstddef>
 #include <boost/log/detail/config.hpp>
+#include <cstddef>
 #include <boost/log/detail/header.hpp>
 
 namespace boost {
diff --git a/src/init_from_settings.cpp b/src/init_from_settings.cpp
index a0f5e81..6852f37 100644
--- a/src/init_from_settings.cpp
+++ b/src/init_from_settings.cpp
@@ -23,7 +23,7 @@
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
-#include "windows_version.hpp"
+#include <boost/log/detail/setup_config.hpp>
 #include <cstddef>
 #include <ios>
 #include <map>
diff --git a/src/init_from_stream.cpp b/src/init_from_stream.cpp
index b73a54f..1bf518b 100644
--- a/src/init_from_stream.cpp
+++ b/src/init_from_stream.cpp
@@ -15,7 +15,7 @@
 
 #ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS
 
-#include <boost/log/detail/config.hpp>
+#include <boost/log/detail/setup_config.hpp>
 #include <boost/log/utility/setup/from_settings.hpp>
 #include <boost/log/utility/setup/settings_parser.hpp>
 #include <boost/log/detail/header.hpp>
diff --git a/src/light_rw_mutex.cpp b/src/light_rw_mutex.cpp
index 6d2912b..47d3ebb 100644
--- a/src/light_rw_mutex.cpp
+++ b/src/light_rw_mutex.cpp
@@ -13,7 +13,6 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
-// This first include is to ensure that __MSVCRT_VERSION__ is defined properly
 #include <boost/log/detail/config.hpp>
 #include <boost/log/detail/light_rw_mutex.hpp>
 
@@ -28,7 +27,6 @@
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/log/utility/once_block.hpp>
 
-#include "windows_version.hpp"
 #include <boost/detail/winapi/basic_types.hpp>
 #include <boost/detail/winapi/dll.hpp>
 
diff --git a/src/named_scope.cpp b/src/named_scope.cpp
index f471df3..5fa634a 100644
--- a/src/named_scope.cpp
+++ b/src/named_scope.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <utility>
 #include <algorithm>
 #include <boost/type_index.hpp>
diff --git a/src/named_scope_format_parser.cpp b/src/named_scope_format_parser.cpp
index 77f21c7..d48eca2 100644
--- a/src/named_scope_format_parser.cpp
+++ b/src/named_scope_format_parser.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <cstddef>
 #include <cstring>
 #include <string>
diff --git a/src/once_block.cpp b/src/once_block.cpp
index e19165c..dde7ea5 100644
--- a/src/once_block.cpp
+++ b/src/once_block.cpp
@@ -15,6 +15,7 @@
  * The code in this file is based on the \c call_once function implementation in Boost.Thread.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <boost/log/utility/once_block.hpp>
 #ifndef BOOST_LOG_NO_THREADS
 
@@ -23,7 +24,6 @@
 
 #if defined(BOOST_THREAD_PLATFORM_WIN32)
 
-#include "windows_version.hpp"
 #include <boost/detail/winapi/wait.hpp> // INFINITE
 #include <boost/detail/winapi/srw_lock.hpp>
 #include <boost/detail/winapi/condition_variable.hpp>
diff --git a/src/parser_utils.cpp b/src/parser_utils.cpp
index ff00bf8..08a5de8 100644
--- a/src/parser_utils.cpp
+++ b/src/parser_utils.cpp
@@ -15,6 +15,7 @@
 
 #ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS
 
+#include <boost/log/detail/setup_config.hpp>
 #include <cctype>
 #include <iterator>
 #include <algorithm>
diff --git a/src/parser_utils.hpp b/src/parser_utils.hpp
index 3086604..e667ccc 100644
--- a/src/parser_utils.hpp
+++ b/src/parser_utils.hpp
@@ -16,10 +16,10 @@
 #ifndef BOOST_LOG_PARSER_UTILS_HPP_INCLUDED_
 #define BOOST_LOG_PARSER_UTILS_HPP_INCLUDED_
 
+#include <boost/log/detail/config.hpp>
 #include <string>
 #include <iostream>
 #include <cctype>
-#include <boost/log/detail/config.hpp>
 #include <boost/log/utility/string_literal.hpp>
 #include <boost/log/detail/header.hpp>
 
diff --git a/src/process_id.cpp b/src/process_id.cpp
index 291ab79..603b723 100644
--- a/src/process_id.cpp
+++ b/src/process_id.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <iostream>
 #include <boost/log/detail/process_id.hpp>
 #include "id_formatting.hpp"
@@ -20,9 +21,6 @@
 
 #if defined(BOOST_WINDOWS)
 
-#define WIN32_LEAN_AND_MEAN
-
-#include "windows_version.hpp"
 #include <windows.h>
 
 namespace boost {
diff --git a/src/process_name.cpp b/src/process_name.cpp
index 19b14c6..864defa 100644
--- a/src/process_name.cpp
+++ b/src/process_name.cpp
@@ -17,6 +17,7 @@
  * http://stackoverflow.com/questions/1023306/finding-current-executables-path-without-proc-self-exe
  */
 
+#include <boost/log/detail/config.hpp>
 #include <climits> // PATH_MAX
 #include <boost/log/attributes/current_process_name.hpp>
 #include <boost/filesystem/path.hpp>
@@ -27,9 +28,6 @@
 
 #if defined(BOOST_WINDOWS)
 
-#define WIN32_LEAN_AND_MEAN
-
-#include "windows_version.hpp"
 #include <windows.h>
 #include <boost/log/detail/header.hpp>
 
diff --git a/src/record_ostream.cpp b/src/record_ostream.cpp
index f8a28ac..1170694 100644
--- a/src/record_ostream.cpp
+++ b/src/record_ostream.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <locale>
 #include <utility>
 #include <boost/log/sources/record_ostream.hpp>
diff --git a/src/settings_parser.cpp b/src/settings_parser.cpp
index ffc9d77..5d8a927 100644
--- a/src/settings_parser.cpp
+++ b/src/settings_parser.cpp
@@ -15,6 +15,7 @@
 
 #ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS
 
+#include <boost/log/detail/setup_config.hpp>
 #include <string>
 #include <locale>
 #include <iostream>
@@ -27,7 +28,6 @@
 #include <boost/io/ios_state.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility.hpp>
-#include <boost/log/detail/config.hpp>
 #include <boost/log/detail/code_conversion.hpp>
 #include <boost/log/utility/setup/settings_parser.hpp>
 #include <boost/log/exceptions.hpp>
diff --git a/src/severity_level.cpp b/src/severity_level.cpp
index c704778..85c7e76 100644
--- a/src/severity_level.cpp
+++ b/src/severity_level.cpp
@@ -13,8 +13,8 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
-#include <boost/cstdint.hpp>
 #include <boost/log/detail/config.hpp>
+#include <boost/cstdint.hpp>
 #include <boost/log/sources/severity_feature.hpp>
 
 #if !defined(BOOST_LOG_NO_THREADS) && !defined(BOOST_LOG_USE_COMPILER_TLS)
diff --git a/src/spirit_encoding.cpp b/src/spirit_encoding.cpp
index d49b39a..1222435 100644
--- a/src/spirit_encoding.cpp
+++ b/src/spirit_encoding.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
 #include "spirit_encoding.hpp"
diff --git a/src/spirit_encoding.hpp b/src/spirit_encoding.hpp
index 4bc9ab3..6542907 100644
--- a/src/spirit_encoding.hpp
+++ b/src/spirit_encoding.hpp
@@ -16,12 +16,12 @@
 #ifndef BOOST_LOG_SPIRIT_ENCODING_HPP_INCLUDED_
 #define BOOST_LOG_SPIRIT_ENCODING_HPP_INCLUDED_
 
+#include <boost/log/detail/config.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/spirit/include/support_standard.hpp>
 #include <boost/spirit/include/support_standard_wide.hpp>
 #include <boost/spirit/home/support/common_terminals.hpp>
-#include <boost/log/detail/config.hpp>
 #include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
diff --git a/src/stateless_allocator.hpp b/src/stateless_allocator.hpp
index d8da0d0..3377f08 100644
--- a/src/stateless_allocator.hpp
+++ b/src/stateless_allocator.hpp
@@ -16,10 +16,10 @@
 #ifndef BOOST_LOG_STATELESS_ALLOCATOR_HPP_INCLUDED_
 #define BOOST_LOG_STATELESS_ALLOCATOR_HPP_INCLUDED_
 
+#include <boost/log/detail/config.hpp>
 #include <cstddef>
 #include <cstdlib>
 #include <memory>
-#include <boost/log/detail/config.hpp>
 #include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
diff --git a/src/syslog_backend.cpp b/src/syslog_backend.cpp
index 94a3c0f..6783d5d 100644
--- a/src/syslog_backend.cpp
+++ b/src/syslog_backend.cpp
@@ -15,7 +15,6 @@
 
 #ifndef BOOST_LOG_WITHOUT_SYSLOG
 
-#include "windows_version.hpp"
 #include <boost/log/detail/config.hpp>
 #include <ctime>
 #include <algorithm>
diff --git a/src/text_file_backend.cpp b/src/text_file_backend.cpp
index 4b26772..c4c4d47 100644
--- a/src/text_file_backend.cpp
+++ b/src/text_file_backend.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <ctime>
 #include <cctype>
 #include <cwctype>
diff --git a/src/text_multifile_backend.cpp b/src/text_multifile_backend.cpp
index 8a2eeb4..58669de 100644
--- a/src/text_multifile_backend.cpp
+++ b/src/text_multifile_backend.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <ios>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/src/text_ostream_backend.cpp b/src/text_ostream_backend.cpp
index 4586190..d803d0d 100644
--- a/src/text_ostream_backend.cpp
+++ b/src/text_ostream_backend.cpp
@@ -13,6 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <vector>
 #include <algorithm>
 #include <boost/log/sinks/text_ostream_backend.hpp>
diff --git a/src/thread_id.cpp b/src/thread_id.cpp
index a2125a5..49739f8 100644
--- a/src/thread_id.cpp
+++ b/src/thread_id.cpp
@@ -44,9 +44,6 @@
 
 #if defined(BOOST_WINDOWS)
 
-#define WIN32_LEAN_AND_MEAN
-
-#include "windows_version.hpp"
 #include <windows.h>
 
 namespace boost {
diff --git a/src/thread_specific.cpp b/src/thread_specific.cpp
index d714cc8..c494b8b 100644
--- a/src/thread_specific.cpp
+++ b/src/thread_specific.cpp
@@ -13,9 +13,9 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <string>
 #include <stdexcept>
-#include <boost/log/detail/config.hpp>
 #include <boost/log/exceptions.hpp>
 #include <boost/log/detail/thread_specific.hpp>
 
@@ -23,7 +23,6 @@
 
 #if defined(BOOST_THREAD_PLATFORM_WIN32)
 
-#include "windows_version.hpp"
 #include <windows.h>
 #include <boost/log/detail/header.hpp>
 
diff --git a/src/threadsafe_queue.cpp b/src/threadsafe_queue.cpp
index f7049e6..bbad463 100644
--- a/src/threadsafe_queue.cpp
+++ b/src/threadsafe_queue.cpp
@@ -21,6 +21,7 @@
  * were not included here.
  */
 
+#include <boost/log/detail/config.hpp>
 #include <boost/log/detail/threadsafe_queue.hpp>
 
 #ifndef BOOST_LOG_NO_THREADS
diff --git a/src/timer.cpp b/src/timer.cpp
index 6ef169d..f9b4cdf 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -13,16 +13,14 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
-#include <boost/config.hpp>
+#include <boost/log/detail/config.hpp>
 #include <boost/log/attributes/timer.hpp>
 #include <boost/log/attributes/attribute_value_impl.hpp>
 
 #if defined(BOOST_WINDOWS) && !defined(BOOST_LOG_NO_QUERY_PERFORMANCE_COUNTER)
 
-#include "windows_version.hpp"
 #include <boost/assert.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/log/detail/config.hpp>
 #if !defined(BOOST_LOG_NO_THREADS)
 #include <boost/log/detail/locks.hpp>
 #include <boost/thread/mutex.hpp>
diff --git a/src/timestamp.cpp b/src/timestamp.cpp
index a012978..0f3b940 100644
--- a/src/timestamp.cpp
+++ b/src/timestamp.cpp
@@ -21,7 +21,6 @@
 #include <boost/memory_order.hpp>
 #include <boost/atomic/atomic.hpp>
 #endif
-#include "windows_version.hpp"
 #include <boost/detail/winapi/dll.hpp>
 #include <boost/detail/winapi/time.hpp>
 #else
diff --git a/src/unhandled_exception_count.cpp b/src/unhandled_exception_count.cpp
index 4c50b9c..1e9a395 100644
--- a/src/unhandled_exception_count.cpp
+++ b/src/unhandled_exception_count.cpp
@@ -17,6 +17,7 @@
  * https://github.com/panaseleus/stack_unwinding/blob/master/boost/exception/uncaught_exception_count.hpp
  */
 
+#include <boost/log/detail/config.hpp>
 #include <exception>
 #include <boost/log/detail/unhandled_exception_count.hpp>
 #include <boost/log/detail/header.hpp>
diff --git a/src/windows_version.hpp b/src/windows_version.hpp
deleted file mode 100644
index d2af580..0000000
--- a/src/windows_version.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *          Copyright Andrey Semashev 2007 - 2015.
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE_1_0.txt or copy at
- *          http://www.boost.org/LICENSE_1_0.txt)
- */
-/*!
- * \file   windows_version.hpp
- * \author Andrey Semashev
- * \date   07.03.2009
- *
- * \brief  This header is the Boost.Log library implementation, see the library documentation
- *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
- */
-
-#ifndef BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_
-#define BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_
-
-#include <boost/log/detail/config.hpp>
-
-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-
-// This is to make Boost.ASIO happy
-#ifndef __USE_W32_SOCKETS
-#define __USE_W32_SOCKETS
-#endif
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-
-#endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_