diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc
index 9339fdb0ac..0f544f5fce 100644
--- a/src/msw/makebase.vc
+++ b/src/msw/makebase.vc
@@ -97,6 +97,7 @@ COMMONOBJS = \
 		..\common\$D\memory.obj \
 		..\common\$D\mimecmn.obj \
 		..\common\$D\module.obj \
+		..\common\$D\msgout.obj \
 		..\common\$D\mstream.obj \
 		..\common\$D\object.obj \
 		..\common\$D\process.obj \
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 46d24ca1e8..145355cb59 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -470,6 +470,7 @@ COMMONOBJS = \
 		$(MSWDIR)\radiocmn.obj \
 		$(MSWDIR)\regex.obj \
 		$(MSWDIR)\resource.obj \
+		$(MSWDIR)\rgncmn.obj \
 		$(MSWDIR)\sckaddr.obj \
 		$(MSWDIR)\sckfile.obj \
 		$(MSWDIR)\sckipc.obj \
@@ -1193,6 +1194,8 @@ $(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
+$(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
+
 $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
 
 $(MSWDIR)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF)
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index b1f9affb98..abbaab6602 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -188,6 +188,7 @@ COMMONOBJS = \
 		$(MSWDIR)\radiocmn.obj \
 		$(MSWDIR)\regex.obj \
 		$(MSWDIR)\resource.obj \
+		$(MSWDIR)\rgncmn.obj \
 		$(MSWDIR)\settcmn.obj \
 		$(MSWDIR)\sizer.obj \
 		$(MSWDIR)\statbar.obj \
@@ -683,6 +684,8 @@ $(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
+$(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
+
 $(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
 
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 0590bdf3b9..491218fb3f 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -176,6 +176,7 @@ COMMONOBJS2 = \
 		$(COMMDIR)\radiocmn.obj \
 		$(COMMDIR)\regex.obj \
 		$(COMMDIR)\resource.obj \
+		$(COMMDIR)\rgncmn.obj \
 		$(COMMDIR)\settcmn.obj \
 		$(COMMDIR)\sizer.obj \
 		$(COMMDIR)\statbar.obj \
@@ -1223,6 +1224,11 @@ $(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/rgncmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/settcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index d269f6c5a2..3b85979659 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -232,6 +232,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/quantize.$(OBJSUFF) \
 		$(COMMDIR)/radiocmn.$(OBJSUFF) \
 		$(COMMDIR)/resource.$(OBJSUFF) \
+		$(COMMDIR)/rgncmn.$(OBJSUFF) \
 		$(COMMDIR)/settcmn.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/statbar.$(OBJSUFF) \
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 7f9e09bd22..f9a7abbdbd 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -154,6 +154,7 @@ COMMONOBJS = \
 		$(COMMDIR)\radiocmn.obj \
 		$(COMMDIR)\regex.obj \
 		$(COMMDIR)\resource.obj \
+		$(COMMDIR)\rgncmn.obj \
 		$(COMMDIR)\sckaddr.obj \
 		$(COMMDIR)\sckfile.obj \
 		$(COMMDIR)\sckipc.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 96b7f055e7..adab5ae50a 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -232,6 +232,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\radiocmn.obj \
 		$(COMMDIR)\$D\regex.obj \
 		$(COMMDIR)\$D\resource.obj \
+		$(COMMDIR)\$D\rgncmn.obj \
 		$(COMMDIR)\$D\sckaddr.obj \
 		$(COMMDIR)\$D\sckfile.obj \
 		$(COMMDIR)\$D\sckipc.obj \
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 9cb5e13edc..b3bfd44eb2 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -177,6 +177,7 @@ COMMONOBJS = &
 	$(OUTPUTDIR)\radiocmn.obj &
 	$(OUTPUTDIR)\regex.obj &
 	$(OUTPUTDIR)\resource.obj &
+	$(OUTPUTDIR)\rgncmn.obj &
 	$(OUTPUTDIR)\sckaddr.obj &
 	$(OUTPUTDIR)\sckfile.obj &
 	$(OUTPUTDIR)\sckipc.obj &
@@ -359,7 +360,7 @@ $(ARCHINCDIR)\wx:
 $(OUTPUTDIR):
 	@if not exist $^@ mkdir $^@
 
-$(SETUP_H):  $(ARCHINCDIR)\wx
+$(SETUP_H): $(ARCHINCDIR)\wx
     if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
 	copy $(WXDIR)\include\wx\msw\setup.h $@
 
@@ -999,6 +1000,9 @@ $(OUTPUTDIR)\regex.obj:     $(COMMDIR)\regex.cpp
 $(OUTPUTDIR)\resource.obj:     $(COMMDIR)\resource.cpp
   *$(CXX) $(CXXFLAGS) $<
 
+$(OUTPUTDIR)\rgncmn.obj:     $(COMMDIR)\rgncmn.cpp
+  *$(CXX) $(CXXFLAGS) $<
+
 $(OUTPUTDIR)\sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
   *$(CXX) $(CXXFLAGS) $<
 
diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 439a974655..4d73ed60d4 100644
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -465,6 +465,10 @@ SOURCE=.\common\resource.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\rgncmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\sckaddr.cpp
 # End Source File
 # Begin Source File
diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 998b94c1e9..169c49dbc5 100644
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -624,6 +624,10 @@ SOURCE=.\common\resource.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\rgncmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\sckaddr.cpp
 # End Source File
 # Begin Source File