diff --git a/Makefile.in b/Makefile.in
index 0d896381f1..09fccd91fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2874,7 +2874,8 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
 	wx/msw/helpchm.h \
 	wx/msw/sound.h \
 	wx/msw/joystick.h \
-	wx/msw/evtloop.h
+	wx/msw/evtloop.h \
+	wx/msw/taskbarbutton.h
 @COND_TOOLKIT_MSW@LOWLEVEL_HDR = $(COND_TOOLKIT_MSW_LOWLEVEL_HDR)
 @COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR = 
 @COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR = 
@@ -3193,7 +3194,6 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/statusbar.h \
 	wx/msw/statline.h \
 	wx/msw/stattext.h \
-	wx/msw/taskbarbutton.h \
 	wx/msw/toolbar.h \
 	wx/msw/textctrl.h \
 	wx/msw/textentry.h \
@@ -5040,7 +5040,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_access.o \
 	monodll_msw_bmpbndl.o \
 	monodll_msw_overlay.o \
-	monodll_darkmode.o
+	monodll_darkmode.o \
+	monodll_msw_appprogress.o \
+	monodll_taskbarbutton.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS)
@@ -5292,7 +5294,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
 	monodll_prntdlgg.o \
 	monodll_msw_accel.o \
 	monodll_msw_anybutton.o \
-	monodll_msw_appprogress.o \
 	monodll_artmsw.o \
 	monodll_msw_bmpbuttn.o \
 	monodll_msw_button.o \
@@ -5334,7 +5335,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
 	monodll_msw_statusbar.o \
 	monodll_msw_statline.o \
 	monodll_msw_stattext.o \
-	monodll_taskbarbutton.o \
 	monodll_msw_toolbar.o \
 	monodll_msw_textctrl.o \
 	monodll_msw_textentry.o \
@@ -5768,7 +5768,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_access.o \
 	monodll_msw_bmpbndl.o \
 	monodll_msw_overlay.o \
-	monodll_darkmode.o
+	monodll_darkmode.o \
+	monodll_msw_appprogress.o \
+	monodll_taskbarbutton.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS)
@@ -6799,7 +6801,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_access.o \
 	monolib_msw_bmpbndl.o \
 	monolib_msw_overlay.o \
-	monolib_darkmode.o
+	monolib_darkmode.o \
+	monolib_msw_appprogress.o \
+	monolib_taskbarbutton.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_17)
@@ -7051,7 +7055,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
 	monolib_prntdlgg.o \
 	monolib_msw_accel.o \
 	monolib_msw_anybutton.o \
-	monolib_msw_appprogress.o \
 	monolib_artmsw.o \
 	monolib_msw_bmpbuttn.o \
 	monolib_msw_button.o \
@@ -7093,7 +7096,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
 	monolib_msw_statusbar.o \
 	monolib_msw_statline.o \
 	monolib_msw_stattext.o \
-	monolib_taskbarbutton.o \
 	monolib_msw_toolbar.o \
 	monolib_msw_textctrl.o \
 	monolib_msw_textentry.o \
@@ -7527,7 +7529,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_access.o \
 	monolib_msw_bmpbndl.o \
 	monolib_msw_overlay.o \
-	monolib_darkmode.o
+	monolib_darkmode.o \
+	monolib_msw_appprogress.o \
+	monolib_taskbarbutton.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_17)
@@ -8710,7 +8714,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_access.o \
 	coredll_msw_bmpbndl.o \
 	coredll_msw_overlay.o \
-	coredll_darkmode.o
+	coredll_darkmode.o \
+	coredll_msw_appprogress.o \
+	coredll_taskbarbutton.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@@ -8962,7 +8968,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
 	coredll_prntdlgg.o \
 	coredll_msw_accel.o \
 	coredll_msw_anybutton.o \
-	coredll_msw_appprogress.o \
 	coredll_artmsw.o \
 	coredll_msw_bmpbuttn.o \
 	coredll_msw_button.o \
@@ -9004,7 +9009,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
 	coredll_msw_statusbar.o \
 	coredll_msw_statline.o \
 	coredll_msw_stattext.o \
-	coredll_taskbarbutton.o \
 	coredll_msw_toolbar.o \
 	coredll_msw_textctrl.o \
 	coredll_msw_textentry.o \
@@ -9438,7 +9442,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_access.o \
 	coredll_msw_bmpbndl.o \
 	coredll_msw_overlay.o \
-	coredll_darkmode.o
+	coredll_darkmode.o \
+	coredll_msw_appprogress.o \
+	coredll_taskbarbutton.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@@ -10197,7 +10203,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_access.o \
 	corelib_msw_bmpbndl.o \
 	corelib_msw_overlay.o \
-	corelib_darkmode.o
+	corelib_darkmode.o \
+	corelib_msw_appprogress.o \
+	corelib_taskbarbutton.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@@ -10449,7 +10457,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
 	corelib_prntdlgg.o \
 	corelib_msw_accel.o \
 	corelib_msw_anybutton.o \
-	corelib_msw_appprogress.o \
 	corelib_artmsw.o \
 	corelib_msw_bmpbuttn.o \
 	corelib_msw_button.o \
@@ -10491,7 +10498,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
 	corelib_msw_statusbar.o \
 	corelib_msw_statline.o \
 	corelib_msw_stattext.o \
-	corelib_taskbarbutton.o \
 	corelib_msw_toolbar.o \
 	corelib_msw_textctrl.o \
 	corelib_msw_textentry.o \
@@ -10925,7 +10931,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_access.o \
 	corelib_msw_bmpbndl.o \
 	corelib_msw_overlay.o \
-	corelib_darkmode.o
+	corelib_darkmode.o \
+	corelib_msw_appprogress.o \
+	corelib_taskbarbutton.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@@ -15160,9 +15168,6 @@ monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
 monodll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
 
-monodll_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
-
 monodll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
 
@@ -15286,9 +15291,6 @@ monodll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
 monodll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
 
-monodll_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
-
 monodll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
 
@@ -17491,6 +17493,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
 
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
+
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
 
@@ -19924,9 +19932,6 @@ monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
 monolib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
 
-monolib_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
-
 monolib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
 
@@ -20050,9 +20055,6 @@ monolib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
 monolib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
 
-monolib_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
-
 monolib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
 
@@ -22255,6 +22257,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
 
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
+
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
 
@@ -25369,9 +25377,6 @@ coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
 coredll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
 
-coredll_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
-
 coredll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
 
@@ -25495,9 +25500,6 @@ coredll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
 coredll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
 
-coredll_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
-
 coredll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
 
@@ -27118,6 +27120,12 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
 
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
+
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
 
@@ -29104,9 +29112,6 @@ corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
 corelib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
 
-corelib_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
-
 corelib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
 
@@ -29230,9 +29235,6 @@ corelib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
 corelib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
 
-corelib_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
-
 corelib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
 
@@ -30853,6 +30855,12 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
 
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
+
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b543a6016c..05eb446931 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1765,6 +1765,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/bmpbndl.cpp
     src/msw/overlay.cpp
     src/msw/darkmode.cpp
+    src/msw/appprogress.cpp
+    src/msw/taskbarbutton.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
     wx/msw/nonownedwnd.h
@@ -1778,6 +1780,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/sound.h
     wx/msw/joystick.h
     wx/msw/evtloop.h
+    wx/msw/taskbarbutton.h
 </set>
 
 <set var="MSW_SRC" hints="files">
@@ -1789,7 +1792,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/prntdlgg.cpp
     src/msw/accel.cpp
     src/msw/anybutton.cpp
-    src/msw/appprogress.cpp
     src/msw/artmsw.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
@@ -1831,7 +1833,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/statusbar.cpp
     src/msw/statline.cpp
     src/msw/stattext.cpp
-    src/msw/taskbarbutton.cpp
     src/msw/toolbar.cpp
     src/msw/textctrl.cpp
     src/msw/textentry.cpp
@@ -1935,7 +1936,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/statusbar.h
     wx/msw/statline.h
     wx/msw/stattext.h
-    wx/msw/taskbarbutton.h
     wx/msw/toolbar.h
     wx/msw/textctrl.h
     wx/msw/textentry.h
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 58dd865e8b..ebacb69079 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -1641,6 +1641,8 @@ set(MSW_LOWLEVEL_SRC
     src/msw/bmpbndl.cpp
     src/msw/overlay.cpp
     src/msw/darkmode.cpp
+    src/msw/appprogress.cpp
+    src/msw/taskbarbutton.cpp
 )
 
 set(MSW_LOWLEVEL_HDR
@@ -1655,6 +1657,7 @@ set(MSW_LOWLEVEL_HDR
     wx/msw/helpwin.h
     wx/msw/taskbar.h
     wx/msw/evtloop.h
+    wx/msw/taskbarbutton.h
 )
 
 set(MSW_DESKTOP_LOWLEVEL_SRC
@@ -1678,7 +1681,6 @@ set(MSW_SRC
     src/generic/prntdlgg.cpp
     src/msw/accel.cpp
     src/msw/anybutton.cpp
-    src/msw/appprogress.cpp
     src/msw/artmsw.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
@@ -1722,7 +1724,6 @@ set(MSW_SRC
     src/msw/statline.cpp
     src/msw/stattext.cpp
     src/msw/systhemectrl.cpp
-    src/msw/taskbarbutton.cpp
     src/msw/toolbar.cpp
     src/msw/textctrl.cpp
     src/msw/textentry.cpp
@@ -1826,7 +1827,6 @@ set(MSW_HDR
     wx/msw/statusbar.h
     wx/msw/statline.h
     wx/msw/stattext.h
-    wx/msw/taskbarbutton.h
     wx/msw/toolbar.h
     wx/msw/textctrl.h
     wx/msw/textentry.h
diff --git a/build/files b/build/files
index 1e5e78afbc..5c7d2ce2a4 100644
--- a/build/files
+++ b/build/files
@@ -1582,6 +1582,7 @@ MSW_LOWLEVEL_SRC =
     src/common/taskbarcmn.cpp
     src/msw/aboutdlg.cpp
     src/msw/app.cpp
+    src/msw/appprogress.cpp
     src/msw/bitmap.cpp
     src/msw/bmpbndl.cpp
     src/msw/brush.cpp
@@ -1640,6 +1641,7 @@ MSW_LOWLEVEL_SRC =
     src/msw/settings.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
+    src/msw/taskbarbutton.cpp
     src/msw/textmeasure.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
@@ -1660,6 +1662,7 @@ MSW_LOWLEVEL_HDR =
     wx/msw/popupwin.h
     wx/msw/sound.h
     wx/msw/taskbar.h
+    wx/msw/taskbarbutton.h
     wx/msw/uxtheme.h
 
 MSW_SRC =
@@ -1672,7 +1675,6 @@ MSW_SRC =
     src/generic/statusbr.cpp
     src/msw/accel.cpp
     src/msw/anybutton.cpp
-    src/msw/appprogress.cpp
     src/msw/artmsw.cpp
     src/msw/bmpbuttn.cpp
     src/msw/bmpcbox.cpp
@@ -1723,7 +1725,6 @@ MSW_SRC =
     src/msw/stattext.cpp
     src/msw/statusbar.cpp
     src/msw/systhemectrl.cpp
-    src/msw/taskbarbutton.cpp
     src/msw/textctrl.cpp
     src/msw/textentry.cpp
     src/msw/tglbtn.cpp
@@ -1826,7 +1827,6 @@ MSW_HDR =
     wx/msw/statline.h
     wx/msw/stattext.h
     wx/msw/statusbar.h
-    wx/msw/taskbarbutton.h
     wx/msw/textctrl.h
     wx/msw/textentry.h
     wx/msw/tglbtn.h
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 447f02ef97..5ace30e53b 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1940,6 +1940,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_bmpbndl.o \
 	$(OBJS)\monodll_overlay.o \
 	$(OBJS)\monodll_darkmode.o \
+	$(OBJS)\monodll_appprogress.o \
+	$(OBJS)\monodll_taskbarbutton.o \
 	$(OBJS)\monodll_clrpickerg.o \
 	$(OBJS)\monodll_collpaneg.o \
 	$(OBJS)\monodll_filepickerg.o \
@@ -1948,7 +1950,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_prntdlgg.o \
 	$(OBJS)\monodll_msw_accel.o \
 	$(OBJS)\monodll_msw_anybutton.o \
-	$(OBJS)\monodll_appprogress.o \
 	$(OBJS)\monodll_artmsw.o \
 	$(OBJS)\monodll_msw_bmpbuttn.o \
 	$(OBJS)\monodll_msw_button.o \
@@ -1990,7 +1991,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_statusbar.o \
 	$(OBJS)\monodll_msw_statline.o \
 	$(OBJS)\monodll_msw_stattext.o \
-	$(OBJS)\monodll_taskbarbutton.o \
 	$(OBJS)\monodll_msw_toolbar.o \
 	$(OBJS)\monodll_msw_textctrl.o \
 	$(OBJS)\monodll_textentry.o \
@@ -2288,6 +2288,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_bmpbndl.o \
 	$(OBJS)\monodll_overlay.o \
 	$(OBJS)\monodll_darkmode.o \
+	$(OBJS)\monodll_appprogress.o \
+	$(OBJS)\monodll_taskbarbutton.o \
 	$(OBJS)\monodll_generic_accel.o \
 	$(OBJS)\monodll_clrpickerg.o \
 	$(OBJS)\monodll_collpaneg.o \
@@ -2793,6 +2795,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_bmpbndl.o \
 	$(OBJS)\monolib_overlay.o \
 	$(OBJS)\monolib_darkmode.o \
+	$(OBJS)\monolib_appprogress.o \
+	$(OBJS)\monolib_taskbarbutton.o \
 	$(OBJS)\monolib_clrpickerg.o \
 	$(OBJS)\monolib_collpaneg.o \
 	$(OBJS)\monolib_filepickerg.o \
@@ -2801,7 +2805,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_prntdlgg.o \
 	$(OBJS)\monolib_msw_accel.o \
 	$(OBJS)\monolib_msw_anybutton.o \
-	$(OBJS)\monolib_appprogress.o \
 	$(OBJS)\monolib_artmsw.o \
 	$(OBJS)\monolib_msw_bmpbuttn.o \
 	$(OBJS)\monolib_msw_button.o \
@@ -2843,7 +2846,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_statusbar.o \
 	$(OBJS)\monolib_msw_statline.o \
 	$(OBJS)\monolib_msw_stattext.o \
-	$(OBJS)\monolib_taskbarbutton.o \
 	$(OBJS)\monolib_msw_toolbar.o \
 	$(OBJS)\monolib_msw_textctrl.o \
 	$(OBJS)\monolib_textentry.o \
@@ -3141,6 +3143,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_bmpbndl.o \
 	$(OBJS)\monolib_overlay.o \
 	$(OBJS)\monolib_darkmode.o \
+	$(OBJS)\monolib_appprogress.o \
+	$(OBJS)\monolib_taskbarbutton.o \
 	$(OBJS)\monolib_generic_accel.o \
 	$(OBJS)\monolib_clrpickerg.o \
 	$(OBJS)\monolib_collpaneg.o \
@@ -3525,6 +3529,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_bmpbndl.o \
 	$(OBJS)\coredll_overlay.o \
 	$(OBJS)\coredll_darkmode.o \
+	$(OBJS)\coredll_appprogress.o \
+	$(OBJS)\coredll_taskbarbutton.o \
 	$(OBJS)\coredll_clrpickerg.o \
 	$(OBJS)\coredll_collpaneg.o \
 	$(OBJS)\coredll_filepickerg.o \
@@ -3533,7 +3539,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_prntdlgg.o \
 	$(OBJS)\coredll_msw_accel.o \
 	$(OBJS)\coredll_msw_anybutton.o \
-	$(OBJS)\coredll_appprogress.o \
 	$(OBJS)\coredll_artmsw.o \
 	$(OBJS)\coredll_msw_bmpbuttn.o \
 	$(OBJS)\coredll_msw_button.o \
@@ -3575,7 +3580,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_statusbar.o \
 	$(OBJS)\coredll_msw_statline.o \
 	$(OBJS)\coredll_msw_stattext.o \
-	$(OBJS)\coredll_taskbarbutton.o \
 	$(OBJS)\coredll_msw_toolbar.o \
 	$(OBJS)\coredll_msw_textctrl.o \
 	$(OBJS)\coredll_textentry.o \
@@ -3873,6 +3877,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_bmpbndl.o \
 	$(OBJS)\coredll_overlay.o \
 	$(OBJS)\coredll_darkmode.o \
+	$(OBJS)\coredll_appprogress.o \
+	$(OBJS)\coredll_taskbarbutton.o \
 	$(OBJS)\coredll_generic_accel.o \
 	$(OBJS)\coredll_clrpickerg.o \
 	$(OBJS)\coredll_collpaneg.o \
@@ -4214,6 +4220,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_bmpbndl.o \
 	$(OBJS)\corelib_overlay.o \
 	$(OBJS)\corelib_darkmode.o \
+	$(OBJS)\corelib_appprogress.o \
+	$(OBJS)\corelib_taskbarbutton.o \
 	$(OBJS)\corelib_clrpickerg.o \
 	$(OBJS)\corelib_collpaneg.o \
 	$(OBJS)\corelib_filepickerg.o \
@@ -4222,7 +4230,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_prntdlgg.o \
 	$(OBJS)\corelib_msw_accel.o \
 	$(OBJS)\corelib_msw_anybutton.o \
-	$(OBJS)\corelib_appprogress.o \
 	$(OBJS)\corelib_artmsw.o \
 	$(OBJS)\corelib_msw_bmpbuttn.o \
 	$(OBJS)\corelib_msw_button.o \
@@ -4264,7 +4271,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_statusbar.o \
 	$(OBJS)\corelib_msw_statline.o \
 	$(OBJS)\corelib_msw_stattext.o \
-	$(OBJS)\corelib_taskbarbutton.o \
 	$(OBJS)\corelib_msw_toolbar.o \
 	$(OBJS)\corelib_msw_textctrl.o \
 	$(OBJS)\corelib_textentry.o \
@@ -4562,6 +4568,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_bmpbndl.o \
 	$(OBJS)\corelib_overlay.o \
 	$(OBJS)\corelib_darkmode.o \
+	$(OBJS)\corelib_appprogress.o \
+	$(OBJS)\corelib_taskbarbutton.o \
 	$(OBJS)\corelib_generic_accel.o \
 	$(OBJS)\corelib_clrpickerg.o \
 	$(OBJS)\corelib_collpaneg.o \
@@ -7369,9 +7377,6 @@ $(OBJS)\monodll_msw_accel.o: ../../src/msw/accel.cpp
 $(OBJS)\monodll_msw_anybutton.o: ../../src/msw/anybutton.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_appprogress.o: ../../src/msw/appprogress.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_artmsw.o: ../../src/msw/artmsw.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -7495,9 +7500,6 @@ $(OBJS)\monodll_msw_statline.o: ../../src/msw/statline.cpp
 $(OBJS)\monodll_msw_stattext.o: ../../src/msw/stattext.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_msw_toolbar.o: ../../src/msw/toolbar.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -8506,6 +8508,16 @@ $(OBJS)\monodll_darkmode.o: ../../src/msw/darkmode.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_appprogress.o: ../../src/msw/appprogress.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9958,9 +9970,6 @@ $(OBJS)\monolib_msw_accel.o: ../../src/msw/accel.cpp
 $(OBJS)\monolib_msw_anybutton.o: ../../src/msw/anybutton.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_appprogress.o: ../../src/msw/appprogress.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_artmsw.o: ../../src/msw/artmsw.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -10084,9 +10093,6 @@ $(OBJS)\monolib_msw_statline.o: ../../src/msw/statline.cpp
 $(OBJS)\monolib_msw_stattext.o: ../../src/msw/stattext.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_msw_toolbar.o: ../../src/msw/toolbar.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -11095,6 +11101,16 @@ $(OBJS)\monolib_darkmode.o: ../../src/msw/darkmode.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_appprogress.o: ../../src/msw/appprogress.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12970,9 +12986,6 @@ $(OBJS)\coredll_msw_accel.o: ../../src/msw/accel.cpp
 $(OBJS)\coredll_msw_anybutton.o: ../../src/msw/anybutton.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\coredll_appprogress.o: ../../src/msw/appprogress.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\coredll_artmsw.o: ../../src/msw/artmsw.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -13096,9 +13109,6 @@ $(OBJS)\coredll_msw_statline.o: ../../src/msw/statline.cpp
 $(OBJS)\coredll_msw_stattext.o: ../../src/msw/stattext.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\coredll_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\coredll_msw_toolbar.o: ../../src/msw/toolbar.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -13645,6 +13655,16 @@ $(OBJS)\coredll_darkmode.o: ../../src/msw/darkmode.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_appprogress.o: ../../src/msw/appprogress.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14725,9 +14745,6 @@ $(OBJS)\corelib_msw_accel.o: ../../src/msw/accel.cpp
 $(OBJS)\corelib_msw_anybutton.o: ../../src/msw/anybutton.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\corelib_appprogress.o: ../../src/msw/appprogress.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\corelib_artmsw.o: ../../src/msw/artmsw.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14851,9 +14868,6 @@ $(OBJS)\corelib_msw_statline.o: ../../src/msw/statline.cpp
 $(OBJS)\corelib_msw_stattext.o: ../../src/msw/stattext.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\corelib_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\corelib_msw_toolbar.o: ../../src/msw/toolbar.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -15400,6 +15414,16 @@ $(OBJS)\corelib_darkmode.o: ../../src/msw/darkmode.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_appprogress.o: ../../src/msw/appprogress.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 7eee539f00..e0453fea72 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2273,6 +2273,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_bmpbndl.obj \
 	$(OBJS)\monodll_overlay.obj \
 	$(OBJS)\monodll_darkmode.obj \
+	$(OBJS)\monodll_appprogress.obj \
+	$(OBJS)\monodll_taskbarbutton.obj \
 	$(OBJS)\monodll_clrpickerg.obj \
 	$(OBJS)\monodll_collpaneg.obj \
 	$(OBJS)\monodll_filepickerg.obj \
@@ -2281,7 +2283,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_prntdlgg.obj \
 	$(OBJS)\monodll_msw_accel.obj \
 	$(OBJS)\monodll_msw_anybutton.obj \
-	$(OBJS)\monodll_appprogress.obj \
 	$(OBJS)\monodll_artmsw.obj \
 	$(OBJS)\monodll_msw_bmpbuttn.obj \
 	$(OBJS)\monodll_msw_button.obj \
@@ -2323,7 +2324,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_statusbar.obj \
 	$(OBJS)\monodll_msw_statline.obj \
 	$(OBJS)\monodll_msw_stattext.obj \
-	$(OBJS)\monodll_taskbarbutton.obj \
 	$(OBJS)\monodll_msw_toolbar.obj \
 	$(OBJS)\monodll_msw_textctrl.obj \
 	$(OBJS)\monodll_textentry.obj \
@@ -2619,6 +2619,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_bmpbndl.obj \
 	$(OBJS)\monodll_overlay.obj \
 	$(OBJS)\monodll_darkmode.obj \
+	$(OBJS)\monodll_appprogress.obj \
+	$(OBJS)\monodll_taskbarbutton.obj \
 	$(OBJS)\monodll_generic_accel.obj \
 	$(OBJS)\monodll_clrpickerg.obj \
 	$(OBJS)\monodll_collpaneg.obj \
@@ -3126,6 +3128,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_bmpbndl.obj \
 	$(OBJS)\monolib_overlay.obj \
 	$(OBJS)\monolib_darkmode.obj \
+	$(OBJS)\monolib_appprogress.obj \
+	$(OBJS)\monolib_taskbarbutton.obj \
 	$(OBJS)\monolib_clrpickerg.obj \
 	$(OBJS)\monolib_collpaneg.obj \
 	$(OBJS)\monolib_filepickerg.obj \
@@ -3134,7 +3138,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_prntdlgg.obj \
 	$(OBJS)\monolib_msw_accel.obj \
 	$(OBJS)\monolib_msw_anybutton.obj \
-	$(OBJS)\monolib_appprogress.obj \
 	$(OBJS)\monolib_artmsw.obj \
 	$(OBJS)\monolib_msw_bmpbuttn.obj \
 	$(OBJS)\monolib_msw_button.obj \
@@ -3176,7 +3179,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_statusbar.obj \
 	$(OBJS)\monolib_msw_statline.obj \
 	$(OBJS)\monolib_msw_stattext.obj \
-	$(OBJS)\monolib_taskbarbutton.obj \
 	$(OBJS)\monolib_msw_toolbar.obj \
 	$(OBJS)\monolib_msw_textctrl.obj \
 	$(OBJS)\monolib_textentry.obj \
@@ -3472,6 +3474,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_bmpbndl.obj \
 	$(OBJS)\monolib_overlay.obj \
 	$(OBJS)\monolib_darkmode.obj \
+	$(OBJS)\monolib_appprogress.obj \
+	$(OBJS)\monolib_taskbarbutton.obj \
 	$(OBJS)\monolib_generic_accel.obj \
 	$(OBJS)\monolib_clrpickerg.obj \
 	$(OBJS)\monolib_collpaneg.obj \
@@ -3908,6 +3912,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_bmpbndl.obj \
 	$(OBJS)\coredll_overlay.obj \
 	$(OBJS)\coredll_darkmode.obj \
+	$(OBJS)\coredll_appprogress.obj \
+	$(OBJS)\coredll_taskbarbutton.obj \
 	$(OBJS)\coredll_clrpickerg.obj \
 	$(OBJS)\coredll_collpaneg.obj \
 	$(OBJS)\coredll_filepickerg.obj \
@@ -3916,7 +3922,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_prntdlgg.obj \
 	$(OBJS)\coredll_msw_accel.obj \
 	$(OBJS)\coredll_msw_anybutton.obj \
-	$(OBJS)\coredll_appprogress.obj \
 	$(OBJS)\coredll_artmsw.obj \
 	$(OBJS)\coredll_msw_bmpbuttn.obj \
 	$(OBJS)\coredll_msw_button.obj \
@@ -3958,7 +3963,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_statusbar.obj \
 	$(OBJS)\coredll_msw_statline.obj \
 	$(OBJS)\coredll_msw_stattext.obj \
-	$(OBJS)\coredll_taskbarbutton.obj \
 	$(OBJS)\coredll_msw_toolbar.obj \
 	$(OBJS)\coredll_msw_textctrl.obj \
 	$(OBJS)\coredll_textentry.obj \
@@ -4254,6 +4258,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_bmpbndl.obj \
 	$(OBJS)\coredll_overlay.obj \
 	$(OBJS)\coredll_darkmode.obj \
+	$(OBJS)\coredll_appprogress.obj \
+	$(OBJS)\coredll_taskbarbutton.obj \
 	$(OBJS)\coredll_generic_accel.obj \
 	$(OBJS)\coredll_clrpickerg.obj \
 	$(OBJS)\coredll_collpaneg.obj \
@@ -4595,6 +4601,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_bmpbndl.obj \
 	$(OBJS)\corelib_overlay.obj \
 	$(OBJS)\corelib_darkmode.obj \
+	$(OBJS)\corelib_appprogress.obj \
+	$(OBJS)\corelib_taskbarbutton.obj \
 	$(OBJS)\corelib_clrpickerg.obj \
 	$(OBJS)\corelib_collpaneg.obj \
 	$(OBJS)\corelib_filepickerg.obj \
@@ -4603,7 +4611,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_prntdlgg.obj \
 	$(OBJS)\corelib_msw_accel.obj \
 	$(OBJS)\corelib_msw_anybutton.obj \
-	$(OBJS)\corelib_appprogress.obj \
 	$(OBJS)\corelib_artmsw.obj \
 	$(OBJS)\corelib_msw_bmpbuttn.obj \
 	$(OBJS)\corelib_msw_button.obj \
@@ -4645,7 +4652,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_statusbar.obj \
 	$(OBJS)\corelib_msw_statline.obj \
 	$(OBJS)\corelib_msw_stattext.obj \
-	$(OBJS)\corelib_taskbarbutton.obj \
 	$(OBJS)\corelib_msw_toolbar.obj \
 	$(OBJS)\corelib_msw_textctrl.obj \
 	$(OBJS)\corelib_textentry.obj \
@@ -4941,6 +4947,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_bmpbndl.obj \
 	$(OBJS)\corelib_overlay.obj \
 	$(OBJS)\corelib_darkmode.obj \
+	$(OBJS)\corelib_appprogress.obj \
+	$(OBJS)\corelib_taskbarbutton.obj \
 	$(OBJS)\corelib_generic_accel.obj \
 	$(OBJS)\corelib_clrpickerg.obj \
 	$(OBJS)\corelib_collpaneg.obj \
@@ -7826,9 +7834,6 @@ $(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp
 $(OBJS)\monodll_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
 
-$(OBJS)\monodll_appprogress.obj: ..\..\src\msw\appprogress.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
-
 $(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
@@ -7952,9 +7957,6 @@ $(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp
 $(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
 
-$(OBJS)\monodll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
-
 $(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
 
@@ -8963,6 +8965,16 @@ $(OBJS)\monodll_darkmode.obj: ..\..\src\msw\darkmode.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\darkmode.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_appprogress.obj: ..\..\src\msw\appprogress.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -10415,9 +10427,6 @@ $(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp
 $(OBJS)\monolib_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
 
-$(OBJS)\monolib_appprogress.obj: ..\..\src\msw\appprogress.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
-
 $(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
@@ -10541,9 +10550,6 @@ $(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp
 $(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
 
-$(OBJS)\monolib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
-
 $(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
 
@@ -11552,6 +11558,16 @@ $(OBJS)\monolib_darkmode.obj: ..\..\src\msw\darkmode.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\darkmode.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_appprogress.obj: ..\..\src\msw\appprogress.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -13427,9 +13443,6 @@ $(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp
 $(OBJS)\coredll_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
 
-$(OBJS)\coredll_appprogress.obj: ..\..\src\msw\appprogress.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
-
 $(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
@@ -13553,9 +13566,6 @@ $(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp
 $(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
 
-$(OBJS)\coredll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
-
 $(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
 
@@ -14102,6 +14112,16 @@ $(OBJS)\coredll_darkmode.obj: ..\..\src\msw\darkmode.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\darkmode.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_appprogress.obj: ..\..\src\msw\appprogress.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -15182,9 +15202,6 @@ $(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp
 $(OBJS)\corelib_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
 
-$(OBJS)\corelib_appprogress.obj: ..\..\src\msw\appprogress.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
-
 $(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
@@ -15308,9 +15325,6 @@ $(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp
 $(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
 
-$(OBJS)\corelib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
-
 $(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
 
@@ -15857,6 +15871,16 @@ $(OBJS)\corelib_darkmode.obj: ..\..\src\msw\darkmode.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\darkmode.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_appprogress.obj: ..\..\src\msw\appprogress.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp