diff --git a/include/boost/predef/platform/windows_desktop.h b/include/boost/predef/platform/windows_desktop.h
index de5fa87..9d3a5b0 100644
--- a/include/boost/predef/platform/windows_desktop.h
+++ b/include/boost/predef/platform/windows_desktop.h
@@ -10,6 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/predef/version_number.h>
 #include <boost/predef/make.h>
+#include <boost/predef/os/windows.h>
 
 /*`
 [heading `BOOST_PLAT_WINDOWS_DESKTOP`]
@@ -24,7 +25,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_PLAT_WINDOWS_DESKTOP BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
-#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
+#if BOOST_OS_WINDOWS && \
+    ( !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) )
 #   undef BOOST_PLAT_WINDOWS_DESKTOP
 #   define BOOST_PLAT_WINDOWS_DESKTOP BOOST_VERSION_NUMBER_AVAILABLE
 #endif
diff --git a/include/boost/predef/platform/windows_phone.h b/include/boost/predef/platform/windows_phone.h
index 3e90505..90ea5ed 100644
--- a/include/boost/predef/platform/windows_phone.h
+++ b/include/boost/predef/platform/windows_phone.h
@@ -10,6 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/predef/version_number.h>
 #include <boost/predef/make.h>
+#include <boost/predef/os/windows.h>
 
 /*`
 [heading `BOOST_PLAT_WINDOWS_PHONE`]
@@ -23,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_PLAT_WINDOWS_PHONE BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
-#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#if BOOST_OS_WINDOWS && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
 #   undef BOOST_PLAT_WINDOWS_PHONE
 #   define BOOST_PLAT_WINDOWS_PHONE BOOST_VERSION_NUMBER_AVAILABLE
 #endif
diff --git a/include/boost/predef/platform/windows_runtime.h b/include/boost/predef/platform/windows_runtime.h
index e93e4bb..1440fe3 100644
--- a/include/boost/predef/platform/windows_runtime.h
+++ b/include/boost/predef/platform/windows_runtime.h
@@ -10,6 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/predef/version_number.h>
 #include <boost/predef/make.h>
+#include <boost/predef/os/windows.h>
 
 /*`
 [heading `BOOST_PLAT_WINDOWS_RUNTIME`]
@@ -24,7 +25,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_PLAT_WINDOWS_RUNTIME BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
-#if WINAPI_FAMILY == WINAPI_FAMILY_APP || WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#if BOOST_OS_WINDOWS && \
+    ( WINAPI_FAMILY == WINAPI_FAMILY_APP || WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP )
 #   undef BOOST_PLAT_WINDOWS_RUNTIME
 #   define BOOST_PLAT_WINDOWS_RUNTIME BOOST_VERSION_NUMBER_AVAILABLE
 #endif
diff --git a/include/boost/predef/platform/windows_store.h b/include/boost/predef/platform/windows_store.h
index e577e37..641c7b9 100644
--- a/include/boost/predef/platform/windows_store.h
+++ b/include/boost/predef/platform/windows_store.h
@@ -10,6 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/predef/version_number.h>
 #include <boost/predef/make.h>
+#include <boost/predef/os/windows.h>
 
 /*`
 [heading `BOOST_PLAT_WINDOWS_STORE`]
@@ -23,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_PLAT_WINDOWS_STORE BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
-#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+#if BOOST_OS_WINDOWS && WINAPI_FAMILY == WINAPI_FAMILY_APP
 #   undef BOOST_PLAT_WINDOWS_STORE
 #   define BOOST_PLAT_WINDOWS_STORE BOOST_VERSION_NUMBER_AVAILABLE
 #endif