diff --git a/Makefile.in b/Makefile.in
index f1cdfbdc39..57a01ea2f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4137,6 +4137,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 \
@@ -4154,6 +4155,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 ef41ab9617..a6666056fa 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -880,6 +880,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
@@ -897,6 +898,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/makefile.bcc b/build/msw/makefile.bcc
index 2cf02f397f..7205b12f0d 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -5484,7 +5484,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 23a80de7e5..79202fd5f7 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -5655,7 +5655,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 3884212901..0ce50ebcf5 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -6170,7 +6170,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 0716099c3a..5d8b8b04aa 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -5927,7 +5927,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h :  $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 106bd72602..6f3567f35a 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2888,6 +2888,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
@@ -3164,6 +3168,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 3eafea6dd5..8bd4f46f96 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2351,6 +2351,9 @@
 			<File
 				RelativePath="..\..\include\wx\position.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\preferences.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\print.h">
 			</File>
@@ -2558,6 +2561,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 a192b10a56..fa9901f2bc 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3143,6 +3143,10 @@
 				RelativePath="..\..\include\wx\position.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\preferences.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\print.h"
 				>
@@ -3419,6 +3423,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 fa534894b1..00eba9502e 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3141,6 +3141,10 @@
 				RelativePath="..\..\include\wx\position.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\preferences.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\print.h"
 				>
@@ -3417,6 +3421,10 @@
 				RelativePath="..\..\include\wx\tbarbase.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\testing.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textcompleter.h"
 				>