diff --git a/include/wx/accel.h b/include/wx/accel.h
index f51578538c..40676ee7f0 100644
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -105,8 +105,6 @@ private:
     #include "wx/motif/accel.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/accel.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/accel.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/app.h b/include/wx/app.h
index 1ea9b4c11a..36e9e19790 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -331,8 +331,6 @@ protected:
         #include "wx/motif/app.h"
     #elif defined(__WXMGL__)
         #include "wx/mgl/app.h"
-    #elif defined(__WXQT__)
-        #include "wx/qt/app.h"
     #elif defined(__WXGTK__)
         #include "wx/gtk/app.h"
     #elif defined(__WXMAC__)
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 9e6f11f984..aa86bc86b9 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -161,8 +161,6 @@ protected:
 #include "wx/gtk/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"
-#elif defined(__WXQT__)
-#include "wx/qt/bitmap.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 7c1ad834fd..884796042a 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -83,8 +83,6 @@ private:
     #include "wx/motif/bmpbuttn.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/bmpbuttn.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/bmpbuttn.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/bmpbuttn.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/brush.h b/include/wx/brush.h
index ddcae04a49..b8ddfd0181 100644
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/brush.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/brush.h"
-#elif defined(__WXQT__)
-#include "wx/qt/brush.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/brush.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/button.h b/include/wx/button.h
index 0a7ccc6a8b..4e75d97c33 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -66,8 +66,6 @@ public:
     #include "wx/motif/button.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/button.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/button.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 7b59f05211..5b43a6af37 100644
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -40,8 +40,6 @@ public:
     #include "wx/motif/checkbox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/checkbox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/checkbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/checkbox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index 955c533445..9231f6b178 100644
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -36,8 +36,6 @@ public:
     #include "wx/motif/checklst.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/checklst.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/checklst.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/checklst.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/choice.h b/include/wx/choice.h
index a99e477cd2..b94a76c6e2 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -69,8 +69,6 @@ public:
     #include "wx/motif/choice.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/choice.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index d04fa7df9a..25c9b7f806 100644
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -90,8 +90,6 @@ public:
     #include "wx/gtk/clipbrd.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/clipbrd.h"
-#elif defined(__WXQT__)
-    #include "wx/gtk/clipbrd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/clipbrd.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/colour.h b/include/wx/colour.h
index 18f5ab4809..9f43002689 100644
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/colour.h"
-#elif defined(__WXQT__)
-#include "wx/qt/colour.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 6255f13225..237f471e8f 100644
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -59,8 +59,6 @@ public:
     #include "wx/motif/combobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/combobox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/combobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/combobox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/control.h b/include/wx/control.h
index 6858103d6e..549f98d183 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -82,8 +82,6 @@ protected:
     #include "wx/motif/control.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/control.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index b226494bae..cc89879e13 100644
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/cursor.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/cursor.h"
-#elif defined(__WXQT__)
-#include "wx/qt/cursor.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/cursor.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index e1f345e2d9..490016575d 100644
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -161,8 +161,6 @@ public:
     #include "wx/motif/dataobj.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataobj.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dataobj.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dc.h b/include/wx/dc.h
index eef4e7b99c..1a7283aab7 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -750,8 +750,6 @@ private:
     #include "wx/gtk/dc.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/dc.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dc.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dc.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index c4de440cf1..63acb36e88 100644
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/dcclient.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcclient.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dcclient.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcclient.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 338b612972..0716eab54a 100644
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/dcmemory.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcmemory.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dcmemory.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcmemory.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 047c1cfb74..d0b8f133ad 100644
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/dcscreen.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcscreen.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dcscreen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcscreen.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dde.h b/include/wx/dde.h
index a77e343d16..e0da0c961f 100644
--- a/include/wx/dde.h
+++ b/include/wx/dde.h
@@ -7,8 +7,6 @@
 #include "wx/motif/dde.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dde.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dde.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dde.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 4f9855a832..923af01585 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -273,7 +273,7 @@
     #error "Target can't be both X and Windows"
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
       !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
-      !defined(__WXQT__) && !defined(__WXMGL__) && wxUSE_GUI
+      !defined(__WXMGL__) && wxUSE_GUI
     #ifdef __UNIX__
         #error "No Target! You should use wx-config program for compilation flags!"
     #else // !Unix
@@ -603,7 +603,6 @@ enum
     wxGTK_WIN32,              // GTK on Win32
     wxGTK_OS2,                // GTK on OS/2
     wxGTK_BEOS,               // GTK on BeOS
-    wxQT,                     // Qt
     wxGEOS,                   // GEOS
     wxOS2_PM,                 // OS/2 Workplace
     wxWINDOWS,                // Windows or WfW
diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index c96c015e73..5485cd6390 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -55,8 +55,6 @@ protected:
 #elif defined(__WXMGL__)
     #include "wx/mgl/dialog.h"
 // FIXME_MGL -- belongs to wxUniv
-#elif defined(__WXQT__)
-    #include "wx/qt/dialog.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dialog.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 6ac8eb2c0c..00a314639b 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -21,8 +21,6 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/dirdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dirdlg.h"
 #elif defined(__WXMAC__)
 #ifdef __DARWIN__
 #include "wx/generic/dirdlgg.h"
diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 23530a666d..20d34cd6bc 100644
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -188,8 +188,6 @@ protected:
     #include "wx/motif/dnd.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dnd.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dnd.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h
index 8a3ff7c33e..63ab20c64d 100644
--- a/include/wx/dragimag.h
+++ b/include/wx/dragimag.h
@@ -22,11 +22,6 @@
 #define wxDragImage wxGenericDragImage
 #define sm_classwxDragImage sm_classwxGenericDragImage
 
-#elif defined(__WXQT__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
-
 #elif defined(__WXMAC__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index a051d309f5..6b917aa5ae 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -20,8 +20,6 @@ enum
 #include "wx/motif/filedlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/filedlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/filedlg.h"
 #elif defined(__WXMAC__)
 #ifdef __DARWIN__
 #include "wx/generic/filedlgg.h"
diff --git a/include/wx/font.h b/include/wx/font.h
index 1aad6d9172..12ce162da7 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -163,8 +163,6 @@ private:
     #include "wx/gtk/font.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/font.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/font.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index b468392fac..801dab1943 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -86,8 +86,6 @@ protected:
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/gauge.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/gauge.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 7acc570097..a5bf86c00c 100644
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/gdiobj.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/gdiobj.h"
-#elif defined(__WXQT__)
-#include "wx/qt/gdiobj.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/gdiobj.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 2385447aab..6b21c50604 100644
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -7,8 +7,6 @@
 #include "wx/motif/glcanvas.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/glcanvas.h"
-#elif defined(__WXQT__)
-#include "wx/qt/glcanvas.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/glcanvas.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/icon.h b/include/wx/icon.h
index 609c8c42c2..1632b1a03f 100644
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -15,8 +15,6 @@
   #include "wx/gtk/icon.h"
 #elif defined(__WXMGL__)
   #include "wx/mgl/icon.h"
-#elif defined(__WXQT__)
-  #include "wx/qt/icon.h"
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 662a953a6f..afe6348038 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -133,8 +133,6 @@ protected:
     #include "wx/motif/listbox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/listbox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/listbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/listbox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 40d7abf66c..2eae537791 100644
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -7,8 +7,6 @@
 #include "wx/motif/mdi.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/mdi.h"
-#elif defined(__WXQT__)
-#include "wx/qt/mdi.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/mdi.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/menu.h b/include/wx/menu.h
index 0ffe2447a9..54d5dca36f 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -451,8 +451,6 @@ protected:
     #include "wx/motif/menu.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/menu.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/menu.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menu.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 6d1c9872cf..9a74c6e07e 100644
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -140,8 +140,6 @@ private:
     #include "wx/motif/menuitem.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/menuitem.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/menuitem.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 02e43e1f0b..58ce76e40a 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -11,8 +11,6 @@
 #include "wx/motif/msgdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/msgdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/generic/msgdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 0a05ec9120..b9633705e7 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -273,8 +273,6 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
     #include  "wx/generic/notebook.h"
 #elif defined(__WXGTK__)
     #include  "wx/gtk/notebook.h"
-#elif defined(__WXQT__)
-    #include  "wx/qt/notebook.h"
 #elif defined(__WXMAC__)
     #include  "wx/mac/notebook.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/palette.h b/include/wx/palette.h
index 84f6bd8151..a09f55dc32 100644
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -9,8 +9,6 @@
 #include "wx/generic/paletteg.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/palette.h"
-#elif defined(__WXQT__)
-#include "wx/qt/palette.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/palette.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/pen.h b/include/wx/pen.h
index 0067885a40..5cef9c390e 100644
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/pen.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/pen.h"
-#elif defined(__WXQT__)
-#include "wx/qt/pen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/pen.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 778488ca6b..7260859147 100644
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -7,8 +7,6 @@
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/prntdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/generic/prntdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/printdlg.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 33924706a4..caa8fbbe91 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -102,8 +102,6 @@ public:
     #include "wx/motif/radiobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/radiobox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/radiobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index f2ed555db5..2181ce68c4 100644
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -41,8 +41,6 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
     #include "wx/motif/radiobut.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/radiobut.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/radiobut.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobut.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/region.h b/include/wx/region.h
index f0c7d86ad1..fc75ad05eb 100644
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/region.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/region.h"
-#elif defined(__WXQT__)
-#include "wx/qt/region.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/region.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index f995c03e5a..a4b86f0103 100644
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -46,8 +46,6 @@ public:
     #include "wx/motif/scrolbar.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/scrolbar.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/scrolbar.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/settings.h b/include/wx/settings.h
index 7858b6d68f..14b487a92a 100644
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -114,8 +114,6 @@
 #include "wx/gtk/settings.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/settings.h"
-#elif defined(__WXQT__)
-#include "wx/qt/settings.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/settings.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/setup.h b/include/wx/setup.h
index a4bf2e32c5..e6bfe68c4f 100644
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -11,8 +11,8 @@
 
 /* compatibility code, to be removed asap: */
 
-#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
-#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
+#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
+#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXMSW__,__WXGTK__,__WXMOTIF__,__WXSTUBS__,__WXMAC__,__WXPM__
 #endif
 
 /*
@@ -40,13 +40,6 @@
 #elif defined(__WXMAC__)
 #include "wx/mac/setup.h"
 
-#elif defined(__WXQT__)
-#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
-#include "wx/qtd/setup.h"
-#else
-#include "wx/qt/setup.h"
-#endif
-
 #elif defined(__WXMOTIF__)
 #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 #include "wx/motifd/setup.h"
diff --git a/include/wx/slider.h b/include/wx/slider.h
index 3f09b67dd0..cc0a5b61a5 100644
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -98,8 +98,6 @@ public:
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/slider.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/slider.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/slider.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index e2c4fd53d6..52928d24d4 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -82,8 +82,6 @@ protected:
     #include "wx/motif/spinbutt.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/spinbutt.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/spinbutt.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/spinbutt.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index b029e5833a..93f26e7924 100644
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -54,8 +54,6 @@ protected:
     #include "wx/motif/statbmp.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/statbmp.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 3edf096c1e..188abffa67 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -26,8 +26,6 @@ public:
 #include "wx/motif/statbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/statbox.h"
-#elif defined(__WXQT__)
-#include "wx/qt/statbox.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/statbox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 4df4158dc0..0eb58a3397 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -22,8 +22,6 @@ public:
     #include "wx/motif/stattext.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/stattext.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/stattext.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/stattext.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 3474858a65..8a212f71f4 100644
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -6,7 +6,6 @@
 #elif defined(__WXMOTIF__)
 #include "wx/motif/taskbar.h"
 #elif defined(__WXGTK__)
-#elif defined(__WXQT__)
 #elif defined(__WXMAC__)
 #include "wx/mac/taskbar.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 1114db36a7..d0b8ad3ff7 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -273,8 +273,6 @@ private:
     #include "wx/motif/textctrl.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/textctrl.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/textctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/textctrl.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 009df2910c..e0d53e661e 100644
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -33,8 +33,6 @@ END_DECLARE_EVENT_TYPES()
 /*
 # elif defined(__WXMOTIF__)
 #  include "wx/motif/tglbtn.h"
-# elif defined(__WXQT__)
-#  include "wx/qt/tglbtn.h"
 # elif defined(__WXMAC__)
 #  include "wx/mac/tglbtn.h"
 # elif defined(__WXPM__)
diff --git a/include/wx/timer.h b/include/wx/timer.h
index ae1da9917b..c7459e9152 100644
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -111,8 +111,6 @@ protected:
     #include "wx/gtk/timer.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/timer.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/timer.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index ac9bbc5c18..e7872223aa 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -43,8 +43,6 @@
            #include "wx/motif/toolbar.h"
         #elif defined(__WXGTK__)
            #include "wx/gtk/tbargtk.h"
-        #elif defined(__WXQT__)
-           #include "wx/qt/tbarqt.h"
         #elif defined(__WXMAC__)
            #include "wx/mac/toolbar.h"
         #elif defined(__WXPM__)
diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index 017bed7de1..3f23431543 100644
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -7,8 +7,6 @@
 // #include "wx/motif/tooltip.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/tooltip.h"
-#elif defined(__WXQT__)
-#include "wx/qt/tooltip.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/tooltip.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 4c720bb17f..8b5b215034 100644
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -19,8 +19,6 @@
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/treectlg.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/treectrl.h"
 #elif defined(__WXMAC__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/wave.h b/include/wx/wave.h
index 8a31835ed4..e9aaa5a888 100644
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -5,8 +5,6 @@
 #include "wx/msw/wave.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/wave.h"
-#elif defined(__WXQT__)
-#include "wx/qt/wave.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/wave.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/window.h b/include/wx/window.h
index 6e3e82e943..2e940e1ddd 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1019,8 +1019,6 @@ private:
         #define sm_classwxWindowMGL sm_classwxWindow
     #endif // wxUniv
     #include "wx/mgl/window.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/window.h"
 #elif defined(__WXMAC__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowMac
diff --git a/wxGTK.spec b/wxGTK.spec
index bbf85644ad..3da722f282 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -16,7 +16,7 @@ BuildRoot: /var/tmp/%{name}-root
 
 # all packages providing an implementation of wxWindows library (regardless of
 # the toolkit used) should provide the (virtual) wxwin package, this makes it
-# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxqt..."
+# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
 Provides: wxwin
 
 # in addition, we should provide libwx_gtk as automatic generator only notices
diff --git a/wxMotif.spec b/wxMotif.spec
index eac2686ead..82b111a7aa 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -19,7 +19,7 @@ BuildRoot: /tmp/wxmotif_root
 
 # all packages providing an implementation of wxWindows library (regardless of
 # the toolkit used) should provide the (virtual) wxwin package, this makes it
-# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxqt..."
+# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
 Provides: wxwin
 
 %description