diff --git a/build/msw/wx_vc11_aui.vcxproj b/build/msw/wx_vc11_aui.vcxproj
index 674e9a51f7..01ff61f4d3 100644
--- a/build/msw/wx_vc11_aui.vcxproj
+++ b/build/msw/wx_vc11_aui.vcxproj
@@ -493,6 +493,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" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -571,8 +572,9 @@
     <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" />
   </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 d3278615d3..741764520f 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>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -77,6 +80,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>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\include\wx\msw\setup.h">
diff --git a/build/msw/wx_vc11_ribbon.vcxproj b/build/msw/wx_vc11_ribbon.vcxproj
index 2674c72dbf..e5a5bf5401 100644
--- a/build/msw/wx_vc11_ribbon.vcxproj
+++ b/build/msw/wx_vc11_ribbon.vcxproj
@@ -496,6 +496,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">
@@ -575,8 +576,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 73aee0f26c..7844e2ded6 100644
--- a/build/msw/wx_vc11_richtext.vcxproj
+++ b/build/msw/wx_vc11_richtext.vcxproj
@@ -496,6 +496,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">
@@ -587,8 +588,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 ef6959bc5a..2eb7f42309 100644
--- a/build/msw/wx_vc12_aui.vcxproj
+++ b/build/msw/wx_vc12_aui.vcxproj
@@ -493,6 +493,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" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -571,6 +572,7 @@
     <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" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/msw/wx_vc12_aui.vcxproj.filters b/build/msw/wx_vc12_aui.vcxproj.filters
index d3278615d3..741764520f 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>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -77,6 +80,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>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\include\wx\msw\setup.h">
diff --git a/build/msw/wx_vc12_ribbon.vcxproj b/build/msw/wx_vc12_ribbon.vcxproj
index 206b459191..5fa60eccb0 100644
--- a/build/msw/wx_vc12_ribbon.vcxproj
+++ b/build/msw/wx_vc12_ribbon.vcxproj
@@ -496,6 +496,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">
@@ -575,8 +576,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 c9e0828f87..a55e7f293b 100644
--- a/build/msw/wx_vc12_richtext.vcxproj
+++ b/build/msw/wx_vc12_richtext.vcxproj
@@ -496,6 +496,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">
@@ -587,8 +588,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">