diff --git a/Makefile.in b/Makefile.in
index e493a91229..32d3e0e95c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -494,6 +494,12 @@ ALL_DIST: distclean
 	mkdir $(DISTDIR)/lib
 	cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
 	cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
+	mkdir $(DISTDIR)/src
+	mkdir $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
@@ -518,7 +524,6 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-	mkdir $(DISTDIR)/src
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/generic
 	mkdir $(DISTDIR)/src/html
@@ -527,7 +532,6 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
 	mkdir $(DISTDIR)/src/tiff
-	mkdir $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/iodbc
 	mkdir $(DISTDIR)/src/unix
 	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
@@ -549,10 +553,6 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
 	cp $(PNGDIR)/README $(DISTDIR)/src/png
-	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
-	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
-	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
-	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
@@ -572,7 +572,6 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
-	mkdir $(DISTDIR)/src
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
 	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
@@ -584,6 +583,7 @@ BASE_DIST: ALL_DIST
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
+	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common/unzip.h
 	list='$(HEADERS)'; for p in $$list; do \
 	  cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \
 	done
diff --git a/configure b/configure
index 6cfd68b5b9..c6db93af1f 100755
--- a/configure
+++ b/configure
@@ -12973,6 +12973,8 @@ EOF
 fi
 
 
+if test "$wxUSE_GUI" = "yes"; then
+
 if test "$TOOLKIT" != "MSW"; then
 
 if test "$wxUSE_JOYSTICK" = "yes"; then
@@ -12980,17 +12982,17 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12984: checking for $ac_hdr" >&5
+echo "configure:12986: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12989 "configure"
+#line 12991 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13018,7 +13020,7 @@ done
 
   if test "$ac_cv_header_linux_joystick_h" != "yes"; then
     wxUSE_JOYSTICK=no
-    echo "configure: warning: Joystick not supported yb this system" 1>&2
+    echo "configure: warning: Joystick not supported by this system" 1>&2
   fi
 fi
 
@@ -13032,6 +13034,8 @@ EOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
 fi
 
+fi
+
 
 if test "$TOOLKIT" != "MSW"; then
 
@@ -13041,12 +13045,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
                 for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13045: checking for $ac_func" >&5
+echo "configure:13049: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13050 "configure"
+#line 13054 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13069,7 +13073,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -13097,7 +13101,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:13101: checking for dlopen in -ldl" >&5
+echo "configure:13105: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13105,7 +13109,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13109 "configure"
+#line 13113 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13116,7 +13120,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:13120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13145,12 +13149,12 @@ else
                             for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13149: checking for $ac_func" >&5
+echo "configure:13153: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13154 "configure"
+#line 13158 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13173,7 +13177,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -13408,17 +13412,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13412: checking for $ac_hdr" >&5
+echo "configure:13416: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13417 "configure"
+#line 13421 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13970,7 +13974,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:13974: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:13978: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/configure.in b/configure.in
index 0aaf2a5e4a..bde4a0e0f9 100644
--- a/configure.in
+++ b/configure.in
@@ -3054,6 +3054,8 @@ dnl ---------------------------------------------------------------------------
 dnl Joystick support
 dnl ---------------------------------------------------------------------------
 
+if test "$wxUSE_GUI" = "yes"; then
+
 dnl under MSW we always have joystick support
 if test "$TOOLKIT" != "MSW"; then
 
@@ -3062,7 +3064,7 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
   AC_CHECK_HEADERS(linux/joystick.h)
   if test "$ac_cv_header_linux_joystick_h" != "yes"; then
     wxUSE_JOYSTICK=no
-    AC_MSG_WARN(Joystick not supported yb this system, disabled)
+    AC_MSG_WARN(Joystick not supported by this system, disabled)
   fi
 fi
 
@@ -3074,6 +3076,9 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
 fi
 
+fi
+dnl if wxUSE_GUI
+
 dnl ------------------------------------------------------------------------
 dnl DLL support
 dnl ------------------------------------------------------------------------
diff --git a/distrib/msw/tmake/base.t b/distrib/msw/tmake/base.t
index 420de365ef..eabcdf40da 100644
--- a/distrib/msw/tmake/base.t
+++ b/distrib/msw/tmake/base.t
@@ -52,7 +52,7 @@
     }
 
     foreach $file (sort keys %wxUNIXINCLUDE) {
-        next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
+        next unless $wxUNIXINCLUDE{$file} =~ /\bB\b/;
 
         $project{"BASE_HEADERS"} .= "unix/" . $file . " "
     }
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 2e07b2cf87..ca215871f1 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -611,7 +611,7 @@ geometry.h	W
 gifdecod.h	W
 glcanvas.h	W
 grid.h	W
-gsocket.h	W
+gsocket.h	W	B
 hash.h	W	B
 help.h	W
 helpbase.h	W
@@ -630,7 +630,7 @@ imagjpeg.h	W
 imaglist.h	W
 intl.h	W	B
 ioswrap.h	W	B
-ipcbase.h	W
+ipcbase.h	W	B
 isql.h	W
 isqlext.h	W
 joystick.h	W
@@ -676,9 +676,9 @@ radiobut.h	W
 region.h	W
 resource.h	W
 sashwin.h	W
-sckaddr.h	W
-sckipc.h	W
-sckstrm.h	W
+sckaddr.h	W	B
+sckipc.h	W	B
+sckstrm.h	W	B
 scrolbar.h	W
 scrolwin.h	W
 serbase.h	W	B
@@ -686,7 +686,7 @@ settings.h	W
 setup.h	W	B
 sizer.h	W
 slider.h	W
-socket.h	W
+socket.h	W	B
 spinbutt.h	W
 spinctrl.h	W
 splitter.h	W
@@ -1050,10 +1050,10 @@ dataform.h	2
 pnghand.h	2
 statbox.h	2
 
-fontutil.h	S
 execute.h	S
+fontutil.h	S
+gsockunx.h	S	B
 mimetype.h	S	B
-gsockunx.h	S
 
 file.h	P	B
 ftp.h	P	B
diff --git a/src/files.lst b/src/files.lst
index e9056b4129..f6fc2a3323 100644
--- a/src/files.lst
+++ b/src/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 09:19, 2000/03/15
+# This file was automatically generated by tmake at 19:26, 2000/03/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
 		common/init.cpp \
@@ -23,6 +23,7 @@ ALL_SOURCES = \
 		common/hash.cpp \
 		common/http.cpp \
 		common/intl.cpp \
+		common/ipcbase.cpp \
 		common/list.cpp \
 		common/log.cpp \
 		common/longlong.cpp \
@@ -55,6 +56,7 @@ ALL_SOURCES = \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
 		unix/dir.cpp \
+		unix/gsocket.c \
 		unix/mimetype.cpp \
 		unix/threadpsx.cpp \
 		unix/utilsunx.cpp
@@ -70,6 +72,7 @@ ALL_HEADERS = \
 		datetime.h \
 		datetime.inl \
 		datstrm.h \
+		dde.h \
 		debug.h \
 		defs.h \
 		dir.h \
@@ -84,9 +87,11 @@ ALL_HEADERS = \
 		fs_inet.h \
 		fs_mem.h \
 		fs_zip.h \
+		gsocket.h \
 		hash.h \
 		intl.h \
 		ioswrap.h \
+		ipcbase.h \
 		list.h \
 		listimpl.cpp \
 		log.h \
@@ -99,8 +104,12 @@ ALL_HEADERS = \
 		object.h \
 		objstrm.h \
 		process.h \
+		sckaddr.h \
+		sckipc.h \
+		sckstrm.h \
 		serbase.h \
 		setup.h \
+		socket.h \
 		strconv.h \
 		stream.h \
 		string.h \
@@ -120,6 +129,7 @@ ALL_HEADERS = \
 		wxprec.h \
 		zipstrm.h \
 		zstream.h \
+		unix/gsockunx.h \
 		unix/mimetype.h \
 		protocol/file.h \
 		protocol/ftp.h \
@@ -127,8 +137,6 @@ ALL_HEADERS = \
 		protocol/protocol.h
 
 BASE_OBJS = \
-		ipcbase.o \
-		gsocket.o \
 		init.o \
 		appcmn.o \
 		cmdline.o \
@@ -151,6 +159,7 @@ BASE_OBJS = \
 		hash.o \
 		http.o \
 		intl.o \
+		ipcbase.o \
 		list.o \
 		log.o \
 		longlong.o \
@@ -206,6 +215,7 @@ BASE_DEPS = \
 		hash.d \
 		http.d \
 		intl.d \
+		ipcbase.d \
 		list.d \
 		log.d \
 		longlong.d \
@@ -240,6 +250,7 @@ BASE_DEPS = \
 
 BASE_UNIX_OBJS = \
 		dir.o \
+		gsocket.o \
 		mimetype.o \
 		threadpsx.o \
 		utilsunx.o
@@ -267,6 +278,7 @@ BASE_DEPS = \
 		hash.d \
 		http.d \
 		intl.d \
+		ipcbase.d \
 		list.d \
 		log.d \
 		longlong.d \
diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index 188e93c6e5..121ccda391 100644
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -115,7 +115,7 @@ wxDirData::~wxDirData()
 
 bool wxDirData::Read(wxString *filename)
 {
-    dirent *de;
+    dirent *de = (dirent *)NULL;    // just to silent compiler warnings
     bool matches = FALSE;
 
     while ( !matches )
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 69d789cd61..49067b4d82 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -848,7 +848,7 @@ long wxGetFreeMemory()
 
 #include <signal.h>
 
-static void wxFatalSignalHandler(int signal)
+static void wxFatalSignalHandler(int WXUNUSED(signal))
 {
     if ( wxTheApp )
     {