diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index 86cbb3bfef..7c8a3450b8 100644
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -1,6 +1,6 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket)
- * Name:    gsocket.c
+ * Name:    gsocket.cpp
  * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket main MSW file
  * Licence: The wxWindows licence
@@ -8,9 +8,20 @@
  * -------------------------------------------------------------------------
  */
 
-/*
- * PLEASE don't put C++ comments here - this is a C source file.
- */
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #ifdef _MSC_VER
    /* RPCNOTIFICATION_ROUTINE in rasasync.h (included from winsock.h),
diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp
index 81affd4f96..13c14fb687 100644
--- a/src/msw/gsockmsw.cpp
+++ b/src/msw/gsockmsw.cpp
@@ -1,12 +1,27 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket)
- * Name:    gsockmsw.c
+ * Name:    gsockmsw.cpp
  * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket GUI-specific MSW code
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 /*
  * TODO: for WinCE we need to replace WSAAsyncSelect
  * (Windows message-based notification of network events for a socket)