From 0f009657bdb128dc818e423d4d26ecce7ee4f2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Thu, 7 Aug 2003 12:35:39 +0000
Subject: [PATCH] fixed wxBase and GUI separation for sockets code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in               | 96 ++++++++++++++++++++++++++++++++-------
 build/bakefiles/files.bkl | 10 ++--
 build/msw/makefile.bcc    | 57 ++++++++++++++++-------
 build/msw/makefile.gcc    | 47 ++++++++++++++-----
 build/msw/makefile.vc     | 52 ++++++++++++++++-----
 build/msw/makefile.wat    | 47 ++++++++++++++-----
 build/msw/wx_coredll.dsp  |  5 ++
 build/msw/wx_corelib.dsp  |  5 ++
 build/msw/wx_netdll.dsp   |  5 --
 build/msw/wx_netlib.dsp   |  5 --
 10 files changed, 245 insertions(+), 84 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6e86f6e229..ba8d177c86 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3309,6 +3309,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
 	monodll_frame.o \
 	monodll_gauge.o \
 	monodll_gdiobj.o \
+	monodll_gsockmot.o \
 	monodll_icon.o \
 	monodll_listbox.o \
 	monodll_main.o \
@@ -3431,6 +3432,7 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS =  \
 	monodll_gdiimage.o \
 	monodll_gdiobj.o \
 	monodll_gsocket.o \
+	monodll_gsockpm.o \
 	monodll_helpwin.o \
 	monodll_icon.o \
 	monodll_iniconf.o \
@@ -3696,6 +3698,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
 	monolib_frame.o \
 	monolib_gauge.o \
 	monolib_gdiobj.o \
+	monolib_gsockmot.o \
 	monolib_icon.o \
 	monolib_listbox.o \
 	monolib_main.o \
@@ -3818,6 +3821,7 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 =  \
 	monolib_gdiimage.o \
 	monolib_gdiobj.o \
 	monolib_gsocket.o \
+	monolib_gsockpm.o \
 	monolib_helpwin.o \
 	monolib_icon.o \
 	monolib_iniconf.o \
@@ -4083,6 +4087,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
 	coredll_frame.o \
 	coredll_gauge.o \
 	coredll_gdiobj.o \
+	coredll_gsockmot.o \
 	coredll_icon.o \
 	coredll_listbox.o \
 	coredll_main.o \
@@ -4205,6 +4210,7 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 =  \
 	coredll_gdiimage.o \
 	coredll_gdiobj.o \
 	coredll_gsocket.o \
+	coredll_gsockpm.o \
 	coredll_helpwin.o \
 	coredll_icon.o \
 	coredll_iniconf.o \
@@ -4470,6 +4476,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
 	corelib_frame.o \
 	corelib_gauge.o \
 	corelib_gdiobj.o \
+	corelib_gsockmot.o \
 	corelib_icon.o \
 	corelib_listbox.o \
 	corelib_main.o \
@@ -4592,6 +4599,7 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \
 	corelib_gdiimage.o \
 	corelib_gdiobj.o \
 	corelib_gsocket.o \
+	corelib_gsockpm.o \
 	corelib_helpwin.o \
 	corelib_icon.o \
 	corelib_iniconf.o \
@@ -4682,6 +4690,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_gdiobj.o \
+	monodll_gsockgtk.o \
 	monodll_icon.o \
 	monodll_main.o \
 	monodll_pen.o \
@@ -4764,6 +4773,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_fontutil.o \
 	monodll_gdiimage.o \
 	monodll_gdiobj.o \
+	monodll_gsockmsw.o \
 	monodll_helpchm.o \
 	monodll_helpwin.o \
 	monodll_icon.o \
@@ -4811,6 +4821,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_gdiobj.o \
+	monodll_gsockx11.o \
 	monodll_icon.o \
 	monodll_main.o \
 	monodll_minifram.o \
@@ -4851,6 +4862,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_gdiobj.o \
+	coredll_gsockgtk.o \
 	coredll_icon.o \
 	coredll_main.o \
 	coredll_pen.o \
@@ -4933,6 +4945,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
 	coredll_fontutil.o \
 	coredll_gdiimage.o \
 	coredll_gdiobj.o \
+	coredll_gsockmsw.o \
 	coredll_helpchm.o \
 	coredll_helpwin.o \
 	coredll_icon.o \
@@ -4980,6 +4993,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_gdiobj.o \
+	coredll_gsockx11.o \
 	coredll_icon.o \
 	coredll_main.o \
 	coredll_minifram.o \
@@ -5020,6 +5034,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_gdiobj.o \
+	monolib_gsockgtk.o \
 	monolib_icon.o \
 	monolib_main.o \
 	monolib_pen.o \
@@ -5102,6 +5117,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_fontutil.o \
 	monolib_gdiimage.o \
 	monolib_gdiobj.o \
+	monolib_gsockmsw.o \
 	monolib_helpchm.o \
 	monolib_helpwin.o \
 	monolib_icon.o \
@@ -5149,6 +5165,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_gdiobj.o \
+	monolib_gsockx11.o \
 	monolib_icon.o \
 	monolib_main.o \
 	monolib_minifram.o \
@@ -5189,6 +5206,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_gdiobj.o \
+	corelib_gsockgtk.o \
 	corelib_icon.o \
 	corelib_main.o \
 	corelib_pen.o \
@@ -5271,6 +5289,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
 	corelib_fontutil.o \
 	corelib_gdiimage.o \
 	corelib_gdiobj.o \
+	corelib_gsockmsw.o \
 	corelib_helpchm.o \
 	corelib_helpwin.o \
 	corelib_icon.o \
@@ -5318,6 +5337,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_gdiobj.o \
+	corelib_gsockx11.o \
 	corelib_icon.o \
 	corelib_main.o \
 	corelib_minifram.o \
@@ -5428,23 +5448,19 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@	= $(__NET_MACOSX_SRC_OBJECTS)
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
-@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = \
-@COND_PLATFORM_WIN32_1@	monodll_gsocket.o monodll_gsockmsw.o
+@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@	= $(__NET_MACOSX_SRC_OBJECTS_1)
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
-@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_WIN32_1@	= monolib_gsocket.o monolib_gsockmsw.o
+@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@	= $(__NET_MACOSX_SRC_OBJECTS_2)
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
-@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 \
-@COND_PLATFORM_WIN32_1@	= netdll_gsocket.o netdll_gsockmsw.o
+@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@	= $(__NET_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
-@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 \
-@COND_PLATFORM_WIN32_1@	= netlib_gsocket.o netlib_gsockmsw.o
+@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
 @COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
 @COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
@@ -7716,6 +7732,21 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp
 coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c
 	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
+
+coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c
+	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
+
+coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c
+	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.c
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
+
 coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -9770,6 +9801,21 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp
 corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c
 	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
+
+corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c
+	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
+
+corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c
+	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.c
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
+
 corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -12337,9 +12383,21 @@ monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
-monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c
 	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c
+	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.c
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
 monodll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -14853,9 +14911,21 @@ monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
-monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c
 	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c
+	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.c
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
 monolib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16273,9 +16343,6 @@ netdll_ftp.o: $(srcdir)/src/common/ftp.cpp
 @COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
 
-netdll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c
-	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
-
 netdll_http.o: $(srcdir)/src/common/http.cpp
 	$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
 
@@ -16326,9 +16393,6 @@ netlib_ftp.o: $(srcdir)/src/common/ftp.cpp
 @COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
 
-netlib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c
-	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
-
 netlib_http.o: $(srcdir)/src/common/http.cpp
 	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index f67c8c441e..10a5c3a2c3 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -281,7 +281,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="NET_WIN32_SRC" hints="files">
     src/msw/gsocket.c
-    src/msw/gsockmsw.c
 </set>
 <set var="NET_WIN32_HDR" hints="files">
     wx/msw/gsockmsw.h
@@ -643,7 +642,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/evtloop.cpp
     src/gtk/font.cpp
     src/gtk/gdiobj.cpp
-    <!-- src/gtk/gsockgtk.c FIXME -->
+    src/gtk/gsockgtk.c
     src/gtk/icon.cpp
     src/gtk/main.cpp
     src/gtk/pen.cpp
@@ -821,7 +820,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/frame.cpp
     src/motif/gauge.cpp
     src/motif/gdiobj.cpp
-    <!-- src/motif/gsockmot.c FIXME -->
+    src/motif/gsockmot.c
     src/motif/icon.cpp
     src/motif/listbox.cpp
     src/motif/main.cpp
@@ -950,7 +949,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/evtloop.cpp
     src/x11/font.cpp
     src/x11/gdiobj.cpp
-    <!-- src/x11/gsockx11.c FIXME -->
+    src/x11/gsockx11.c
     src/x11/icon.cpp
     src/x11/main.cpp
     src/x11/minifram.cpp
@@ -1031,6 +1030,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
+    src/msw/gsockmsw.c
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/icon.cpp
@@ -1348,7 +1348,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/gdiimage.cpp
     src/os2/gdiobj.cpp
     src/os2/gsocket.c
-    <!-- src/os2/gsockpm.c FIXME -->
+    src/os2/gsockpm.c
     src/os2/helpwin.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 045621f3fd..c54308e92d 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -228,6 +228,12 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_main.obj \
 	$(OBJS)\baselib_mslu.obj \
 	$(OBJS)\baselib_volume.obj
+COREDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
+	-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
+	-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
+	-I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 \
+	$(CFLAGS)
 COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -244,6 +250,11 @@ COREDLL_OBJECTS =  \
 	$(OBJS)\coredll_mslu.obj \
 	$(OBJS)\coredll_volume.obj \
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
+	-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
+	-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
+	-I..\..\src\expat\lib -DwxUSE_BASE=0 $(CFLAGS)
 CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -447,7 +458,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_socket.obj \
 	$(OBJS)\monodll_url.obj \
 	$(OBJS)\monodll_gsocket.obj \
-	$(OBJS)\monodll_gsockmsw.obj \
 	$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
 	$(OBJS)\monodll_xml.obj
 MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
@@ -542,7 +552,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_socket.obj \
 	$(OBJS)\monolib_url.obj \
 	$(OBJS)\monolib_gsocket.obj \
-	$(OBJS)\monolib_gsockmsw.obj \
 	$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
 	$(OBJS)\monolib_xml.obj
 NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
@@ -568,8 +577,7 @@ NETDLL_OBJECTS =  \
 	$(OBJS)\netdll_sckstrm.obj \
 	$(OBJS)\netdll_socket.obj \
 	$(OBJS)\netdll_url.obj \
-	$(OBJS)\netdll_gsocket.obj \
-	$(OBJS)\netdll_gsockmsw.obj
+	$(OBJS)\netdll_gsocket.obj
 NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -593,8 +601,7 @@ NETLIB_OBJECTS =  \
 	$(OBJS)\netlib_sckstrm.obj \
 	$(OBJS)\netlib_socket.obj \
 	$(OBJS)\netlib_url.obj \
-	$(OBJS)\netlib_gsocket.obj \
-	$(OBJS)\netlib_gsockmsw.obj
+	$(OBJS)\netlib_gsocket.obj
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
@@ -623,7 +630,7 @@ WXEXPAT_OBJECTS =  \
 	$(OBJS)\wxexpat_xmlrole.obj \
 	$(OBJS)\wxexpat_xmltok.obj
 WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-	-tWM -I$(LIBDIRNAME) $(CFLAGS)
+	-tWM -I$(LIBDIRNAME) $(CFLAGS) -w-8004 -w-8008 -w-8057 -w-8066
 WXJPEG_OBJECTS =  \
 	$(OBJS)\wxjpeg_jcomapi.obj \
 	$(OBJS)\wxjpeg_jutils.obj \
@@ -672,7 +679,7 @@ WXJPEG_OBJECTS =  \
 	$(OBJS)\wxjpeg_jquant2.obj \
 	$(OBJS)\wxjpeg_jdmerge.obj
 WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-	-tWM -I..\..\src\zlib $(CFLAGS)
+	-tWM -I..\..\src\zlib $(CFLAGS) -w-8004
 WXPNG_OBJECTS =  \
 	$(OBJS)\wxpng_png.obj \
 	$(OBJS)\wxpng_pngerror.obj \
@@ -692,14 +699,14 @@ WXPNG_OBJECTS =  \
 	$(OBJS)\wxpng_pngwtran.obj \
 	$(OBJS)\wxpng_pngwutil.obj
 WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-	-tWM $(CFLAGS)
+	-tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 -w-8066
 WXREGEX_OBJECTS =  \
 	$(OBJS)\wxregex_regcomp.obj \
 	$(OBJS)\wxregex_regexec.obj \
 	$(OBJS)\wxregex_regerror.obj \
 	$(OBJS)\wxregex_regfree.obj
 WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-	-tWM $(CFLAGS)
+	-tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 -w-8060 -w-8066
 WXTIFF_OBJECTS =  \
 	$(OBJS)\wxtiff_tif_win32.obj \
 	$(OBJS)\wxtiff_tif_aux.obj \
@@ -735,7 +742,7 @@ WXTIFF_OBJECTS =  \
 	$(OBJS)\wxtiff_tif_write.obj \
 	$(OBJS)\wxtiff_tif_zip.obj
 WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-	-tWM $(CFLAGS)
+	-tWM $(CFLAGS) -w-8004 -w-8012 -w-8057
 WXZLIB_OBJECTS =  \
 	$(OBJS)\wxzlib_adler32.obj \
 	$(OBJS)\wxzlib_compress.obj \
@@ -886,6 +893,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontutil.obj \
 	$(OBJS)\monolib_gdiimage.obj \
 	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_gsockmsw.obj \
 	$(OBJS)\monolib_helpchm.obj \
 	$(OBJS)\monolib_helpwin.obj \
 	$(OBJS)\monolib_icon.obj \
@@ -1075,6 +1083,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontutil.obj \
 	$(OBJS)\monolib_gdiimage.obj \
 	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_gsockmsw.obj \
 	$(OBJS)\monolib_helpchm.obj \
 	$(OBJS)\monolib_helpwin.obj \
 	$(OBJS)\monolib_icon.obj \
@@ -1264,6 +1273,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontutil.obj \
 	$(OBJS)\coredll_gdiimage.obj \
 	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_gsockmsw.obj \
 	$(OBJS)\coredll_helpchm.obj \
 	$(OBJS)\coredll_helpwin.obj \
 	$(OBJS)\coredll_icon.obj \
@@ -1453,6 +1463,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontutil.obj \
 	$(OBJS)\coredll_gdiimage.obj \
 	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_gsockmsw.obj \
 	$(OBJS)\coredll_helpchm.obj \
 	$(OBJS)\coredll_helpwin.obj \
 	$(OBJS)\coredll_icon.obj \
@@ -1642,6 +1653,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontutil.obj \
 	$(OBJS)\corelib_gdiimage.obj \
 	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_gsockmsw.obj \
 	$(OBJS)\corelib_helpchm.obj \
 	$(OBJS)\corelib_helpwin.obj \
 	$(OBJS)\corelib_icon.obj \
@@ -1831,6 +1843,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontutil.obj \
 	$(OBJS)\corelib_gdiimage.obj \
 	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_gsockmsw.obj \
 	$(OBJS)\corelib_helpchm.obj \
 	$(OBJS)\corelib_helpwin.obj \
 	$(OBJS)\corelib_icon.obj \
@@ -2020,6 +2033,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontutil.obj \
 	$(OBJS)\monodll_gdiimage.obj \
 	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_gsockmsw.obj \
 	$(OBJS)\monodll_helpchm.obj \
 	$(OBJS)\monodll_helpwin.obj \
 	$(OBJS)\monodll_icon.obj \
@@ -2209,6 +2223,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontutil.obj \
 	$(OBJS)\monodll_gdiimage.obj \
 	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_gsockmsw.obj \
 	$(OBJS)\monodll_helpchm.obj \
 	$(OBJS)\monodll_helpwin.obj \
 	$(OBJS)\monodll_icon.obj \
@@ -3550,6 +3565,11 @@ $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) -q -c -P- -o$@ $(COREDLL_CFLAGS) $**
+!endif
+
 $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
@@ -4653,6 +4673,11 @@ $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) -q -c -P- -o$@ $(CORELIB_CFLAGS) $**
+!endif
+
 $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
@@ -6023,8 +6048,10 @@ $(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
 $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c
 	$(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
 	$(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $**
+!endif
 
 $(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7468,8 +7495,10 @@ $(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
 $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c
 	$(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
 	$(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $**
+!endif
 
 $(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8341,9 +8370,6 @@ $(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp
 $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.c
 	$(CC) -q -c -P- -o$@ $(NETDLL_CFLAGS) $**
 
-$(OBJS)\netdll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-	$(CC) -q -c -P- -o$@ $(NETDLL_CFLAGS) $**
-
 $(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp
 	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
 
@@ -8380,9 +8406,6 @@ $(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp
 $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.c
 	$(CC) -q -c -P- -o$@ $(NETLIB_CFLAGS) $**
 
-$(OBJS)\netlib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-	$(CC) -q -c -P- -o$@ $(NETLIB_CFLAGS) $**
-
 $(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp
 	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 74ce19886e..18b5dd175d 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -218,6 +218,12 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_main.o \
 	$(OBJS)\baselib_mslu.o \
 	$(OBJS)\baselib_volume.o
+COREDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
+	-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
+	-I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 \
+	$(CFLAGS)
 COREDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -234,6 +240,11 @@ COREDLL_OBJECTS =  \
 	$(OBJS)\coredll_mslu.o \
 	$(OBJS)\coredll_volume.o \
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
+	-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
+	-I..\..\src\expat\lib -DwxUSE_BASE=0 $(CFLAGS)
 CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -432,7 +443,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_socket.o \
 	$(OBJS)\monodll_url.o \
 	$(OBJS)\monodll_gsocket.o \
-	$(OBJS)\monodll_gsockmsw.o \
 	$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
 	$(OBJS)\monodll_xml.o
 MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
@@ -526,7 +536,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_socket.o \
 	$(OBJS)\monolib_url.o \
 	$(OBJS)\monolib_gsocket.o \
-	$(OBJS)\monolib_gsockmsw.o \
 	$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
 	$(OBJS)\monolib_xml.o
 NETDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
@@ -551,8 +560,7 @@ NETDLL_OBJECTS =  \
 	$(OBJS)\netdll_sckstrm.o \
 	$(OBJS)\netdll_socket.o \
 	$(OBJS)\netdll_url.o \
-	$(OBJS)\netdll_gsocket.o \
-	$(OBJS)\netdll_gsockmsw.o
+	$(OBJS)\netdll_gsocket.o
 NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -575,8 +583,7 @@ NETLIB_OBJECTS =  \
 	$(OBJS)\netlib_sckstrm.o \
 	$(OBJS)\netlib_socket.o \
 	$(OBJS)\netlib_url.o \
-	$(OBJS)\netlib_gsocket.o \
-	$(OBJS)\netlib_gsockmsw.o
+	$(OBJS)\netlib_gsocket.o
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
@@ -866,6 +873,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontutil.o \
 	$(OBJS)\monolib_gdiimage.o \
 	$(OBJS)\monolib_gdiobj.o \
+	$(OBJS)\monolib_gsockmsw.o \
 	$(OBJS)\monolib_helpchm.o \
 	$(OBJS)\monolib_helpwin.o \
 	$(OBJS)\monolib_icon.o \
@@ -1057,6 +1065,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontutil.o \
 	$(OBJS)\monolib_gdiimage.o \
 	$(OBJS)\monolib_gdiobj.o \
+	$(OBJS)\monolib_gsockmsw.o \
 	$(OBJS)\monolib_helpchm.o \
 	$(OBJS)\monolib_helpwin.o \
 	$(OBJS)\monolib_icon.o \
@@ -1248,6 +1257,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontutil.o \
 	$(OBJS)\coredll_gdiimage.o \
 	$(OBJS)\coredll_gdiobj.o \
+	$(OBJS)\coredll_gsockmsw.o \
 	$(OBJS)\coredll_helpchm.o \
 	$(OBJS)\coredll_helpwin.o \
 	$(OBJS)\coredll_icon.o \
@@ -1439,6 +1449,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontutil.o \
 	$(OBJS)\coredll_gdiimage.o \
 	$(OBJS)\coredll_gdiobj.o \
+	$(OBJS)\coredll_gsockmsw.o \
 	$(OBJS)\coredll_helpchm.o \
 	$(OBJS)\coredll_helpwin.o \
 	$(OBJS)\coredll_icon.o \
@@ -1630,6 +1641,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontutil.o \
 	$(OBJS)\corelib_gdiimage.o \
 	$(OBJS)\corelib_gdiobj.o \
+	$(OBJS)\corelib_gsockmsw.o \
 	$(OBJS)\corelib_helpchm.o \
 	$(OBJS)\corelib_helpwin.o \
 	$(OBJS)\corelib_icon.o \
@@ -1821,6 +1833,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontutil.o \
 	$(OBJS)\corelib_gdiimage.o \
 	$(OBJS)\corelib_gdiobj.o \
+	$(OBJS)\corelib_gsockmsw.o \
 	$(OBJS)\corelib_helpchm.o \
 	$(OBJS)\corelib_helpwin.o \
 	$(OBJS)\corelib_icon.o \
@@ -2012,6 +2025,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontutil.o \
 	$(OBJS)\monodll_gdiimage.o \
 	$(OBJS)\monodll_gdiobj.o \
+	$(OBJS)\monodll_gsockmsw.o \
 	$(OBJS)\monodll_helpchm.o \
 	$(OBJS)\monodll_helpwin.o \
 	$(OBJS)\monodll_icon.o \
@@ -2203,6 +2217,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontutil.o \
 	$(OBJS)\monodll_gdiimage.o \
 	$(OBJS)\monodll_gdiobj.o \
+	$(OBJS)\monodll_gsockmsw.o \
 	$(OBJS)\monodll_helpchm.o \
 	$(OBJS)\monodll_helpwin.o \
 	$(OBJS)\monodll_icon.o \
@@ -3657,6 +3672,11 @@ $(OBJS)\coredll_gifdecod.o: ..\..\src\common\gifdecod.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_gsockmsw.o: ..\..\src\msw\gsockmsw.c
+	$(CC) -c -o $@ $(COREDLL_CFLAGS) $<
+endif
+
 $(OBJS)\coredll_gtk.o: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -4860,6 +4880,11 @@ $(OBJS)\corelib_gifdecod.o: ..\..\src\common\gifdecod.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_gsockmsw.o: ..\..\src\msw\gsockmsw.c
+	$(CC) -c -o $@ $(CORELIB_CFLAGS) $<
+endif
+
 $(OBJS)\corelib_gtk.o: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -6330,8 +6355,10 @@ $(OBJS)\monodll_gridsel.o: ..\..\src\generic\gridsel.cpp
 $(OBJS)\monodll_gsocket.o: ..\..\src\msw\gsocket.c
 	$(CC) -c -o $@ $(MONODLL_CFLAGS) $<
 
+ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_gsockmsw.o: ..\..\src\msw\gsockmsw.c
 	$(CC) -c -o $@ $(MONODLL_CFLAGS) $<
+endif
 
 $(OBJS)\monodll_gtk.o: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -7875,8 +7902,10 @@ $(OBJS)\monolib_gridsel.o: ..\..\src\generic\gridsel.cpp
 $(OBJS)\monolib_gsocket.o: ..\..\src\msw\gsocket.c
 	$(CC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
+ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_gsockmsw.o: ..\..\src\msw\gsockmsw.c
 	$(CC) -c -o $@ $(MONOLIB_CFLAGS) $<
+endif
 
 $(OBJS)\monolib_gtk.o: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -8808,9 +8837,6 @@ $(OBJS)\netdll_ftp.o: ..\..\src\common\ftp.cpp
 $(OBJS)\netdll_gsocket.o: ..\..\src\msw\gsocket.c
 	$(CC) -c -o $@ $(NETDLL_CFLAGS) $<
 
-$(OBJS)\netdll_gsockmsw.o: ..\..\src\msw\gsockmsw.c
-	$(CC) -c -o $@ $(NETDLL_CFLAGS) $<
-
 $(OBJS)\netdll_http.o: ..\..\src\common\http.cpp
 	$(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $<
 
@@ -8847,9 +8873,6 @@ $(OBJS)\netlib_ftp.o: ..\..\src\common\ftp.cpp
 $(OBJS)\netlib_gsocket.o: ..\..\src\msw\gsocket.c
 	$(CC) -c -o $@ $(NETLIB_CFLAGS) $<
 
-$(OBJS)\netlib_gsockmsw.o: ..\..\src\msw\gsockmsw.c
-	$(CC) -c -o $@ $(NETLIB_CFLAGS) $<
-
 $(OBJS)\netlib_http.o: ..\..\src\common\http.cpp
 	$(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 50d190b16f..de648e7c15 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -235,6 +235,14 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_main.obj \
 	$(OBJS)\baselib_mslu.obj \
 	$(OBJS)\baselib_volume.obj
+COREDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) /DWIN32 \
+	$(__DEBUGINFO_38) \
+	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
+	$(____DEBUGRUNTIME_104_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	/I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+	/I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+	/DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CFLAGS)
 COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) \
 	/DWIN32 $(__DEBUGINFO_38) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
@@ -254,6 +262,14 @@ COREDLL_OBJECTS =  \
 	$(OBJS)\coredll_mslu.obj \
 	$(OBJS)\coredll_volume.obj \
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) /DWIN32 \
+	$(__DEBUGINFO_38) \
+	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
+	$(____DEBUGRUNTIME_113_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	/I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+	/I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+	/DwxUSE_BASE=0 $(CFLAGS)
 CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) \
 	/DWIN32 $(__DEBUGINFO_38) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
@@ -482,7 +498,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_socket.obj \
 	$(OBJS)\monodll_url.obj \
 	$(OBJS)\monodll_gsocket.obj \
-	$(OBJS)\monodll_gsockmsw.obj \
 	$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
 	$(OBJS)\monodll_xml.obj
 MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \
@@ -581,7 +596,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_socket.obj \
 	$(OBJS)\monolib_url.obj \
 	$(OBJS)\monolib_gsocket.obj \
-	$(OBJS)\monolib_gsockmsw.obj \
 	$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
 	$(OBJS)\monolib_xml.obj
 NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
@@ -612,8 +626,7 @@ NETDLL_OBJECTS =  \
 	$(OBJS)\netdll_sckstrm.obj \
 	$(OBJS)\netdll_socket.obj \
 	$(OBJS)\netdll_url.obj \
-	$(OBJS)\netdll_gsocket.obj \
-	$(OBJS)\netdll_gsockmsw.obj
+	$(OBJS)\netdll_gsocket.obj
 NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
 	$(__DEBUGINFO_38) \
 	/Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
@@ -642,8 +655,7 @@ NETLIB_OBJECTS =  \
 	$(OBJS)\netlib_sckstrm.obj \
 	$(OBJS)\netlib_socket.obj \
 	$(OBJS)\netlib_url.obj \
-	$(OBJS)\netlib_gsocket.obj \
-	$(OBJS)\netlib_gsockmsw.obj
+	$(OBJS)\netlib_gsocket.obj
 OBJS = \
 	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 ODBCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) \
@@ -1206,6 +1218,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontutil.obj \
 	$(OBJS)\monolib_gdiimage.obj \
 	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_gsockmsw.obj \
 	$(OBJS)\monolib_helpchm.obj \
 	$(OBJS)\monolib_helpwin.obj \
 	$(OBJS)\monolib_icon.obj \
@@ -1395,6 +1408,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontutil.obj \
 	$(OBJS)\monolib_gdiimage.obj \
 	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_gsockmsw.obj \
 	$(OBJS)\monolib_helpchm.obj \
 	$(OBJS)\monolib_helpwin.obj \
 	$(OBJS)\monolib_icon.obj \
@@ -1584,6 +1598,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontutil.obj \
 	$(OBJS)\coredll_gdiimage.obj \
 	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_gsockmsw.obj \
 	$(OBJS)\coredll_helpchm.obj \
 	$(OBJS)\coredll_helpwin.obj \
 	$(OBJS)\coredll_icon.obj \
@@ -1773,6 +1788,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontutil.obj \
 	$(OBJS)\coredll_gdiimage.obj \
 	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_gsockmsw.obj \
 	$(OBJS)\coredll_helpchm.obj \
 	$(OBJS)\coredll_helpwin.obj \
 	$(OBJS)\coredll_icon.obj \
@@ -1962,6 +1978,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontutil.obj \
 	$(OBJS)\corelib_gdiimage.obj \
 	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_gsockmsw.obj \
 	$(OBJS)\corelib_helpchm.obj \
 	$(OBJS)\corelib_helpwin.obj \
 	$(OBJS)\corelib_icon.obj \
@@ -2151,6 +2168,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontutil.obj \
 	$(OBJS)\corelib_gdiimage.obj \
 	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_gsockmsw.obj \
 	$(OBJS)\corelib_helpchm.obj \
 	$(OBJS)\corelib_helpwin.obj \
 	$(OBJS)\corelib_icon.obj \
@@ -2340,6 +2358,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontutil.obj \
 	$(OBJS)\monodll_gdiimage.obj \
 	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_gsockmsw.obj \
 	$(OBJS)\monodll_helpchm.obj \
 	$(OBJS)\monodll_helpwin.obj \
 	$(OBJS)\monodll_icon.obj \
@@ -2529,6 +2548,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontutil.obj \
 	$(OBJS)\monodll_gdiimage.obj \
 	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_gsockmsw.obj \
 	$(OBJS)\monodll_helpchm.obj \
 	$(OBJS)\monodll_helpwin.obj \
 	$(OBJS)\monodll_icon.obj \
@@ -4114,6 +4134,11 @@ $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) $**
+!endif
+
 $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 
@@ -5217,6 +5242,11 @@ $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) $**
+!endif
+
 $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 
@@ -6587,8 +6617,10 @@ $(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
 $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c
 	$(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
 	$(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
+!endif
 
 $(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -8032,8 +8064,10 @@ $(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
 $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c
 	$(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
 	$(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
+!endif
 
 $(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8905,9 +8939,6 @@ $(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp
 $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.c
 	$(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $**
 
-$(OBJS)\netdll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-	$(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $**
-
 $(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
 
@@ -8944,9 +8975,6 @@ $(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp
 $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.c
 	$(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $**
 
-$(OBJS)\netlib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-	$(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $**
-
 $(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index a9aea9d1d1..65a0aea08c 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -181,6 +181,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_fontutil.obj &
 	$(OBJS)\monolib_gdiimage.obj &
 	$(OBJS)\monolib_gdiobj.obj &
+	$(OBJS)\monolib_gsockmsw.obj &
 	$(OBJS)\monolib_helpchm.obj &
 	$(OBJS)\monolib_helpwin.obj &
 	$(OBJS)\monolib_icon.obj &
@@ -372,6 +373,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_fontutil.obj &
 	$(OBJS)\monolib_gdiimage.obj &
 	$(OBJS)\monolib_gdiobj.obj &
+	$(OBJS)\monolib_gsockmsw.obj &
 	$(OBJS)\monolib_helpchm.obj &
 	$(OBJS)\monolib_helpwin.obj &
 	$(OBJS)\monolib_icon.obj &
@@ -564,6 +566,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_fontutil.obj &
 	$(OBJS)\coredll_gdiimage.obj &
 	$(OBJS)\coredll_gdiobj.obj &
+	$(OBJS)\coredll_gsockmsw.obj &
 	$(OBJS)\coredll_helpchm.obj &
 	$(OBJS)\coredll_helpwin.obj &
 	$(OBJS)\coredll_icon.obj &
@@ -755,6 +758,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_fontutil.obj &
 	$(OBJS)\coredll_gdiimage.obj &
 	$(OBJS)\coredll_gdiobj.obj &
+	$(OBJS)\coredll_gsockmsw.obj &
 	$(OBJS)\coredll_helpchm.obj &
 	$(OBJS)\coredll_helpwin.obj &
 	$(OBJS)\coredll_icon.obj &
@@ -947,6 +951,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_fontutil.obj &
 	$(OBJS)\corelib_gdiimage.obj &
 	$(OBJS)\corelib_gdiobj.obj &
+	$(OBJS)\corelib_gsockmsw.obj &
 	$(OBJS)\corelib_helpchm.obj &
 	$(OBJS)\corelib_helpwin.obj &
 	$(OBJS)\corelib_icon.obj &
@@ -1138,6 +1143,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_fontutil.obj &
 	$(OBJS)\corelib_gdiimage.obj &
 	$(OBJS)\corelib_gdiobj.obj &
+	$(OBJS)\corelib_gsockmsw.obj &
 	$(OBJS)\corelib_helpchm.obj &
 	$(OBJS)\corelib_helpwin.obj &
 	$(OBJS)\corelib_icon.obj &
@@ -1330,6 +1336,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_fontutil.obj &
 	$(OBJS)\monodll_gdiimage.obj &
 	$(OBJS)\monodll_gdiobj.obj &
+	$(OBJS)\monodll_gsockmsw.obj &
 	$(OBJS)\monodll_helpchm.obj &
 	$(OBJS)\monodll_helpwin.obj &
 	$(OBJS)\monodll_icon.obj &
@@ -1521,6 +1528,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_fontutil.obj &
 	$(OBJS)\monodll_gdiimage.obj &
 	$(OBJS)\monodll_gdiobj.obj &
+	$(OBJS)\monodll_gsockmsw.obj &
 	$(OBJS)\monodll_helpchm.obj &
 	$(OBJS)\monodll_helpwin.obj &
 	$(OBJS)\monodll_icon.obj &
@@ -2170,6 +2178,12 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_main.obj &
 	$(OBJS)\baselib_mslu.obj &
 	$(OBJS)\baselib_volume.obj
+COREDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
+	-i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 &
+	$(CFLAGS)
 COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
@@ -2186,6 +2200,11 @@ COREDLL_OBJECTS =  &
 	$(OBJS)\coredll_mslu.obj &
 	$(OBJS)\coredll_volume.obj &
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
+	-i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+	-i=..\..\src\expat\lib -dwxUSE_BASE=0 $(CFLAGS)
 CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
@@ -2389,7 +2408,6 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_socket.obj &
 	$(OBJS)\monodll_url.obj &
 	$(OBJS)\monodll_gsocket.obj &
-	$(OBJS)\monodll_gsockmsw.obj &
 	$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) &
 	$(OBJS)\monodll_xml.obj
 MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
@@ -2484,7 +2502,6 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_socket.obj &
 	$(OBJS)\monolib_url.obj &
 	$(OBJS)\monolib_gsocket.obj &
-	$(OBJS)\monolib_gsockmsw.obj &
 	$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) &
 	$(OBJS)\monolib_xml.obj
 NETDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
@@ -2510,8 +2527,7 @@ NETDLL_OBJECTS =  &
 	$(OBJS)\netdll_sckstrm.obj &
 	$(OBJS)\netdll_socket.obj &
 	$(OBJS)\netdll_url.obj &
-	$(OBJS)\netdll_gsocket.obj &
-	$(OBJS)\netdll_gsockmsw.obj
+	$(OBJS)\netdll_gsocket.obj
 NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
@@ -2535,8 +2551,7 @@ NETLIB_OBJECTS =  &
 	$(OBJS)\netlib_sckstrm.obj &
 	$(OBJS)\netlib_socket.obj &
 	$(OBJS)\netlib_url.obj &
-	$(OBJS)\netlib_gsocket.obj &
-	$(OBJS)\netlib_gsockmsw.obj
+	$(OBJS)\netlib_gsocket.obj
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 ODBCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
@@ -3751,6 +3766,11 @@ $(OBJS)\coredll_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
+	$(CC) -zq -fo=$^@ $(COREDLL_CFLAGS) $<
+!endif
+
 $(OBJS)\coredll_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -4954,6 +4974,11 @@ $(OBJS)\corelib_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
+	$(CC) -zq -fo=$^@ $(CORELIB_CFLAGS) $<
+!endif
+
 $(OBJS)\corelib_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
@@ -6424,8 +6449,10 @@ $(OBJS)\monodll_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
 $(OBJS)\monodll_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.c
 	$(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $<
 
+!ifeq USE_GUI 1
 $(OBJS)\monodll_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
 	$(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $<
+!endif
 
 $(OBJS)\monodll_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7969,8 +7996,10 @@ $(OBJS)\monolib_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
 $(OBJS)\monolib_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.c
 	$(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $<
 
+!ifeq USE_GUI 1
 $(OBJS)\monolib_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
 	$(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $<
+!endif
 
 $(OBJS)\monolib_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8902,9 +8931,6 @@ $(OBJS)\netdll_ftp.obj :  .AUTODEPEND ..\..\src\common\ftp.cpp
 $(OBJS)\netdll_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.c
 	$(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $<
 
-$(OBJS)\netdll_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
-	$(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $<
-
 $(OBJS)\netdll_http.obj :  .AUTODEPEND ..\..\src\common\http.cpp
 	$(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
 
@@ -8941,9 +8967,6 @@ $(OBJS)\netlib_ftp.obj :  .AUTODEPEND ..\..\src\common\ftp.cpp
 $(OBJS)\netlib_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.c
 	$(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $<
 
-$(OBJS)\netlib_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
-	$(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $<
-
 $(OBJS)\netlib_http.obj :  .AUTODEPEND ..\..\src\common\http.cpp
 	$(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
 
diff --git a/build/msw/wx_coredll.dsp b/build/msw/wx_coredll.dsp
index 81b89b772b..19ac7dcf69 100644
--- a/build/msw/wx_coredll.dsp
+++ b/build/msw/wx_coredll.dsp
@@ -4256,6 +4256,11 @@ SOURCE=..\..\src\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\helpchm.cpp
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_corelib.dsp b/build/msw/wx_corelib.dsp
index b9b56fc3d7..9ab073cc51 100644
--- a/build/msw/wx_corelib.dsp
+++ b/build/msw/wx_corelib.dsp
@@ -4239,6 +4239,11 @@ SOURCE=..\..\src\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\helpchm.cpp
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_netdll.dsp b/build/msw/wx_netdll.dsp
index 90100d9d47..1d261c4448 100644
--- a/build/msw/wx_netdll.dsp
+++ b/build/msw/wx_netdll.dsp
@@ -357,11 +357,6 @@ SOURCE=..\..\src\msw\dummy.cpp
 SOURCE=..\..\src\msw\gsocket.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/build/msw/wx_netlib.dsp b/build/msw/wx_netlib.dsp
index 999490ef18..aa336c1a79 100644
--- a/build/msw/wx_netlib.dsp
+++ b/build/msw/wx_netlib.dsp
@@ -336,11 +336,6 @@ SOURCE=..\..\src\msw\dummy.cpp
 SOURCE=..\..\src\msw\gsocket.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
 # End Group
 # End Target
 # End Project