diff --git a/Makefile.in b/Makefile.in
index 9c3919ffaa..65ee6e1817 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4063,6 +4063,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/generic/creddlgg.h \
 	wx/creddlg.h \
 	wx/bmpbndl.h \
+	wx/filedlgcustomize.h \
 	$(LOWLEVEL_HDR) \
 	$(GUI_CORE_HEADERS) \
 	wx/mediactrl.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0b16b7d632..5007c6ab97 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1310,6 +1310,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/creddlgg.h
     wx/creddlg.h
     wx/bmpbndl.h
+    wx/filedlgcustomize.h
 </set>
 
 <!-- ====================================================================== -->
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 8c9bcf58b5..0b5ea94dcf 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -1213,6 +1213,7 @@ set(GUI_CMN_HDR
     wx/generic/creddlgg.h
     wx/generic/animate.h
     wx/bmpbndl.h
+    wx/filedlgcustomize.h
 )
 
 set(UNIX_SRC
diff --git a/build/files b/build/files
index ca7e119b61..e918da31ba 100644
--- a/build/files
+++ b/build/files
@@ -1017,6 +1017,7 @@ GUI_CMN_HDR =
     wx/fdrepdlg.h
     wx/filectrl.h
     wx/filedlg.h
+    wx/filedlgcustomize.h
     wx/filehistory.h
     wx/filepicker.h
     wx/fmappriv.h
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index 36eb3274d4..57ae402c7c 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -1518,6 +1518,7 @@
     <ClInclude Include="..\..\include\wx\dcbuffer.h" />
     <ClInclude Include="..\..\include\wx\creddlg.h" />
     <ClInclude Include="..\..\include\wx\generic\creddlgg.h" />
+    <ClInclude Include="..\..\include\wx\filedlgcustomize.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index 1b30b9f0ed..2a27584e6b 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -60,6 +60,9 @@
     <ClCompile Include="..\..\src\common\bmpbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\common\bmpbndl.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\bmpbtncmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -471,6 +474,9 @@
     <ClCompile Include="..\..\src\generic\bmpcboxg.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\generic\bmpsvg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\generic\busyinfo.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -693,6 +699,9 @@
     <ClCompile Include="..\..\src\msw\bitmap.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msw\bmpbndl.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\msw\bmpbuttn.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -1068,15 +1077,6 @@
     <ClCompile Include="..\..\src\xrc\xmlreshandler.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\common\bmpbndl.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\msw\bmpbndl.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\generic\bmpsvg.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -1129,6 +1129,9 @@
     <ClInclude Include="..\..\include\wx\bitmap.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\bmpbndl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\bmpbuttn.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1318,6 +1321,9 @@
     <ClInclude Include="..\..\include\wx\filedlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\filedlgcustomize.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\filehistory.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -2308,9 +2314,6 @@
     <ClInclude Include="..\..\include\wx\xrc\xmlreshandler.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\bmpbndl.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\include\wx\msw\setup.h">
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 7a7e8df0a0..184f90e85c 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3740,6 +3740,10 @@
 				RelativePath="..\..\include\wx\filedlg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\filedlgcustomize.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filehistory.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 9c9574ee98..7faa7ebfc9 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3736,6 +3736,10 @@
 				RelativePath="..\..\include\wx\filedlg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\filedlgcustomize.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filehistory.h"
 				>