diff --git a/Makefile.in b/Makefile.in
index 8456220c45..e1acf62abe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3389,8 +3389,12 @@ COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR =  \
 	wx/generic/animate.h \
 	wx/generic/animateanimate.h
 @COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MOTIF_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_MSW_ADVANCED_PLATFORM_HDR =  \
+	wx/msw/sound.h \
+	wx/msw/taskbar.h \
+	wx/generic/activityindicator.h \
+	wx/msw/joystick.h
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR)
 COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR =  \
 	wx/generic/animate.h \
 	wx/osx/activityindicator.h \
@@ -3446,8 +3450,7 @@ COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR =  \
 	wx/msw/datectrl.h \
 	wx/msw/datetimectrl.h \
 	wx/msw/hyperlink.h \
-	wx/msw/timectrl.h \
-	wx/generic/activityindicator.h
+	wx/msw/timectrl.h
 @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR)
 COND_WXUNIV_0_ADVANCED_HDR =  \
 	wx/aboutdlg.h \
@@ -4533,6 +4536,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_univ_toolbar.o \
 	monodll_topluniv.o \
 	monodll_winuniv.o \
+	monodll_generic_activityindicator.o \
 	monodll_gtk.o \
 	monodll_metal.o \
 	monodll_mono.o \
@@ -5883,6 +5887,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS =  \
 	monodll_msw_sound.o \
 	monodll_msw_taskbar.o \
 	monodll_notifmsgrt.o \
+	monodll_generic_activityindicator.o \
 	monodll_msw_joystick.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS)
 COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS =  \
@@ -5952,8 +5957,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
 	monodll_datectrl.o \
 	monodll_msw_datetimectrl.o \
 	monodll_msw_hyperlink.o \
-	monodll_timectrl.o \
-	monodll_generic_activityindicator.o
+	monodll_timectrl.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 	monodll_src_cocoa_taskbar.o \
@@ -5999,6 +6003,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 	monodll_msw_sound.o \
 	monodll_msw_taskbar.o \
 	monodll_notifmsgrt.o \
+	monodll_generic_activityindicator.o \
 	monodll_msw_joystick.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_1)
 COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
@@ -6539,6 +6544,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_univ_toolbar.o \
 	monolib_topluniv.o \
 	monolib_winuniv.o \
+	monolib_generic_activityindicator.o \
 	monolib_gtk.o \
 	monolib_metal.o \
 	monolib_mono.o \
@@ -7889,6 +7895,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
 	monolib_msw_sound.o \
 	monolib_msw_taskbar.o \
 	monolib_notifmsgrt.o \
+	monolib_generic_activityindicator.o \
 	monolib_msw_joystick.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_2)
 COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
@@ -7958,8 +7965,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
 	monolib_datectrl.o \
 	monolib_msw_datetimectrl.o \
 	monolib_msw_hyperlink.o \
-	monolib_timectrl.o \
-	monolib_generic_activityindicator.o
+	monolib_timectrl.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
 	monolib_src_cocoa_taskbar.o \
@@ -8005,6 +8011,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
 	monolib_msw_sound.o \
 	monolib_msw_taskbar.o \
 	monolib_notifmsgrt.o \
+	monolib_generic_activityindicator.o \
 	monolib_msw_joystick.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_3)
 COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
@@ -8688,6 +8695,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_univ_toolbar.o \
 	coredll_topluniv.o \
 	coredll_winuniv.o \
+	coredll_activityindicator.o \
 	coredll_gtk.o \
 	coredll_metal.o \
 	coredll_mono.o \
@@ -10156,6 +10164,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_univ_toolbar.o \
 	corelib_topluniv.o \
 	corelib_winuniv.o \
+	corelib_activityindicator.o \
 	corelib_gtk.o \
 	corelib_metal.o \
 	corelib_mono.o \
@@ -11575,6 +11584,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_4 =  \
 	advdll_msw_sound.o \
 	advdll_msw_taskbar.o \
 	advdll_notifmsgrt.o \
+	advdll_generic_activityindicator.o \
 	advdll_msw_joystick.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_4)
 COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_4 =  \
@@ -11644,8 +11654,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
 	advdll_datectrl.o \
 	advdll_msw_datetimectrl.o \
 	advdll_msw_hyperlink.o \
-	advdll_timectrl.o \
-	advdll_generic_activityindicator.o
+	advdll_timectrl.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
 	advdll_src_cocoa_taskbar.o \
@@ -11691,6 +11700,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
 	advdll_msw_sound.o \
 	advdll_msw_taskbar.o \
 	advdll_notifmsgrt.o \
+	advdll_generic_activityindicator.o \
 	advdll_msw_joystick.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_5)
 COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
@@ -11873,6 +11883,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_6 =  \
 	advlib_msw_sound.o \
 	advlib_msw_taskbar.o \
 	advlib_notifmsgrt.o \
+	advlib_generic_activityindicator.o \
 	advlib_msw_joystick.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_6)
 COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_6 =  \
@@ -11942,8 +11953,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
 	advlib_datectrl.o \
 	advlib_msw_datetimectrl.o \
 	advlib_msw_hyperlink.o \
-	advlib_timectrl.o \
-	advlib_generic_activityindicator.o
+	advlib_timectrl.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
 COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
 	advlib_src_cocoa_taskbar.o \
@@ -11989,6 +11999,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
 	advlib_msw_sound.o \
 	advlib_msw_taskbar.o \
 	advlib_notifmsgrt.o \
+	advlib_generic_activityindicator.o \
 	advlib_msw_joystick.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_7)
 COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
@@ -19891,6 +19902,21 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp
 
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
 @COND_USE_GUI_1@monodll_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
 
@@ -20218,18 +20244,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.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) $(srcdir)/src/unix/taskbarx11.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_notifmsg.o: $(srcdir)/src/gtk/notifmsg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/notifmsg.cpp
 
@@ -24712,6 +24726,21 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp
 
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
 @COND_USE_GUI_1@monolib_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
 
@@ -25039,18 +25068,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.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) $(srcdir)/src/unix/taskbarx11.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_notifmsg.o: $(srcdir)/src/gtk/notifmsg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/notifmsg.cpp
 
@@ -26917,6 +26934,9 @@ coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(COREDLL_ODEP)
 coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
 
+coredll_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(COREDLL_ODEP)
+	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
 coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
 
@@ -30307,6 +30327,9 @@ corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(CORELIB_ODEP)
 corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
 
+corelib_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(CORELIB_ODEP)
+	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
 corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
 
@@ -33172,6 +33195,18 @@ advdll_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@advdll_notifmsgrt.o: $(srcdir)/src/msw/rt/notifmsgrt.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/rt/notifmsgrt.cpp
 
+@COND_TOOLKIT_MSW@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_MOTIF@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
 @COND_TOOLKIT_MSW@advdll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
 
@@ -33331,18 +33366,6 @@ advdll_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
-@COND_TOOLKIT_MSW_WXUNIV_0@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_MOTIF@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_gtk_notifmsg.o: $(srcdir)/src/gtk/notifmsg.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/notifmsg.cpp
 
@@ -33622,6 +33645,18 @@ advlib_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@advlib_notifmsgrt.o: $(srcdir)/src/msw/rt/notifmsgrt.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/rt/notifmsgrt.cpp
 
+@COND_TOOLKIT_MSW@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_MOTIF@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
 @COND_TOOLKIT_MSW@advlib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
 
@@ -33781,18 +33816,6 @@ advlib_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
-@COND_TOOLKIT_MSW_WXUNIV_0@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_MOTIF@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_gtk_notifmsg.o: $(srcdir)/src/gtk/notifmsg.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/notifmsg.cpp
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index ae25e20201..891c6f71dd 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2565,6 +2565,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp
     src/univ/winuniv.cpp
+    src/generic/activityindicator.cpp
 </set>
 <set var="UNIV_HDR" hints="files">
     $(UNIV_PLATFORM_HDR)
@@ -2732,10 +2733,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/sound.cpp
     src/msw/taskbar.cpp
     src/msw/rt/notifmsgrt.cpp
+    src/generic/activityindicator.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
     wx/msw/sound.h
     wx/msw/taskbar.h
+    wx/generic/activityindicator.h
 </set>
 
 <!-- not used with wxUniv -->
@@ -2749,7 +2752,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/datetimectrl.cpp
     src/msw/hyperlink.cpp
     src/msw/timectrl.cpp
-    src/generic/activityindicator.cpp
 </set>
 <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
     wx/generic/animate.h
@@ -2760,7 +2762,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/datetimectrl.h
     wx/msw/hyperlink.h
     wx/msw/timectrl.h
-    wx/generic/activityindicator.h
 </set>
 
 <!-- not built on WindowsCE: -->
diff --git a/build/files b/build/files
index 0314ea9f14..ff0020cff8 100644
--- a/build/files
+++ b/build/files
@@ -2137,6 +2137,7 @@ UNIV_THEMES_SRC =
 UNIV_SRC =
     $(UNIV_PLATFORM_SRC)
     src/generic/accel.cpp
+    src/generic/activityindicator.cpp
     src/generic/clrpickerg.cpp
     src/generic/collpaneg.cpp
     src/generic/colrdlgg.cpp
@@ -2340,6 +2341,7 @@ ADVANCED_CMN_HDR =
     wx/wizard.h
 
 ADVANCED_MSW_SRC =
+    src/generic/activityindicator.cpp
     src/common/taskbarcmn.cpp
     src/msw/aboutdlg.cpp
     src/msw/notifmsg.cpp
@@ -2348,12 +2350,12 @@ ADVANCED_MSW_SRC =
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 ADVANCED_MSW_HDR =
+    wx/generic/activityindicator.h
     wx/msw/sound.h
     wx/msw/taskbar.h
 
 # not used with wxUniv
 ADVANCED_MSW_NATIVE_SRC =
-    src/generic/activityindicator.cpp
     src/generic/animateg.cpp
     src/msw/bmpcbox.cpp
     src/msw/calctrl.cpp
@@ -2364,7 +2366,6 @@ ADVANCED_MSW_NATIVE_SRC =
     src/msw/hyperlink.cpp
     src/msw/timectrl.cpp
 ADVANCED_MSW_NATIVE_HDR =
-    wx/generic/activityindicator.h
     wx/generic/animate.h
     wx/msw/bmpcbox.h
     wx/msw/commandlinkbutton.h
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 7d1006dd90..36bd8e1610 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -2170,6 +2170,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_univ_toolbar.obj \
 	$(OBJS)\monodll_topluniv.obj \
 	$(OBJS)\monodll_winuniv.obj \
+	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_gtk.obj \
 	$(OBJS)\monodll_metal.obj \
 	$(OBJS)\monodll_mono.obj \
@@ -2384,6 +2385,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_taskbar.obj \
 	$(OBJS)\monodll_notifmsgrt.obj \
+	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_joystick.obj \
 	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_bmpcbox.obj \
@@ -2393,8 +2395,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.obj \
 	$(OBJS)\monodll_datetimectrl.obj \
 	$(OBJS)\monodll_hyperlink.obj \
-	$(OBJS)\monodll_timectrl.obj \
-	$(OBJS)\monodll_activityindicator.obj
+	$(OBJS)\monodll_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2440,6 +2441,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_taskbar.obj \
 	$(OBJS)\monodll_notifmsgrt.obj \
+	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_joystick.obj \
 	$(OBJS)\monodll_animateg.obj
 !endif
@@ -2999,6 +3001,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_univ_toolbar.obj \
 	$(OBJS)\monolib_topluniv.obj \
 	$(OBJS)\monolib_winuniv.obj \
+	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_gtk.obj \
 	$(OBJS)\monolib_metal.obj \
 	$(OBJS)\monolib_mono.obj \
@@ -3213,6 +3216,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_taskbar.obj \
 	$(OBJS)\monolib_notifmsgrt.obj \
+	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_joystick.obj \
 	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_bmpcbox.obj \
@@ -3222,8 +3226,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.obj \
 	$(OBJS)\monolib_datetimectrl.obj \
 	$(OBJS)\monolib_hyperlink.obj \
-	$(OBJS)\monolib_timectrl.obj \
-	$(OBJS)\monolib_activityindicator.obj
+	$(OBJS)\monolib_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -3269,6 +3272,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_taskbar.obj \
 	$(OBJS)\monolib_notifmsgrt.obj \
+	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_joystick.obj \
 	$(OBJS)\monolib_animateg.obj
 !endif
@@ -3700,6 +3704,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_univ_toolbar.obj \
 	$(OBJS)\coredll_topluniv.obj \
 	$(OBJS)\coredll_winuniv.obj \
+	$(OBJS)\coredll_activityindicator.obj \
 	$(OBJS)\coredll_gtk.obj \
 	$(OBJS)\coredll_metal.obj \
 	$(OBJS)\coredll_mono.obj \
@@ -4270,6 +4275,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_univ_toolbar.obj \
 	$(OBJS)\corelib_topluniv.obj \
 	$(OBJS)\corelib_winuniv.obj \
+	$(OBJS)\corelib_activityindicator.obj \
 	$(OBJS)\corelib_gtk.obj \
 	$(OBJS)\corelib_metal.obj \
 	$(OBJS)\corelib_mono.obj \
@@ -4494,6 +4500,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_sound.obj \
 	$(OBJS)\advdll_taskbar.obj \
 	$(OBJS)\advdll_notifmsgrt.obj \
+	$(OBJS)\advdll_activityindicator.obj \
 	$(OBJS)\advdll_joystick.obj \
 	$(OBJS)\advdll_animateg.obj \
 	$(OBJS)\advdll_bmpcbox.obj \
@@ -4503,8 +4510,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.obj \
 	$(OBJS)\advdll_datetimectrl.obj \
 	$(OBJS)\advdll_hyperlink.obj \
-	$(OBJS)\advdll_timectrl.obj \
-	$(OBJS)\advdll_activityindicator.obj
+	$(OBJS)\advdll_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4550,6 +4556,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_sound.obj \
 	$(OBJS)\advdll_taskbar.obj \
 	$(OBJS)\advdll_notifmsgrt.obj \
+	$(OBJS)\advdll_activityindicator.obj \
 	$(OBJS)\advdll_joystick.obj \
 	$(OBJS)\advdll_animateg.obj
 !endif
@@ -4601,6 +4608,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_sound.obj \
 	$(OBJS)\advlib_taskbar.obj \
 	$(OBJS)\advlib_notifmsgrt.obj \
+	$(OBJS)\advlib_activityindicator.obj \
 	$(OBJS)\advlib_joystick.obj \
 	$(OBJS)\advlib_animateg.obj \
 	$(OBJS)\advlib_bmpcbox.obj \
@@ -4610,8 +4618,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.obj \
 	$(OBJS)\advlib_datetimectrl.obj \
 	$(OBJS)\advlib_hyperlink.obj \
-	$(OBJS)\advlib_timectrl.obj \
-	$(OBJS)\advlib_activityindicator.obj
+	$(OBJS)\advlib_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -4657,6 +4664,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_sound.obj \
 	$(OBJS)\advlib_taskbar.obj \
 	$(OBJS)\advlib_notifmsgrt.obj \
+	$(OBJS)\advlib_activityindicator.obj \
 	$(OBJS)\advlib_joystick.obj \
 	$(OBJS)\advlib_animateg.obj
 !endif
@@ -7079,9 +7087,6 @@ $(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
-$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
-
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
@@ -8667,6 +8672,16 @@ $(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -9607,9 +9622,6 @@ $(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
-$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
-
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
@@ -11195,6 +11207,16 @@ $(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -12507,6 +12529,9 @@ $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
 $(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
 
+$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
 
@@ -13981,6 +14006,9 @@ $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
 $(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
 
+$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
 
@@ -15158,9 +15186,6 @@ $(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
-$(OBJS)\advdll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
-
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 
@@ -15287,6 +15312,9 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
 $(OBJS)\advdll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\rt\notifmsgrt.cpp
 
+$(OBJS)\advdll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
@@ -15320,9 +15348,6 @@ $(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
-$(OBJS)\advlib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
-
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 
@@ -15449,6 +15474,9 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
 $(OBJS)\advlib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\rt\notifmsgrt.cpp
 
+$(OBJS)\advlib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index d2f0052f62..2ceea9b67b 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -2191,6 +2191,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_univ_toolbar.o \
 	$(OBJS)\monodll_topluniv.o \
 	$(OBJS)\monodll_winuniv.o \
+	$(OBJS)\monodll_activityindicator.o \
 	$(OBJS)\monodll_gtk.o \
 	$(OBJS)\monodll_metal.o \
 	$(OBJS)\monodll_mono.o \
@@ -2406,6 +2407,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.o \
 	$(OBJS)\monodll_taskbar.o \
 	$(OBJS)\monodll_notifmsgrt.o \
+	$(OBJS)\monodll_activityindicator.o \
 	$(OBJS)\monodll_joystick.o \
 	$(OBJS)\monodll_animateg.o \
 	$(OBJS)\monodll_bmpcbox.o \
@@ -2415,8 +2417,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.o \
 	$(OBJS)\monodll_datetimectrl.o \
 	$(OBJS)\monodll_hyperlink.o \
-	$(OBJS)\monodll_timectrl.o \
-	$(OBJS)\monodll_activityindicator.o
+	$(OBJS)\monodll_timectrl.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2462,6 +2463,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.o \
 	$(OBJS)\monodll_taskbar.o \
 	$(OBJS)\monodll_notifmsgrt.o \
+	$(OBJS)\monodll_activityindicator.o \
 	$(OBJS)\monodll_joystick.o \
 	$(OBJS)\monodll_animateg.o
 endif
@@ -3026,6 +3028,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_univ_toolbar.o \
 	$(OBJS)\monolib_topluniv.o \
 	$(OBJS)\monolib_winuniv.o \
+	$(OBJS)\monolib_activityindicator.o \
 	$(OBJS)\monolib_gtk.o \
 	$(OBJS)\monolib_metal.o \
 	$(OBJS)\monolib_mono.o \
@@ -3241,6 +3244,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.o \
 	$(OBJS)\monolib_taskbar.o \
 	$(OBJS)\monolib_notifmsgrt.o \
+	$(OBJS)\monolib_activityindicator.o \
 	$(OBJS)\monolib_joystick.o \
 	$(OBJS)\monolib_animateg.o \
 	$(OBJS)\monolib_bmpcbox.o \
@@ -3250,8 +3254,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.o \
 	$(OBJS)\monolib_datetimectrl.o \
 	$(OBJS)\monolib_hyperlink.o \
-	$(OBJS)\monolib_timectrl.o \
-	$(OBJS)\monolib_activityindicator.o
+	$(OBJS)\monolib_timectrl.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -3297,6 +3300,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.o \
 	$(OBJS)\monolib_taskbar.o \
 	$(OBJS)\monolib_notifmsgrt.o \
+	$(OBJS)\monolib_activityindicator.o \
 	$(OBJS)\monolib_joystick.o \
 	$(OBJS)\monolib_animateg.o
 endif
@@ -3743,6 +3747,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_univ_toolbar.o \
 	$(OBJS)\coredll_topluniv.o \
 	$(OBJS)\coredll_winuniv.o \
+	$(OBJS)\coredll_activityindicator.o \
 	$(OBJS)\coredll_gtk.o \
 	$(OBJS)\coredll_metal.o \
 	$(OBJS)\coredll_mono.o \
@@ -4321,6 +4326,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_univ_toolbar.o \
 	$(OBJS)\corelib_topluniv.o \
 	$(OBJS)\corelib_winuniv.o \
+	$(OBJS)\corelib_activityindicator.o \
 	$(OBJS)\corelib_gtk.o \
 	$(OBJS)\corelib_metal.o \
 	$(OBJS)\corelib_mono.o \
@@ -4550,6 +4556,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_sound.o \
 	$(OBJS)\advdll_taskbar.o \
 	$(OBJS)\advdll_notifmsgrt.o \
+	$(OBJS)\advdll_activityindicator.o \
 	$(OBJS)\advdll_joystick.o \
 	$(OBJS)\advdll_animateg.o \
 	$(OBJS)\advdll_bmpcbox.o \
@@ -4559,8 +4566,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.o \
 	$(OBJS)\advdll_datetimectrl.o \
 	$(OBJS)\advdll_hyperlink.o \
-	$(OBJS)\advdll_timectrl.o \
-	$(OBJS)\advdll_activityindicator.o
+	$(OBJS)\advdll_timectrl.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4606,6 +4612,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_sound.o \
 	$(OBJS)\advdll_taskbar.o \
 	$(OBJS)\advdll_notifmsgrt.o \
+	$(OBJS)\advdll_activityindicator.o \
 	$(OBJS)\advdll_joystick.o \
 	$(OBJS)\advdll_animateg.o
 endif
@@ -4661,6 +4668,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_sound.o \
 	$(OBJS)\advlib_taskbar.o \
 	$(OBJS)\advlib_notifmsgrt.o \
+	$(OBJS)\advlib_activityindicator.o \
 	$(OBJS)\advlib_joystick.o \
 	$(OBJS)\advlib_animateg.o \
 	$(OBJS)\advlib_bmpcbox.o \
@@ -4670,8 +4678,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.o \
 	$(OBJS)\advlib_datetimectrl.o \
 	$(OBJS)\advlib_hyperlink.o \
-	$(OBJS)\advlib_timectrl.o \
-	$(OBJS)\advlib_activityindicator.o
+	$(OBJS)\advlib_timectrl.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -4717,6 +4724,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_sound.o \
 	$(OBJS)\advlib_taskbar.o \
 	$(OBJS)\advlib_notifmsgrt.o \
+	$(OBJS)\advlib_activityindicator.o \
 	$(OBJS)\advlib_joystick.o \
 	$(OBJS)\advlib_animateg.o
 endif
@@ -7254,9 +7262,6 @@ $(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp
 $(OBJS)\monodll_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -8842,6 +8847,18 @@ $(OBJS)\monodll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_animatecmn.o: ../../src/common/animatecmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9782,9 +9799,6 @@ $(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp
 $(OBJS)\monolib_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -11370,6 +11384,18 @@ $(OBJS)\monolib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_animatecmn.o: ../../src/common/animatecmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12682,6 +12708,9 @@ $(OBJS)\coredll_topluniv.o: ../../src/univ/topluniv.cpp
 $(OBJS)\coredll_winuniv.o: ../../src/univ/winuniv.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\coredll_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\coredll_gtk.o: ../../src/univ/themes/gtk.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14156,6 +14185,9 @@ $(OBJS)\corelib_topluniv.o: ../../src/univ/topluniv.cpp
 $(OBJS)\corelib_winuniv.o: ../../src/univ/winuniv.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\corelib_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\corelib_gtk.o: ../../src/univ/themes/gtk.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -15333,9 +15365,6 @@ $(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp
 $(OBJS)\advdll_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -15462,6 +15491,9 @@ $(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp
 $(OBJS)\advdll_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\advdll_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -15495,9 +15527,6 @@ $(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp
 $(OBJS)\advlib_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -15624,6 +15653,9 @@ $(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp
 $(OBJS)\advlib_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\advlib_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 5607fac77b..5a30f76808 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2470,6 +2470,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_univ_toolbar.obj \
 	$(OBJS)\monodll_topluniv.obj \
 	$(OBJS)\monodll_winuniv.obj \
+	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_gtk.obj \
 	$(OBJS)\monodll_metal.obj \
 	$(OBJS)\monodll_mono.obj \
@@ -2684,6 +2685,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_taskbar.obj \
 	$(OBJS)\monodll_notifmsgrt.obj \
+	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_joystick.obj \
 	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_bmpcbox.obj \
@@ -2693,8 +2695,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.obj \
 	$(OBJS)\monodll_datetimectrl.obj \
 	$(OBJS)\monodll_hyperlink.obj \
-	$(OBJS)\monodll_timectrl.obj \
-	$(OBJS)\monodll_activityindicator.obj
+	$(OBJS)\monodll_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2740,6 +2741,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_taskbar.obj \
 	$(OBJS)\monodll_notifmsgrt.obj \
+	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_joystick.obj \
 	$(OBJS)\monodll_animateg.obj
 !endif
@@ -3305,6 +3307,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_univ_toolbar.obj \
 	$(OBJS)\monolib_topluniv.obj \
 	$(OBJS)\monolib_winuniv.obj \
+	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_gtk.obj \
 	$(OBJS)\monolib_metal.obj \
 	$(OBJS)\monolib_mono.obj \
@@ -3519,6 +3522,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_taskbar.obj \
 	$(OBJS)\monolib_notifmsgrt.obj \
+	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_joystick.obj \
 	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_bmpcbox.obj \
@@ -3528,8 +3532,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.obj \
 	$(OBJS)\monolib_datetimectrl.obj \
 	$(OBJS)\monolib_hyperlink.obj \
-	$(OBJS)\monolib_timectrl.obj \
-	$(OBJS)\monolib_activityindicator.obj
+	$(OBJS)\monolib_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -3575,6 +3578,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_taskbar.obj \
 	$(OBJS)\monolib_notifmsgrt.obj \
+	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_joystick.obj \
 	$(OBJS)\monolib_animateg.obj
 !endif
@@ -4072,6 +4076,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_univ_toolbar.obj \
 	$(OBJS)\coredll_topluniv.obj \
 	$(OBJS)\coredll_winuniv.obj \
+	$(OBJS)\coredll_activityindicator.obj \
 	$(OBJS)\coredll_gtk.obj \
 	$(OBJS)\coredll_metal.obj \
 	$(OBJS)\coredll_mono.obj \
@@ -4648,6 +4653,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_univ_toolbar.obj \
 	$(OBJS)\corelib_topluniv.obj \
 	$(OBJS)\corelib_winuniv.obj \
+	$(OBJS)\corelib_activityindicator.obj \
 	$(OBJS)\corelib_gtk.obj \
 	$(OBJS)\corelib_metal.obj \
 	$(OBJS)\corelib_mono.obj \
@@ -4890,6 +4896,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_sound.obj \
 	$(OBJS)\advdll_taskbar.obj \
 	$(OBJS)\advdll_notifmsgrt.obj \
+	$(OBJS)\advdll_activityindicator.obj \
 	$(OBJS)\advdll_joystick.obj \
 	$(OBJS)\advdll_animateg.obj \
 	$(OBJS)\advdll_bmpcbox.obj \
@@ -4899,8 +4906,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.obj \
 	$(OBJS)\advdll_datetimectrl.obj \
 	$(OBJS)\advdll_hyperlink.obj \
-	$(OBJS)\advdll_timectrl.obj \
-	$(OBJS)\advdll_activityindicator.obj
+	$(OBJS)\advdll_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4946,6 +4952,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_sound.obj \
 	$(OBJS)\advdll_taskbar.obj \
 	$(OBJS)\advdll_notifmsgrt.obj \
+	$(OBJS)\advdll_activityindicator.obj \
 	$(OBJS)\advdll_joystick.obj \
 	$(OBJS)\advdll_animateg.obj
 !endif
@@ -5003,6 +5010,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_sound.obj \
 	$(OBJS)\advlib_taskbar.obj \
 	$(OBJS)\advlib_notifmsgrt.obj \
+	$(OBJS)\advlib_activityindicator.obj \
 	$(OBJS)\advlib_joystick.obj \
 	$(OBJS)\advlib_animateg.obj \
 	$(OBJS)\advlib_bmpcbox.obj \
@@ -5012,8 +5020,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.obj \
 	$(OBJS)\advlib_datetimectrl.obj \
 	$(OBJS)\advlib_hyperlink.obj \
-	$(OBJS)\advlib_timectrl.obj \
-	$(OBJS)\advlib_activityindicator.obj
+	$(OBJS)\advlib_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -5059,6 +5066,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_sound.obj \
 	$(OBJS)\advlib_taskbar.obj \
 	$(OBJS)\advlib_notifmsgrt.obj \
+	$(OBJS)\advlib_activityindicator.obj \
 	$(OBJS)\advlib_joystick.obj \
 	$(OBJS)\advlib_animateg.obj
 !endif
@@ -7771,9 +7779,6 @@ $(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
-$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
-
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
@@ -9359,6 +9364,16 @@ $(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -10299,9 +10314,6 @@ $(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
-$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
-
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
@@ -11887,6 +11899,16 @@ $(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -13199,6 +13221,9 @@ $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
 $(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
 
+$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
 
@@ -14673,6 +14698,9 @@ $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
 $(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
 
+$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
 
@@ -15850,9 +15878,6 @@ $(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
-$(OBJS)\advdll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
-
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 
@@ -15979,6 +16004,9 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
 $(OBJS)\advdll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\rt\notifmsgrt.cpp
 
+$(OBJS)\advdll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
@@ -16012,9 +16040,6 @@ $(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
-$(OBJS)\advlib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
-
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 
@@ -16141,6 +16166,9 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
 $(OBJS)\advlib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\rt\notifmsgrt.cpp
 
+$(OBJS)\advlib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index b6bfa86143..10657529ed 100644
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -18,9 +18,12 @@
     class WXDLLIMPEXP_FWD_CORE wxSlider;
 #endif // wxUSE_SLIDER
 
-// Preview with opacity is possible only
-// if wxGCDC and wxStaticBitmap are available.
-#define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA (wxUSE_GRAPHICS_CONTEXT && wxUSE_STATBMP)
+// Preview with opacity is possible only if wxGCDC and wxStaticBitmap are
+// available and currently it only works in wxOSX and wxMSW as it uses wxBitmap
+// UseAlpha() and HasAlpha() methods which only these ports provide.
+#define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA \
+    ((wxUSE_GRAPHICS_CONTEXT && wxUSE_STATBMP) && \
+     (defined(__WXMSW__) || defined(__WXOSX__)))
 
 #if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA
 class wxStaticBitmap;
diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index 4f4c3e1b57..d0bb4aad1a 100644
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -191,7 +191,7 @@ private:
     // the object handling the arrows
     wxScrollArrows m_arrows;
 
-    friend WXDLLIMPEXP_CORE class wxControlRenderer; // for geometry methods
+    friend class WXDLLIMPEXP_FWD_CORE wxControlRenderer; // for geometry methods
     friend class wxStdScrollBarInputHandler; // for geometry methods
 
     wxDECLARE_EVENT_TABLE();
diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index d2830ec472..1ba9c1b5ce 100644
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -214,7 +214,7 @@ void wxGenericColourDialog::OnCustomColourMouseClick(wxMouseEvent& event)
 {
     // Find index of custom colour
     // and call the handler.
-    for (int i = 0; i < WXSIZEOF(m_customColoursBmp); i++)
+    for (unsigned i = 0; i < WXSIZEOF(m_customColoursBmp); i++)
     {
         if ( m_customColoursBmp[i]->GetId() == event.GetId() )
         {
@@ -284,7 +284,7 @@ void wxGenericColourDialog::CreateWidgets()
                                            wxBORDER_SUNKEN);
 
     // 16 bitmaps to preview custom colours (with alpha channel)
-    for (int i = 0; i < WXSIZEOF(m_customColoursBmp); i++)
+    for (unsigned i = 0; i < WXSIZEOF(m_customColoursBmp); i++)
     {
         int x = ((i % 8)*(m_smallRectangleSize.x+m_gridSpacing)) + m_customColoursRect.x;
         int y = ((i / 8)*(m_smallRectangleSize.y+m_gridSpacing)) + m_customColoursRect.y;
@@ -471,7 +471,7 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc, int clrIndex)
     int idxStart;
     int idxEnd;
     // For clrIndex == -1 redraw all custom colours
-    if ( clrIndex < 0 || clrIndex >= WXSIZEOF(m_customColours) )
+    if ( clrIndex < 0 || static_cast<unsigned>(clrIndex) >= WXSIZEOF(m_customColours) )
     {
         idxStart = 0;
         idxEnd = WXSIZEOF(m_customColours) - 1;
diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 5c62d41d8c..b7c8a12636 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -184,8 +184,11 @@ bool wxApp::Initialize(int& argC, wxChar **argV)
         return false;
 
 #if wxUSE_UNICODE
-    // Glib's type system required by Pango
+    // Glib's type system required by Pango (deprecated since glib 2.36 but
+    // used to be required, so still call it, it's harmless).
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     g_type_init();
+    wxGCC_WARNING_RESTORE()
 #endif
 
 #if wxUSE_INTL