diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 95fe0deeac..f66828d1f2 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1204,6 +1204,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xpmdecod.h
     wx/xpmhand.h
     wx/xrc/xmlreshandler.h
+    wx/taskbarbutton.h
 </set>
 
 <!-- ====================================================================== -->
@@ -2001,6 +2002,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/textentry.cpp
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
+    src/msw/taskbarbutton.cpp
 </set>
 <set var="MSW_HDR" hints="files">
     wx/generic/clrpickerg.h
@@ -2096,6 +2098,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/toplevel.h
     wx/msw/treectrl.h
     wx/msw/window.h
+    wx/msw/taskbarbutton.h
 </set>
 <set var="MSW_RSC" hints="files">
     <!-- Resources must be installed together with headers: -->
@@ -3025,13 +3028,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/richtooltip.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
-    src/msw/taskbarbutton.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
     wx/msw/notifmsg.h
     wx/msw/sound.h
     wx/msw/taskbar.h
-    wx/msw/taskbarbutton.h
 </set>
 
 <!-- not used with wxUniv -->
diff --git a/build/files b/build/files
index e4a601288d..0795577838 100644
--- a/build/files
+++ b/build/files
@@ -757,6 +757,7 @@ GUI_CMN_HDR =
     wx/statbox.h
     wx/stattext.h
     wx/statusbr.h
+    wx/taskbarbutton.h
     wx/testing.h
     wx/textcompleter.h
     wx/textctrl.h
@@ -1625,6 +1626,7 @@ MSW_SRC =
     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
@@ -1716,6 +1718,7 @@ 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/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index 1b69afb0f2..88a15226c1 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -1002,6 +1002,7 @@
     <ClCompile Include="..\..\src\generic\vlbox.cpp" />
     <ClCompile Include="..\..\src\generic\vscroll.cpp" />
     <ClCompile Include="..\..\src\xrc\xmlreshandler.cpp" />
+    <ClCompile Include="..\..\src\msw\taskbarbutton.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -1122,6 +1123,7 @@
     <ClInclude Include="..\..\include\wx\msw\statline.h" />
     <ClInclude Include="..\..\include\wx\msw\stattext.h" />
     <ClInclude Include="..\..\include\wx\msw\statusbar.h" />
+    <ClInclude Include="..\..\include\wx\msw\taskbarbutton.h" />
     <ClInclude Include="..\..\include\wx\msw\textctrl.h" />
     <ClInclude Include="..\..\include\wx\msw\textentry.h" />
     <ClInclude Include="..\..\include\wx\msw\tglbtn.h" />
@@ -1327,6 +1329,7 @@
     <ClInclude Include="..\..\include\wx\statline.h" />
     <ClInclude Include="..\..\include\wx\stattext.h" />
     <ClInclude Include="..\..\include\wx\statusbr.h" />
+    <ClInclude Include="..\..\include\wx\taskbarbutton.h" />
     <ClInclude Include="..\..\include\wx\tbarbase.h" />
     <ClInclude Include="..\..\include\wx\textcompleter.h" />
     <ClInclude Include="..\..\include\wx\textctrl.h" />
@@ -1370,4 +1373,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index 4aa3c32166..7eacd606e5 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -837,6 +837,9 @@
     <ClCompile Include="..\..\src\msw\statusbar.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msw\taskbarbutton.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\msw\textctrl.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -1612,6 +1615,9 @@
     <ClInclude Include="..\..\include\wx\msw\statusbar.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\taskbarbutton.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\textctrl.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1792,6 +1798,9 @@
     <ClInclude Include="..\..\include\wx\statusbr.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\taskbarbutton.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\tbarbase.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1903,4 +1912,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/include/wx/msw/taskbarbutton.h b/include/wx/msw/taskbarbutton.h
index c88d1f36b0..2c1f9002fa 100644
--- a/include/wx/msw/taskbarbutton.h
+++ b/include/wx/msw/taskbarbutton.h
@@ -17,7 +17,7 @@
 
 struct ITaskbarList3;
 
-class WXDLLIMPEXP_ADV wxTaskBarButtonImpl : public wxTaskBarButton {
+class WXDLLIMPEXP_CORE wxTaskBarButtonImpl : public wxTaskBarButton {
 public:
     virtual ~wxTaskBarButtonImpl();
 
diff --git a/include/wx/taskbarbutton.h b/include/wx/taskbarbutton.h
index 904efed5b1..55edc5697d 100644
--- a/include/wx/taskbarbutton.h
+++ b/include/wx/taskbarbutton.h
@@ -22,7 +22,7 @@
 /**
     State of the task bar button.
 */
-enum wxTaskBarButtonState
+enum WXDLLIMPEXP_CORE wxTaskBarButtonState
 {
     wxTASKBAR_BUTTON_NO_PROGRESS   = 0,
     wxTASKBAR_BUTTON_INDETERMINATE = 1,
@@ -31,7 +31,7 @@ enum wxTaskBarButtonState
     wxTASKBAR_BUTTON_PAUSED        = 8
 };
 
-class WXDLLIMPEXP_ADV wxThumbBarButton {
+class WXDLLIMPEXP_CORE wxThumbBarButton {
 public:
     wxThumbBarButton(int id,
                      const wxIcon& icon,
@@ -64,7 +64,7 @@ private:
     bool m_interactive;
 };
 
-class WXDLLIMPEXP_ADV wxTaskBarButton
+class WXDLLIMPEXP_CORE wxTaskBarButton
 {
 public:
     wxTaskBarButton() { }
diff --git a/samples/taskbarbutton/taskbarbutton.cpp b/samples/taskbarbutton/taskbarbutton.cpp
index 6de3becdf5..54387438ea 100644
--- a/samples/taskbarbutton/taskbarbutton.cpp
+++ b/samples/taskbarbutton/taskbarbutton.cpp
@@ -86,7 +86,8 @@ wxIcon CreateRandomIcon()
 
     wxIcon icon;
     icon.CopyFromBitmap(CreateBitmap(*(colours[counter]), 16, 16));
-    counter = (++counter) % WXSIZEOF(colours);
+    counter += 1;
+    counter = counter % WXSIZEOF(colours);
     return icon;
 }