diff --git a/include/wx/app.h b/include/wx/app.h
index 67f500de2f..5e31544b35 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -516,7 +516,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
 };
 
-#if defined(__UNIX__) && !defined(__WXMSW__)
+#if defined(__UNIX__) && !defined(__WINDOWS__)
     #include "wx/unix/app.h"
 #else
     // this has to be a class and not a typedef as we forward declare it
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9e7353c76a..af282b8eed 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -193,7 +193,7 @@
 
 /* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
 /* when using Windows sockets. */
-#if defined(__CYGWIN__) && defined(__WXMSW__)
+#if defined(__CYGWIN__) && defined(__WINDOWS__)
 #define __USE_W32_SOCKETS
 #endif
 
diff --git a/include/wx/private/pipestream.h b/include/wx/private/pipestream.h
index f14d9aba79..7fdcb71760 100644
--- a/include/wx/private/pipestream.h
+++ b/include/wx/private/pipestream.h
@@ -20,7 +20,7 @@
 // IsOpened() method.
 //
 // wxPipeOutputStream is similar but has no additional methods at all.
-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WINDOWS__)
     #include "wx/unix/private/pipestream.h"
 #elif defined(__WINDOWS__) && !defined(__WXWINCE__)
     #include "wx/msw/private/pipestream.h"
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 7a7b5f73c2..62badbc68b 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -46,7 +46,7 @@
 
 #include <errno.h>
 
-#if defined(__UNIX__) && !defined(__WXMSW__)
+#if defined(__UNIX__) && !defined(__WINDOWS__)
     #include <netdb.h>
     #include <arpa/inet.h>
 #endif // __UNIX__