diff --git a/include/boost/interprocess/detail/win32_api.hpp b/include/boost/interprocess/detail/win32_api.hpp
index bc700d7..e206b58 100644
--- a/include/boost/interprocess/detail/win32_api.hpp
+++ b/include/boost/interprocess/detail/win32_api.hpp
@@ -31,10 +31,6 @@
 #include <string>
 #include <vector>
 
-#ifdef BOOST_USE_WINDOWS_H
-#include <windows.h>
-#endif
-
 #if defined(_MSC_VER)
 #  pragma once
 #  pragma comment( lib, "Advapi32.lib" )
@@ -43,6 +39,9 @@
 #endif
 
 #if defined (BOOST_INTERPROCESS_WINDOWS)
+#  ifdef BOOST_USE_WINDOWS_H
+#     include <windows.h>
+#  endif
 #  include <cstdarg>
 #  include <boost/detail/interlocked.hpp>
 #else
diff --git a/include/boost/interprocess/detail/workaround.hpp b/include/boost/interprocess/detail/workaround.hpp
index 2d4c70a..4c43603 100644
--- a/include/boost/interprocess/detail/workaround.hpp
+++ b/include/boost/interprocess/detail/workaround.hpp
@@ -25,7 +25,7 @@
 
 //#define BOOST_INTERPROCESS_FORCE_NATIVE_EMULATION
 
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#if !defined(__CYGWIN__) && (defined(_WIN32) || defined(__WIN32__) || defined(WIN32))
    #define BOOST_INTERPROCESS_WINDOWS
    #if !defined(BOOST_INTERPROCESS_FORCE_NATIVE_EMULATION) && !defined(BOOST_INTERPROCESS_FORCE_GENERIC_EMULATION)
       #define BOOST_INTERPROCESS_FORCE_GENERIC_EMULATION