diff --git a/Makefile.in b/Makefile.in
index 0dc4d1a902..67573fec2b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4148,6 +4148,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/panel.h \
 	wx/pen.h \
 	wx/position.h \
+	wx/preferences.h \
 	wx/radiobox.h \
 	wx/radiobut.h \
 	wx/range.h \
@@ -4165,6 +4166,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/statbox.h \
 	wx/stattext.h \
 	wx/statusbr.h \
+	wx/testing.h \
 	wx/textcompleter.h \
 	wx/textctrl.h \
 	wx/textdlg.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 360c06f06d..e077460543 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -879,6 +879,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/panel.h
     wx/pen.h
     wx/position.h
+    wx/preferences.h
     wx/radiobox.h
     wx/radiobut.h
     wx/range.h
@@ -896,6 +897,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/statbox.h
     wx/stattext.h
     wx/statusbr.h
+    wx/testing.h
     wx/textcompleter.h
     wx/textctrl.h
     wx/textdlg.h
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 937464bf39..2247ccf3e6 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2884,6 +2884,10 @@ SOURCE=..\..\include\wx\position.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\preferences.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\print.h
 # End Source File
 # Begin Source File
@@ -3160,6 +3164,10 @@ SOURCE=..\..\include\wx\tbarbase.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\testing.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\textcompleter.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 772004e25b..011e4f0157 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2348,6 +2348,9 @@
 			<File
 				RelativePath="..\..\include\wx\position.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\preferences.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\print.h">
 			</File>
@@ -2555,6 +2558,9 @@
 			<File
 				RelativePath="..\..\include\wx\tbarbase.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\testing.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textcompleter.h">
 			</File>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 780e7e2031..ecdec84b92 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3139,6 +3139,10 @@
 				RelativePath="..\..\include\wx\position.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\preferences.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\print.h"
 				>
@@ -3415,6 +3419,10 @@
 				RelativePath="..\..\include\wx\tbarbase.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\testing.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textcompleter.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index e62422f8d0..f7891f82a6 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3137,6 +3137,10 @@
 				RelativePath="..\..\include\wx\position.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\preferences.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\print.h"
 				>
@@ -3413,6 +3417,10 @@
 				RelativePath="..\..\include\wx\tbarbase.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\testing.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textcompleter.h"
 				>