diff --git a/Makefile.in b/Makefile.in
index 342a4d4a29..8eb734fbd4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3479,8 +3479,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR =  \
 COND_TOOLKIT_QT_GUI_HDR =  \
 	wx/qt/accel.h \
 	wx/qt/app.h \
-	wx/qt/apptbase.h \
-	wx/qt/apptrait.h \
 	wx/qt/bitmap.h \
 	wx/qt/bmpbuttn.h \
 	wx/qt/brush.h \
@@ -3496,7 +3494,6 @@ COND_TOOLKIT_QT_GUI_HDR =  \
 	wx/qt/colour.h \
 	wx/qt/combobox.h \
 	wx/qt/control.h \
-	wx/qt/converter.h \
 	wx/qt/ctrlsub.h \
 	wx/qt/cursor.h \
 	wx/qt/dataform.h \
@@ -3547,16 +3544,12 @@ COND_TOOLKIT_QT_GUI_HDR =  \
 	wx/qt/statusbar.h \
 	wx/qt/stattext.h \
 	wx/qt/textctrl.h \
-	wx/qt/textdlg.h \
 	wx/qt/textentry.h \
 	wx/qt/tglbtn.h \
-	wx/qt/timer.h \
 	wx/qt/toolbar.h \
 	wx/qt/tooltip.h \
 	wx/qt/toplevel.h \
-	wx/qt/utils.h \
 	wx/qt/window.h \
-	wx/qt/private/winevent.h \
 	wx/generic/fdrepdlg.h \
 	wx/generic/filepickerg.h \
 	wx/generic/clrpickerg.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 27339536a8..e501061a11 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -245,8 +245,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="QT_HDR" hints="files">
     wx/qt/accel.h
     wx/qt/app.h
-    wx/qt/apptbase.h
-    wx/qt/apptrait.h
     wx/qt/bitmap.h
     wx/qt/bmpbuttn.h
     wx/qt/brush.h
@@ -262,7 +260,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/qt/colour.h
     wx/qt/combobox.h
     wx/qt/control.h
-    wx/qt/converter.h
     wx/qt/ctrlsub.h
     wx/qt/cursor.h
     wx/qt/dataform.h
@@ -313,17 +310,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/qt/statusbar.h
     wx/qt/stattext.h
     wx/qt/textctrl.h
-    wx/qt/textdlg.h
     wx/qt/textentry.h
     wx/qt/tglbtn.h
-    wx/qt/timer.h
     wx/qt/toolbar.h
     wx/qt/tooltip.h
     wx/qt/toplevel.h
     <!-- wx/qt/treectrl.h -->
-    wx/qt/utils.h
     wx/qt/window.h
-    wx/qt/private/winevent.h
     wx/generic/fdrepdlg.h
     wx/generic/filepickerg.h
     wx/generic/clrpickerg.h
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 7749731579..f0812e7474 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -168,8 +168,6 @@ set(BASE_OSX_NOTWXMAC_HDR
 set(QT_HDR
     wx/qt/accel.h
     wx/qt/app.h
-    wx/qt/apptbase.h
-    wx/qt/apptrait.h
     wx/qt/bitmap.h
     wx/qt/bmpbuttn.h
     wx/qt/brush.h
@@ -187,7 +185,6 @@ set(QT_HDR
     wx/qt/colour.h
     wx/qt/combobox.h
     wx/qt/control.h
-    wx/qt/converter.h
     wx/qt/ctrlsub.h
     wx/qt/cursor.h
     wx/qt/dataform.h
@@ -241,16 +238,12 @@ set(QT_HDR
     wx/qt/statusbar.h
     wx/qt/stattext.h
     wx/qt/textctrl.h
-    wx/qt/textdlg.h
     wx/qt/textentry.h
     wx/qt/tglbtn.h
-    wx/qt/timer.h
     wx/qt/toolbar.h
     wx/qt/tooltip.h
     wx/qt/toplevel.h
-    wx/qt/utils.h
     wx/qt/window.h
-    wx/qt/private/winevent.h
     wx/qt/dvrenderer.h
     wx/qt/dvrenderers.h
     wx/generic/animate.h
diff --git a/build/files b/build/files
index ef98625be1..7c3b433047 100644
--- a/build/files
+++ b/build/files
@@ -204,8 +204,6 @@ QT_HDR =
     wx/qt/accel.h
     wx/qt/anybutton.h
     wx/qt/app.h
-    wx/qt/apptbase.h
-    wx/qt/apptrait.h
     wx/qt/bitmap.h
     wx/qt/bmpbuttn.h
     wx/qt/brush.h
@@ -220,7 +218,6 @@ QT_HDR =
     wx/qt/colour.h
     wx/qt/combobox.h
     wx/qt/control.h
-    wx/qt/converter.h
     wx/qt/ctrlsub.h
     wx/qt/cursor.h
     wx/qt/dataform.h
@@ -258,7 +255,6 @@ QT_HDR =
     wx/qt/popupwin.h
     wx/qt/printdlg.h
     wx/qt/printqt.h
-    wx/qt/private/winevent.h
     wx/qt/radiobox.h
     wx/qt/radiobut.h
     wx/qt/region.h
@@ -273,14 +269,11 @@ QT_HDR =
     wx/qt/statusbar.h
     wx/qt/taskbar.h
     wx/qt/textctrl.h
-    wx/qt/textdlg.h
     wx/qt/textentry.h
     wx/qt/tglbtn.h
-    wx/qt/timer.h
     wx/qt/toolbar.h
     wx/qt/tooltip.h
     wx/qt/toplevel.h
-    wx/qt/utils.h
     wx/qt/window.h
 
 QT_SRC=
@@ -316,7 +309,6 @@ QT_SRC=
     src/qt/combobox.cpp
     src/qt/control.cpp
     src/qt/converter.cpp
-    src/qt/converter.cpp
     src/qt/ctrlsub.cpp
     src/qt/cursor.cpp
     src/qt/dataobj.cpp