diff --git a/qtinterface/tqapplication.h b/qtinterface/tqapplication.h
index 6d03b76..5a3b53f 100644
--- a/qtinterface/tqapplication.h
+++ b/qtinterface/tqapplication.h
@@ -23,6 +23,7 @@ Boston, MA 02110-1301, USA.
 #define TQAPPLICATION_H
 
 #include <tqt.h>
+#include <tqasciidict.h>
 
 #ifdef USE_QT3
 
@@ -50,6 +51,7 @@ class QApplication : public IQApplication {
 // Essentially, the compiler needs to know that these Q functions exist so that the above I functions
 // are not attempted to link.  Instead, these empty declarations allow the linker to pull in the complete Q function
 // from the Qt toolkit in use.  Convoluted, yes, but it should make maintinance MUCH easier as the Qt API changes.
+public:
     enum Type { Tty, GuiClient, GuiServer };
 
 #ifdef Q_WS_S60
diff --git a/qtinterface/tqasciidict.h b/qtinterface/tqasciidict.h
index 2b03388..8a6a877 100644
--- a/qtinterface/tqasciidict.h
+++ b/qtinterface/tqasciidict.h
@@ -40,7 +40,11 @@ Boston, MA 02110-1301, USA.
 
 #include <Qt/q3asciidict.h>
 
-#define AsciiDict Q3AsciiDict
+#define QAsciiDict Q3AsciiDict
+#define QAsciiDictIterator Q3AsciiDictIterator
+
+// template<class type>
+// class QAsciiDict : public Q3AsciiDict<type> {};
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqcstring.h b/qtinterface/tqcstring.h
index 2c2001a..455c1cf 100644
--- a/qtinterface/tqcstring.h
+++ b/qtinterface/tqcstring.h
@@ -37,6 +37,11 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT4
 
+// Reimplement the QByteArray class
+// For Qt4, some changes are needed
+
+#include <Qt/qbytearray.h>
+
 // Reimplement the QCString class
 // For Qt4, some changes are needed
 
diff --git a/qtinterface/tqdatastream.h b/qtinterface/tqdatastream.h
index 0d35258..5f52abf 100644
--- a/qtinterface/tqdatastream.h
+++ b/qtinterface/tqdatastream.h
@@ -37,7 +37,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QDataStream class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
 #include <Qt/qdatastream.h>
 
diff --git a/qtinterface/tqdict.h b/qtinterface/tqdict.h
index d4e5c6c..ee146d4 100644
--- a/qtinterface/tqdict.h
+++ b/qtinterface/tqdict.h
@@ -40,6 +40,8 @@ Boston, MA 02110-1301, USA.
 
 #include <Qt/q3dict.h>
 
+#define QDict Q3Dict
+
 #endif // USE_QT4
 
 #endif /* TQDICT_H */
\ No newline at end of file
diff --git a/qtinterface/tqglobal.h b/qtinterface/tqglobal.h
index 5db81a3..1e336ac 100644
--- a/qtinterface/tqglobal.h
+++ b/qtinterface/tqglobal.h
@@ -36,7 +36,7 @@ Boston, MA 02110-1301, USA.
 
 // Pull in all Qt4 global defines
 
-#include <qglobal.h>
+#include <Qt/qglobal.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgrid.h b/qtinterface/tqgrid.h
index 1130bf4..cbc2010 100644
--- a/qtinterface/tqgrid.h
+++ b/qtinterface/tqgrid.h
@@ -27,7 +27,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT3
 
 // Reimplement the QGrid class
-// For Qt3, no changes are needed
+// For Qt3, some changes are needed
 
 #include <qgrid.h>
 
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QGrid class
 // For Qt4, no changes are needed
 
-#include <qgrid.h>
+#include <Qt/q3grid.h>
+
+#define QGrid Q3Grid
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgridview.h b/qtinterface/tqgridview.h
index fe3a9fe..774b69d 100644
--- a/qtinterface/tqgridview.h
+++ b/qtinterface/tqgridview.h
@@ -27,7 +27,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT3
 
 // Reimplement the QGridView class
-// For Qt3, no changes are needed
+// For Qt3, some changes are needed
 
 #include <qgridview.h>
 
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QGridView class
 // For Qt4, no changes are needed
 
-#include <qgridview.h>
+#include <Qt/q3gridview.h>
+
+#define QGridView Q3GridView
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgroupbox.h b/qtinterface/tqgroupbox.h
index a7a6008..d70d5f3 100644
--- a/qtinterface/tqgroupbox.h
+++ b/qtinterface/tqgroupbox.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGroupBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qgroupbox.h>
+#include <Qt/qgroupbox.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgvector.h b/qtinterface/tqgvector.h
index 911b5c7..20e11fe 100644
--- a/qtinterface/tqgvector.h
+++ b/qtinterface/tqgvector.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGVector class
-// For Qt4, no changes are needed
-
-#include <qgvector.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqhbox.h b/qtinterface/tqhbox.h
index 36c7ab5..132771e 100644
--- a/qtinterface/tqhbox.h
+++ b/qtinterface/tqhbox.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QHBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qhbox.h>
+#include <Qt/q3hbox.h>
+
+#define QHBox Q3HBox
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqhbuttongroup.h b/qtinterface/tqhbuttongroup.h
index caff8dd..1e7e6e0 100644
--- a/qtinterface/tqhbuttongroup.h
+++ b/qtinterface/tqhbuttongroup.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QHButtonGroup class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qhbuttongroup.h>
+#include <Qt/q3buttongroup.h>
+
+#define QHButtonGroup Q3HButtonGroup
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqheader.h b/qtinterface/tqheader.h
index d396b43..7b0146b 100644
--- a/qtinterface/tqheader.h
+++ b/qtinterface/tqheader.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QHeader class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qheader.h>
+#include <Qt/q3header.h>
+
+#define QHeader Q3Header
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqhgroupbox.h b/qtinterface/tqhgroupbox.h
index d9ba16a..8158aad 100644
--- a/qtinterface/tqhgroupbox.h
+++ b/qtinterface/tqhgroupbox.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QHGroupBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qhgroupbox.h>
+#include <Qt/q3hgroupbox.h>
+
+#define QHGroupBox Q3HGroupBox
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqhostaddress.h b/qtinterface/tqhostaddress.h
index 685abee..59073c6 100644
--- a/qtinterface/tqhostaddress.h
+++ b/qtinterface/tqhostaddress.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QHostAddress class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qhostaddress.h>
+#include <Qt/qhostaddress.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqhttp.h b/qtinterface/tqhttp.h
index 1f90dc7..ffda32f 100644
--- a/qtinterface/tqhttp.h
+++ b/qtinterface/tqhttp.h
@@ -36,9 +36,14 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QHttp class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qhttp.h>
+#include <Qt/q3http.h>
+
+#define QHttp Q3Http
+#define QHttpHeader Q3HttpHeader
+#define QHttpRequestHeader Q3HttpRequestHeader
+#define QHttpResponseHeader Q3HttpResponseHeader
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqiconview.h b/qtinterface/tqiconview.h
index 17a6de8..ac10e8c 100644
--- a/qtinterface/tqiconview.h
+++ b/qtinterface/tqiconview.h
@@ -36,9 +36,14 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QIconView class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qiconview.h>
+#include <Qt/q3iconview.h>
+
+#define QIconView Q3IconView
+#define QIconViewItem Q3IconViewItem
+#define QIconDrag Q3IconDrag
+#define QIconDragItem Q3IconDragItem
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqimage.h b/qtinterface/tqimage.h
index 13d8fe4..f20d7ce 100644
--- a/qtinterface/tqimage.h
+++ b/qtinterface/tqimage.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QImage class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qimage.h>
+#include <Qt/qimage.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqimageformatplugin.h b/qtinterface/tqimageformatplugin.h
index 7745c26..2b25221 100644
--- a/qtinterface/tqimageformatplugin.h
+++ b/qtinterface/tqimageformatplugin.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QImageFormatPlugin class
-// For Qt4, no changes are needed
-
-#include <qimageformatplugin.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqinputcontext.h b/qtinterface/tqinputcontext.h
index 2e508e0..a73636f 100644
--- a/qtinterface/tqinputcontext.h
+++ b/qtinterface/tqinputcontext.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QInputContext class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qinputcontext.h>
+#include <Qt/qinputcontext.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqinputcontextfactory.h b/qtinterface/tqinputcontextfactory.h
index 98e7f9a..85aae01 100644
--- a/qtinterface/tqinputcontextfactory.h
+++ b/qtinterface/tqinputcontextfactory.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QInputContextFactory class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qinputcontextfactory.h>
+#include <Qt/qinputcontextfactory.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqinputdialog.h b/qtinterface/tqinputdialog.h
index 3572c6c..f0edbc2 100644
--- a/qtinterface/tqinputdialog.h
+++ b/qtinterface/tqinputdialog.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QInputDialog class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qinputdialog.h>
+#include <Qt/qinputdialog.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqintcache.h b/qtinterface/tqintcache.h
index 2b663db..d2615ee 100644
--- a/qtinterface/tqintcache.h
+++ b/qtinterface/tqintcache.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QIntCache class
 // For Qt4, no changes are needed
 
-#include <qintcache.h>
+#include <Qt/q3intcache.h>
+
+#define QIntCache Q3IntCache
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqintdict.h b/qtinterface/tqintdict.h
index d625d63..ee70748 100644
--- a/qtinterface/tqintdict.h
+++ b/qtinterface/tqintdict.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QIntDict class
 // For Qt4, no changes are needed
 
-#include <qintdict.h>
+#include <Qt/q3intdict.h>
+
+#define QIntDict Q3IntDict
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqinterlacestyle.h b/qtinterface/tqinterlacestyle.h
index b381077..90540e3 100644
--- a/qtinterface/tqinterlacestyle.h
+++ b/qtinterface/tqinterlacestyle.h
@@ -40,7 +40,7 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QInterlaceStyle class
 // For Qt4, no changes are needed
 
-#include <qinterlacestyle.h>
+#include <Qt/qinterlacestyle.h>
 
 #error "Not ported to new API as of Qt4!"
 
diff --git a/qtinterface/tqjiscodec.h b/qtinterface/tqjiscodec.h
index 256f880..0d187e7 100644
--- a/qtinterface/tqjiscodec.h
+++ b/qtinterface/tqjiscodec.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QJisCodec class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qjiscodec.h>
+#include <Qt/qjiscodec.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqjpunicode.h b/qtinterface/tqjpunicode.h
index 1b70a99..63a7363 100644
--- a/qtinterface/tqjpunicode.h
+++ b/qtinterface/tqjpunicode.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QJpUnicodeConv class
-// For Qt4, no changes are needed
-
-#include <qjpunicode.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqkeysequence.h b/qtinterface/tqkeysequence.h
index 8fbf4c6..29f2496 100644
--- a/qtinterface/tqkeysequence.h
+++ b/qtinterface/tqkeysequence.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QKeySequence class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qkeysequence.h>
+#include <Qt/qkeysequence.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlabel.h b/qtinterface/tqlabel.h
index 275f9ae..1eca0c8 100644
--- a/qtinterface/tqlabel.h
+++ b/qtinterface/tqlabel.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QLabel class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qlabel.h>
+#include <Qt/qlabel.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlayout.h b/qtinterface/tqlayout.h
index b45b165..53c4392 100644
--- a/qtinterface/tqlayout.h
+++ b/qtinterface/tqlayout.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QLayout class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qlayout.h>
+#include <Qt/qlayout.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlcdnumber.h b/qtinterface/tqlcdnumber.h
index 24be6e2..d965df9 100644
--- a/qtinterface/tqlcdnumber.h
+++ b/qtinterface/tqlcdnumber.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QLCDNumber class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qlcdnumber.h>
+#include <Qt/qlcdnumber.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlibrary.h b/qtinterface/tqlibrary.h
index 1388a47..db8b5e4 100644
--- a/qtinterface/tqlibrary.h
+++ b/qtinterface/tqlibrary.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QLibrary class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qlibrary.h>
+#include <Qt/qlibrary.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlineedit.h b/qtinterface/tqlineedit.h
index 3879f33..47ccd9f 100644
--- a/qtinterface/tqlineedit.h
+++ b/qtinterface/tqlineedit.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QLineEdit class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qlineedit.h>
+#include <Qt/qlineedit.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlistbox.h b/qtinterface/tqlistbox.h
index 2d3d9ca..29d7045 100644
--- a/qtinterface/tqlistbox.h
+++ b/qtinterface/tqlistbox.h
@@ -36,9 +36,14 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QListBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qlistbox.h>
+#include <Qt/q3listbox.h>
+
+#define QListBox Q3ListBox
+#define QListBoxItem Q3ListBoxItem
+#define QListBoxText Q3ListBoxText
+#define QListBoxPixmap Q3ListBoxPixmap
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlistview.h b/qtinterface/tqlistview.h
index eca43fa..fbdb295 100644
--- a/qtinterface/tqlistview.h
+++ b/qtinterface/tqlistview.h
@@ -38,7 +38,12 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QListView class
 // For Qt4, no changes are needed
 
-#include <qlistview.h>
+#include <Qt/q3listview.h>
+
+#define QListView Q3ListView
+#define QListViewItem Q3ListViewItem
+#define QCheckListItem Q3CheckListItem
+#define QListViewItemIterator Q3ListViewItemIterator
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlocale.h b/qtinterface/tqlocale.h
index d06cea3..4ed038a 100644
--- a/qtinterface/tqlocale.h
+++ b/qtinterface/tqlocale.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QLocale class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qlocale.h>
+#include <Qt/qlocale.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqlocalfs.h b/qtinterface/tqlocalfs.h
index 5206463..63a2092 100644
--- a/qtinterface/tqlocalfs.h
+++ b/qtinterface/tqlocalfs.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QLocalFs class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qlocalfs.h>
+#include <Qt/q3localfs.h>
+
+#define QLocalFs Q3LocalFs
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmainwindow.h b/qtinterface/tqmainwindow.h
index 5970505..b04f35a 100644
--- a/qtinterface/tqmainwindow.h
+++ b/qtinterface/tqmainwindow.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMainWindow class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmainwindow.h>
+#include <Qt/q3mainwindow.h>
+
+#define QMainWindow Q3MainWindow
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmap.h b/qtinterface/tqmap.h
index 7893016..5a445df 100644
--- a/qtinterface/tqmap.h
+++ b/qtinterface/tqmap.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMap class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmap.h>
+#include <Qt/qmap.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmenubar.h b/qtinterface/tqmenubar.h
index 7eae17f..64fd780 100644
--- a/qtinterface/tqmenubar.h
+++ b/qtinterface/tqmenubar.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMenuBar class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmenubar.h>
+#include <Qt/qmenubar.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmenudata.h b/qtinterface/tqmenudata.h
index 07e172f..86bfd64 100644
--- a/qtinterface/tqmenudata.h
+++ b/qtinterface/tqmenudata.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMenuData class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmenudata.h>
+#include <Qt/qmenudata.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmessagebox.h b/qtinterface/tqmessagebox.h
index 968eee5..49bb050 100644
--- a/qtinterface/tqmessagebox.h
+++ b/qtinterface/tqmessagebox.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMessageBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmessagebox.h>
+#include <Qt/qmessagebox.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmetaobject.h b/qtinterface/tqmetaobject.h
index ee77ff8..5ddb65f 100644
--- a/qtinterface/tqmetaobject.h
+++ b/qtinterface/tqmetaobject.h
@@ -38,9 +38,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMetaObject class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmetaobject.h>
+#include <Qt/qmetaobject.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmime.h b/qtinterface/tqmime.h
index 4a80351..e5409cb 100644
--- a/qtinterface/tqmime.h
+++ b/qtinterface/tqmime.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMime class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmime.h>
+#include <Qt/qmime.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmotifplusstyle.h b/qtinterface/tqmotifplusstyle.h
index 46538c3..4de6aed 100644
--- a/qtinterface/tqmotifplusstyle.h
+++ b/qtinterface/tqmotifplusstyle.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMotifPlusStyle class
-// For Qt4, no changes are needed
-
-#include <qmotifplusstyle.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmotifstyle.h b/qtinterface/tqmotifstyle.h
index 3161066..6f908fa 100644
--- a/qtinterface/tqmotifstyle.h
+++ b/qtinterface/tqmotifstyle.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMotifStyle class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmotifstyle.h>
+#include <Qt/qmotifstyle.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmovie.h b/qtinterface/tqmovie.h
index 9211eab..a5f22b2 100644
--- a/qtinterface/tqmovie.h
+++ b/qtinterface/tqmovie.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMovie class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmovie.h>
+#include <Qt/qmovie.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmultilineedit.h b/qtinterface/tqmultilineedit.h
index e5190f1..4815678 100644
--- a/qtinterface/tqmultilineedit.h
+++ b/qtinterface/tqmultilineedit.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QMultiLineEdit class
 // For Qt4, no changes are needed
 
-#include <qmultilineedit.h>
+#include <Qt/q3multilineedit.h>
+
+#define QMultiLineEdit Q3MultiLineEdit
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqmutex.h b/qtinterface/tqmutex.h
index 9f67c2e..07f927f 100644
--- a/qtinterface/tqmutex.h
+++ b/qtinterface/tqmutex.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QMutex class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qmutex.h>
+#include <Qt/qmutex.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqnamespace.h b/qtinterface/tqnamespace.h
index 423887a..4ffe2d7 100644
--- a/qtinterface/tqnamespace.h
+++ b/qtinterface/tqnamespace.h
@@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT3
 
-// Reimplement the QAccel class
+// Reimplement the QNamespace class
 // For Qt3, no changes are needed
 
 #include <qnamespace.h>
@@ -35,10 +35,10 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT4
 
-// Reimplement the QAccel class
-// For Qt4, no changes are needed
+// Reimplement the QNamespace class
+// For Qt4, some changes are needed
 
-#include <qnamespace.h>
+#include <Qt/qnamespace.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqnetworkprotocol.h b/qtinterface/tqnetworkprotocol.h
index f4abed0..4bfecc5 100644
--- a/qtinterface/tqnetworkprotocol.h
+++ b/qtinterface/tqnetworkprotocol.h
@@ -38,7 +38,12 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QNetworkProtocol class
 // For Qt4, no changes are needed
 
-#include <qnetworkprotocol.h>
+#include <Qt/q3networkprotocol.h>
+
+#define QNetworkProtocol Q3NetworkProtocol
+#define QNetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase
+#define QNetworkProtocolFactory Q3NetworkProtocolFactory
+#define QNetworkOperation Q3NetworkOperation
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqnp.h b/qtinterface/tqnp.h
index 1f72e97..0a1eff0 100644
--- a/qtinterface/tqnp.h
+++ b/qtinterface/tqnp.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QNPWidget class
-// For Qt4, no changes are needed
-
-#include <qnp.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqobjectcleanuphandler.h b/qtinterface/tqobjectcleanuphandler.h
index 3229a7f..ddfa5be 100644
--- a/qtinterface/tqobjectcleanuphandler.h
+++ b/qtinterface/tqobjectcleanuphandler.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QObjectCleanupHandler class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qobjectcleanuphandler.h>
+#include <Qt/qobjectcleanuphandler.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqobjectdict.h b/qtinterface/tqobjectdict.h
index 34b3620..37431f2 100644
--- a/qtinterface/tqobjectdict.h
+++ b/qtinterface/tqobjectdict.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QObjectDictionary class
-// For Qt4, no changes are needed
-
-#include <qobjectdict.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqobjectlist.h b/qtinterface/tqobjectlist.h
index ac0be7e..1286100 100644
--- a/qtinterface/tqobjectlist.h
+++ b/qtinterface/tqobjectlist.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QObjectList class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qobjectlist.h>
+#include <Qt/qobject.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpaintdevice.h b/qtinterface/tqpaintdevice.h
index 7c30751..9c3adb3 100644
--- a/qtinterface/tqpaintdevice.h
+++ b/qtinterface/tqpaintdevice.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPaintDevice class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpaintdevice.h>
+#include <Qt/qpaintdevice.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpaintdevicemetrics.h b/qtinterface/tqpaintdevicemetrics.h
index 6a92a85..ac51f42 100644
--- a/qtinterface/tqpaintdevicemetrics.h
+++ b/qtinterface/tqpaintdevicemetrics.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QPaintDeviceMetrics class
 // For Qt4, no changes are needed
 
-#include <qpaintdevicemetrics.h>
+#include <Qt/q3paintdevicemetrics.h>
+
+#define QPaintDeviceMetrics Q3PaintDeviceMetrics
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpainter.h b/qtinterface/tqpainter.h
index 56db57f..57dad86 100644
--- a/qtinterface/tqpainter.h
+++ b/qtinterface/tqpainter.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QPainter class
 // For Qt4, no changes are needed
 
-#include <qpainter.h>
+#include <Qt/q3painter.h>
+
+#define QPainter Q3Painter
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpair.h b/qtinterface/tqpair.h
index 3efa894..883fa3f 100644
--- a/qtinterface/tqpair.h
+++ b/qtinterface/tqpair.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPair class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpair.h>
+#include <Qt/qpair.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpalette.h b/qtinterface/tqpalette.h
index 7713bc4..9f6d34c 100644
--- a/qtinterface/tqpalette.h
+++ b/qtinterface/tqpalette.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPalette class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpalette.h>
+#include <Qt/qpalette.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpen.h b/qtinterface/tqpen.h
index 2dc62ec..d9929b5 100644
--- a/qtinterface/tqpen.h
+++ b/qtinterface/tqpen.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPen class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpen.h>
+#include <Qt/qpen.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpicture.h b/qtinterface/tqpicture.h
index 7159211..560f5a0 100644
--- a/qtinterface/tqpicture.h
+++ b/qtinterface/tqpicture.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPicture class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpicture.h>
+#include <Qt/q3picture.h>
+
+#define QPicture Q3Picture
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpixmap.h b/qtinterface/tqpixmap.h
index a5e8fbb..2fac3e2 100644
--- a/qtinterface/tqpixmap.h
+++ b/qtinterface/tqpixmap.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPixmap class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpixmap.h>
+#include <Qt/qpixmap.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpixmapcache.h b/qtinterface/tqpixmapcache.h
index 3174095..c39670f 100644
--- a/qtinterface/tqpixmapcache.h
+++ b/qtinterface/tqpixmapcache.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPixmapCache class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpixmapcache.h>
+#include <Qt/qpixmapcache.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqplatinumstyle.h b/qtinterface/tqplatinumstyle.h
index ee56252..6a065c1 100644
--- a/qtinterface/tqplatinumstyle.h
+++ b/qtinterface/tqplatinumstyle.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPlatinumStyle class
-// For Qt4, no changes are needed
-
-#include <qplatinumstyle.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpngio.h b/qtinterface/tqpngio.h
index a3e77f2..18a4d8f 100644
--- a/qtinterface/tqpngio.h
+++ b/qtinterface/tqpngio.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPNGImage class
-// For Qt4, no changes are needed
-
-#include <qpngio.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpoint.h b/qtinterface/tqpoint.h
index d1b895d..09e720e 100644
--- a/qtinterface/tqpoint.h
+++ b/qtinterface/tqpoint.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPoint class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpoint.h>
+#include <Qt/qpoint.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpointarray.h b/qtinterface/tqpointarray.h
index b4560bf..3477a67 100644
--- a/qtinterface/tqpointarray.h
+++ b/qtinterface/tqpointarray.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QAccel class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpointarray.h>
+#include <Qt/q3pointarray.h>
+
+#define QPointArray Q3PointArray
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpolygonscanner.h b/qtinterface/tqpolygonscanner.h
index 757520d..4a5499f 100644
--- a/qtinterface/tqpolygonscanner.h
+++ b/qtinterface/tqpolygonscanner.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPolygonScanner class
-// For Qt4, no changes are needed
-
-#include <qpolygonscanner.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpopupmenu.h b/qtinterface/tqpopupmenu.h
index 4d0fd9a..1862306 100644
--- a/qtinterface/tqpopupmenu.h
+++ b/qtinterface/tqpopupmenu.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPopupMenu class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpopupmenu.h>
+#include <Qt/q3popupmenu.h>
+
+#define QPopupMenu Q3PopupMenu
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqprintdialog.h b/qtinterface/tqprintdialog.h
index 6847f28..777c4a4 100644
--- a/qtinterface/tqprintdialog.h
+++ b/qtinterface/tqprintdialog.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPrintDialog class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qprintdialog.h>
+#include <Qt/qprintdialog.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqprinter.h b/qtinterface/tqprinter.h
index 00d7a51..ed5abfd 100644
--- a/qtinterface/tqprinter.h
+++ b/qtinterface/tqprinter.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPrinter class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qprinter.h>
+#include <Qt/qprinter.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqprocess.h b/qtinterface/tqprocess.h
index 283663b..3fdd0e7 100644
--- a/qtinterface/tqprocess.h
+++ b/qtinterface/tqprocess.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QProcess class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qprocess.h>
+#include <Qt/qprocess.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqprogressbar.h b/qtinterface/tqprogressbar.h
index e5ece58..5012072 100644
--- a/qtinterface/tqprogressbar.h
+++ b/qtinterface/tqprogressbar.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QProgressBar class
 // For Qt4, no changes are needed
 
-#include <qprogressbar.h>
+#include <Qt/qprogressbar.h>
+
+#define QProgressBar Q3ProgressBar
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqprogressdialog.h b/qtinterface/tqprogressdialog.h
index e87347b..53f8513 100644
--- a/qtinterface/tqprogressdialog.h
+++ b/qtinterface/tqprogressdialog.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QProgressDialog class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qprogressdialog.h>
+#include <Qt/q3progressdialog.h>
+
+#define QProgressDialog Q3ProgressDialog
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqptrcollection.h b/qtinterface/tqptrcollection.h
index 41e5559..675015a 100644
--- a/qtinterface/tqptrcollection.h
+++ b/qtinterface/tqptrcollection.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QPtrCollection class
 // For Qt4, no changes are needed
 
-#include <qptrcollection.h>
+#include <Qt/q3ptrcollection.h>
+
+#define QPtrCollection Q3PtrCollection
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqptrdict.h b/qtinterface/tqptrdict.h
index 3221c11..187e889 100644
--- a/qtinterface/tqptrdict.h
+++ b/qtinterface/tqptrdict.h
@@ -38,7 +38,10 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QPtrDict class
 // For Qt4, no changes are needed
 
-#include <qptrdict.h>
+#include <Qt/q3ptrdict.h>
+
+#define QPtrDict Q3PtrDict
+#define QPtrDictIterator Q3PtrDictIterator
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqptrlist.h b/qtinterface/tqptrlist.h
index 8c7a96c..9b05dfd 100644
--- a/qtinterface/tqptrlist.h
+++ b/qtinterface/tqptrlist.h
@@ -36,9 +36,13 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPtrList class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qptrlist.h>
+#include <Qt/q3ptrlist.h>
+
+#define QPtrList Q3PtrList
+#define QPtrListIterator Q3PtrListIterator
+#define QPtrListStdIterator Q3PtrListStdIterator
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqptrqueue.h b/qtinterface/tqptrqueue.h
index 18fbd16..c935339 100644
--- a/qtinterface/tqptrqueue.h
+++ b/qtinterface/tqptrqueue.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPtrQueue class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qptrqueue.h>
+#include <Qt/q3ptrqueue.h>
+
+#define QPtrQueue Q3PtrQueue
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqptrstack.h b/qtinterface/tqptrstack.h
index 1778459..a884ac8 100644
--- a/qtinterface/tqptrstack.h
+++ b/qtinterface/tqptrstack.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPtrStack class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qptrstack.h>
+#include <Qt/q3ptrstack.h>
+
+#define QPtrStack Q3PtrStack
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqptrvector.h b/qtinterface/tqptrvector.h
index d3429f3..9fab17a 100644
--- a/qtinterface/tqptrvector.h
+++ b/qtinterface/tqptrvector.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPtrVector class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qptrvector.h>
+#include <Qt/q3ptrvector.h>
+
+#define QPtrVector Q3PtrVector
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqpushbutton.h b/qtinterface/tqpushbutton.h
index d9d997a..203ccf2 100644
--- a/qtinterface/tqpushbutton.h
+++ b/qtinterface/tqpushbutton.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QPushButton class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qpushbutton.h>
+#include <Qt/qpushbutton.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqradiobutton.h b/qtinterface/tqradiobutton.h
index 69f3e85..d7754f6 100644
--- a/qtinterface/tqradiobutton.h
+++ b/qtinterface/tqradiobutton.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QRadioButton class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qradiobutton.h>
+#include <Qt/qradiobutton.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqrangecontrol.h b/qtinterface/tqrangecontrol.h
index 7d20e6d..c887a4d 100644
--- a/qtinterface/tqrangecontrol.h
+++ b/qtinterface/tqrangecontrol.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QRangeControl class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qrangecontrol.h>
+#include <Qt/q3rangecontrol.h>
+
+#define QRangeControl Q3RangeControl
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqrect.h b/qtinterface/tqrect.h
index 0163593..5160c57 100644
--- a/qtinterface/tqrect.h
+++ b/qtinterface/tqrect.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QRect class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qrect.h>
+#include <Qt/qrect.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqregexp.h b/qtinterface/tqregexp.h
index d98acb7..7798253 100644
--- a/qtinterface/tqregexp.h
+++ b/qtinterface/tqregexp.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QRegExp class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qregexp.h>
+#include <Qt/qregexp.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqregion.h b/qtinterface/tqregion.h
index b39449a..8abec90 100644
--- a/qtinterface/tqregion.h
+++ b/qtinterface/tqregion.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QRegion class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qregion.h>
+#include <Qt/qregion.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqrtlcodec.h b/qtinterface/tqrtlcodec.h
index 79fa115..c769792 100644
--- a/qtinterface/tqrtlcodec.h
+++ b/qtinterface/tqrtlcodec.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QHebrewCodec class
-// For Qt4, no changes are needed
-
-#include <qrtlcodec.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqscrollbar.h b/qtinterface/tqscrollbar.h
index ec8c937..e3e0760 100644
--- a/qtinterface/tqscrollbar.h
+++ b/qtinterface/tqscrollbar.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QScrollBar class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qscrollbar.h>
+#include <Qt/qscrollbar.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqscrollview.h b/qtinterface/tqscrollview.h
index b2a3bf2..d7a81c1 100644
--- a/qtinterface/tqscrollview.h
+++ b/qtinterface/tqscrollview.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QScrollView class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qscrollview.h>
+#include <Qt/q3scrollview.h>
+
+#define QScrollView Q3ScrollView
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsemaphore.h b/qtinterface/tqsemaphore.h
index d297d92..70c63ad 100644
--- a/qtinterface/tqsemaphore.h
+++ b/qtinterface/tqsemaphore.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSemaphore class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsemaphore.h>
+#include <Qt/qsemaphore.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsemimodal.h b/qtinterface/tqsemimodal.h
index d08a7d4..2f2ddb1 100644
--- a/qtinterface/tqsemimodal.h
+++ b/qtinterface/tqsemimodal.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSemiModal class
-// For Qt4, no changes are needed
-
-#include <qsemimodal.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqserversocket.h b/qtinterface/tqserversocket.h
index 8bc63df..e3cd078 100644
--- a/qtinterface/tqserversocket.h
+++ b/qtinterface/tqserversocket.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QServerSocket class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qserversocket.h>
+#include <Qt/q3serversocket.h>
+
+#define QServerSocket Q3ServerSocket
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsessionmanager.h b/qtinterface/tqsessionmanager.h
index 3faea08..cd7d9a4 100644
--- a/qtinterface/tqsessionmanager.h
+++ b/qtinterface/tqsessionmanager.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSessionManager class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsessionmanager.h>
+#include <Qt/qsessionmanager.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsettings.h b/qtinterface/tqsettings.h
index 65f9686..7fd0181 100644
--- a/qtinterface/tqsettings.h
+++ b/qtinterface/tqsettings.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSettings class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsettings.h>
+#include <Qt/qsettings.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsgistyle.h b/qtinterface/tqsgistyle.h
index e768301..06eae67 100644
--- a/qtinterface/tqsgistyle.h
+++ b/qtinterface/tqsgistyle.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSGIStyle class
-// For Qt4, no changes are needed
-
-#include <qsgistyle.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsignal.h b/qtinterface/tqsignal.h
index 2d0ae34..85e899a 100644
--- a/qtinterface/tqsignal.h
+++ b/qtinterface/tqsignal.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSignal class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsignal.h>
+#include <Qt/q3signal.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsignalmapper.h b/qtinterface/tqsignalmapper.h
index 2244a24..207bd1b 100644
--- a/qtinterface/tqsignalmapper.h
+++ b/qtinterface/tqsignalmapper.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSignalMapper class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsignalmapper.h>
+#include <Qt/qsignalmapper.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsignalslotimp.h b/qtinterface/tqsignalslotimp.h
index 9d10888..b1db14a 100644
--- a/qtinterface/tqsignalslotimp.h
+++ b/qtinterface/tqsignalslotimp.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSignalSlotImp class
-// For Qt4, no changes are needed
-
-#include <qsignalslotimp.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsimplerichtext.h b/qtinterface/tqsimplerichtext.h
index aa23d65..5f940d6 100644
--- a/qtinterface/tqsimplerichtext.h
+++ b/qtinterface/tqsimplerichtext.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSimpleRichText class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsimplerichtext.h>
+#include <Qt/q3simplerichtext.h>
+
+#define QSimpleRichText Q3SimpleRichText
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsize.h b/qtinterface/tqsize.h
index 4ed2fe1..e0fe0f3 100644
--- a/qtinterface/tqsize.h
+++ b/qtinterface/tqsize.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSize class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsize.h>
+#include <Qt/qsize.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsizegrip.h b/qtinterface/tqsizegrip.h
index ddc9474..2e22649 100644
--- a/qtinterface/tqsizegrip.h
+++ b/qtinterface/tqsizegrip.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSizeGrip class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsizegrip.h>
+#include <Qt/qsizegrip.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsizepolicy.h b/qtinterface/tqsizepolicy.h
index 0bcf095..1f04758 100644
--- a/qtinterface/tqsizepolicy.h
+++ b/qtinterface/tqsizepolicy.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSizePolicy class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsizepolicy.h>
+#include <Qt/qsizepolicy.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsjiscodec.h b/qtinterface/tqsjiscodec.h
index 8166875..51561e8 100644
--- a/qtinterface/tqsjiscodec.h
+++ b/qtinterface/tqsjiscodec.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSjisCodec class
-// For Qt4, no changes are needed
-
-#include <qsjiscodec.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqslider.h b/qtinterface/tqslider.h
index b26adf0..7be4965 100644
--- a/qtinterface/tqslider.h
+++ b/qtinterface/tqslider.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSlider class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qslider.h>
+#include <Qt/qslider.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsocket.h b/qtinterface/tqsocket.h
index 44eeac0..a7c8f51 100644
--- a/qtinterface/tqsocket.h
+++ b/qtinterface/tqsocket.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSocket class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsocket.h>
+#include <Qt/q3socket.h>
+
+#define QSocket Q3Socket
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsocketdevice.h b/qtinterface/tqsocketdevice.h
index 90df1c0..08315e7 100644
--- a/qtinterface/tqsocketdevice.h
+++ b/qtinterface/tqsocketdevice.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSocketDevice class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsocketdevice.h>
+#include <Qt/q3socketdevice.h>
+
+#define QSocketDevice Q3SocketDevice
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsortedlist.h b/qtinterface/tqsortedlist.h
index bb4574b..db8eb22 100644
--- a/qtinterface/tqsortedlist.h
+++ b/qtinterface/tqsortedlist.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QAccel class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsortedlist.h>
+#include <Qt/q3sortedlist.h>
+
+#define QSortedList Q3SortedList
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsound.h b/qtinterface/tqsound.h
index 25665d3..ca42cbb 100644
--- a/qtinterface/tqsound.h
+++ b/qtinterface/tqsound.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSound class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsound.h>
+#include <Qt/qsound.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqspinbox.h b/qtinterface/tqspinbox.h
index 0844f8f..faf7321 100644
--- a/qtinterface/tqspinbox.h
+++ b/qtinterface/tqspinbox.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSpinBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qspinbox.h>
+#include <Qt/qspinbox.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsplashscreen.h b/qtinterface/tqsplashscreen.h
index 6d40496..b488d08 100644
--- a/qtinterface/tqsplashscreen.h
+++ b/qtinterface/tqsplashscreen.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSplashScreen class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsplashscreen.h>
+#include <Qt/qsplashscreen.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsplitter.h b/qtinterface/tqsplitter.h
index 6ee1857..922d1bc 100644
--- a/qtinterface/tqsplitter.h
+++ b/qtinterface/tqsplitter.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSplitter class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsplitter.h>
+#include <Qt/qsplitter.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlcursor.h b/qtinterface/tqsqlcursor.h
index 0aeee1e..6c1d09c 100644
--- a/qtinterface/tqsqlcursor.h
+++ b/qtinterface/tqsqlcursor.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlCursor class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlcursor.h>
+#include <Qt/q3sqlcursor.h>
+
+#define QSqlCursor Q3SqlCursor
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqldatabase.h b/qtinterface/tqsqldatabase.h
index 64fa723..8b1c44c 100644
--- a/qtinterface/tqsqldatabase.h
+++ b/qtinterface/tqsqldatabase.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlDatabase class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqldatabase.h>
+#include <Qt/qsqldatabase.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqldriver.h b/qtinterface/tqsqldriver.h
index 12431ad..fa56b8a 100644
--- a/qtinterface/tqsqldriver.h
+++ b/qtinterface/tqsqldriver.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlDriver class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqldriver.h>
+#include <Qt/qsqldriver.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqldriverplugin.h b/qtinterface/tqsqldriverplugin.h
index 654ff82..a82ba6e 100644
--- a/qtinterface/tqsqldriverplugin.h
+++ b/qtinterface/tqsqldriverplugin.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlDriverPlugin class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqldriverplugin.h>
+#include <Qt/qsqldriverplugin.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqleditorfactory.h b/qtinterface/tqsqleditorfactory.h
index 806cd3a..d25e93f 100644
--- a/qtinterface/tqsqleditorfactory.h
+++ b/qtinterface/tqsqleditorfactory.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlEditorFactory class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqleditorfactory.h>
+#include <Qt/q3sqleditorfactory.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlerror.h b/qtinterface/tqsqlerror.h
index ec118a3..1897f36 100644
--- a/qtinterface/tqsqlerror.h
+++ b/qtinterface/tqsqlerror.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlError class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlerror.h>
+#include <Qt/qsqlerror.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlfield.h b/qtinterface/tqsqlfield.h
index 5a0cb55..5933964 100644
--- a/qtinterface/tqsqlfield.h
+++ b/qtinterface/tqsqlfield.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlField class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlfield.h>
+#include <Qt/q3sqlfieldinfo.h>
+
+#define QSqlFieldInfo Q3SqlFieldInfo
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlform.h b/qtinterface/tqsqlform.h
index 1ead663..43e11dd 100644
--- a/qtinterface/tqsqlform.h
+++ b/qtinterface/tqsqlform.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlForm class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlform.h>
+#include <Qt/q3sqlform.h>
+
+#define QSqlForm Q3SqlForm
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlindex.h b/qtinterface/tqsqlindex.h
index 013f71d..b403021 100644
--- a/qtinterface/tqsqlindex.h
+++ b/qtinterface/tqsqlindex.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlIndex class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlindex.h>
+#include <Qt/qsqlindex.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlpropertymap.h b/qtinterface/tqsqlpropertymap.h
index c269ee2..3d9d392 100644
--- a/qtinterface/tqsqlpropertymap.h
+++ b/qtinterface/tqsqlpropertymap.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QSqlPropertyMap class
 // For Qt4, no changes are needed
 
-#include <qsqlpropertymap.h>
+#include <Qt/q3sqlpropertymap.h>
+
+#define QSqlPropertyMap Q3SqlPropertyMap
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlquery.h b/qtinterface/tqsqlquery.h
index f7bcf99..4d1d3bf 100644
--- a/qtinterface/tqsqlquery.h
+++ b/qtinterface/tqsqlquery.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlQuery class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlquery.h>
+#include <Qt/qsqlquery.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlrecord.h b/qtinterface/tqsqlrecord.h
index 370c13b..6ba228f 100644
--- a/qtinterface/tqsqlrecord.h
+++ b/qtinterface/tqsqlrecord.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlRecord class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlrecord.h>
+#include <Qt/qsqlrecord.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlresult.h b/qtinterface/tqsqlresult.h
index b7de2f9..2cdc75a 100644
--- a/qtinterface/tqsqlresult.h
+++ b/qtinterface/tqsqlresult.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlResult class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlresult.h>
+#include <Qt/qsqlresult.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsqlselectcursor.h b/qtinterface/tqsqlselectcursor.h
index 05ed66f..6bd51ff 100644
--- a/qtinterface/tqsqlselectcursor.h
+++ b/qtinterface/tqsqlselectcursor.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSqlSelectCursor class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsqlselectcursor.h>
+#include <Qt/q3sqlselectcursor.h>
+
+#define QSqlSelectCursor Q3SqlSelectCursor
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstatusbar.h b/qtinterface/tqstatusbar.h
index 0ae83e9..847a2a9 100644
--- a/qtinterface/tqstatusbar.h
+++ b/qtinterface/tqstatusbar.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QStatusBar class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qstatusbar.h>
+#include <Qt/qstatusbar.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstring.h b/qtinterface/tqstring.h
index 6a02469..2e50ad8 100644
--- a/qtinterface/tqstring.h
+++ b/qtinterface/tqstring.h
@@ -38,9 +38,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QString class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qstring.h>
+#include <Qt/qstring.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstringlist.h b/qtinterface/tqstringlist.h
index aaf6986..81ee9d1 100644
--- a/qtinterface/tqstringlist.h
+++ b/qtinterface/tqstringlist.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QStringList class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qstringlist.h>
+#include <Qt/qstringlist.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstrlist.h b/qtinterface/tqstrlist.h
index 38c9927..c2ae35d 100644
--- a/qtinterface/tqstrlist.h
+++ b/qtinterface/tqstrlist.h
@@ -36,9 +36,13 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QStrList class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qstrlist.h>
+#include <Qt/q3strlist.h>
+
+#define QStrList Q3StrList
+#define QStrIList Q3StrIList
+#define QStrListIterator Q3StrListIterator
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstrvec.h b/qtinterface/tqstrvec.h
index 4755a66..5bc587f 100644
--- a/qtinterface/tqstrvec.h
+++ b/qtinterface/tqstrvec.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QStrVec class
-// For Qt4, no changes are needed
-
-#include <qstrvec.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstyle.h b/qtinterface/tqstyle.h
index 59b8177..f1e1afe 100644
--- a/qtinterface/tqstyle.h
+++ b/qtinterface/tqstyle.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QStyle class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qstyle.h>
+#include <Qt/qstyle.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstylefactory.h b/qtinterface/tqstylefactory.h
index 00b38e8..da50720 100644
--- a/qtinterface/tqstylefactory.h
+++ b/qtinterface/tqstylefactory.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QStyleFactory class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qstylefactory.h>
+#include <Qt/qstylefactory.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstyleplugin.h b/qtinterface/tqstyleplugin.h
index 2d9278a..6e6593e 100644
--- a/qtinterface/tqstyleplugin.h
+++ b/qtinterface/tqstyleplugin.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QStylePlugin class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qstyleplugin.h>
+#include <Qt/qstyleplugin.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqstylesheet.h b/qtinterface/tqstylesheet.h
index 4ed88e7..94722bd 100644
--- a/qtinterface/tqstylesheet.h
+++ b/qtinterface/tqstylesheet.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QStyleSheet class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qstylesheet.h>
+#include <Qt/q3stylesheet.h>
+
+#define QStyleSheet Q3StyleSheet
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqsyntaxhighlighter.h b/qtinterface/tqsyntaxhighlighter.h
index b99efe6..cfb764f 100644
--- a/qtinterface/tqsyntaxhighlighter.h
+++ b/qtinterface/tqsyntaxhighlighter.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QSyntaxHighlighter class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qsyntaxhighlighter.h>
+#include <Qt/q3syntaxhighlighter.h>
+
+#define QSyntaxHighlighter Q3SyntaxHighlighter
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 59aec11..4b88f32 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -22,8 +22,8 @@ Boston, MA 02110-1301, USA.
 #ifndef TQT_H
 #define TQT_H
 
-#define USE_QT3
-//#define USE_QT4
+//#define USE_QT3
+#define USE_QT4
 
 #ifdef USE_QT4
 #define QT3_SUPPORT
diff --git a/qtinterface/tqt_defs.h b/qtinterface/tqt_defs.h
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/qtinterface/tqt_defs.h
@@ -0,0 +1 @@
+ 
diff --git a/qtinterface/tqt_undefs.h b/qtinterface/tqt_undefs.h
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/qtinterface/tqt_undefs.h
@@ -0,0 +1 @@
+ 
diff --git a/qtinterface/tqtabbar.h b/qtinterface/tqtabbar.h
index d94b33f..2edefff 100644
--- a/qtinterface/tqtabbar.h
+++ b/qtinterface/tqtabbar.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTabBar class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtabbar.h>
+#include <Qt/qtabbar.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtabdialog.h b/qtinterface/tqtabdialog.h
index 12bc004..445ff3c 100644
--- a/qtinterface/tqtabdialog.h
+++ b/qtinterface/tqtabdialog.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTabDialog class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtabdialog.h>
+#include <Qt/q3tabdialog.h>
+
+#define QTabDialog Q3TabDialog
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtable.h b/qtinterface/tqtable.h
index 4c3b080..c7413fc 100644
--- a/qtinterface/tqtable.h
+++ b/qtinterface/tqtable.h
@@ -36,9 +36,15 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTable class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtable.h>
+#include <Qt/q3table.h>
+
+#define QTable Q3Table
+#define QTableItem Q3TableItem
+#define QComboTableItem Q3ComboTableItem
+#define QCheckTableItem Q3CheckTableItem
+#define QTableSelection Q3TableSelection
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtabwidget.h b/qtinterface/tqtabwidget.h
index 1228acd..533b674 100644
--- a/qtinterface/tqtabwidget.h
+++ b/qtinterface/tqtabwidget.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTabWidget class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtabwidget.h>
+#include <Qt/qtabwidget.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtextbrowser.h b/qtinterface/tqtextbrowser.h
index dd939fb..7a2f448 100644
--- a/qtinterface/tqtextbrowser.h
+++ b/qtinterface/tqtextbrowser.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTextBrowser class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtextbrowser.h>
+#include <Qt/qtextbrowser.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtextcodec.h b/qtinterface/tqtextcodec.h
index f779c64..2dde117 100644
--- a/qtinterface/tqtextcodec.h
+++ b/qtinterface/tqtextcodec.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTextCodec class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtextcodec.h>
+#include <Qt/qtextcodec.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtextcodecfactory.h b/qtinterface/tqtextcodecfactory.h
index 8d37be5..e772da2 100644
--- a/qtinterface/tqtextcodecfactory.h
+++ b/qtinterface/tqtextcodecfactory.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTextCodecFactory class
-// For Qt4, no changes are needed
-
-#include <qtextcodecfactory.h>
+// For Qt4, this class has been removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtextcodecplugin.h b/qtinterface/tqtextcodecplugin.h
index 0882eb8..99ea648 100644
--- a/qtinterface/tqtextcodecplugin.h
+++ b/qtinterface/tqtextcodecplugin.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTextCodecPlugin class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtextcodecplugin.h>
+#include <Qt/qtextcodecplugin.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtextedit.h b/qtinterface/tqtextedit.h
index e2742c8..c475df0 100644
--- a/qtinterface/tqtextedit.h
+++ b/qtinterface/tqtextedit.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QTextEdit class
 // For Qt4, no changes are needed
 
-#include <qtextedit.h>
+#include <Qt/q3textedit.h>
+
+#define QTextEdit Q3TextEdit
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtextview.h b/qtinterface/tqtextview.h
index b9d1361..103d82c 100644
--- a/qtinterface/tqtextview.h
+++ b/qtinterface/tqtextview.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTextView class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtextview.h>
+#include <Qt/q3textview.h>
+
+#define QTextView Q3TextView
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqthread.h b/qtinterface/tqthread.h
index 6cd6da2..9cc2a50 100644
--- a/qtinterface/tqthread.h
+++ b/qtinterface/tqthread.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QThread class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qthread.h>
+#include <Qt/qthread.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqthreadstorage.h b/qtinterface/tqthreadstorage.h
index e9b4fe6..b841af6 100644
--- a/qtinterface/tqthreadstorage.h
+++ b/qtinterface/tqthreadstorage.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QThreadStorage class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qthreadstorage.h>
+#include <Qt/qthreadstorage.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtl.h b/qtinterface/tqtl.h
index 1c4edca..3f90727 100644
--- a/qtinterface/tqtl.h
+++ b/qtinterface/tqtl.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the Qtl class
-// For Qt4, no changes are needed
-
-#include <qtl.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtoolbar.h b/qtinterface/tqtoolbar.h
index 4afce7a..ba01a93 100644
--- a/qtinterface/tqtoolbar.h
+++ b/qtinterface/tqtoolbar.h
@@ -37,9 +37,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QToolBar class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtoolbar.h>
+#include <Qt/q3toolbar.h>
+
+#define QToolBar Q3ToolBar
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtoolbox.h b/qtinterface/tqtoolbox.h
index f4a67e1..cd3ee04 100644
--- a/qtinterface/tqtoolbox.h
+++ b/qtinterface/tqtoolbox.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QToolBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtoolbox.h>
+#include <Qt/qtoolbox.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtoolbutton.h b/qtinterface/tqtoolbutton.h
index e9cf5cb..186a1b0 100644
--- a/qtinterface/tqtoolbutton.h
+++ b/qtinterface/tqtoolbutton.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QToolButton class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtoolbutton.h>
+#include <Qt/qtoolbutton.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtooltip.h b/qtinterface/tqtooltip.h
index 5c74fef..3cf75cf 100644
--- a/qtinterface/tqtooltip.h
+++ b/qtinterface/tqtooltip.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QToolTip class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtooltip.h>
+#include <Qt/qtooltip.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtranslator.h b/qtinterface/tqtranslator.h
index 30e92cf..26c21ef 100644
--- a/qtinterface/tqtranslator.h
+++ b/qtinterface/tqtranslator.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTranslator class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qtranslator.h>
+#include <Qt/qtranslator.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqtsciicodec.h b/qtinterface/tqtsciicodec.h
index c35b6aa..e60c707 100644
--- a/qtinterface/tqtsciicodec.h
+++ b/qtinterface/tqtsciicodec.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QTsciiCodec class
-// For Qt4, no changes are needed
-
-#include <qtsciicodec.h>
+// For Qt4, this class has been removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqurl.h b/qtinterface/tqurl.h
index 4ea1f24..90cefbc 100644
--- a/qtinterface/tqurl.h
+++ b/qtinterface/tqurl.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QUrl class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qurl.h>
+#include <Qt/qurl.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqurlinfo.h b/qtinterface/tqurlinfo.h
index 29da9c2..f61c37b 100644
--- a/qtinterface/tqurlinfo.h
+++ b/qtinterface/tqurlinfo.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QUrlInfo class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qurlinfo.h>
+#include <Qt/qurlinfo.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqurloperator.h b/qtinterface/tqurloperator.h
index 781cec0..9f0d5b2 100644
--- a/qtinterface/tqurloperator.h
+++ b/qtinterface/tqurloperator.h
@@ -29,7 +29,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QUrlOperator class
 // For Qt3, no changes are needed
 
-#include <qurloperator.h>
+#include <q3urloperator.h>
+
+#define QUrlOperator Q3UrlOperator
 
 #endif // USE_QT3
 
diff --git a/qtinterface/tqutfcodec.h b/qtinterface/tqutfcodec.h
index 0ec3e3d..270b4b9 100644
--- a/qtinterface/tqutfcodec.h
+++ b/qtinterface/tqutfcodec.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QUtfCodec class
-// For Qt4, no changes are needed
-
-#include <qutfcodec.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tquuid.h b/qtinterface/tquuid.h
index 120297d..3eb3722 100644
--- a/qtinterface/tquuid.h
+++ b/qtinterface/tquuid.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QUuid class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <quuid.h>
+#include <Qt/quuid.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqvalidator.h b/qtinterface/tqvalidator.h
index 7a643c4..10ba23b 100644
--- a/qtinterface/tqvalidator.h
+++ b/qtinterface/tqvalidator.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QValidator class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qvalidator.h>
+#include <Qt/qvalidator.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqvaluestack.h b/qtinterface/tqvaluestack.h
index 151dfc4..3817de0 100644
--- a/qtinterface/tqvaluestack.h
+++ b/qtinterface/tqvaluestack.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QValueStack class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qvaluestack.h>
+#include <Qt/q3valuestack.h>
+
+#define QValueStack Q3ValueStack
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqvaluevector.h b/qtinterface/tqvaluevector.h
index bb7f223..aaf02f7 100644
--- a/qtinterface/tqvaluevector.h
+++ b/qtinterface/tqvaluevector.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QValueVector class
 // For Qt4, no changes are needed
 
-#include <qvaluevector.h>
+#include <Qt/q3valuevector.h>
+
+#define QValueVector Q3ValueVector
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqvbox.h b/qtinterface/tqvbox.h
index 0df40c4..46c4284 100644
--- a/qtinterface/tqvbox.h
+++ b/qtinterface/tqvbox.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QVBox class
 // For Qt4, no changes are needed
 
-#include <qvbox.h>
+#include <Qt/q3vbox.h>
+
+#define QVBox Q3VBox
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqvbuttongroup.h b/qtinterface/tqvbuttongroup.h
index a8c6e0d..7857e66 100644
--- a/qtinterface/tqvbuttongroup.h
+++ b/qtinterface/tqvbuttongroup.h
@@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QVButtonGroup class
 // For Qt4, no changes are needed
 
-#include <qvbuttongroup.h>
+#include <Qt/q3buttongroup.h>
+
+#define QVButtonGroup Q3VButtonGroup
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqvfbhdr.h b/qtinterface/tqvfbhdr.h
index 85041cb..f5073f8 100644
--- a/qtinterface/tqvfbhdr.h
+++ b/qtinterface/tqvfbhdr.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QVFBHDR class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qvfbhdr.h>
+#include <Qt/qvfbhdr.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqvgroupbox.h b/qtinterface/tqvgroupbox.h
index f2349bf..f0d2857 100644
--- a/qtinterface/tqvgroupbox.h
+++ b/qtinterface/tqvgroupbox.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QVGroupBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qvgroupbox.h>
+#include <Qt/q3vgroupbox.h>
+
+#define QVGroupBox Q3VGroupBox
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwaitcondition.h b/qtinterface/tqwaitcondition.h
index 4e5f965..994c888 100644
--- a/qtinterface/tqwaitcondition.h
+++ b/qtinterface/tqwaitcondition.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWaitCondition class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qwaitcondition.h>
+#include <Qt/qwaitcondition.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwhatsthis.h b/qtinterface/tqwhatsthis.h
index d97989e..cf3b2ba 100644
--- a/qtinterface/tqwhatsthis.h
+++ b/qtinterface/tqwhatsthis.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWhatsThis class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qwhatsthis.h>
+#include <Qt/q3whatsthis.h>
+
+#define QWhatsThis Q3WhatsThis
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwidget.h b/qtinterface/tqwidget.h
index 96423e6..8430cd2 100644
--- a/qtinterface/tqwidget.h
+++ b/qtinterface/tqwidget.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWidget class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qwidget.h>
+#include <Qt/qwidget.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwidgetfactory.h b/qtinterface/tqwidgetfactory.h
index 55147d4..040872a 100644
--- a/qtinterface/tqwidgetfactory.h
+++ b/qtinterface/tqwidgetfactory.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWidgetFactory class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qwidgetfactory.h>
+#include <QtDesigner/formbuilder.h>
+
+#define QWidgetFactory QFormBuilder
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwidgetintdict.h b/qtinterface/tqwidgetintdict.h
index 9fed11d..80dd020 100644
--- a/qtinterface/tqwidgetintdict.h
+++ b/qtinterface/tqwidgetintdict.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWidgetIntDict class
-// For Qt4, no changes are needed
-
-#include <qwidgetintdict.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwidgetlist.h b/qtinterface/tqwidgetlist.h
index f63208f..9770e3a 100644
--- a/qtinterface/tqwidgetlist.h
+++ b/qtinterface/tqwidgetlist.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWidgetList class
-// For Qt4, no changes are needed
-
-#include <qwidgetlist.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwidgetplugin.h b/qtinterface/tqwidgetplugin.h
index 4ecde4a..a9c9cb0 100644
--- a/qtinterface/tqwidgetplugin.h
+++ b/qtinterface/tqwidgetplugin.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWidgetPlugin class
-// For Qt4, no changes are needed
-
-#include <qwidgetplugin.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwidgetstack.h b/qtinterface/tqwidgetstack.h
index e9ec0fe..19b9402 100644
--- a/qtinterface/tqwidgetstack.h
+++ b/qtinterface/tqwidgetstack.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWidgetStack class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qwidgetstack.h>
+#include <Qt/q3widgetstack.h>
+
+#define QWidgetStack Q3WidgetStack
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwindowsstyle.h b/qtinterface/tqwindowsstyle.h
index 9d7678d..9d710be 100644
--- a/qtinterface/tqwindowsstyle.h
+++ b/qtinterface/tqwindowsstyle.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWindowsStyle class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qwindowsstyle.h>
+#include <Qt/qwindowsstyle.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqwizard.h b/qtinterface/tqwizard.h
index 54f4dd0..f126da6 100644
--- a/qtinterface/tqwizard.h
+++ b/qtinterface/tqwizard.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWizard class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qwizard.h>
+#include <Qt/q3wizard.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqworkspace.h b/qtinterface/tqworkspace.h
index 8b3bac1..e46974e 100644
--- a/qtinterface/tqworkspace.h
+++ b/qtinterface/tqworkspace.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QWorkspace class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qworkspace.h>
+#include <Qt/qworkspace.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqxml.h b/qtinterface/tqxml.h
index d495484..668d672 100644
--- a/qtinterface/tqxml.h
+++ b/qtinterface/tqxml.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QXml class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qxml.h>
+#include <Qt/qxml.h>
 
 #endif // USE_QT4