diff --git a/Makefile.in b/Makefile.in
index 495881099f..7e70a30446 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 19:22, 1999/09/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -690,6 +690,7 @@ GTK_COMMONOBJS = \
 		sckfile.o \
 		sckipc.o \
 		sckstrm.o \
+		serbase.o \
 		sizer.o \
 		socket.o \
 		strconv.o \
@@ -774,6 +775,7 @@ GTK_COMMONDEPS = \
 		sckfile.d \
 		sckipc.d \
 		sckstrm.d \
+		serbase.d \
 		sizer.d \
 		socket.d \
 		strconv.d \
@@ -1051,6 +1053,7 @@ MOTIF_COMMONOBJS = \
 		sckfile.o \
 		sckipc.o \
 		sckstrm.o \
+		serbase.o \
 		sizer.o \
 		socket.o \
 		strconv.o \
@@ -1138,6 +1141,7 @@ MOTIF_COMMONDEPS = \
 		sckfile.d \
 		sckipc.d \
 		sckstrm.d \
+		serbase.d \
 		sizer.d \
 		socket.d \
 		strconv.d \
@@ -1376,12 +1380,14 @@ MSW_COMMONOBJS = \
 		sckfile.o \
 		sckipc.o \
 		sckstrm.o \
+		serbase.o \
 		sizer.o \
 		socket.o \
 		strconv.o \
 		stream.o \
 		string.o \
 		tbarbase.o \
+		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
 		time.o \
@@ -1461,12 +1467,14 @@ MSW_COMMONDEPS = \
 		sckfile.d \
 		sckipc.d \
 		sckstrm.d \
+		serbase.d \
 		sizer.d \
 		socket.d \
 		strconv.d \
 		stream.d \
 		string.d \
 		tbarbase.d \
+		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
 		time.d \
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 829f897e08..15024491bc 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -145,6 +145,7 @@ sckaddr.cpp	C	S
 sckfile.cpp	C	S
 sckipc.cpp	C	S
 sckstrm.cpp	C	S
+serbase.cpp	C
 sizer.cpp	C
 socket.cpp	C	S
 stream.cpp	C
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 428eecd0fc..3f39afcacc 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 21:04, 1999/09/12
+# This file was automatically generated by tmake at 19:22, 1999/09/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -166,6 +166,7 @@ COMMONOBJS = \
 		$(MSWDIR)\sckfile.obj \
 		$(MSWDIR)\sckipc.obj \
 		$(MSWDIR)\sckstrm.obj \
+		$(MSWDIR)\serbase.obj \
 		$(MSWDIR)\sizer.obj \
 		$(MSWDIR)\socket.obj \
 		$(MSWDIR)\strconv.obj \
@@ -634,6 +635,8 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
+$(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF)
+
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 0b1884627c..18c5d1b099 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 21:04, 1999/09/12
+# This file was automatically generated by tmake at 19:22, 1999/09/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -143,6 +143,7 @@ COMMONOBJS = \
 		$(MSWDIR)\paper.obj \
 		$(MSWDIR)\prntbase.obj \
 		$(MSWDIR)\resource.obj \
+		$(MSWDIR)\serbase.obj \
 		$(MSWDIR)\sizer.obj \
 		$(MSWDIR)\strconv.obj \
 		$(MSWDIR)\stream.obj \
@@ -514,6 +515,8 @@ $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
+$(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF)
+
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 7abdfb39ad..b6d6f52edb 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 21:04, 1999/09/12
+# This file was automatically generated by tmake at 19:22, 1999/09/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -131,6 +131,7 @@ COMMONOBJS = \
 		$(COMMDIR)\paper.obj \
 		$(COMMDIR)\prntbase.obj \
 		$(COMMDIR)\resource.obj \
+		$(COMMDIR)\serbase.obj \
 		$(COMMDIR)\sizer.obj \
 		$(COMMDIR)\strconv.obj \
 		$(COMMDIR)\stream.obj \
@@ -892,6 +893,11 @@ $(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/serbase.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/sizer.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 6271ebfa51..8376cf430e 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 21:04, 1999/09/12
+# This file was automatically generated by tmake at 19:22, 1999/09/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -116,6 +116,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/sckfile.$(OBJSUFF) \
 		$(COMMDIR)/sckipc.$(OBJSUFF) \
 		$(COMMDIR)/sckstrm.$(OBJSUFF) \
+		$(COMMDIR)/serbase.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/socket.$(OBJSUFF) \
 		$(COMMDIR)/strconv.$(OBJSUFF) \
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 6f7b187a57..9c1a19a4ac 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 21:04, 1999/09/12
+# This file was automatically generated by tmake at 19:22, 1999/09/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -105,6 +105,7 @@ COMMONOBJS = \
 		$(COMMDIR)\sckfile.obj \
 		$(COMMDIR)\sckipc.obj \
 		$(COMMDIR)\sckstrm.obj \
+		$(COMMDIR)\serbase.obj \
 		$(COMMDIR)\sizer.obj \
 		$(COMMDIR)\socket.obj \
 		$(COMMDIR)\strconv.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 678fe19d41..6c8dbcbb98 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 21:04, 1999/09/12
+# This file was automatically generated by tmake at 19:22, 1999/09/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -182,6 +182,7 @@ COMMONOBJS = \
 		..\common\$D\sckfile.obj \
 		..\common\$D\sckipc.obj \
 		..\common\$D\sckstrm.obj \
+		..\common\$D\serbase.obj \
 		..\common\$D\sizer.obj \
 		..\common\$D\socket.obj \
 		..\common\$D\strconv.obj \
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index c3e85b1003..65f2bf10b9 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 21:04, 1999/09/12
+# This file was automatically generated by tmake at 19:22, 1999/09/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe
@@ -130,6 +130,7 @@ COMMONOBJS = &
 	sckfile.obj &
 	sckipc.obj &
 	sckstrm.obj &
+	serbase.obj &
 	sizer.obj &
 	socket.obj &
 	strconv.obj &
@@ -719,6 +720,9 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+serbase.obj:     $(COMMDIR)\serbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 sizer.obj:     $(COMMDIR)\sizer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<