diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 001c18be46..38105d5fa2 100644
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -9,7 +9,7 @@
 #ifndef __GSOCK_MSW_H
 #define __GSOCK_MSW_H
 
-#ifdef __WXMSW__
+#ifndef __GSOCKET_STANDALONE__
 #include "wx/gsocket.h"
 #else
 #include "gsocket.h"
@@ -18,6 +18,10 @@
 #include <winsock.h>
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Definition of GSocket */
 struct _GSocket
 {
@@ -51,10 +55,6 @@ struct _GAddress
 };
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Input / output */
 
 GSocketError _GSocket_Input_Timeout(GSocket *socket);