diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index bfc7e17bb2..46dffe8adc 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -24,10 +24,7 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 
-extern "C"
-{
-    struct GSocketGUIFunctionsTable;
-}
+class GSocketGUIFunctionsTable;
 
 // ----------------------------------------------------------------------------
 // toolkit information
diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 1feda83e41..aa85493415 100644
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -118,7 +118,7 @@ public:
 
 /* Sets GUI functions callbacks. Must be called *before* GSocket_Init
    if the app uses async sockets. */
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc);
 
 /* GSocket_Init() must be called at the beginning */
 int GSocket_Init(void);
diff --git a/src/mac/carbon/gsocket.cpp b/src/mac/carbon/gsocket.cpp
index 18154c6469..8437812274 100644
--- a/src/mac/carbon/gsocket.cpp
+++ b/src/mac/carbon/gsocket.cpp
@@ -202,7 +202,7 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 
 /* Global initialisers */
 
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *table)
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *table)
 {
     // do nothing, wxMac doesn't have wxBase-GUI separation yet
 }
diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index 93c654e2c4..ddd98cc06e 100644
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -92,7 +92,7 @@
 /* Table of GUI-related functions. We must call them indirectly because
  * of wxBase and GUI separation: */
 
-static class GSocketGUIFunctionsTable *gs_gui_functions;
+static GSocketGUIFunctionsTable *gs_gui_functions;
 
 class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
 {
@@ -122,7 +122,7 @@ void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket))
 {}
 /* Global initialisers */
 
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)
 {
   gs_gui_functions = guifunc;
 }
@@ -133,7 +133,7 @@ int GSocket_Init(void)
 
   if (!gs_gui_functions)
   {
-    static class GSocketGUIFunctionsTableNull table;
+    static GSocketGUIFunctionsTableNull table;
     gs_gui_functions = &table;
   }
   if ( !gs_gui_functions->OnInit() )
diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 5225353a7d..32c0c8c0e4 100644
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -164,7 +164,7 @@ int _System soclose(int);
 /* Table of GUI-related functions. We must call them indirectly because
  * of wxBase and GUI separation: */
 
-static struct GSocketGUIFunctionsTable *gs_gui_functions;
+static GSocketGUIFunctionsTable *gs_gui_functions;
 
 class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
 {
@@ -200,7 +200,7 @@ void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *socket)
 {}
 /* Global initialisers */
 
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)
 {
   gs_gui_functions = guifunc;
 }
@@ -209,7 +209,7 @@ int GSocket_Init(void)
 {
   if (!gs_gui_functions)
   {
-    static class GSocketGUIFunctionsTableNull table;
+    static GSocketGUIFunctionsTableNull table;
     gs_gui_functions = &table;
   }
   if ( !gs_gui_functions->OnInit() )