diff --git a/build/msw/wx_vc11_aui.vcxproj b/build/msw/wx_vc11_aui.vcxproj
index 1ac916cc1d..917ec1af85 100644
--- a/build/msw/wx_vc11_aui.vcxproj
+++ b/build/msw/wx_vc11_aui.vcxproj
@@ -494,6 +494,7 @@
     <ClCompile Include="..\..\src\aui\framemanager.cpp" />
     <ClCompile Include="..\..\src\aui\tabart.cpp" />
     <ClCompile Include="..\..\src\aui\tabmdi.cpp" />
+    <ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp" />
     <ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -505,7 +506,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
     <CustomBuild Include="..\..\include\wx\msw\setup.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
@@ -574,8 +574,10 @@
     <ClInclude Include="..\..\include\wx\aui\framemanager.h" />
     <ClInclude Include="..\..\include\wx\aui\tabart.h" />
     <ClInclude Include="..\..\include\wx\aui\tabmdi.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc11_aui.vcxproj.filters b/build/msw/wx_vc11_aui.vcxproj.filters
index 9ed1d830ea..d23f3ab4f9 100644
--- a/build/msw/wx_vc11_aui.vcxproj.filters
+++ b/build/msw/wx_vc11_aui.vcxproj.filters
@@ -46,6 +46,9 @@
     <ClCompile Include="..\..\src\aui\tabmdi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -80,6 +83,9 @@
     <ClInclude Include="..\..\include\wx\aui\tabmdi.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -92,4 +98,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc11_ribbon.vcxproj b/build/msw/wx_vc11_ribbon.vcxproj
index 207d4ce503..fc520ab953 100644
--- a/build/msw/wx_vc11_ribbon.vcxproj
+++ b/build/msw/wx_vc11_ribbon.vcxproj
@@ -497,6 +497,7 @@
     <ClCompile Include="..\..\src\ribbon\page.cpp" />
     <ClCompile Include="..\..\src\ribbon\panel.cpp" />
     <ClCompile Include="..\..\src\ribbon\toolbar.cpp" />
+    <ClCompile Include="..\..\src\xrc\xh_ribbon.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -576,8 +577,9 @@
     <ClInclude Include="..\..\include\wx\ribbon\page.h" />
     <ClInclude Include="..\..\include\wx\ribbon\panel.h" />
     <ClInclude Include="..\..\include\wx\ribbon\toolbar.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_ribbon.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc11_ribbon.vcxproj.filters b/build/msw/wx_vc11_ribbon.vcxproj.filters
index 8a7b6d410d..74b8db4e2c 100644
--- a/build/msw/wx_vc11_ribbon.vcxproj.filters
+++ b/build/msw/wx_vc11_ribbon.vcxproj.filters
@@ -55,6 +55,9 @@
     <ClCompile Include="..\..\src\ribbon\toolbar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\xrc\xh_ribbon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -89,6 +92,9 @@
     <ClInclude Include="..\..\include\wx\ribbon\toolbar.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\xrc\xh_ribbon.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\include\wx\msw\setup.h">
diff --git a/build/msw/wx_vc11_richtext.vcxproj b/build/msw/wx_vc11_richtext.vcxproj
index 73399846ed..666d48adb1 100644
--- a/build/msw/wx_vc11_richtext.vcxproj
+++ b/build/msw/wx_vc11_richtext.vcxproj
@@ -497,6 +497,7 @@
     <ClCompile Include="..\..\src\richtext\richtextstyles.cpp" />
     <ClCompile Include="..\..\src\richtext\richtextsymboldlg.cpp" />
     <ClCompile Include="..\..\src\richtext\richtextxml.cpp" />
+    <ClCompile Include="..\..\src\xrc\xh_richtext.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -588,8 +589,9 @@
     <ClInclude Include="..\..\include\wx\richtext\richtextsymboldlg.h" />
     <ClInclude Include="..\..\include\wx\richtext\richtextuicustomization.h" />
     <ClInclude Include="..\..\include\wx\richtext\richtextxml.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_richtext.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc11_richtext.vcxproj.filters b/build/msw/wx_vc11_richtext.vcxproj.filters
index 5e83ad2537..bc88ea988c 100644
--- a/build/msw/wx_vc11_richtext.vcxproj.filters
+++ b/build/msw/wx_vc11_richtext.vcxproj.filters
@@ -55,6 +55,9 @@
     <ClCompile Include="..\..\src\richtext\richtextxml.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\xrc\xh_richtext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -125,6 +128,9 @@
     <ClInclude Include="..\..\include\wx\richtext\richtextxml.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\xrc\xh_richtext.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\include\wx\msw\setup.h">
diff --git a/build/msw/wx_vc12_aui.vcxproj b/build/msw/wx_vc12_aui.vcxproj
index 9c8f9ba3b2..dce782ee35 100644
--- a/build/msw/wx_vc12_aui.vcxproj
+++ b/build/msw/wx_vc12_aui.vcxproj
@@ -494,6 +494,7 @@
     <ClCompile Include="..\..\src\aui\framemanager.cpp" />
     <ClCompile Include="..\..\src\aui\tabart.cpp" />
     <ClCompile Include="..\..\src\aui\tabmdi.cpp" />
+    <ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp" />
     <ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -505,7 +506,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
     <CustomBuild Include="..\..\include\wx\msw\setup.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
@@ -574,8 +574,10 @@
     <ClInclude Include="..\..\include\wx\aui\framemanager.h" />
     <ClInclude Include="..\..\include\wx\aui\tabart.h" />
     <ClInclude Include="..\..\include\wx\aui\tabmdi.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc12_aui.vcxproj.filters b/build/msw/wx_vc12_aui.vcxproj.filters
index fc285bb9fc..c13ba65b0a 100644
--- a/build/msw/wx_vc12_aui.vcxproj.filters
+++ b/build/msw/wx_vc12_aui.vcxproj.filters
@@ -46,6 +46,9 @@
     <ClCompile Include="..\..\src\aui\tabmdi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -80,6 +83,9 @@
     <ClInclude Include="..\..\include\wx\aui\tabmdi.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc12_ribbon.vcxproj b/build/msw/wx_vc12_ribbon.vcxproj
index 4114ccfd6c..1f898552d3 100644
--- a/build/msw/wx_vc12_ribbon.vcxproj
+++ b/build/msw/wx_vc12_ribbon.vcxproj
@@ -497,6 +497,7 @@
     <ClCompile Include="..\..\src\ribbon\page.cpp" />
     <ClCompile Include="..\..\src\ribbon\panel.cpp" />
     <ClCompile Include="..\..\src\ribbon\toolbar.cpp" />
+    <ClCompile Include="..\..\src\xrc\xh_ribbon.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -576,8 +577,9 @@
     <ClInclude Include="..\..\include\wx\ribbon\page.h" />
     <ClInclude Include="..\..\include\wx\ribbon\panel.h" />
     <ClInclude Include="..\..\include\wx\ribbon\toolbar.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_ribbon.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc12_ribbon.vcxproj.filters b/build/msw/wx_vc12_ribbon.vcxproj.filters
index 8a7b6d410d..74b8db4e2c 100644
--- a/build/msw/wx_vc12_ribbon.vcxproj.filters
+++ b/build/msw/wx_vc12_ribbon.vcxproj.filters
@@ -55,6 +55,9 @@
     <ClCompile Include="..\..\src\ribbon\toolbar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\xrc\xh_ribbon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -89,6 +92,9 @@
     <ClInclude Include="..\..\include\wx\ribbon\toolbar.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\xrc\xh_ribbon.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\include\wx\msw\setup.h">
diff --git a/build/msw/wx_vc12_richtext.vcxproj b/build/msw/wx_vc12_richtext.vcxproj
index 82321aed8d..32624712dd 100644
--- a/build/msw/wx_vc12_richtext.vcxproj
+++ b/build/msw/wx_vc12_richtext.vcxproj
@@ -497,6 +497,7 @@
     <ClCompile Include="..\..\src\richtext\richtextstyles.cpp" />
     <ClCompile Include="..\..\src\richtext\richtextsymboldlg.cpp" />
     <ClCompile Include="..\..\src\richtext\richtextxml.cpp" />
+    <ClCompile Include="..\..\src\xrc\xh_richtext.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -588,8 +589,9 @@
     <ClInclude Include="..\..\include\wx\richtext\richtextsymboldlg.h" />
     <ClInclude Include="..\..\include\wx\richtext\richtextuicustomization.h" />
     <ClInclude Include="..\..\include\wx\richtext\richtextxml.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_richtext.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc12_richtext.vcxproj.filters b/build/msw/wx_vc12_richtext.vcxproj.filters
index 5e83ad2537..bc88ea988c 100644
--- a/build/msw/wx_vc12_richtext.vcxproj.filters
+++ b/build/msw/wx_vc12_richtext.vcxproj.filters
@@ -55,6 +55,9 @@
     <ClCompile Include="..\..\src\richtext\richtextxml.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\xrc\xh_richtext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -125,6 +128,9 @@
     <ClInclude Include="..\..\include\wx\richtext\richtextxml.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\xrc\xh_richtext.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\include\wx\msw\setup.h">