diff --git a/Makefile.in b/Makefile.in
index 80a4539ee4..e9310ca894 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -860,17 +860,7 @@ ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
 	-DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
-	advdll_calctrl.o \
-	advdll_grid.o \
-	advdll_gridctrl.o \
-	advdll_gridsel.o \
-	advdll_helpext.o \
-	advdll_laywin.o \
-	advdll_sashwin.o \
-	advdll_splash.o \
-	advdll_tipdlg.o \
-	advdll_wizard.o \
-	$(__ADVANCED_PLATFORM_SRC_OBJECTS_2) \
+	$(__ADVANCED_SRC_OBJECTS_2) \
 	$(__PLUGIN_ADV_SRC_OBJECTS_2)
 ADVDLL_ODEP =  $(___pch_wxprec_advdll_wx_wxprec_h_gch___depname)
 ADVLIB_CFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
@@ -880,17 +870,7 @@ ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
 	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
 ADVLIB_OBJECTS =  \
-	advlib_calctrl.o \
-	advlib_grid.o \
-	advlib_gridctrl.o \
-	advlib_gridsel.o \
-	advlib_helpext.o \
-	advlib_laywin.o \
-	advlib_sashwin.o \
-	advlib_splash.o \
-	advlib_tipdlg.o \
-	advlib_wizard.o \
-	$(__ADVANCED_PLATFORM_SRC_OBJECTS_3) \
+	$(__ADVANCED_SRC_OBJECTS_3) \
 	$(__PLUGIN_ADV_SRC_OBJECTS_3)
 ADVLIB_ODEP =  $(___pch_wxprec_advlib_wx_wxprec_h_gch___depname)
 MEDIADLL_CXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
@@ -2076,18 +2056,67 @@ COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR =  \
 @COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_MOTIF@	wx/unix/joystick.h wx/unix/sound.h \
 @COND_TOOLKIT_MOTIF@	wx/unix/taskbarx11.h
-COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR =  \
-	wx/msw/datectrl.h \
-	wx/msw/sound.h \
-	wx/msw/taskbar.h \
-	wx/msw/joystick.h
-@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR)
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = wx/msw/sound.h \
+@COND_TOOLKIT_MSW@	wx/msw/taskbar.h wx/msw/joystick.h
 @COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = wx/os2/joystick.h \
 @COND_TOOLKIT_PM@	wx/os2/sound.h
 @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \
-@COND_TOOLKIT_WINCE@	wx/msw/datectrl.h wx/msw/sound.h wx/msw/taskbar.h
+@COND_TOOLKIT_WINCE@	wx/msw/sound.h wx/msw/taskbar.h
 @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_X11@	wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = wx/msw/datectrl.h
+COND_WXUNIV_0_ADVANCED_HDR =  \
+	wx/calctrl.h \
+	wx/dateevt.h \
+	wx/dcbuffer.h \
+	wx/generic/calctrl.h \
+	wx/generic/grid.h \
+	wx/generic/gridctrl.h \
+	wx/generic/gridsel.h \
+	wx/generic/helpext.h \
+	wx/generic/laywin.h \
+	wx/generic/sashwin.h \
+	wx/generic/splash.h \
+	wx/generic/wizard.h \
+	wx/grid.h \
+	wx/joystick.h \
+	wx/laywin.h \
+	wx/sashwin.h \
+	wx/sound.h \
+	wx/splash.h \
+	wx/taskbar.h \
+	wx/tipdlg.h \
+	wx/wave.h \
+	wx/wizard.h \
+	wx/datectrl.h \
+	$(ADVANCED_PLATFORM_HDR) \
+	$(ADVANCED_PLATFORM_NATIVE_HDR)
+@COND_WXUNIV_0@ADVANCED_HDR = $(COND_WXUNIV_0_ADVANCED_HDR)
+COND_WXUNIV_1_ADVANCED_HDR =  \
+	wx/calctrl.h \
+	wx/dateevt.h \
+	wx/dcbuffer.h \
+	wx/generic/calctrl.h \
+	wx/generic/grid.h \
+	wx/generic/gridctrl.h \
+	wx/generic/gridsel.h \
+	wx/generic/helpext.h \
+	wx/generic/laywin.h \
+	wx/generic/sashwin.h \
+	wx/generic/splash.h \
+	wx/generic/wizard.h \
+	wx/grid.h \
+	wx/joystick.h \
+	wx/laywin.h \
+	wx/sashwin.h \
+	wx/sound.h \
+	wx/splash.h \
+	wx/taskbar.h \
+	wx/tipdlg.h \
+	wx/wave.h \
+	wx/wizard.h \
+	$(ADVANCED_PLATFORM_HDR)
+@COND_WXUNIV_1@ADVANCED_HDR = $(COND_WXUNIV_1_ADVANCED_HDR)
 @COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR = 
 @COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR = 
 @COND_TOOLKIT_MAC@MEDIA_PLATFORM_HDR = 
@@ -2316,30 +2345,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/xpmhand.h \
 	$(LOWLEVEL_HDR) \
 	$(GUI_CORE_HEADERS) \
-	wx/calctrl.h \
-	wx/dateevt.h \
-	wx/datectrl.h \
-	wx/dcbuffer.h \
-	wx/generic/calctrl.h \
-	wx/generic/grid.h \
-	wx/generic/gridctrl.h \
-	wx/generic/gridsel.h \
-	wx/generic/helpext.h \
-	wx/generic/laywin.h \
-	wx/generic/sashwin.h \
-	wx/generic/splash.h \
-	wx/generic/wizard.h \
-	wx/grid.h \
-	wx/joystick.h \
-	wx/laywin.h \
-	wx/sashwin.h \
-	wx/sound.h \
-	wx/splash.h \
-	wx/taskbar.h \
-	wx/tipdlg.h \
-	wx/wave.h \
-	wx/wizard.h \
-	$(ADVANCED_PLATFORM_HDR) \
+	$(ADVANCED_HDR) \
 	wx/mediactrl.h \
 	$(MEDIA_PLATFORM_HDR) \
 	wx/html/forcelnk.h \
@@ -2585,17 +2591,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
 @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS = monodll_net.o
 COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	$(__CORE_SRC_OBJECTS) \
-	monodll_calctrl.o \
-	monodll_grid.o \
-	monodll_gridctrl.o \
-	monodll_gridsel.o \
-	monodll_helpext.o \
-	monodll_laywin.o \
-	monodll_sashwin.o \
-	monodll_splash.o \
-	monodll_tipdlg.o \
-	monodll_wizard.o \
-	$(__ADVANCED_PLATFORM_SRC_OBJECTS) \
+	$(__ADVANCED_SRC_OBJECTS) \
 	monodll_mediactrlcmn.o \
 	$(__MEDIA_PLATFORM_SRC_OBJECTS) \
 	$(__HTML_SRC_PLATFORM_OBJECTS) \
@@ -3836,47 +3832,35 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_utilsx.o \
 	monodll_window.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1)
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_COCOA@	monodll_taskbar.o monodll_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-	monodll_taskbarcmn.o \
-	monodll_joystick.o \
-	monodll_sound.o \
-	monodll_taskbarx11.o \
-	monodll_taskbar.o \
-	monodll_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-	monodll_taskbarcmn.o \
-	monodll_drawer.o \
-	monodll_joystick.o \
-	monodll_sound.o \
-	monodll_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS)
-COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-	monodll_taskbarcmn.o \
-	monodll_joystick.o \
-	monodll_sound.o \
-	monodll_taskbarx11.o
-@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
-COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-	monodll_taskbarcmn.o \
-	monodll_datectrl.o \
-	monodll_sound.o \
-	monodll_taskbar.o \
-	monodll_joystick.o
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS)
-@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_PM@	monodll_joystick.o monodll_sound.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_WINCE@	monodll_taskbarcmn.o monodll_datectrl.o \
-@COND_TOOLKIT_WINCE@	monodll_sound.o monodll_taskbar.o
-COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-	monodll_taskbarcmn.o \
-	monodll_joystick.o \
-	monodll_sound.o \
-	monodll_taskbarx11.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
+COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
+	monodll_calctrl.o \
+	monodll_grid.o \
+	monodll_gridctrl.o \
+	monodll_gridsel.o \
+	monodll_helpext.o \
+	monodll_laywin.o \
+	monodll_sashwin.o \
+	monodll_splash.o \
+	monodll_tipdlg.o \
+	monodll_wizard.o \
+	$(__ADVANCED_PLATFORM_SRC_OBJECTS) \
+	$(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
+@COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS)
+COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
+	monodll_calctrl.o \
+	monodll_grid.o \
+	monodll_gridctrl.o \
+	monodll_gridsel.o \
+	monodll_helpext.o \
+	monodll_laywin.o \
+	monodll_sashwin.o \
+	monodll_splash.o \
+	monodll_tipdlg.o \
+	monodll_wizard.o \
+	$(__ADVANCED_PLATFORM_SRC_OBJECTS)
+@COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS \
+@COND_TOOLKIT_MSW@	= monodll_datectrl.o
 @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = 
 @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS =  
 @COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
@@ -4040,17 +4024,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_1 = monolib_net.o
 COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	$(__CORE_SRC_OBJECTS_1) \
-	monolib_calctrl.o \
-	monolib_grid.o \
-	monolib_gridctrl.o \
-	monolib_gridsel.o \
-	monolib_helpext.o \
-	monolib_laywin.o \
-	monolib_sashwin.o \
-	monolib_splash.o \
-	monolib_tipdlg.o \
-	monolib_wizard.o \
-	$(__ADVANCED_PLATFORM_SRC_OBJECTS_1) \
+	$(__ADVANCED_SRC_OBJECTS_1) \
 	monolib_mediactrlcmn.o \
 	$(__MEDIA_PLATFORM_SRC_OBJECTS_1) \
 	$(__HTML_SRC_PLATFORM_OBJECTS_1) \
@@ -5293,47 +5267,35 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_utilsx.o \
 	monolib_window.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3)
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_COCOA@	monolib_taskbar.o monolib_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-	monolib_taskbarcmn.o \
-	monolib_joystick.o \
-	monolib_sound.o \
-	monolib_taskbarx11.o \
-	monolib_taskbar.o \
-	monolib_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-	monolib_taskbarcmn.o \
-	monolib_drawer.o \
-	monolib_joystick.o \
-	monolib_sound.o \
-	monolib_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-	monolib_taskbarcmn.o \
-	monolib_joystick.o \
-	monolib_sound.o \
-	monolib_taskbarx11.o
-@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-	monolib_taskbarcmn.o \
-	monolib_datectrl.o \
-	monolib_sound.o \
-	monolib_taskbar.o \
-	monolib_joystick.o
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_PM@	monolib_joystick.o monolib_sound.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_WINCE@	monolib_taskbarcmn.o monolib_datectrl.o \
-@COND_TOOLKIT_WINCE@	monolib_sound.o monolib_taskbar.o
-COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-	monolib_taskbarcmn.o \
-	monolib_joystick.o \
-	monolib_sound.o \
-	monolib_taskbarx11.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
+	monolib_calctrl.o \
+	monolib_grid.o \
+	monolib_gridctrl.o \
+	monolib_gridsel.o \
+	monolib_helpext.o \
+	monolib_laywin.o \
+	monolib_sashwin.o \
+	monolib_splash.o \
+	monolib_tipdlg.o \
+	monolib_wizard.o \
+	$(__ADVANCED_PLATFORM_SRC_OBJECTS_0) \
+	$(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
+@COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1)
+COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
+	monolib_calctrl.o \
+	monolib_grid.o \
+	monolib_gridctrl.o \
+	monolib_gridsel.o \
+	monolib_helpext.o \
+	monolib_laywin.o \
+	monolib_sashwin.o \
+	monolib_splash.o \
+	monolib_tipdlg.o \
+	monolib_wizard.o \
+	$(__ADVANCED_PLATFORM_SRC_OBJECTS_0)
+@COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 \
+@COND_TOOLKIT_MSW@	= monolib_datectrl.o
 @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
 @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 =  
 @COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
@@ -8187,41 +8149,35 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
 	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd)
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_COCOA@	advdll_taskbar.o advdll_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
-	advdll_taskbarcmn.o \
-	advdll_joystick.o \
-	advdll_sound.o \
-	advdll_taskbarx11.o \
-	advdll_taskbar.o \
-	advdll_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_2)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
-	advdll_taskbarcmn.o \
-	advdll_drawer.o \
-	advdll_joystick.o \
-	advdll_sound.o \
-	advdll_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_2)
-@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_MOTIF@	advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
-@COND_TOOLKIT_MOTIF@	advdll_taskbarx11.o
-COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
-	advdll_taskbarcmn.o \
-	advdll_datectrl.o \
-	advdll_sound.o \
-	advdll_taskbar.o \
-	advdll_joystick.o
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_2)
-@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_PM@	advdll_joystick.o advdll_sound.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_WINCE@	advdll_taskbarcmn.o advdll_datectrl.o advdll_sound.o \
-@COND_TOOLKIT_WINCE@	advdll_taskbar.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_X11@	advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
-@COND_TOOLKIT_X11@	advdll_taskbarx11.o
+COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
+	advdll_calctrl.o \
+	advdll_grid.o \
+	advdll_gridctrl.o \
+	advdll_gridsel.o \
+	advdll_helpext.o \
+	advdll_laywin.o \
+	advdll_sashwin.o \
+	advdll_splash.o \
+	advdll_tipdlg.o \
+	advdll_wizard.o \
+	$(__ADVANCED_PLATFORM_SRC_OBJECTS_8) \
+	$(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
+@COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2)
+COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
+	advdll_calctrl.o \
+	advdll_grid.o \
+	advdll_gridctrl.o \
+	advdll_gridsel.o \
+	advdll_helpext.o \
+	advdll_laywin.o \
+	advdll_sashwin.o \
+	advdll_splash.o \
+	advdll_tipdlg.o \
+	advdll_wizard.o \
+	$(__ADVANCED_PLATFORM_SRC_OBJECTS_8)
+@COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
+@COND_TOOLKIT_MSW@	= advdll_datectrl.o
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= advdll_sound_sdl.o advdll_gprint.o
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
@@ -8232,41 +8188,35 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
 @COND_GCC_PCH_1@__advlib_PCH_INC = -I.pch/wxprec_advlib
 @COND_GCC_PCH_1@___pch_wxprec_advlib_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@	= .pch/wxprec_advlib/wx/wxprec.h.gch
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_COCOA@	advlib_taskbar.o advlib_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
-	advlib_taskbarcmn.o \
-	advlib_joystick.o \
-	advlib_sound.o \
-	advlib_taskbarx11.o \
-	advlib_taskbar.o \
-	advlib_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_3)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
-	advlib_taskbarcmn.o \
-	advlib_drawer.o \
-	advlib_joystick.o \
-	advlib_sound.o \
-	advlib_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_3)
-@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_MOTIF@	advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
-@COND_TOOLKIT_MOTIF@	advlib_taskbarx11.o
-COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
-	advlib_taskbarcmn.o \
-	advlib_datectrl.o \
-	advlib_sound.o \
-	advlib_taskbar.o \
-	advlib_joystick.o
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_3)
-@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_PM@	advlib_joystick.o advlib_sound.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_WINCE@	advlib_taskbarcmn.o advlib_datectrl.o advlib_sound.o \
-@COND_TOOLKIT_WINCE@	advlib_taskbar.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_X11@	advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
-@COND_TOOLKIT_X11@	advlib_taskbarx11.o
+COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
+	advlib_calctrl.o \
+	advlib_grid.o \
+	advlib_gridctrl.o \
+	advlib_gridsel.o \
+	advlib_helpext.o \
+	advlib_laywin.o \
+	advlib_sashwin.o \
+	advlib_splash.o \
+	advlib_tipdlg.o \
+	advlib_wizard.o \
+	$(__ADVANCED_PLATFORM_SRC_OBJECTS_9) \
+	$(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
+@COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3)
+COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
+	advlib_calctrl.o \
+	advlib_grid.o \
+	advlib_gridctrl.o \
+	advlib_gridsel.o \
+	advlib_helpext.o \
+	advlib_laywin.o \
+	advlib_sashwin.o \
+	advlib_splash.o \
+	advlib_tipdlg.o \
+	advlib_wizard.o \
+	$(__ADVANCED_PLATFORM_SRC_OBJECTS_9)
+@COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
+@COND_TOOLKIT_MSW@	= advlib_datectrl.o
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= advlib_sound_sdl.o advlib_gprint.o
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___mediadll___depname = \
@@ -8686,12 +8636,144 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
 @COND_SHARED_1@____SHARED = $(PIC_FLAG)
 @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@	= monodll_gsockosx.o monodll_utilsexc_cf.o
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_COCOA@	monodll_taskbar.o monodll_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+	monodll_taskbarcmn.o \
+	monodll_joystick.o \
+	monodll_sound.o \
+	monodll_taskbarx11.o \
+	monodll_taskbar.o \
+	monodll_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+	monodll_taskbarcmn.o \
+	monodll_drawer.o \
+	monodll_joystick.o \
+	monodll_sound.o \
+	monodll_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS)
+COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+	monodll_taskbarcmn.o \
+	monodll_joystick.o \
+	monodll_sound.o \
+	monodll_taskbarx11.o
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_MSW@	monodll_taskbarcmn.o monodll_sound.o monodll_taskbar.o \
+@COND_TOOLKIT_MSW@	monodll_joystick.o
+@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_PM@	monodll_joystick.o monodll_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_WINCE@	monodll_taskbarcmn.o monodll_sound.o monodll_taskbar.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+	monodll_taskbarcmn.o \
+	monodll_joystick.o \
+	monodll_sound.o \
+	monodll_taskbarx11.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 \
 @COND_PLATFORM_MACOSX_1@	= monolib_gsockosx.o monolib_utilsexc_cf.o
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
+@COND_TOOLKIT_COCOA@	monolib_taskbar.o monolib_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
+	monolib_taskbarcmn.o \
+	monolib_joystick.o \
+	monolib_sound.o \
+	monolib_taskbarx11.o \
+	monolib_taskbar.o \
+	monolib_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_0)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
+	monolib_taskbarcmn.o \
+	monolib_drawer.o \
+	monolib_joystick.o \
+	monolib_sound.o \
+	monolib_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_0)
+COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
+	monolib_taskbarcmn.o \
+	monolib_joystick.o \
+	monolib_sound.o \
+	monolib_taskbarx11.o
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
+@COND_TOOLKIT_MSW@	monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o \
+@COND_TOOLKIT_MSW@	monolib_joystick.o
+@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
+@COND_TOOLKIT_PM@	monolib_joystick.o monolib_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
+@COND_TOOLKIT_WINCE@	monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
+	monolib_taskbarcmn.o \
+	monolib_joystick.o \
+	monolib_sound.o \
+	monolib_taskbarx11.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0)
 @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_8 \
 @COND_PLATFORM_MACOSX_1@	= coredll_gsockosx.o coredll_utilsexc_cf.o
 @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 \
 @COND_PLATFORM_MACOSX_1@	= corelib_gsockosx.o corelib_utilsexc_cf.o
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_COCOA@	advdll_taskbar.o advdll_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
+	advdll_taskbarcmn.o \
+	advdll_joystick.o \
+	advdll_sound.o \
+	advdll_taskbarx11.o \
+	advdll_taskbar.o \
+	advdll_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_8)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
+	advdll_taskbarcmn.o \
+	advdll_drawer.o \
+	advdll_joystick.o \
+	advdll_sound.o \
+	advdll_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_8)
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_MOTIF@	advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
+@COND_TOOLKIT_MOTIF@	advdll_taskbarx11.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_MSW@	advdll_taskbarcmn.o advdll_sound.o advdll_taskbar.o \
+@COND_TOOLKIT_MSW@	advdll_joystick.o
+@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_PM@	advdll_joystick.o advdll_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_WINCE@	advdll_taskbarcmn.o advdll_sound.o advdll_taskbar.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_X11@	advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
+@COND_TOOLKIT_X11@	advdll_taskbarx11.o
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_COCOA@	advlib_taskbar.o advlib_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
+	advlib_taskbarcmn.o \
+	advlib_joystick.o \
+	advlib_sound.o \
+	advlib_taskbarx11.o \
+	advlib_taskbar.o \
+	advlib_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_9)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
+	advlib_taskbarcmn.o \
+	advlib_drawer.o \
+	advlib_joystick.o \
+	advlib_sound.o \
+	advlib_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9)
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_MOTIF@	advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
+@COND_TOOLKIT_MOTIF@	advlib_taskbarx11.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_MSW@	advlib_taskbarcmn.o advlib_sound.o advlib_taskbar.o \
+@COND_TOOLKIT_MSW@	advlib_joystick.o
+@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_PM@	advlib_joystick.o advlib_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_WINCE@	advlib_taskbarcmn.o advlib_sound.o advlib_taskbar.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_X11@	advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
+@COND_TOOLKIT_X11@	advlib_taskbarx11.o
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@@ -10120,39 +10202,9 @@ monodll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(MONODLL_ODEP)
 monodll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP)
+monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-monodll_grid.o: $(srcdir)/src/generic/grid.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-monodll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
-	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
-
 monodll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12955,6 +13007,36 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_USE_GUI_1@monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_grid.o: $(srcdir)/src/generic/grid.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12976,12 +13058,6 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13024,6 +13100,9 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13483,39 +13562,9 @@ monolib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(MONOLIB_ODEP)
 monolib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP)
+monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-monolib_grid.o: $(srcdir)/src/generic/grid.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-monolib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
-	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
-
 monolib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16318,6 +16367,36 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_USE_GUI_1@monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_grid.o: $(srcdir)/src/generic/grid.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16339,12 +16418,6 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16387,6 +16460,9 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -22498,6 +22574,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+advdll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVDLL_ODEP)
+	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
+	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+advdll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVDLL_ODEP)
+	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
 advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
@@ -22528,18 +22613,6 @@ advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVDLL_ODEP)
 advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
-advdll_drawer.o: $(srcdir)/src/mac/carbon/drawer.cpp $(ADVDLL_ODEP)
-	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
-
-advdll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP)
-	$(CCC) -c -o $@ $(ADVDLL_CFLAGS) $<
-
-advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
-	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
-
-advdll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVDLL_ODEP)
-	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
@@ -22561,12 +22634,6 @@ advdll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW@advdll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE@advdll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_WINCE@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW@advdll_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
@@ -22621,6 +22688,9 @@ advdll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_PM@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_PM@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_MAC@advdll_drawer.o: $(srcdir)/src/mac/carbon/drawer.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
@@ -22630,6 +22700,18 @@ advdll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK@advdll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK@	$(CCC) -c -o $@ $(ADVDLL_CFLAGS) $<
+
+advlib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVLIB_ODEP)
+	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
+	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+advlib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVLIB_ODEP)
+	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
 advlib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
@@ -22660,18 +22742,6 @@ advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVLIB_ODEP)
 advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
-advlib_drawer.o: $(srcdir)/src/mac/carbon/drawer.cpp $(ADVLIB_ODEP)
-	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
-
-advlib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP)
-	$(CCC) -c -o $@ $(ADVLIB_CFLAGS) $<
-
-advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
-	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
-
-advlib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVLIB_ODEP)
-	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
@@ -22693,12 +22763,6 @@ advlib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW@advlib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE@advlib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_WINCE@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW@advlib_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
@@ -22753,6 +22817,9 @@ advlib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_PM@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_PM@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_MAC@advlib_drawer.o: $(srcdir)/src/mac/carbon/drawer.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
@@ -22762,6 +22829,9 @@ advlib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK@advlib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK@	$(CCC) -c -o $@ $(ADVLIB_CFLAGS) $<
+
 mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
 	$(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $<
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index cd28aa3887..9c09e2751f 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -30,6 +30,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        XWIN_LOWLEVEL                 low-level classes for X Window System
                                      ports (wxGTK, wxMotif, wxX11)
 
+       MSW_DESKTOP                   files used only on desktop Windows
+                                     versions and not under Windows CE
+
+       xxx_NATIVE                    native files not used by wxUniv (used as
+                                     complement of LOWLEVEL when most of the
+                                     files are lowlevel and only few are native)
+
        HTML                          wxHTML files
        XRC                           wxXRC files
 
@@ -1196,14 +1203,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 
-<set var="MSW_ONLY_LOWLEVEL_SRC" hints="files">
+<set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/ole/automtn.cpp
     src/msw/ole/uuid.cpp
 </set>
 
-<set var="MSW_ONLY_LOWLEVEL_HDR" hints="files">
+<set var="MSW_DESKTOP_LOWLEVEL_HDR" hints="files">
     wx/msw/helpchm.h
     wx/msw/helpwin.h
 </set>
@@ -1387,11 +1394,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
-<set var="MSW_ONLY_SRC" hints="files">
+<set var="MSW_DESKTOP_SRC" hints="files">
     src/msw/fdrepdlg.cpp
     src/msw/fontdlg.cpp
 </set>
-<set var="MSW_ONLY_HDR" hints="files">
+<set var="MSW_DESKTOP_HDR" hints="files">
     wx/msw/fdrepdlg.h
     wx/msw/fontdlg.h
     wx/msw/helpbest.h
@@ -2265,7 +2272,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/calctrl.h
     wx/dateevt.h
-    wx/datectrl.h
     wx/dcbuffer.h
     wx/generic/calctrl.h
     wx/generic/grid.h
@@ -2288,22 +2294,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wizard.h
 </set>
 
+<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
+    wx/datectrl.h
+</set>
+
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
-    src/msw/datectrl.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
-    wx/msw/datectrl.h
     wx/msw/sound.h
     wx/msw/taskbar.h
 </set>
+
+<!-- not used with wxUniv -->
+<set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+    src/msw/datectrl.cpp
+</set>
+<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+    wx/msw/datectrl.h
+</set>
+
 <!-- not built on WindowsCE: -->
-<set var="ADVANCED_MSW_ONLY_SRC" hints="files">
+<set var="ADVANCED_MSW_DESKTOP_SRC" hints="files">
     src/msw/joystick.cpp
 </set>
-<set var="ADVANCED_MSW_ONLY_HDR" hints="files">
+<set var="ADVANCED_MSW_DESKTOP_HDR" hints="files">
     wx/msw/joystick.h
 </set>
 
@@ -2373,9 +2390,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MEDIA_MSW_HDR" hints="files">
 </set>
 <!-- not built on WindowsCE: -->
-<set var="MEDIA_MSW_ONLY_SRC" hints="files">
+<set var="MEDIA_MSW_DESKTOP_SRC" hints="files">
 </set>
-<set var="MEDIA_MSW_ONLY_HDR" hints="files">
+<set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
 </set>
 
 <set var="MEDIA_MAC_SRC" hints="files">
@@ -2709,7 +2726,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
-        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_ONLY_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
@@ -2732,7 +2749,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
-        <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
@@ -2741,7 +2758,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
-        <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
@@ -2759,7 +2776,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
@@ -2769,7 +2786,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
@@ -2778,12 +2795,27 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
-    <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
-    <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
+
+    <!-- wxAdv files not used by wxUniv -->
+    <set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
+    </set>
+    <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
+    </set>
+
+    <set var="ADVANCED_SRC" hints="files">
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
+    </set>
+    <set var="ADVANCED_HDR" hints="files">
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
+    </set>
 
     <!-- wxMedia files: -->
     <set var="MEDIA_PLATFORM_SRC" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
@@ -2793,7 +2825,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
     </set>
     <set var="MEDIA_PLATFORM_HDR" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 55e8272176..82d7a77fed 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -37,6 +37,7 @@ WX_RELEASE_NODOT = 25
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
@@ -173,8 +174,8 @@ WXTIFF_OBJECTS =  \
 	$(OBJS)\wxtiff_tif_write.obj \
 	$(OBJS)\wxtiff_tif_zip.obj
 WXEXPAT_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) -tWM $(____LIBDIRNAME_FILENAMES_6_p) -DCOMPILED_FROM_DSP \
-	-w-8004 -w-8008 -w-8012 -w-8057 -w-8066 $(CPPFLAGS) $(CFLAGS)
+	$(__OPTIMIZEFLAG) -tWM -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP -w-8004 -w-8008 \
+	-w-8012 -w-8057 -w-8066 $(CPPFLAGS) $(CFLAGS)
 WXEXPAT_OBJECTS =  \
 	$(OBJS)\wxexpat_xmlparse.obj \
 	$(OBJS)\wxexpat_xmlrole.obj \
@@ -650,21 +651,7 @@ ADVDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	-H=$(OBJS)\wxprec_advdll.csm $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
 	$(OBJS)\advdll_dummy.obj \
-	$(OBJS)\advdll_calctrl.obj \
-	$(OBJS)\advdll_grid.obj \
-	$(OBJS)\advdll_gridctrl.obj \
-	$(OBJS)\advdll_gridsel.obj \
-	$(OBJS)\advdll_helpext.obj \
-	$(OBJS)\advdll_laywin.obj \
-	$(OBJS)\advdll_sashwin.obj \
-	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_tipdlg.obj \
-	$(OBJS)\advdll_wizard.obj \
-	$(OBJS)\advdll_taskbarcmn.obj \
-	$(OBJS)\advdll_datectrl.obj \
-	$(OBJS)\advdll_sound.obj \
-	$(OBJS)\advdll_taskbar.obj \
-	$(OBJS)\advdll_joystick.obj
+	$(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
 ADVLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -673,21 +660,7 @@ ADVLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(CXXFLAGS)
 ADVLIB_OBJECTS =  \
 	$(OBJS)\advlib_dummy.obj \
-	$(OBJS)\advlib_calctrl.obj \
-	$(OBJS)\advlib_grid.obj \
-	$(OBJS)\advlib_gridctrl.obj \
-	$(OBJS)\advlib_gridsel.obj \
-	$(OBJS)\advlib_helpext.obj \
-	$(OBJS)\advlib_laywin.obj \
-	$(OBJS)\advlib_sashwin.obj \
-	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_tipdlg.obj \
-	$(OBJS)\advlib_wizard.obj \
-	$(OBJS)\advlib_taskbarcmn.obj \
-	$(OBJS)\advlib_datectrl.obj \
-	$(OBJS)\advlib_sound.obj \
-	$(OBJS)\advlib_taskbar.obj \
-	$(OBJS)\advlib_joystick.obj
+	$(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 MEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -969,6 +942,12 @@ WXUNIVNAME = univ
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
 !if "$(USE_GUI)" == "1"
 __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
 !endif
@@ -978,12 +957,6 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
-!if "$(SHARED)" == "0"
-____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\bcc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\bcc_dll$(CFG)
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -997,21 +970,7 @@ __monodll___depname = \
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(____CORE_SRC_FILENAMES_OBJECTS) \
-	$(OBJS)\monodll_calctrl.obj \
-	$(OBJS)\monodll_grid.obj \
-	$(OBJS)\monodll_gridctrl.obj \
-	$(OBJS)\monodll_gridsel.obj \
-	$(OBJS)\monodll_helpext.obj \
-	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_sashwin.obj \
-	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_tipdlg.obj \
-	$(OBJS)\monodll_wizard.obj \
-	$(OBJS)\monodll_taskbarcmn.obj \
-	$(OBJS)\monodll_datectrl.obj \
-	$(OBJS)\monodll_sound.obj \
-	$(OBJS)\monodll_taskbar.obj \
-	$(OBJS)\monodll_joystick.obj \
+	$(____ADVANCED_SRC_FILENAMES_OBJECTS) \
 	$(OBJS)\monodll_mediactrlcmn.obj \
 	$(OBJS)\monodll_mediactrl.obj \
 	$(OBJS)\monodll_helpbest.obj \
@@ -1470,6 +1429,41 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj
 !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_calctrl.obj \
+	$(OBJS)\monodll_grid.obj \
+	$(OBJS)\monodll_gridctrl.obj \
+	$(OBJS)\monodll_gridsel.obj \
+	$(OBJS)\monodll_helpext.obj \
+	$(OBJS)\monodll_laywin.obj \
+	$(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_splash.obj \
+	$(OBJS)\monodll_tipdlg.obj \
+	$(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_taskbarcmn.obj \
+	$(OBJS)\monodll_sound.obj \
+	$(OBJS)\monodll_taskbar.obj \
+	$(OBJS)\monodll_joystick.obj \
+	$(OBJS)\monodll_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_calctrl.obj \
+	$(OBJS)\monodll_grid.obj \
+	$(OBJS)\monodll_gridctrl.obj \
+	$(OBJS)\monodll_gridsel.obj \
+	$(OBJS)\monodll_helpext.obj \
+	$(OBJS)\monodll_laywin.obj \
+	$(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_splash.obj \
+	$(OBJS)\monodll_tipdlg.obj \
+	$(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_taskbarcmn.obj \
+	$(OBJS)\monodll_sound.obj \
+	$(OBJS)\monodll_taskbar.obj \
+	$(OBJS)\monodll_joystick.obj
+!endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
 __monolib___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
@@ -1477,21 +1471,7 @@ __monolib___depname = \
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(____CORE_SRC_FILENAMES_1_OBJECTS) \
-	$(OBJS)\monolib_calctrl.obj \
-	$(OBJS)\monolib_grid.obj \
-	$(OBJS)\monolib_gridctrl.obj \
-	$(OBJS)\monolib_gridsel.obj \
-	$(OBJS)\monolib_helpext.obj \
-	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_sashwin.obj \
-	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_tipdlg.obj \
-	$(OBJS)\monolib_wizard.obj \
-	$(OBJS)\monolib_taskbarcmn.obj \
-	$(OBJS)\monolib_datectrl.obj \
-	$(OBJS)\monolib_sound.obj \
-	$(OBJS)\monolib_taskbar.obj \
-	$(OBJS)\monolib_joystick.obj \
+	$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
 	$(OBJS)\monolib_mediactrlcmn.obj \
 	$(OBJS)\monolib_mediactrl.obj \
 	$(OBJS)\monolib_helpbest.obj \
@@ -1950,6 +1930,41 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj
 !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_calctrl.obj \
+	$(OBJS)\monolib_grid.obj \
+	$(OBJS)\monolib_gridctrl.obj \
+	$(OBJS)\monolib_gridsel.obj \
+	$(OBJS)\monolib_helpext.obj \
+	$(OBJS)\monolib_laywin.obj \
+	$(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_splash.obj \
+	$(OBJS)\monolib_tipdlg.obj \
+	$(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_taskbarcmn.obj \
+	$(OBJS)\monolib_sound.obj \
+	$(OBJS)\monolib_taskbar.obj \
+	$(OBJS)\monolib_joystick.obj \
+	$(OBJS)\monolib_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_calctrl.obj \
+	$(OBJS)\monolib_grid.obj \
+	$(OBJS)\monolib_gridctrl.obj \
+	$(OBJS)\monolib_gridsel.obj \
+	$(OBJS)\monolib_helpext.obj \
+	$(OBJS)\monolib_laywin.obj \
+	$(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_splash.obj \
+	$(OBJS)\monolib_tipdlg.obj \
+	$(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_taskbarcmn.obj \
+	$(OBJS)\monolib_sound.obj \
+	$(OBJS)\monolib_taskbar.obj \
+	$(OBJS)\monolib_joystick.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
 	$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll
@@ -2760,10 +2775,80 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 __advdll___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll
 !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_calctrl.obj \
+	$(OBJS)\advdll_grid.obj \
+	$(OBJS)\advdll_gridctrl.obj \
+	$(OBJS)\advdll_gridsel.obj \
+	$(OBJS)\advdll_helpext.obj \
+	$(OBJS)\advdll_laywin.obj \
+	$(OBJS)\advdll_sashwin.obj \
+	$(OBJS)\advdll_splash.obj \
+	$(OBJS)\advdll_tipdlg.obj \
+	$(OBJS)\advdll_wizard.obj \
+	$(OBJS)\advdll_taskbarcmn.obj \
+	$(OBJS)\advdll_sound.obj \
+	$(OBJS)\advdll_taskbar.obj \
+	$(OBJS)\advdll_joystick.obj \
+	$(OBJS)\advdll_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_calctrl.obj \
+	$(OBJS)\advdll_grid.obj \
+	$(OBJS)\advdll_gridctrl.obj \
+	$(OBJS)\advdll_gridsel.obj \
+	$(OBJS)\advdll_helpext.obj \
+	$(OBJS)\advdll_laywin.obj \
+	$(OBJS)\advdll_sashwin.obj \
+	$(OBJS)\advdll_splash.obj \
+	$(OBJS)\advdll_tipdlg.obj \
+	$(OBJS)\advdll_wizard.obj \
+	$(OBJS)\advdll_taskbarcmn.obj \
+	$(OBJS)\advdll_sound.obj \
+	$(OBJS)\advdll_taskbar.obj \
+	$(OBJS)\advdll_joystick.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __advlib___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_calctrl.obj \
+	$(OBJS)\advlib_grid.obj \
+	$(OBJS)\advlib_gridctrl.obj \
+	$(OBJS)\advlib_gridsel.obj \
+	$(OBJS)\advlib_helpext.obj \
+	$(OBJS)\advlib_laywin.obj \
+	$(OBJS)\advlib_sashwin.obj \
+	$(OBJS)\advlib_splash.obj \
+	$(OBJS)\advlib_tipdlg.obj \
+	$(OBJS)\advlib_wizard.obj \
+	$(OBJS)\advlib_taskbarcmn.obj \
+	$(OBJS)\advlib_sound.obj \
+	$(OBJS)\advlib_taskbar.obj \
+	$(OBJS)\advlib_joystick.obj \
+	$(OBJS)\advlib_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_calctrl.obj \
+	$(OBJS)\advlib_grid.obj \
+	$(OBJS)\advlib_gridctrl.obj \
+	$(OBJS)\advlib_gridsel.obj \
+	$(OBJS)\advlib_helpext.obj \
+	$(OBJS)\advlib_laywin.obj \
+	$(OBJS)\advlib_sashwin.obj \
+	$(OBJS)\advlib_splash.obj \
+	$(OBJS)\advlib_tipdlg.obj \
+	$(OBJS)\advlib_wizard.obj \
+	$(OBJS)\advlib_taskbarcmn.obj \
+	$(OBJS)\advlib_sound.obj \
+	$(OBJS)\advlib_taskbar.obj \
+	$(OBJS)\advlib_joystick.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 __mediadll___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll
@@ -2886,12 +2971,6 @@ __DEBUG_DEFINE_p = -D__WXDEBUG__
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -D_UNICODE
 !endif
-!if "$(SHARED)" == "0"
-LIBDIRNAME = ..\..\lib\bcc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = ..\..\lib\bcc_dll$(CFG)
-!endif
 !if "$(WXUNIV)" == "0"
 __SETUP_H_SUBDIR_FILENAMES = msw
 !endif
@@ -4057,51 +4136,9 @@ $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
 $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5281,6 +5318,76 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H $**
 
@@ -5686,51 +5793,9 @@ $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
 $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6910,6 +6975,76 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H $**
 
@@ -9727,6 +9862,9 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
 $(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H $**
 
+$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
 $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -9760,9 +9898,6 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
-
 $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -9775,6 +9910,9 @@ $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
 $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H $**
 
+$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
 $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
@@ -9808,9 +9946,6 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
-
 $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 147c6cb455..01cecfc572 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -27,6 +27,7 @@ WX_RELEASE_NODOT = 25
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
@@ -159,7 +160,7 @@ WXTIFF_OBJECTS =  \
 	$(OBJS)\wxtiff_tif_write.o \
 	$(OBJS)\wxtiff_tif_zip.o
 WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
-	$(____LIBDIRNAME_FILENAMES_6_p) -DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+	-I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
 WXEXPAT_OBJECTS =  \
 	$(OBJS)\wxexpat_xmlparse.o \
 	$(OBJS)\wxexpat_xmlrole.o \
@@ -635,21 +636,7 @@ ADVDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
 	$(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
 	$(OBJS)\advdll_dummy.o \
-	$(OBJS)\advdll_calctrl.o \
-	$(OBJS)\advdll_grid.o \
-	$(OBJS)\advdll_gridctrl.o \
-	$(OBJS)\advdll_gridsel.o \
-	$(OBJS)\advdll_helpext.o \
-	$(OBJS)\advdll_laywin.o \
-	$(OBJS)\advdll_sashwin.o \
-	$(OBJS)\advdll_splash.o \
-	$(OBJS)\advdll_tipdlg.o \
-	$(OBJS)\advdll_wizard.o \
-	$(OBJS)\advdll_taskbarcmn.o \
-	$(OBJS)\advdll_datectrl.o \
-	$(OBJS)\advdll_sound.o \
-	$(OBJS)\advdll_taskbar.o \
-	$(OBJS)\advdll_joystick.o
+	$(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
 ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
 	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I..\..\include -I$(SETUPHDIR) -Wall -Wno-ctor-dtor-privacy -I..\..\src\tiff \
@@ -658,21 +645,7 @@ ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
 	$(CPPFLAGS) $(CXXFLAGS)
 ADVLIB_OBJECTS =  \
 	$(OBJS)\advlib_dummy.o \
-	$(OBJS)\advlib_calctrl.o \
-	$(OBJS)\advlib_grid.o \
-	$(OBJS)\advlib_gridctrl.o \
-	$(OBJS)\advlib_gridsel.o \
-	$(OBJS)\advlib_helpext.o \
-	$(OBJS)\advlib_laywin.o \
-	$(OBJS)\advlib_sashwin.o \
-	$(OBJS)\advlib_splash.o \
-	$(OBJS)\advlib_tipdlg.o \
-	$(OBJS)\advlib_wizard.o \
-	$(OBJS)\advlib_taskbarcmn.o \
-	$(OBJS)\advlib_datectrl.o \
-	$(OBJS)\advlib_sound.o \
-	$(OBJS)\advlib_taskbar.o \
-	$(OBJS)\advlib_joystick.o
+	$(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 MEDIADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -Wall \
@@ -961,6 +934,12 @@ endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
 ifeq ($(USE_GUI),1)
 __wxpng___depname = $(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a
 endif
@@ -970,12 +949,6 @@ endif
 ifeq ($(USE_GUI),1)
 __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a
 endif
-ifeq ($(SHARED),0)
-____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\gcc_dll$(CFG)
-endif
 ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = 
 endif
@@ -991,21 +964,7 @@ endif
 ifeq ($(USE_GUI),1)
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(____CORE_SRC_FILENAMES_OBJECTS) \
-	$(OBJS)\monodll_calctrl.o \
-	$(OBJS)\monodll_grid.o \
-	$(OBJS)\monodll_gridctrl.o \
-	$(OBJS)\monodll_gridsel.o \
-	$(OBJS)\monodll_helpext.o \
-	$(OBJS)\monodll_laywin.o \
-	$(OBJS)\monodll_sashwin.o \
-	$(OBJS)\monodll_splash.o \
-	$(OBJS)\monodll_tipdlg.o \
-	$(OBJS)\monodll_wizard.o \
-	$(OBJS)\monodll_taskbarcmn.o \
-	$(OBJS)\monodll_datectrl.o \
-	$(OBJS)\monodll_sound.o \
-	$(OBJS)\monodll_taskbar.o \
-	$(OBJS)\monodll_joystick.o \
+	$(____ADVANCED_SRC_FILENAMES_OBJECTS) \
 	$(OBJS)\monodll_mediactrlcmn.o \
 	$(OBJS)\monodll_mediactrl.o \
 	$(OBJS)\monodll_helpbest.o \
@@ -1468,6 +1427,41 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_vscroll.o
 endif
 endif
+ifeq ($(WXUNIV),0)
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_calctrl.o \
+	$(OBJS)\monodll_grid.o \
+	$(OBJS)\monodll_gridctrl.o \
+	$(OBJS)\monodll_gridsel.o \
+	$(OBJS)\monodll_helpext.o \
+	$(OBJS)\monodll_laywin.o \
+	$(OBJS)\monodll_sashwin.o \
+	$(OBJS)\monodll_splash.o \
+	$(OBJS)\monodll_tipdlg.o \
+	$(OBJS)\monodll_wizard.o \
+	$(OBJS)\monodll_taskbarcmn.o \
+	$(OBJS)\monodll_sound.o \
+	$(OBJS)\monodll_taskbar.o \
+	$(OBJS)\monodll_joystick.o \
+	$(OBJS)\monodll_datectrl.o
+endif
+ifeq ($(WXUNIV),1)
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_calctrl.o \
+	$(OBJS)\monodll_grid.o \
+	$(OBJS)\monodll_gridctrl.o \
+	$(OBJS)\monodll_gridsel.o \
+	$(OBJS)\monodll_helpext.o \
+	$(OBJS)\monodll_laywin.o \
+	$(OBJS)\monodll_sashwin.o \
+	$(OBJS)\monodll_splash.o \
+	$(OBJS)\monodll_tipdlg.o \
+	$(OBJS)\monodll_wizard.o \
+	$(OBJS)\monodll_taskbarcmn.o \
+	$(OBJS)\monodll_sound.o \
+	$(OBJS)\monodll_taskbar.o \
+	$(OBJS)\monodll_joystick.o
+endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),0)
 __monolib___depname = \
@@ -1477,21 +1471,7 @@ endif
 ifeq ($(USE_GUI),1)
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(____CORE_SRC_FILENAMES_1_OBJECTS) \
-	$(OBJS)\monolib_calctrl.o \
-	$(OBJS)\monolib_grid.o \
-	$(OBJS)\monolib_gridctrl.o \
-	$(OBJS)\monolib_gridsel.o \
-	$(OBJS)\monolib_helpext.o \
-	$(OBJS)\monolib_laywin.o \
-	$(OBJS)\monolib_sashwin.o \
-	$(OBJS)\monolib_splash.o \
-	$(OBJS)\monolib_tipdlg.o \
-	$(OBJS)\monolib_wizard.o \
-	$(OBJS)\monolib_taskbarcmn.o \
-	$(OBJS)\monolib_datectrl.o \
-	$(OBJS)\monolib_sound.o \
-	$(OBJS)\monolib_taskbar.o \
-	$(OBJS)\monolib_joystick.o \
+	$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
 	$(OBJS)\monolib_mediactrlcmn.o \
 	$(OBJS)\monolib_mediactrl.o \
 	$(OBJS)\monolib_helpbest.o \
@@ -1954,6 +1934,41 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_vscroll.o
 endif
 endif
+ifeq ($(WXUNIV),0)
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_calctrl.o \
+	$(OBJS)\monolib_grid.o \
+	$(OBJS)\monolib_gridctrl.o \
+	$(OBJS)\monolib_gridsel.o \
+	$(OBJS)\monolib_helpext.o \
+	$(OBJS)\monolib_laywin.o \
+	$(OBJS)\monolib_sashwin.o \
+	$(OBJS)\monolib_splash.o \
+	$(OBJS)\monolib_tipdlg.o \
+	$(OBJS)\monolib_wizard.o \
+	$(OBJS)\monolib_taskbarcmn.o \
+	$(OBJS)\monolib_sound.o \
+	$(OBJS)\monolib_taskbar.o \
+	$(OBJS)\monolib_joystick.o \
+	$(OBJS)\monolib_datectrl.o
+endif
+ifeq ($(WXUNIV),1)
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_calctrl.o \
+	$(OBJS)\monolib_grid.o \
+	$(OBJS)\monolib_gridctrl.o \
+	$(OBJS)\monolib_gridsel.o \
+	$(OBJS)\monolib_helpext.o \
+	$(OBJS)\monolib_laywin.o \
+	$(OBJS)\monolib_sashwin.o \
+	$(OBJS)\monolib_splash.o \
+	$(OBJS)\monolib_tipdlg.o \
+	$(OBJS)\monolib_wizard.o \
+	$(OBJS)\monolib_taskbarcmn.o \
+	$(OBJS)\monolib_sound.o \
+	$(OBJS)\monolib_taskbar.o \
+	$(OBJS)\monolib_joystick.o
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 __basedll___depname = \
@@ -2792,6 +2807,41 @@ __advdll___depname = \
 endif
 endif
 endif
+ifeq ($(WXUNIV),0)
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_calctrl.o \
+	$(OBJS)\advdll_grid.o \
+	$(OBJS)\advdll_gridctrl.o \
+	$(OBJS)\advdll_gridsel.o \
+	$(OBJS)\advdll_helpext.o \
+	$(OBJS)\advdll_laywin.o \
+	$(OBJS)\advdll_sashwin.o \
+	$(OBJS)\advdll_splash.o \
+	$(OBJS)\advdll_tipdlg.o \
+	$(OBJS)\advdll_wizard.o \
+	$(OBJS)\advdll_taskbarcmn.o \
+	$(OBJS)\advdll_sound.o \
+	$(OBJS)\advdll_taskbar.o \
+	$(OBJS)\advdll_joystick.o \
+	$(OBJS)\advdll_datectrl.o
+endif
+ifeq ($(WXUNIV),1)
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_calctrl.o \
+	$(OBJS)\advdll_grid.o \
+	$(OBJS)\advdll_gridctrl.o \
+	$(OBJS)\advdll_gridsel.o \
+	$(OBJS)\advdll_helpext.o \
+	$(OBJS)\advdll_laywin.o \
+	$(OBJS)\advdll_sashwin.o \
+	$(OBJS)\advdll_splash.o \
+	$(OBJS)\advdll_tipdlg.o \
+	$(OBJS)\advdll_wizard.o \
+	$(OBJS)\advdll_taskbarcmn.o \
+	$(OBJS)\advdll_sound.o \
+	$(OBJS)\advdll_taskbar.o \
+	$(OBJS)\advdll_joystick.o
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),0)
 ifeq ($(USE_GUI),1)
@@ -2800,6 +2850,41 @@ __advlib___depname = \
 endif
 endif
 endif
+ifeq ($(WXUNIV),0)
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_calctrl.o \
+	$(OBJS)\advlib_grid.o \
+	$(OBJS)\advlib_gridctrl.o \
+	$(OBJS)\advlib_gridsel.o \
+	$(OBJS)\advlib_helpext.o \
+	$(OBJS)\advlib_laywin.o \
+	$(OBJS)\advlib_sashwin.o \
+	$(OBJS)\advlib_splash.o \
+	$(OBJS)\advlib_tipdlg.o \
+	$(OBJS)\advlib_wizard.o \
+	$(OBJS)\advlib_taskbarcmn.o \
+	$(OBJS)\advlib_sound.o \
+	$(OBJS)\advlib_taskbar.o \
+	$(OBJS)\advlib_joystick.o \
+	$(OBJS)\advlib_datectrl.o
+endif
+ifeq ($(WXUNIV),1)
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_calctrl.o \
+	$(OBJS)\advlib_grid.o \
+	$(OBJS)\advlib_gridctrl.o \
+	$(OBJS)\advlib_gridsel.o \
+	$(OBJS)\advlib_helpext.o \
+	$(OBJS)\advlib_laywin.o \
+	$(OBJS)\advlib_sashwin.o \
+	$(OBJS)\advlib_splash.o \
+	$(OBJS)\advlib_tipdlg.o \
+	$(OBJS)\advlib_wizard.o \
+	$(OBJS)\advlib_taskbarcmn.o \
+	$(OBJS)\advlib_sound.o \
+	$(OBJS)\advlib_taskbar.o \
+	$(OBJS)\advlib_joystick.o
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -2988,12 +3073,6 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
-ifeq ($(SHARED),0)
-LIBDIRNAME = ..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = ..\..\lib\gcc_dll$(CFG)
-endif
 ifeq ($(WXUNIV),0)
 __SETUP_H_SUBDIR_FILENAMES = msw
 endif
@@ -4126,51 +4205,9 @@ $(OBJS)\monodll_metal.o: ../../src/univ/themes/metal.cpp
 $(OBJS)\monodll_win32.o: ../../src/univ/themes/win32.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gridctrl.o: ../../src/generic/gridctrl.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gridsel.o: ../../src/generic/gridsel.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpext.o: ../../src/generic/helpext.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -5450,6 +5487,76 @@ $(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_gridctrl.o: ../../src/generic/gridctrl.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_gridsel.o: ../../src/generic/gridsel.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_helpext.o: ../../src/generic/helpext.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
 $(OBJS)\monolib_dummy.o: ../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -5855,51 +5962,9 @@ $(OBJS)\monolib_metal.o: ../../src/univ/themes/metal.cpp
 $(OBJS)\monolib_win32.o: ../../src/univ/themes/win32.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gridctrl.o: ../../src/generic/gridctrl.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gridsel.o: ../../src/generic/gridsel.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpext.o: ../../src/generic/helpext.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -7179,6 +7244,76 @@ $(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_gridctrl.o: ../../src/generic/gridctrl.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_gridsel.o: ../../src/generic/gridsel.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_helpext.o: ../../src/generic/helpext.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
 $(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -10196,6 +10331,9 @@ endif
 $(OBJS)\advdll_dummy.o: ../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
+$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
@@ -10229,9 +10367,6 @@ $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp
 $(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $<
-
 $(OBJS)\advdll_sound.o: ../../src/msw/sound.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
@@ -10244,6 +10379,9 @@ $(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp
 $(OBJS)\advlib_dummy.o: ../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
+$(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
@@ -10277,9 +10415,6 @@ $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp
 $(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $<
-
 $(OBJS)\advlib_sound.o: ../../src/msw/sound.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 246897a318..4fcbdbfbaf 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -28,6 +28,7 @@ WX_RELEASE_NODOT = 25
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 OBJS = \
 	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO) \
@@ -169,7 +170,7 @@ WXTIFF_OBJECTS =  \
 WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \
 	$(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
 	$(____DEBUGRUNTIME_62_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-	$(____LIBDIRNAME_FILENAMES_6_p) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+	/I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
 WXEXPAT_OBJECTS =  \
 	$(OBJS)\wxexpat_xmlparse.obj \
 	$(OBJS)\wxexpat_xmlrole.obj \
@@ -686,21 +687,7 @@ ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_176) /DWIN32 \
 	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
 	$(OBJS)\advdll_dummy.obj \
-	$(OBJS)\advdll_calctrl.obj \
-	$(OBJS)\advdll_grid.obj \
-	$(OBJS)\advdll_gridctrl.obj \
-	$(OBJS)\advdll_gridsel.obj \
-	$(OBJS)\advdll_helpext.obj \
-	$(OBJS)\advdll_laywin.obj \
-	$(OBJS)\advdll_sashwin.obj \
-	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_tipdlg.obj \
-	$(OBJS)\advdll_wizard.obj \
-	$(OBJS)\advdll_taskbarcmn.obj \
-	$(OBJS)\advdll_datectrl.obj \
-	$(OBJS)\advdll_sound.obj \
-	$(OBJS)\advdll_taskbar.obj \
-	$(OBJS)\advdll_joystick.obj
+	$(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
 ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_188) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
@@ -712,21 +699,7 @@ ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_188) /DWIN32 \
 	/Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
 ADVLIB_OBJECTS =  \
 	$(OBJS)\advlib_dummy.obj \
-	$(OBJS)\advlib_calctrl.obj \
-	$(OBJS)\advlib_grid.obj \
-	$(OBJS)\advlib_gridctrl.obj \
-	$(OBJS)\advlib_gridsel.obj \
-	$(OBJS)\advlib_helpext.obj \
-	$(OBJS)\advlib_laywin.obj \
-	$(OBJS)\advlib_sashwin.obj \
-	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_tipdlg.obj \
-	$(OBJS)\advlib_wizard.obj \
-	$(OBJS)\advlib_taskbarcmn.obj \
-	$(OBJS)\advlib_datectrl.obj \
-	$(OBJS)\advlib_sound.obj \
-	$(OBJS)\advlib_taskbar.obj \
-	$(OBJS)\advlib_joystick.obj
+	$(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_201) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
@@ -1052,6 +1025,12 @@ WXUNIVNAME = univ
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_2_p = 
 !endif
@@ -1169,12 +1148,6 @@ __DEBUGRUNTIME_63 = d
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 __DEBUGRUNTIME_63 = $(__DEBUGINFO_3_0)
 !endif
-!if "$(SHARED)" == "0"
-____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_dll$(CFG)
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -1206,21 +1179,7 @@ __DEBUGRUNTIME_76 = $(__DEBUGINFO_3_0)
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(____CORE_SRC_FILENAMES_OBJECTS) \
-	$(OBJS)\monodll_calctrl.obj \
-	$(OBJS)\monodll_grid.obj \
-	$(OBJS)\monodll_gridctrl.obj \
-	$(OBJS)\monodll_gridsel.obj \
-	$(OBJS)\monodll_helpext.obj \
-	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_sashwin.obj \
-	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_tipdlg.obj \
-	$(OBJS)\monodll_wizard.obj \
-	$(OBJS)\monodll_taskbarcmn.obj \
-	$(OBJS)\monodll_datectrl.obj \
-	$(OBJS)\monodll_sound.obj \
-	$(OBJS)\monodll_taskbar.obj \
-	$(OBJS)\monodll_joystick.obj \
+	$(____ADVANCED_SRC_FILENAMES_OBJECTS) \
 	$(OBJS)\monodll_mediactrlcmn.obj \
 	$(OBJS)\monodll_mediactrl.obj \
 	$(OBJS)\monodll_helpbest.obj \
@@ -1679,6 +1638,41 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj
 !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_calctrl.obj \
+	$(OBJS)\monodll_grid.obj \
+	$(OBJS)\monodll_gridctrl.obj \
+	$(OBJS)\monodll_gridsel.obj \
+	$(OBJS)\monodll_helpext.obj \
+	$(OBJS)\monodll_laywin.obj \
+	$(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_splash.obj \
+	$(OBJS)\monodll_tipdlg.obj \
+	$(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_taskbarcmn.obj \
+	$(OBJS)\monodll_sound.obj \
+	$(OBJS)\monodll_taskbar.obj \
+	$(OBJS)\monodll_joystick.obj \
+	$(OBJS)\monodll_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_calctrl.obj \
+	$(OBJS)\monodll_grid.obj \
+	$(OBJS)\monodll_gridctrl.obj \
+	$(OBJS)\monodll_gridsel.obj \
+	$(OBJS)\monodll_helpext.obj \
+	$(OBJS)\monodll_laywin.obj \
+	$(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_splash.obj \
+	$(OBJS)\monodll_tipdlg.obj \
+	$(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_taskbarcmn.obj \
+	$(OBJS)\monodll_sound.obj \
+	$(OBJS)\monodll_taskbar.obj \
+	$(OBJS)\monodll_joystick.obj
+!endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
 __monolib___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
@@ -1704,21 +1698,7 @@ __DEBUGRUNTIME_88 = $(__DEBUGINFO_3_0)
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(____CORE_SRC_FILENAMES_1_OBJECTS) \
-	$(OBJS)\monolib_calctrl.obj \
-	$(OBJS)\monolib_grid.obj \
-	$(OBJS)\monolib_gridctrl.obj \
-	$(OBJS)\monolib_gridsel.obj \
-	$(OBJS)\monolib_helpext.obj \
-	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_sashwin.obj \
-	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_tipdlg.obj \
-	$(OBJS)\monolib_wizard.obj \
-	$(OBJS)\monolib_taskbarcmn.obj \
-	$(OBJS)\monolib_datectrl.obj \
-	$(OBJS)\monolib_sound.obj \
-	$(OBJS)\monolib_taskbar.obj \
-	$(OBJS)\monolib_joystick.obj \
+	$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
 	$(OBJS)\monolib_mediactrlcmn.obj \
 	$(OBJS)\monolib_mediactrl.obj \
 	$(OBJS)\monolib_helpbest.obj \
@@ -2177,6 +2157,41 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj
 !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_calctrl.obj \
+	$(OBJS)\monolib_grid.obj \
+	$(OBJS)\monolib_gridctrl.obj \
+	$(OBJS)\monolib_gridsel.obj \
+	$(OBJS)\monolib_helpext.obj \
+	$(OBJS)\monolib_laywin.obj \
+	$(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_splash.obj \
+	$(OBJS)\monolib_tipdlg.obj \
+	$(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_taskbarcmn.obj \
+	$(OBJS)\monolib_sound.obj \
+	$(OBJS)\monolib_taskbar.obj \
+	$(OBJS)\monolib_joystick.obj \
+	$(OBJS)\monolib_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_calctrl.obj \
+	$(OBJS)\monolib_grid.obj \
+	$(OBJS)\monolib_gridctrl.obj \
+	$(OBJS)\monolib_gridsel.obj \
+	$(OBJS)\monolib_helpext.obj \
+	$(OBJS)\monolib_laywin.obj \
+	$(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_splash.obj \
+	$(OBJS)\monolib_tipdlg.obj \
+	$(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_taskbarcmn.obj \
+	$(OBJS)\monolib_sound.obj \
+	$(OBJS)\monolib_taskbar.obj \
+	$(OBJS)\monolib_joystick.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
 	$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
@@ -3113,6 +3128,41 @@ __DEBUGRUNTIME_176 = d
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 __DEBUGRUNTIME_176 = $(__DEBUGINFO_3_0)
 !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_calctrl.obj \
+	$(OBJS)\advdll_grid.obj \
+	$(OBJS)\advdll_gridctrl.obj \
+	$(OBJS)\advdll_gridsel.obj \
+	$(OBJS)\advdll_helpext.obj \
+	$(OBJS)\advdll_laywin.obj \
+	$(OBJS)\advdll_sashwin.obj \
+	$(OBJS)\advdll_splash.obj \
+	$(OBJS)\advdll_tipdlg.obj \
+	$(OBJS)\advdll_wizard.obj \
+	$(OBJS)\advdll_taskbarcmn.obj \
+	$(OBJS)\advdll_sound.obj \
+	$(OBJS)\advdll_taskbar.obj \
+	$(OBJS)\advdll_joystick.obj \
+	$(OBJS)\advdll_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_calctrl.obj \
+	$(OBJS)\advdll_grid.obj \
+	$(OBJS)\advdll_gridctrl.obj \
+	$(OBJS)\advdll_gridsel.obj \
+	$(OBJS)\advdll_helpext.obj \
+	$(OBJS)\advdll_laywin.obj \
+	$(OBJS)\advdll_sashwin.obj \
+	$(OBJS)\advdll_splash.obj \
+	$(OBJS)\advdll_tipdlg.obj \
+	$(OBJS)\advdll_wizard.obj \
+	$(OBJS)\advdll_taskbarcmn.obj \
+	$(OBJS)\advdll_sound.obj \
+	$(OBJS)\advdll_taskbar.obj \
+	$(OBJS)\advdll_joystick.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __advlib___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
@@ -3135,6 +3185,41 @@ __DEBUGRUNTIME_188 = d
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 __DEBUGRUNTIME_188 = $(__DEBUGINFO_3_0)
 !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_calctrl.obj \
+	$(OBJS)\advlib_grid.obj \
+	$(OBJS)\advlib_gridctrl.obj \
+	$(OBJS)\advlib_gridsel.obj \
+	$(OBJS)\advlib_helpext.obj \
+	$(OBJS)\advlib_laywin.obj \
+	$(OBJS)\advlib_sashwin.obj \
+	$(OBJS)\advlib_splash.obj \
+	$(OBJS)\advlib_tipdlg.obj \
+	$(OBJS)\advlib_wizard.obj \
+	$(OBJS)\advlib_taskbarcmn.obj \
+	$(OBJS)\advlib_sound.obj \
+	$(OBJS)\advlib_taskbar.obj \
+	$(OBJS)\advlib_joystick.obj \
+	$(OBJS)\advlib_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_calctrl.obj \
+	$(OBJS)\advlib_grid.obj \
+	$(OBJS)\advlib_gridctrl.obj \
+	$(OBJS)\advlib_gridsel.obj \
+	$(OBJS)\advlib_helpext.obj \
+	$(OBJS)\advlib_laywin.obj \
+	$(OBJS)\advlib_sashwin.obj \
+	$(OBJS)\advlib_splash.obj \
+	$(OBJS)\advlib_tipdlg.obj \
+	$(OBJS)\advlib_wizard.obj \
+	$(OBJS)\advlib_taskbarcmn.obj \
+	$(OBJS)\advlib_sound.obj \
+	$(OBJS)\advlib_taskbar.obj \
+	$(OBJS)\advlib_joystick.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 __mediadll___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
@@ -3557,12 +3642,6 @@ __DEBUG_DEFINE_p = /D__WXDEBUG__
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /D_UNICODE
 !endif
-!if "$(SHARED)" == "0"
-LIBDIRNAME = ..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = ..\..\lib\vc_dll$(CFG)
-!endif
 !if "$(WXUNIV)" == "0"
 __SETUP_H_SUBDIR_FILENAMES = msw
 !endif
@@ -4678,51 +4757,9 @@ $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
 $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5902,6 +5939,76 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h $**
 
@@ -6307,51 +6414,9 @@ $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
 $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -7531,6 +7596,76 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
@@ -10348,6 +10483,9 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
 $(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
+$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
 $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -10381,9 +10519,6 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
-
 $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -10396,6 +10531,9 @@ $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
 $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $**
 
+$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
 $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
@@ -10429,9 +10567,6 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
-
 $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 41e2b36d73..a67885e1e0 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -62,6 +62,13 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
 __wxpng___depname =
 !ifeq USE_GUI 1
 __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
@@ -74,13 +81,6 @@ __wxtiff___depname =
 !ifeq USE_GUI 1
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
-____LIBDIRNAME_FILENAMES_6_p =
-!ifeq SHARED 0
-____LIBDIRNAME_FILENAMES_6_p = -i=..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-____LIBDIRNAME_FILENAMES_6_p = -i=..\..\lib\wat_dll$(CFG)
-!endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE = 
@@ -99,21 +99,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
 	$(____CORE_SRC_FILENAMES_OBJECTS) &
-	$(OBJS)\monodll_calctrl.obj &
-	$(OBJS)\monodll_grid.obj &
-	$(OBJS)\monodll_gridctrl.obj &
-	$(OBJS)\monodll_gridsel.obj &
-	$(OBJS)\monodll_helpext.obj &
-	$(OBJS)\monodll_laywin.obj &
-	$(OBJS)\monodll_sashwin.obj &
-	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_tipdlg.obj &
-	$(OBJS)\monodll_wizard.obj &
-	$(OBJS)\monodll_taskbarcmn.obj &
-	$(OBJS)\monodll_datectrl.obj &
-	$(OBJS)\monodll_sound.obj &
-	$(OBJS)\monodll_taskbar.obj &
-	$(OBJS)\monodll_joystick.obj &
+	$(____ADVANCED_SRC_FILENAMES_OBJECTS) &
 	$(OBJS)\monodll_mediactrlcmn.obj &
 	$(OBJS)\monodll_mediactrl.obj &
 	$(OBJS)\monodll_helpbest.obj &
@@ -577,6 +563,42 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_vscroll.obj
 !endif
 !endif
+____ADVANCED_SRC_FILENAMES_OBJECTS =
+!ifeq WXUNIV 0
+____ADVANCED_SRC_FILENAMES_OBJECTS =  &
+	$(OBJS)\monodll_calctrl.obj &
+	$(OBJS)\monodll_grid.obj &
+	$(OBJS)\monodll_gridctrl.obj &
+	$(OBJS)\monodll_gridsel.obj &
+	$(OBJS)\monodll_helpext.obj &
+	$(OBJS)\monodll_laywin.obj &
+	$(OBJS)\monodll_sashwin.obj &
+	$(OBJS)\monodll_splash.obj &
+	$(OBJS)\monodll_tipdlg.obj &
+	$(OBJS)\monodll_wizard.obj &
+	$(OBJS)\monodll_taskbarcmn.obj &
+	$(OBJS)\monodll_sound.obj &
+	$(OBJS)\monodll_taskbar.obj &
+	$(OBJS)\monodll_joystick.obj &
+	$(OBJS)\monodll_datectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_OBJECTS =  &
+	$(OBJS)\monodll_calctrl.obj &
+	$(OBJS)\monodll_grid.obj &
+	$(OBJS)\monodll_gridctrl.obj &
+	$(OBJS)\monodll_gridsel.obj &
+	$(OBJS)\monodll_helpext.obj &
+	$(OBJS)\monodll_laywin.obj &
+	$(OBJS)\monodll_sashwin.obj &
+	$(OBJS)\monodll_splash.obj &
+	$(OBJS)\monodll_tipdlg.obj &
+	$(OBJS)\monodll_wizard.obj &
+	$(OBJS)\monodll_taskbarcmn.obj &
+	$(OBJS)\monodll_sound.obj &
+	$(OBJS)\monodll_taskbar.obj &
+	$(OBJS)\monodll_joystick.obj
+!endif
 __monolib___depname =
 !ifeq MONOLITHIC 1
 !ifeq SHARED 0
@@ -588,21 +610,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(____CORE_SRC_FILENAMES_1_OBJECTS) &
-	$(OBJS)\monolib_calctrl.obj &
-	$(OBJS)\monolib_grid.obj &
-	$(OBJS)\monolib_gridctrl.obj &
-	$(OBJS)\monolib_gridsel.obj &
-	$(OBJS)\monolib_helpext.obj &
-	$(OBJS)\monolib_laywin.obj &
-	$(OBJS)\monolib_sashwin.obj &
-	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_tipdlg.obj &
-	$(OBJS)\monolib_wizard.obj &
-	$(OBJS)\monolib_taskbarcmn.obj &
-	$(OBJS)\monolib_datectrl.obj &
-	$(OBJS)\monolib_sound.obj &
-	$(OBJS)\monolib_taskbar.obj &
-	$(OBJS)\monolib_joystick.obj &
+	$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) &
 	$(OBJS)\monolib_mediactrlcmn.obj &
 	$(OBJS)\monolib_mediactrl.obj &
 	$(OBJS)\monolib_helpbest.obj &
@@ -1066,6 +1074,42 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_vscroll.obj
 !endif
 !endif
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =
+!ifeq WXUNIV 0
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
+	$(OBJS)\monolib_calctrl.obj &
+	$(OBJS)\monolib_grid.obj &
+	$(OBJS)\monolib_gridctrl.obj &
+	$(OBJS)\monolib_gridsel.obj &
+	$(OBJS)\monolib_helpext.obj &
+	$(OBJS)\monolib_laywin.obj &
+	$(OBJS)\monolib_sashwin.obj &
+	$(OBJS)\monolib_splash.obj &
+	$(OBJS)\monolib_tipdlg.obj &
+	$(OBJS)\monolib_wizard.obj &
+	$(OBJS)\monolib_taskbarcmn.obj &
+	$(OBJS)\monolib_sound.obj &
+	$(OBJS)\monolib_taskbar.obj &
+	$(OBJS)\monolib_joystick.obj &
+	$(OBJS)\monolib_datectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
+	$(OBJS)\monolib_calctrl.obj &
+	$(OBJS)\monolib_grid.obj &
+	$(OBJS)\monolib_gridctrl.obj &
+	$(OBJS)\monolib_gridsel.obj &
+	$(OBJS)\monolib_helpext.obj &
+	$(OBJS)\monolib_laywin.obj &
+	$(OBJS)\monolib_sashwin.obj &
+	$(OBJS)\monolib_splash.obj &
+	$(OBJS)\monolib_tipdlg.obj &
+	$(OBJS)\monolib_wizard.obj &
+	$(OBJS)\monolib_taskbarcmn.obj &
+	$(OBJS)\monolib_sound.obj &
+	$(OBJS)\monolib_taskbar.obj &
+	$(OBJS)\monolib_joystick.obj
+!endif
 __basedll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
@@ -1913,6 +1957,42 @@ __advdll___depname = &
 !endif
 !endif
 !endif
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =
+!ifeq WXUNIV 0
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
+	$(OBJS)\advdll_calctrl.obj &
+	$(OBJS)\advdll_grid.obj &
+	$(OBJS)\advdll_gridctrl.obj &
+	$(OBJS)\advdll_gridsel.obj &
+	$(OBJS)\advdll_helpext.obj &
+	$(OBJS)\advdll_laywin.obj &
+	$(OBJS)\advdll_sashwin.obj &
+	$(OBJS)\advdll_splash.obj &
+	$(OBJS)\advdll_tipdlg.obj &
+	$(OBJS)\advdll_wizard.obj &
+	$(OBJS)\advdll_taskbarcmn.obj &
+	$(OBJS)\advdll_sound.obj &
+	$(OBJS)\advdll_taskbar.obj &
+	$(OBJS)\advdll_joystick.obj &
+	$(OBJS)\advdll_datectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
+	$(OBJS)\advdll_calctrl.obj &
+	$(OBJS)\advdll_grid.obj &
+	$(OBJS)\advdll_gridctrl.obj &
+	$(OBJS)\advdll_gridsel.obj &
+	$(OBJS)\advdll_helpext.obj &
+	$(OBJS)\advdll_laywin.obj &
+	$(OBJS)\advdll_sashwin.obj &
+	$(OBJS)\advdll_splash.obj &
+	$(OBJS)\advdll_tipdlg.obj &
+	$(OBJS)\advdll_wizard.obj &
+	$(OBJS)\advdll_taskbarcmn.obj &
+	$(OBJS)\advdll_sound.obj &
+	$(OBJS)\advdll_taskbar.obj &
+	$(OBJS)\advdll_joystick.obj
+!endif
 __advlib___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 0
@@ -1922,6 +2002,42 @@ __advlib___depname = &
 !endif
 !endif
 !endif
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =
+!ifeq WXUNIV 0
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
+	$(OBJS)\advlib_calctrl.obj &
+	$(OBJS)\advlib_grid.obj &
+	$(OBJS)\advlib_gridctrl.obj &
+	$(OBJS)\advlib_gridsel.obj &
+	$(OBJS)\advlib_helpext.obj &
+	$(OBJS)\advlib_laywin.obj &
+	$(OBJS)\advlib_sashwin.obj &
+	$(OBJS)\advlib_splash.obj &
+	$(OBJS)\advlib_tipdlg.obj &
+	$(OBJS)\advlib_wizard.obj &
+	$(OBJS)\advlib_taskbarcmn.obj &
+	$(OBJS)\advlib_sound.obj &
+	$(OBJS)\advlib_taskbar.obj &
+	$(OBJS)\advlib_joystick.obj &
+	$(OBJS)\advlib_datectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
+	$(OBJS)\advlib_calctrl.obj &
+	$(OBJS)\advlib_grid.obj &
+	$(OBJS)\advlib_gridctrl.obj &
+	$(OBJS)\advlib_gridsel.obj &
+	$(OBJS)\advlib_helpext.obj &
+	$(OBJS)\advlib_laywin.obj &
+	$(OBJS)\advlib_sashwin.obj &
+	$(OBJS)\advlib_splash.obj &
+	$(OBJS)\advlib_tipdlg.obj &
+	$(OBJS)\advlib_wizard.obj &
+	$(OBJS)\advlib_taskbarcmn.obj &
+	$(OBJS)\advlib_sound.obj &
+	$(OBJS)\advlib_taskbar.obj &
+	$(OBJS)\advlib_joystick.obj
+!endif
 __mediadll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
@@ -2151,13 +2267,6 @@ __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = ..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = ..\..\lib\wat_dll$(CFG)
-!endif
 __SETUP_H_SUBDIR_FILENAMES =
 !ifeq WXUNIV 0
 __SETUP_H_SUBDIR_FILENAMES = msw
@@ -2183,6 +2292,7 @@ WX_RELEASE_NODOT = 25
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
@@ -2315,7 +2425,7 @@ WXTIFF_OBJECTS =  &
 	$(OBJS)\wxtiff_tif_write.obj &
 	$(OBJS)\wxtiff_tif_zip.obj
 WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
-	$(____LIBDIRNAME_FILENAMES_6_p) -dCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+	-i=$(LIBDIRNAME) -dCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
 WXEXPAT_OBJECTS =  &
 	$(OBJS)\wxexpat_xmlparse.obj &
 	$(OBJS)\wxexpat_xmlrole.obj &
@@ -2797,21 +2907,7 @@ ADVDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	/fh=$(OBJS)\wxprec_advdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  &
 	$(OBJS)\advdll_dummy.obj &
-	$(OBJS)\advdll_calctrl.obj &
-	$(OBJS)\advdll_grid.obj &
-	$(OBJS)\advdll_gridctrl.obj &
-	$(OBJS)\advdll_gridsel.obj &
-	$(OBJS)\advdll_helpext.obj &
-	$(OBJS)\advdll_laywin.obj &
-	$(OBJS)\advdll_sashwin.obj &
-	$(OBJS)\advdll_splash.obj &
-	$(OBJS)\advdll_tipdlg.obj &
-	$(OBJS)\advdll_wizard.obj &
-	$(OBJS)\advdll_taskbarcmn.obj &
-	$(OBJS)\advdll_datectrl.obj &
-	$(OBJS)\advdll_sound.obj &
-	$(OBJS)\advdll_taskbar.obj &
-	$(OBJS)\advdll_joystick.obj
+	$(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
 ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
 	-i=..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
@@ -2820,21 +2916,7 @@ ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 ADVLIB_OBJECTS =  &
 	$(OBJS)\advlib_dummy.obj &
-	$(OBJS)\advlib_calctrl.obj &
-	$(OBJS)\advlib_grid.obj &
-	$(OBJS)\advlib_gridctrl.obj &
-	$(OBJS)\advlib_gridsel.obj &
-	$(OBJS)\advlib_helpext.obj &
-	$(OBJS)\advlib_laywin.obj &
-	$(OBJS)\advlib_sashwin.obj &
-	$(OBJS)\advlib_splash.obj &
-	$(OBJS)\advlib_tipdlg.obj &
-	$(OBJS)\advlib_wizard.obj &
-	$(OBJS)\advlib_taskbarcmn.obj &
-	$(OBJS)\advlib_datectrl.obj &
-	$(OBJS)\advlib_sound.obj &
-	$(OBJS)\advlib_taskbar.obj &
-	$(OBJS)\advlib_joystick.obj
+	$(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
 	-i=..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
@@ -4342,51 +4424,9 @@ $(OBJS)\monodll_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
 $(OBJS)\monodll_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_grid.obj :  .AUTODEPEND ..\..\src\generic\grid.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gridctrl.obj :  .AUTODEPEND ..\..\src\generic\gridctrl.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -5666,6 +5706,76 @@ $(OBJS)\monodll_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_grid.obj :  .AUTODEPEND ..\..\src\generic\grid.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_gridctrl.obj :  .AUTODEPEND ..\..\src\generic\gridctrl.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 $(OBJS)\monolib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -6071,51 +6181,9 @@ $(OBJS)\monolib_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
 $(OBJS)\monolib_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_grid.obj :  .AUTODEPEND ..\..\src\generic\grid.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gridctrl.obj :  .AUTODEPEND ..\..\src\generic\gridctrl.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -7395,6 +7463,76 @@ $(OBJS)\monolib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_grid.obj :  .AUTODEPEND ..\..\src\generic\grid.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_gridctrl.obj :  .AUTODEPEND ..\..\src\generic\gridctrl.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 $(OBJS)\basedll_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -10412,6 +10550,9 @@ $(OBJS)\corelib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
 $(OBJS)\advdll_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
+$(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -10445,9 +10586,6 @@ $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
 $(OBJS)\advdll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
 $(OBJS)\advdll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
 	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -10460,6 +10598,9 @@ $(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
 $(OBJS)\advlib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
+$(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -10493,9 +10634,6 @@ $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
 $(OBJS)\advlib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
 $(OBJS)\advlib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
 	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index 2281e72775..40f28444de 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -461,6 +461,65 @@ SOURCE=..\..\src\common\taskbarcmn.cpp
 # Begin Source File
 
 SOURCE=..\..\src\msw\datectrl.cpp
+
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"
+
+
+!ENDIF
+
 # End Source File
 # Begin Source File