diff --git a/build.py b/build.py
index c164c71..5251dec 100644
--- a/build.py
+++ b/build.py
@@ -309,8 +309,8 @@ def generateFeatures(featfile):
 
     f.write(
 """#include <stdio.h>
-#include <qglobal.h>
-#include <qapplication.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
 
 int main(int argc,char **argv)
 {
diff --git a/configure.py b/configure.py
index cde42eb..42769f3 100644
--- a/configure.py
+++ b/configure.py
@@ -685,8 +685,8 @@ def create_features_file(name):
     f.write(
 """#include <Python.h>
 #include <stdio.h>
-#include <qglobal.h>
-#include <qapplication.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
 
 int main(int argc,char **argv)
 {
diff --git a/pylupdate3/fetchtr.cpp b/pylupdate3/fetchtr.cpp
index 74f683d..c21fcff 100644
--- a/pylupdate3/fetchtr.cpp
+++ b/pylupdate3/fetchtr.cpp
@@ -29,17 +29,17 @@
 **
 **********************************************************************/
 
-#include <qfile.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <metatranslator.h>
 #include <stdio.h>
 #include <string.h>
-/*#include <qxml.h>*/
+/*#include <tqxml.h>*/
 
 
 static const char MagicComment[] = "TRANSLATOR ";
diff --git a/pylupdate3/main.cpp b/pylupdate3/main.cpp
index 63f54c0..d78e5a3 100644
--- a/pylupdate3/main.cpp
+++ b/pylupdate3/main.cpp
@@ -29,10 +29,10 @@
 **
 **********************************************************************/
 
-#include <qfile.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqtextstream.h>
 
 #include <errno.h>
 #include <metatranslator.h>
diff --git a/pylupdate3/metatranslator.cpp b/pylupdate3/metatranslator.cpp
index 4b67c32..7f46c19 100644
--- a/pylupdate3/metatranslator.cpp
+++ b/pylupdate3/metatranslator.cpp
@@ -14,14 +14,14 @@
 **
 **********************************************************************/
 
-#include <qapplication.h>
-#include <qcstring.h>
-#include <qfile.h>
-#include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtextcodec.h>
-#include <qtextstream.h>
-#include <qxml.h>
+#include <tqapplication.h>
+#include <tqcstring.h>
+#include <tqfile.h>
+#include <tqmessagebox.h>
+#include <tqregexp.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
+#include <tqxml.h>
 
 #include "metatranslator.h"
 
diff --git a/pylupdate3/metatranslator.h b/pylupdate3/metatranslator.h
index 5bf3961..aab280f 100644
--- a/pylupdate3/metatranslator.h
+++ b/pylupdate3/metatranslator.h
@@ -17,10 +17,10 @@
 #ifndef METATRANSLATOR_H
 #define METATRANSLATOR_H
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qtranslator.h>
-#include <qvaluelist.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <tqtranslator.h>
+#include <tqvaluelist.h>
 
 class TQTextCodec;
 
diff --git a/pylupdate3/numberh.cpp b/pylupdate3/numberh.cpp
index 7c5f7ee..13bb4ad 100644
--- a/pylupdate3/numberh.cpp
+++ b/pylupdate3/numberh.cpp
@@ -14,10 +14,10 @@
 **
 **********************************************************************/
 
-#include <qmemarray.h>
-#include <qcstring.h>
-#include <qmap.h>
-#include <qstringlist.h>
+#include <tqmemarray.h>
+#include <tqcstring.h>
+#include <tqmap.h>
+#include <tqstringlist.h>
 
 #include <ctype.h>
 #include <metatranslator.h>
diff --git a/pylupdate3/proparser.cpp b/pylupdate3/proparser.cpp
index edb86c1..72256f3 100644
--- a/pylupdate3/proparser.cpp
+++ b/pylupdate3/proparser.cpp
@@ -14,8 +14,8 @@
 **
 **********************************************************************/
 
-#include <qregexp.h>
-#include <qstringlist.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
 
 #include "proparser.h"
 
diff --git a/pylupdate3/proparser.h b/pylupdate3/proparser.h
index 953f0ea..1cb7928 100644
--- a/pylupdate3/proparser.h
+++ b/pylupdate3/proparser.h
@@ -17,8 +17,8 @@
 #ifndef PROPARSER_H
 #define PROPARSER_H
 
-#include <qmap.h>
-#include <qstring.h>
+#include <tqmap.h>
+#include <tqstring.h>
 
 TQMap<TQString, TQString> proFileTagMap( const TQString& text );
 
diff --git a/pylupdate3/sametexth.cpp b/pylupdate3/sametexth.cpp
index 53e1fa7..0f8f56a 100644
--- a/pylupdate3/sametexth.cpp
+++ b/pylupdate3/sametexth.cpp
@@ -14,8 +14,8 @@
 **
 **********************************************************************/
 
-#include <qcstring.h>
-#include <qmap.h>
+#include <tqcstring.h>
+#include <tqmap.h>
 
 #include <metatranslator.h>
 
diff --git a/pyuic2/domtool.cpp b/pyuic2/domtool.cpp
index 605af27..108844e 100644
--- a/pyuic2/domtool.cpp
+++ b/pyuic2/domtool.cpp
@@ -21,12 +21,12 @@
 
 #include "domtool.h"
 
-#include <qsizepolicy.h>
-#include <qpalette.h>
-#include <qcursor.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qfont.h>
+#include <tqsizepolicy.h>
+#include <tqpalette.h>
+#include <tqcursor.h>
+#include <tqrect.h>
+#include <tqsize.h>
+#include <tqfont.h>
 
 
 /*!
diff --git a/pyuic2/domtool.h b/pyuic2/domtool.h
index 434729b..b3f833c 100644
--- a/pyuic2/domtool.h
+++ b/pyuic2/domtool.h
@@ -19,9 +19,9 @@
 #ifndef DOMTOOL_H
 #define DOMTOOL_H
 
-#include <qnamespace.h>
-#include <qvariant.h>
-#include <qdom.h>
+#include <tqnamespace.h>
+#include <tqvariant.h>
+#include <tqdom.h>
 
 
 class DomTool : public TQt
diff --git a/pyuic2/globaldefs.h b/pyuic2/globaldefs.h
index de3bce1..a5fa077 100644
--- a/pyuic2/globaldefs.h
+++ b/pyuic2/globaldefs.h
@@ -21,7 +21,7 @@
 #ifndef GLOBALDEFS_H
 #define GLOBALDEFS_H
 
-#include <qcolor.h>
+#include <tqcolor.h>
 
 #define BOXLAYOUT_DEFAULT_MARGIN 11
 #define BOXLAYOUT_DEFAULT_SPACING 6
diff --git a/pyuic2/uic.cpp b/pyuic2/uic.cpp
index 2f445e5..0ec57e6 100644
--- a/pyuic2/uic.cpp
+++ b/pyuic2/uic.cpp
@@ -18,18 +18,18 @@
 **********************************************************************/
 
 #include "uic.h"
-#include <qapplication.h>
-#include <qfile.h>
-#include <qfileinfo.h>
+#include <tqapplication.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <qstringlist.h>
-#include <qstrlist.h>
-#include <qdatetime.h>
+#include <tqstringlist.h>
+#include <tqstrlist.h>
+#include <tqdatetime.h>
 #include <widgetdatabase.h>
 #include <domtool.h>
 #include <globaldefs.h>
-#include <qregexp.h>
+#include <tqregexp.h>
 #include <zlib.h>
 
 static TQString mkBool( bool b )
diff --git a/pyuic2/uic.h b/pyuic2/uic.h
index 9ac4851..5560581 100644
--- a/pyuic2/uic.h
+++ b/pyuic2/uic.h
@@ -19,13 +19,13 @@
 #ifndef UIC_H
 #define UIC_H
 
-#include <qnamespace.h>
-#include <qdom.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
-#include <qtextstream.h>
-#include <qcolor.h>
+#include <tqnamespace.h>
+#include <tqdom.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
+#include <tqtextstream.h>
+#include <tqcolor.h>
 
 
 #define	PYQT_VERSION	"3.18.1"
diff --git a/pyuic2/widgetdatabase.cpp b/pyuic2/widgetdatabase.cpp
index 8016ac2..bed387b 100644
--- a/pyuic2/widgetdatabase.cpp
+++ b/pyuic2/widgetdatabase.cpp
@@ -18,7 +18,7 @@
 **
 **********************************************************************/
 
-#include <qvariant.h>  // HP-UX compiler needs this here
+#include <tqvariant.h>  // HP-UX compiler needs this here
 
 #include "widgetdatabase.h"
 
@@ -30,12 +30,12 @@
 //#include "../integration/kdevelop/kdewidgets.h"
 
 #include <globaldefs.h>
-#include <qstrlist.h>
-#include <qdict.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqstrlist.h>
+#include <tqdict.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 
-#include <qmodules.h>
+#include <tqmodules.h>
 
 const int dbsize = 300;
 const int dbcustom = 200;
diff --git a/pyuic2/widgetdatabase.h b/pyuic2/widgetdatabase.h
index 80f86cd..9a44919 100644
--- a/pyuic2/widgetdatabase.h
+++ b/pyuic2/widgetdatabase.h
@@ -21,9 +21,9 @@
 #ifndef WIDGETDATABASE_H
 #define WIDGETDATABASE_H
 
-#include <qiconset.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqiconset.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 struct WidgetDatabaseRecord
 {
diff --git a/pyuic3/domtool.cpp b/pyuic3/domtool.cpp
index 37f7f0f..74d024f 100644
--- a/pyuic3/domtool.cpp
+++ b/pyuic3/domtool.cpp
@@ -20,14 +20,14 @@
 
 #include "domtool.h"
 
-#include <qsizepolicy.h>
-#include <qcolor.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qfont.h>
-#include <qdom.h>
+#include <tqsizepolicy.h>
+#include <tqcolor.h>
+#include <tqcursor.h>
+#include <tqdatetime.h>
+#include <tqrect.h>
+#include <tqsize.h>
+#include <tqfont.h>
+#include <tqdom.h>
 
 /*!
   \class DomTool domtool.h
diff --git a/pyuic3/domtool.h b/pyuic3/domtool.h
index c9647ed..87fbaf6 100644
--- a/pyuic3/domtool.h
+++ b/pyuic3/domtool.h
@@ -21,8 +21,8 @@
 #ifndef DOMTOOL_H
 #define DOMTOOL_H
 
-#include <qvariant.h>
-#include <qnamespace.h>
+#include <tqvariant.h>
+#include <tqnamespace.h>
 
 class TQDomElement;
 class TQDomDocument;
diff --git a/pyuic3/embed.cpp b/pyuic3/embed.cpp
index 824cca8..3e54d83 100644
--- a/pyuic3/embed.cpp
+++ b/pyuic3/embed.cpp
@@ -21,11 +21,11 @@
 **********************************************************************/
 
 #include "uic.h"
-#include <qfile.h>
-#include <qimage.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qfileinfo.h>
+#include <tqfile.h>
+#include <tqimage.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
+#include <tqfileinfo.h>
 #include <stdio.h>
 #include <ctype.h>
 
diff --git a/pyuic3/form.cpp b/pyuic3/form.cpp
index 427aa66..6aa5aa5 100644
--- a/pyuic3/form.cpp
+++ b/pyuic3/form.cpp
@@ -23,10 +23,10 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
+#include <tqstringlist.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqregexp.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 
diff --git a/pyuic3/globaldefs.h b/pyuic3/globaldefs.h
index 65f5974..0035612 100644
--- a/pyuic3/globaldefs.h
+++ b/pyuic3/globaldefs.h
@@ -21,8 +21,8 @@
 #ifndef GLOBALDEFS_H
 #define GLOBALDEFS_H
 
-#include <qcolor.h>
-#include <qapplication.h>
+#include <tqcolor.h>
+#include <tqapplication.h>
 
 #define BOXLAYOUT_DEFAULT_MARGIN 11
 #define BOXLAYOUT_DEFAULT_SPACING 6
diff --git a/pyuic3/main.cpp b/pyuic3/main.cpp
index 2cd8e5b..6049a70 100644
--- a/pyuic3/main.cpp
+++ b/pyuic3/main.cpp
@@ -23,13 +23,13 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qapplication.h>
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <tqapplication.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/pyuic3/object.cpp b/pyuic3/object.cpp
index b507d9f..b4c443b 100644
--- a/pyuic3/object.cpp
+++ b/pyuic3/object.cpp
@@ -21,9 +21,9 @@
 #include "uic.h"
 #include "parser.h"
 #include "domtool.h"
-#include <qregexp.h>
-#include <qsizepolicy.h>
-#include <qstringlist.h>
+#include <tqregexp.h>
+#include <tqsizepolicy.h>
+#include <tqstringlist.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 
diff --git a/pyuic3/parser.cpp b/pyuic3/parser.cpp
index a4def26..85446fa 100644
--- a/pyuic3/parser.cpp
+++ b/pyuic3/parser.cpp
@@ -19,8 +19,8 @@
 **********************************************************************/
 
 #include "parser.h"
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
 
 class NormalizeObject : public TQObject
 {
diff --git a/pyuic3/parser.h b/pyuic3/parser.h
index db07ea2..5fdbdc2 100644
--- a/pyuic3/parser.h
+++ b/pyuic3/parser.h
@@ -21,7 +21,7 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include <qstring.h>
+#include <tqstring.h>
 
 class Parser
 {
diff --git a/pyuic3/subclassing.cpp b/pyuic3/subclassing.cpp
index 2d71cdd..143a27a 100644
--- a/pyuic3/subclassing.cpp
+++ b/pyuic3/subclassing.cpp
@@ -22,12 +22,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/pyuic3/uic.cpp b/pyuic3/uic.cpp
index f227ccd..6189639 100644
--- a/pyuic3/uic.cpp
+++ b/pyuic3/uic.cpp
@@ -23,12 +23,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/pyuic3/uic.h b/pyuic3/uic.h
index 710d6e2..12f704a 100644
--- a/pyuic3/uic.h
+++ b/pyuic3/uic.h
@@ -21,13 +21,13 @@
 
 #ifndef UIC_H
 #define UIC_H
-#include <qdom.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
-#include <qtextstream.h>
-#include <qpalette.h>
-#include <qvariant.h>
+#include <tqdom.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
+#include <tqtextstream.h>
+#include <tqpalette.h>
+#include <tqvariant.h>
 
 
 #define	PYQT_VERSION	"3.18.1"
diff --git a/pyuic3/widgetdatabase.cpp b/pyuic3/widgetdatabase.cpp
index 4eb7914..198a41b 100644
--- a/pyuic3/widgetdatabase.cpp
+++ b/pyuic3/widgetdatabase.cpp
@@ -27,15 +27,15 @@
 #include "widgetdatabase.h"
 #include "widgetinterface.h"
 
-#include <qapplication.h>
+#include <tqapplication.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qstrlist.h>
-#include <qdict.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qcleanuphandler.h>
-#include <qfeatures.h>
+#include <tqstrlist.h>
+#include <tqdict.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqcleanuphandler.h>
+#include <tqfeatures.h>
 
 #include <stdlib.h>
 
diff --git a/pyuic3/widgetdatabase.h b/pyuic3/widgetdatabase.h
index 10685ad..18b63af 100644
--- a/pyuic3/widgetdatabase.h
+++ b/pyuic3/widgetdatabase.h
@@ -27,8 +27,8 @@
 #ifndef WIDGETDATABASE_H
 #define WIDGETDATABASE_H
 
-#include <qiconset.h>
-#include <qstring.h>
+#include <tqiconset.h>
+#include <tqstring.h>
 #include "widgetinterface.h" // up here for GCC 2.7.* compatibility
 #include <private/qpluginmanager_p.h>
 
diff --git a/sip/qt/qaccel.sip b/sip/qt/qaccel.sip
index 1dbf06c..da17dac 100644
--- a/sip/qt/qaccel.sip
+++ b/sip/qt/qaccel.sip
@@ -32,7 +32,7 @@
 class TQAccel : TQObject
 {
 %TypeHeaderCode
-#include <qaccel.h>
+#include <tqaccel.h>
 %End
 
 public:
diff --git a/sip/qt/qaction.sip b/sip/qt/qaction.sip
index a8815fd..7b98a09 100644
--- a/sip/qt/qaction.sip
+++ b/sip/qt/qaction.sip
@@ -41,7 +41,7 @@
 class TQAction : TQObject
 {
 %TypeHeaderCode
-#include <qaction.h>
+#include <tqaction.h>
 %End
 
 public:
@@ -144,7 +144,7 @@ private:
 class TQActionGroup : TQAction
 {
 %TypeHeaderCode
-#include <qaction.h>
+#include <tqaction.h>
 %End
 
 public:
diff --git a/sip/qt/qapplication.sip b/sip/qt/qapplication.sip
index 577308e..4e08b98 100644
--- a/sip/qt/qapplication.sip
+++ b/sip/qt/qapplication.sip
@@ -71,8 +71,8 @@ TQApplication *qApp;
 class TQApplication : TQObject
 {
 %TypeHeaderCode
-#include <qapplication.h>
-#include <qwidgetlist.h>
+#include <tqapplication.h>
+#include <tqwidgetlist.h>
 %End
 
 public:
diff --git a/sip/qt/qarray.sip b/sip/qt/qarray.sip
index 8d1fed4..a7c34b8 100644
--- a/sip/qt/qarray.sip
+++ b/sip/qt/qarray.sip
@@ -36,7 +36,7 @@ converted to and from Python lists of the type.
 %MappedType TQArray<int>
 {
 %TypeHeaderCode
-#include <qarray.h>
+#include <tqarray.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qassistantclient.sip b/sip/qt/qassistantclient.sip
index fce0214..34990c4 100644
--- a/sip/qt/qassistantclient.sip
+++ b/sip/qt/qassistantclient.sip
@@ -35,7 +35,7 @@
 class TQAssistantClient : TQObject
 {
 %TypeHeaderCode
-#include <qassistantclient.h>
+#include <tqassistantclient.h>
 %End
 
 public:
diff --git a/sip/qt/qbitmap.sip b/sip/qt/qbitmap.sip
index e538d2d..544338f 100644
--- a/sip/qt/qbitmap.sip
+++ b/sip/qt/qbitmap.sip
@@ -32,7 +32,7 @@
 class TQBitmap : TQPixmap
 {
 %TypeHeaderCode
-#include <qbitmap.h>
+#include <tqbitmap.h>
 %End
 
 public:
diff --git a/sip/qt/qbrush.sip b/sip/qt/qbrush.sip
index fc9269f..83ddea5 100644
--- a/sip/qt/qbrush.sip
+++ b/sip/qt/qbrush.sip
@@ -55,7 +55,7 @@ enum BrushStyle {
 class TQBrush
 {
 %TypeHeaderCode
-#include <qbrush.h>
+#include <tqbrush.h>
 %End
 
 public:
@@ -81,7 +81,7 @@ public:
 class TQBrush : TQt
 {
 %TypeHeaderCode
-#include <qbrush.h>
+#include <tqbrush.h>
 %End
 
 public:
diff --git a/sip/qt/qbutton.sip b/sip/qt/qbutton.sip
index fcd83ec..589d204 100644
--- a/sip/qt/qbutton.sip
+++ b/sip/qt/qbutton.sip
@@ -32,7 +32,7 @@
 class TQButton : TQWidget
 {
 %TypeHeaderCode
-#include <qbutton.h>
+#include <tqbutton.h>
 %End
 
 public:
diff --git a/sip/qt/qbuttongroup.sip b/sip/qt/qbuttongroup.sip
index 61c0258..72d4009 100644
--- a/sip/qt/qbuttongroup.sip
+++ b/sip/qt/qbuttongroup.sip
@@ -32,7 +32,7 @@
 class TQButtonGroup : TQGroupBox
 {
 %TypeHeaderCode
-#include <qbuttongroup.h>
+#include <tqbuttongroup.h>
 %End
 
 public:
diff --git a/sip/qt/qbytearray.sip b/sip/qt/qbytearray.sip
index d5941b4..aa56baf 100644
--- a/sip/qt/qbytearray.sip
+++ b/sip/qt/qbytearray.sip
@@ -95,7 +95,7 @@ Not implemented.
 class TQByteArray
 {
 %TypeHeaderCode
-#include <qstring.h>
+#include <tqstring.h>
 %End
 
 public:
diff --git a/sip/qt/qcdestyle.sip b/sip/qt/qcdestyle.sip
index b11f518..3f6510e 100644
--- a/sip/qt/qcdestyle.sip
+++ b/sip/qt/qcdestyle.sip
@@ -35,7 +35,7 @@
 class TQCDEStyle : TQMotifStyle
 {
 %TypeHeaderCode
-#include <qcdestyle.h>
+#include <tqcdestyle.h>
 %End
 
 public:
diff --git a/sip/qt/qcheckbox.sip b/sip/qt/qcheckbox.sip
index a554a17..1f18760 100644
--- a/sip/qt/qcheckbox.sip
+++ b/sip/qt/qcheckbox.sip
@@ -32,7 +32,7 @@
 class TQCheckBox : TQButton
 {
 %TypeHeaderCode
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
 %End
 
 public:
diff --git a/sip/qt/qclipboard.sip b/sip/qt/qclipboard.sip
index b6255ef..aa2acbf 100644
--- a/sip/qt/qclipboard.sip
+++ b/sip/qt/qclipboard.sip
@@ -47,7 +47,7 @@ Not yet implemented (TQt v1.x).
 class TQClipboard : TQObject
 {
 %TypeHeaderCode
-#include <qclipboard.h>
+#include <tqclipboard.h>
 %End
 
 private:
diff --git a/sip/qt/qcolor.sip b/sip/qt/qcolor.sip
index d951617..553b064 100644
--- a/sip/qt/qcolor.sip
+++ b/sip/qt/qcolor.sip
@@ -75,7 +75,7 @@ This takes no parameters and returns the <Literal>r</Literal>,
 
 
 %ModuleHeaderCode
-#include <qcolor.h>
+#include <tqcolor.h>
 %End
 
 
@@ -122,7 +122,7 @@ TQRgb qRgba(int,int,int,int);
 class TQColor
 {
 %TypeHeaderCode
-#include <qcolor.h>
+#include <tqcolor.h>
 %End
 
 public:
diff --git a/sip/qt/qcolordialog.sip b/sip/qt/qcolordialog.sip
index bbc9a46..936dc7a 100644
--- a/sip/qt/qcolordialog.sip
+++ b/sip/qt/qcolordialog.sip
@@ -44,7 +44,7 @@ This takes the <Literal>initial</Literal>, <Literal>parent</Literal> and
 class TQColorDialog : TQDialog
 {
 %TypeHeaderCode
-#include <qcolordialog.h>
+#include <tqcolordialog.h>
 %End
 
 public:
diff --git a/sip/qt/qcolorgroup.sip b/sip/qt/qcolorgroup.sip
index 0be09d3..5ca0c34 100644
--- a/sip/qt/qcolorgroup.sip
+++ b/sip/qt/qcolorgroup.sip
@@ -32,7 +32,7 @@
 class TQColorGroup
 {
 %TypeHeaderCode
-#include <qpalette.h>
+#include <tqpalette.h>
 %End
 
 public:
diff --git a/sip/qt/qcombobox.sip b/sip/qt/qcombobox.sip
index 62f4863..e74dbf6 100644
--- a/sip/qt/qcombobox.sip
+++ b/sip/qt/qcombobox.sip
@@ -32,7 +32,7 @@
 class TQComboBox : TQWidget
 {
 %TypeHeaderCode
-#include <qcombobox.h>
+#include <tqcombobox.h>
 %End
 
 public:
diff --git a/sip/qt/qcommonstyle.sip b/sip/qt/qcommonstyle.sip
index 0209d68..6985ec2 100644
--- a/sip/qt/qcommonstyle.sip
+++ b/sip/qt/qcommonstyle.sip
@@ -53,7 +53,7 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the
 class TQCommonStyle : TQStyle
 {
 %TypeHeaderCode
-#include <qcommonstyle.h>
+#include <tqcommonstyle.h>
 %End
 
 public:
diff --git a/sip/qt/qcstring.sip b/sip/qt/qcstring.sip
index 0fcc624..5e877e6 100644
--- a/sip/qt/qcstring.sip
+++ b/sip/qt/qcstring.sip
@@ -117,7 +117,7 @@ This returns a tuple of the <Literal>double</Literal> result and the
 class TQCString : TQByteArray
 {
 %TypeHeaderCode
-#include <qcstring.h>
+#include <tqcstring.h>
 %End
 
 public:
diff --git a/sip/qt/qcursor.sip b/sip/qt/qcursor.sip
index 07b3554..2256cdb 100644
--- a/sip/qt/qcursor.sip
+++ b/sip/qt/qcursor.sip
@@ -30,7 +30,7 @@
 
 
 %ModuleHeaderCode
-#include <qcursor.h>
+#include <tqcursor.h>
 %End
 
 
@@ -72,7 +72,7 @@ enum TQCursorShape {
 class TQCursor
 {
 %TypeHeaderCode
-#include <qcursor.h>
+#include <tqcursor.h>
 %End
 
 public:
@@ -109,7 +109,7 @@ public:
 class TQCursor : TQt
 {
 %TypeHeaderCode
-#include <qcursor.h>
+#include <tqcursor.h>
 %End
 
 public:
diff --git a/sip/qt/qdatastream.sip b/sip/qt/qdatastream.sip
index e970c30..003ba8c 100644
--- a/sip/qt/qdatastream.sip
+++ b/sip/qt/qdatastream.sip
@@ -69,7 +69,7 @@ parameter.
 class TQDataStream
 {
 %TypeHeaderCode
-#include <qdatastream.h>
+#include <tqdatastream.h>
 %End
 
 public:
diff --git a/sip/qt/qdatetime.sip b/sip/qt/qdatetime.sip
index c631660..2a62440 100644
--- a/sip/qt/qdatetime.sip
+++ b/sip/qt/qdatetime.sip
@@ -68,7 +68,7 @@ operators.
 class TQDate
 {
 %TypeHeaderCode
-#include <qdatetime.h>
+#include <tqdatetime.h>
 %End
 
 public:
@@ -153,7 +153,7 @@ public:
 class TQTime
 {
 %TypeHeaderCode
-#include <qdatetime.h>
+#include <tqdatetime.h>
 %End
 
 public:
@@ -217,7 +217,7 @@ public:
 class TQDateTime
 {
 %TypeHeaderCode
-#include <qdatetime.h>
+#include <tqdatetime.h>
 %End
 
 public:
diff --git a/sip/qt/qdatetimeedit.sip b/sip/qt/qdatetimeedit.sip
index 271c4ca..46aa7bf 100644
--- a/sip/qt/qdatetimeedit.sip
+++ b/sip/qt/qdatetimeedit.sip
@@ -50,7 +50,7 @@
 class TQDateEdit : TQWidget
 {
 %TypeHeaderCode
-#include <qdatetimeedit.h>
+#include <tqdatetimeedit.h>
 %End
 
 public:
@@ -128,7 +128,7 @@ private:
 class TQTimeEdit : TQWidget
 {
 %TypeHeaderCode
-#include <qdatetimeedit.h>
+#include <tqdatetimeedit.h>
 %End
 
 public:
@@ -207,7 +207,7 @@ private:
 class TQDateTimeEdit : TQWidget
 {
 %TypeHeaderCode
-#include <qdatetimeedit.h>
+#include <tqdatetimeedit.h>
 %End
 
 public:
diff --git a/sip/qt/qdesktopwidget.sip b/sip/qt/qdesktopwidget.sip
index 76556ad..1cd9d14 100644
--- a/sip/qt/qdesktopwidget.sip
+++ b/sip/qt/qdesktopwidget.sip
@@ -34,7 +34,7 @@
 class TQDesktopWidget : TQWidget
 {
 %TypeHeaderCode
-#include <qdesktopwidget.h>
+#include <tqdesktopwidget.h>
 %End
 
 public:
diff --git a/sip/qt/qdial.sip b/sip/qt/qdial.sip
index cbf80e1..3c2d816 100644
--- a/sip/qt/qdial.sip
+++ b/sip/qt/qdial.sip
@@ -35,7 +35,7 @@
 class TQDial : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
-#include <qdial.h>
+#include <tqdial.h>
 %End
 
 public:
diff --git a/sip/qt/qdialog.sip b/sip/qt/qdialog.sip
index 9874d26..ac78030 100644
--- a/sip/qt/qdialog.sip
+++ b/sip/qt/qdialog.sip
@@ -43,7 +43,7 @@ ensures that the dialog is deleted without having to explicity code it using
 class TQDialog : TQWidget
 {
 %TypeHeaderCode
-#include <qdialog.h>
+#include <tqdialog.h>
 %End
 
 public:
diff --git a/sip/qt/qdir.sip b/sip/qt/qdir.sip
index a531b5e..12a98f7 100644
--- a/sip/qt/qdir.sip
+++ b/sip/qt/qdir.sip
@@ -43,7 +43,7 @@ the return type of a function or the type of an argument, a Python list of
 %MappedType TQFileInfoList
 {
 %TypeHeaderCode
-#include <qdir.h>
+#include <tqdir.h>
 %End
 
 %ConvertFromTypeCode
@@ -119,7 +119,7 @@ the return type of a function or the type of an argument, a Python list of
 class TQDir
 {
 %TypeHeaderCode
-#include <qdir.h>
+#include <tqdir.h>
 %End
 
 public:
diff --git a/sip/qt/qdockarea.sip b/sip/qt/qdockarea.sip
index 7c1c7a3..3e1f6f9 100644
--- a/sip/qt/qdockarea.sip
+++ b/sip/qt/qdockarea.sip
@@ -40,7 +40,7 @@ TQDockWIndow or -1 if the TQDockArea does not contain the TQDockWindow.
 class TQDockArea : TQWidget
 {
 %TypeHeaderCode
-#include <qdockarea.h>
+#include <tqdockarea.h>
 %End
 
 public:
diff --git a/sip/qt/qdockwindow.sip b/sip/qt/qdockwindow.sip
index d9ad4fd..43c7218 100644
--- a/sip/qt/qdockwindow.sip
+++ b/sip/qt/qdockwindow.sip
@@ -34,7 +34,7 @@
 class TQDockWindow : TQFrame
 {
 %TypeHeaderCode
-#include <qdockwindow.h>
+#include <tqdockwindow.h>
 %End
 
 public:
diff --git a/sip/qt/qdragobject.sip b/sip/qt/qdragobject.sip
index 9c7f50f..f258596 100644
--- a/sip/qt/qdragobject.sip
+++ b/sip/qt/qdragobject.sip
@@ -71,7 +71,7 @@
 class TQDragObject : TQObject
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
@@ -107,7 +107,7 @@ protected:
 class TQDragObject : TQObject, TQMimeSource
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
@@ -174,7 +174,7 @@ private:
 class TQStoredDrag : TQDragObject
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
@@ -202,7 +202,7 @@ private:
 class TQTextDrag : TQStoredDrag
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
@@ -221,7 +221,7 @@ public:
 class TQTextDrag : TQDragObject
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
@@ -251,7 +251,7 @@ private:
 class TQImageDrag : TQDragObject
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
@@ -291,7 +291,7 @@ private:
 class TQUrlDrag : TQStoredDrag
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
@@ -312,7 +312,7 @@ public:
 class TQUriDrag : TQStoredDrag
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
@@ -352,7 +352,7 @@ private:
 class TQColorDrag : TQStoredDrag
 {
 %TypeHeaderCode
-#include <qdragobject.h>
+#include <tqdragobject.h>
 %End
 
 public:
diff --git a/sip/qt/qdrawutil.sip b/sip/qt/qdrawutil.sip
index 0cd9ec8..4213d4c 100644
--- a/sip/qt/qdrawutil.sip
+++ b/sip/qt/qdrawutil.sip
@@ -21,7 +21,7 @@
 
 
 %ModuleHeaderCode
-#include <qdrawutil.h>
+#include <tqdrawutil.h>
 %End
 
 
diff --git a/sip/qt/qdropsite.sip b/sip/qt/qdropsite.sip
index 90a64ee..5153f30 100644
--- a/sip/qt/qdropsite.sip
+++ b/sip/qt/qdropsite.sip
@@ -34,7 +34,7 @@
 class TQDropSite
 {
 %TypeHeaderCode
-#include <qdropsite.h>
+#include <tqdropsite.h>
 %End
 
 public:
diff --git a/sip/qt/qerrormessage.sip b/sip/qt/qerrormessage.sip
index 9393b01..6e14b5c 100644
--- a/sip/qt/qerrormessage.sip
+++ b/sip/qt/qerrormessage.sip
@@ -34,7 +34,7 @@
 class TQErrorMessage : TQDialog
 {
 %TypeHeaderCode
-#include <qerrormessage.h>
+#include <tqerrormessage.h>
 %End
 
 public:
diff --git a/sip/qt/qevent.sip b/sip/qt/qevent.sip
index 098e253..46e899d 100644
--- a/sip/qt/qevent.sip
+++ b/sip/qt/qevent.sip
@@ -171,7 +171,7 @@ passed as the event data and its reference count is increased.
 
 
 %ModuleHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 
@@ -230,7 +230,7 @@ enum ButtonState {
 class TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -321,7 +321,7 @@ public:
 class TQEvent : TQt
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -579,7 +579,7 @@ public:
 class TQTimerEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -592,7 +592,7 @@ public:
 class TQMouseEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -633,7 +633,7 @@ public:
 class TQWheelEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -671,7 +671,7 @@ public:
 class TQTabletEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -714,7 +714,7 @@ public:
 class TQKeyEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -749,7 +749,7 @@ public:
 class TQFocusEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -796,7 +796,7 @@ public:
 class TQPaintEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -822,7 +822,7 @@ public:
 class TQMoveEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -836,7 +836,7 @@ public:
 class TQResizeEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -850,7 +850,7 @@ public:
 class TQCloseEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -867,7 +867,7 @@ public:
 class TQIconDragEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -884,7 +884,7 @@ public:
 class TQShowEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -902,7 +902,7 @@ public:
 class TQHideEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -922,7 +922,7 @@ public:
 class TQContextMenuEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -960,7 +960,7 @@ public:
 class TQIMEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -984,7 +984,7 @@ public:
 class TQIMComposeEvent : TQIMEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -999,7 +999,7 @@ public:
 class TQDropEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -1021,7 +1021,7 @@ public:
 class TQDropEvent : TQEvent, TQMimeSource
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -1062,7 +1062,7 @@ public:
 class TQDragMoveEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -1092,7 +1092,7 @@ protected:
 class TQDragMoveEvent : TQDropEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -1111,7 +1111,7 @@ public:
 class TQDragEnterEvent : TQDragMoveEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -1122,7 +1122,7 @@ public:
 class TQDragLeaveEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -1135,7 +1135,7 @@ public:
 class TQChildEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
@@ -1160,7 +1160,7 @@ public:
 class TQCustomEvent : TQEvent
 {
 %TypeHeaderCode
-#include <qevent.h>
+#include <tqevent.h>
 %End
 
 public:
diff --git a/sip/qt/qeventloop.sip b/sip/qt/qeventloop.sip
index 8ad3b06..009917d 100644
--- a/sip/qt/qeventloop.sip
+++ b/sip/qt/qeventloop.sip
@@ -38,7 +38,7 @@ This has been renamed to <Literal>exec_loop</Literal> in Python.
 class TQEventLoop : TQObject
 {
 %TypeHeaderCode
-#include <qeventloop.h>
+#include <tqeventloop.h>
 %End
 
 public:
diff --git a/sip/qt/qfile.sip b/sip/qt/qfile.sip
index 2b3eb28..4bd3760 100644
--- a/sip/qt/qfile.sip
+++ b/sip/qt/qfile.sip
@@ -85,7 +85,7 @@ as a parameter.
 class TQFile : TQIODevice
 {
 %TypeHeaderCode
-#include <qfile.h>
+#include <tqfile.h>
 %End
 
 public:
diff --git a/sip/qt/qfiledialog.sip b/sip/qt/qfiledialog.sip
index 212b74c..b5a7af8 100644
--- a/sip/qt/qfiledialog.sip
+++ b/sip/qt/qfiledialog.sip
@@ -65,7 +65,7 @@ Thanks to Hans-Peter Jansen for this trick.
 class TQFileIconProvider : TQObject
 {
 %TypeHeaderCode
-#include <qfiledialog.h>
+#include <tqfiledialog.h>
 %End
 
 public:
@@ -84,7 +84,7 @@ private:
 class TQFilePreview
 {
 %TypeHeaderCode
-#include <qfiledialog.h>
+#include <tqfiledialog.h>
 %End
 
 public:
@@ -98,7 +98,7 @@ public:
 class TQFileDialog : TQDialog
 {
 %TypeHeaderCode
-#include <qfiledialog.h>
+#include <tqfiledialog.h>
 %End
 
 public:
diff --git a/sip/qt/qfileinfo.sip b/sip/qt/qfileinfo.sip
index a43f156..a2b6869 100644
--- a/sip/qt/qfileinfo.sip
+++ b/sip/qt/qfileinfo.sip
@@ -32,7 +32,7 @@
 class TQFileInfo
 {
 %TypeHeaderCode
-#include <qfileinfo.h>
+#include <tqfileinfo.h>
 %End
 
 public:
diff --git a/sip/qt/qfont.sip b/sip/qt/qfont.sip
index 54689e9..cb42fde 100644
--- a/sip/qt/qfont.sip
+++ b/sip/qt/qfont.sip
@@ -33,7 +33,7 @@
 class TQFont
 {
 %TypeHeaderCode
-#include <qfont.h>
+#include <tqfont.h>
 %End
 
 public:
diff --git a/sip/qt/qfontdatabase.sip b/sip/qt/qfontdatabase.sip
index 4676e43..4a1e07c 100644
--- a/sip/qt/qfontdatabase.sip
+++ b/sip/qt/qfontdatabase.sip
@@ -35,7 +35,7 @@
 class TQFontDatabase
 {
 %TypeHeaderCode
-#include <qfontdatabase.h>
+#include <tqfontdatabase.h>
 %End
 
 public:
diff --git a/sip/qt/qfontdialog.sip b/sip/qt/qfontdialog.sip
index e4f93f1..d7bb673 100644
--- a/sip/qt/qfontdialog.sip
+++ b/sip/qt/qfontdialog.sip
@@ -56,7 +56,7 @@ and returns a tuple containing the <Literal>TQFont</Literal> result and the
 class TQFontDialog : TQDialog
 {
 %TypeHeaderCode
-#include <qfontdialog.h>
+#include <tqfontdialog.h>
 %End
 
 public:
diff --git a/sip/qt/qfontinfo.sip b/sip/qt/qfontinfo.sip
index f2d48ff..ed85074 100644
--- a/sip/qt/qfontinfo.sip
+++ b/sip/qt/qfontinfo.sip
@@ -32,7 +32,7 @@
 class TQFontInfo
 {
 %TypeHeaderCode
-#include <qfontinfo.h>
+#include <tqfontinfo.h>
 %End
 
 public:
diff --git a/sip/qt/qfontmetrics.sip b/sip/qt/qfontmetrics.sip
index c3dbf4e..28f89a1 100644
--- a/sip/qt/qfontmetrics.sip
+++ b/sip/qt/qfontmetrics.sip
@@ -56,7 +56,7 @@ The <Literal>tabarray</Literal> parameter is a Python list of integers.
 class TQFontMetrics
 {
 %TypeHeaderCode
-#include <qfontmetrics.h>
+#include <tqfontmetrics.h>
 %End
 
 public:
diff --git a/sip/qt/qframe.sip b/sip/qt/qframe.sip
index 1bc9308..737e4ae 100644
--- a/sip/qt/qframe.sip
+++ b/sip/qt/qframe.sip
@@ -32,7 +32,7 @@
 class TQFrame : TQWidget
 {
 %TypeHeaderCode
-#include <qframe.h>
+#include <tqframe.h>
 %End
 
 public:
diff --git a/sip/qt/qglobal.sip b/sip/qt/qglobal.sip
index a508f3f..a20090f 100644
--- a/sip/qt/qglobal.sip
+++ b/sip/qt/qglobal.sip
@@ -21,7 +21,7 @@
 
 
 %ModuleHeaderCode
-#include <qglobal.h>
+#include <tqglobal.h>
 %End
 
 
diff --git a/sip/qt/qgmanager.sip b/sip/qt/qgmanager.sip
index 9f81d48..9dc97fa 100644
--- a/sip/qt/qgmanager.sip
+++ b/sip/qt/qgmanager.sip
@@ -43,7 +43,7 @@ class TQChain;
 class TQGManager : TQObject
 {
 %TypeHeaderCode
-#include <qgmanager.h>
+#include <tqgmanager.h>
 %End
 
 public:
diff --git a/sip/qt/qgrid.sip b/sip/qt/qgrid.sip
index 3b52514..d0078ad 100644
--- a/sip/qt/qgrid.sip
+++ b/sip/qt/qgrid.sip
@@ -34,7 +34,7 @@
 class TQGrid : TQFrame
 {
 %TypeHeaderCode
-#include <qgrid.h>
+#include <tqgrid.h>
 %End
 
 public:
diff --git a/sip/qt/qgridview.sip b/sip/qt/qgridview.sip
index 1afeeaa..d251c54 100644
--- a/sip/qt/qgridview.sip
+++ b/sip/qt/qgridview.sip
@@ -34,7 +34,7 @@
 class TQGridView : TQScrollView
 {
 %TypeHeaderCode
-#include <qgridview.h>
+#include <tqgridview.h>
 %End
 
 public:
diff --git a/sip/qt/qgroupbox.sip b/sip/qt/qgroupbox.sip
index 43e8f32..a6401f5 100644
--- a/sip/qt/qgroupbox.sip
+++ b/sip/qt/qgroupbox.sip
@@ -32,7 +32,7 @@
 class TQGroupBox : TQFrame
 {
 %TypeHeaderCode
-#include <qgroupbox.h>
+#include <tqgroupbox.h>
 %End
 
 public:
diff --git a/sip/qt/qhbox.sip b/sip/qt/qhbox.sip
index 549dcdb..1d5d84c 100644
--- a/sip/qt/qhbox.sip
+++ b/sip/qt/qhbox.sip
@@ -34,7 +34,7 @@
 class TQHBox : TQFrame
 {
 %TypeHeaderCode
-#include <qhbox.h>
+#include <tqhbox.h>
 %End
 
 public:
diff --git a/sip/qt/qhbuttongroup.sip b/sip/qt/qhbuttongroup.sip
index 3851609..bad9f30 100644
--- a/sip/qt/qhbuttongroup.sip
+++ b/sip/qt/qhbuttongroup.sip
@@ -34,7 +34,7 @@
 class TQHButtonGroup : TQButtonGroup
 {
 %TypeHeaderCode
-#include <qhbuttongroup.h>
+#include <tqhbuttongroup.h>
 %End
 
 public:
diff --git a/sip/qt/qheader.sip b/sip/qt/qheader.sip
index c921a34..eaf1701 100644
--- a/sip/qt/qheader.sip
+++ b/sip/qt/qheader.sip
@@ -34,7 +34,7 @@
 class TQHeader : TQTableView
 {
 %TypeHeaderCode
-#include <qheader.h>
+#include <tqheader.h>
 %End
 
 public:
@@ -97,7 +97,7 @@ private:
 class TQHeader : TQWidget
 {
 %TypeHeaderCode
-#include <qheader.h>
+#include <tqheader.h>
 %End
 
 public:
diff --git a/sip/qt/qhgroupbox.sip b/sip/qt/qhgroupbox.sip
index cfbdb3b..5761c17 100644
--- a/sip/qt/qhgroupbox.sip
+++ b/sip/qt/qhgroupbox.sip
@@ -34,7 +34,7 @@
 class TQHGroupBox : TQGroupBox
 {
 %TypeHeaderCode
-#include <qhgroupbox.h>
+#include <tqhgroupbox.h>
 %End
 
 public:
diff --git a/sip/qt/qiconset.sip b/sip/qt/qiconset.sip
index 3dd2f3a..45f8140 100644
--- a/sip/qt/qiconset.sip
+++ b/sip/qt/qiconset.sip
@@ -38,7 +38,7 @@
 class TQIconSet
 {
 %TypeHeaderCode
-#include <qiconset.h>
+#include <tqiconset.h>
 %End
 
 public:
@@ -124,7 +124,7 @@ public:
 class TQIconFactory
 {
 %TypeHeaderCode
-#include <qiconset.h>
+#include <tqiconset.h>
 %End
 
 public:
diff --git a/sip/qt/qiconview.sip b/sip/qt/qiconview.sip
index bdc3bcb..a9dc9d5 100644
--- a/sip/qt/qiconview.sip
+++ b/sip/qt/qiconview.sip
@@ -61,7 +61,7 @@ Not yet implemented.
 class TQIconDragItem
 {
 %TypeHeaderCode
-#include <qiconview.h>
+#include <tqiconview.h>
 %End
 
 public:
@@ -75,7 +75,7 @@ public:
 class TQIconDrag : TQDragObject
 {
 %TypeHeaderCode
-#include <qiconview.h>
+#include <tqiconview.h>
 %End
 
 public:
@@ -99,7 +99,7 @@ private:
 class TQIconViewItem : TQt
 {
 %TypeHeaderCode
-#include <qiconview.h>
+#include <tqiconview.h>
 %End
 
 public:
@@ -224,7 +224,7 @@ protected:
 class TQIconView : TQScrollView
 {
 %TypeHeaderCode
-#include <qiconview.h>
+#include <tqiconview.h>
 %End
 
 public:
diff --git a/sip/qt/qimage.sip b/sip/qt/qimage.sip
index 7431f4d..e0d99ed 100644
--- a/sip/qt/qimage.sip
+++ b/sip/qt/qimage.sip
@@ -136,7 +136,7 @@ Not implemented.
 class TQImage
 {
 %TypeHeaderCode
-#include <qimage.h>
+#include <tqimage.h>
 %End
 
 public:
@@ -407,7 +407,7 @@ void bitBlt(TQImage *,int,int,const TQImage *,int = 0,int = 0,int = -1,int = -1,
 class TQImageIO
 {
 %TypeHeaderCode
-#include <qimage.h>
+#include <tqimage.h>
 %End
 
 public:
@@ -490,7 +490,7 @@ private:
 class TQImageTextKeyLang
 {
 %TypeHeaderCode
-#include <qimage.h>
+#include <tqimage.h>
 %End
 
 public:
diff --git a/sip/qt/qinputdialog.sip b/sip/qt/qinputdialog.sip
index 55f50d3..199e29d 100644
--- a/sip/qt/qinputdialog.sip
+++ b/sip/qt/qinputdialog.sip
@@ -128,7 +128,7 @@ the <Literal>TQString</Literal> result and the <Literal>ok</Literal> flag.
 class TQInputDialog : TQDialog
 {
 %TypeHeaderCode
-#include <qinputdialog.h>
+#include <tqinputdialog.h>
 %End
 
 public:
diff --git a/sip/qt/qinterlacestyle.sip b/sip/qt/qinterlacestyle.sip
index 97f4e19..7e4445f 100644
--- a/sip/qt/qinterlacestyle.sip
+++ b/sip/qt/qinterlacestyle.sip
@@ -46,7 +46,7 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 class TQInterlaceStyle : TQMotifStyle
 {
 %TypeHeaderCode
-#include <qinterlacestyle.h>
+#include <tqinterlacestyle.h>
 %End
 
 public:
diff --git a/sip/qt/qiodevice.sip b/sip/qt/qiodevice.sip
index 6d44689..f52e598 100644
--- a/sip/qt/qiodevice.sip
+++ b/sip/qt/qiodevice.sip
@@ -30,7 +30,7 @@
 
 
 %ModuleHeaderCode
-#include <qiodevice.h>
+#include <tqiodevice.h>
 %End
 
 
@@ -80,7 +80,7 @@ const int IO_UnspecifiedError;
 class TQIODevice
 {
 %TypeHeaderCode
-#include <qiodevice.h>
+#include <tqiodevice.h>
 %End
 
 public:
diff --git a/sip/qt/qkeycode.sip b/sip/qt/qkeycode.sip
index cdd5bfb..ca10bd2 100644
--- a/sip/qt/qkeycode.sip
+++ b/sip/qt/qkeycode.sip
@@ -23,7 +23,7 @@
 %If (- TQt_2_00)
 
 %ModuleHeaderCode
-#include <qkeycode.h>
+#include <tqkeycode.h>
 %End
 
 // Accelerator modifiers.
diff --git a/sip/qt/qkeysequence.sip b/sip/qt/qkeysequence.sip
index f70f6ef..8d8e32e 100644
--- a/sip/qt/qkeysequence.sip
+++ b/sip/qt/qkeysequence.sip
@@ -37,7 +37,7 @@ integer may be used whenever a <Literal>TQKeySequence</Literal> can be used.
 class TQKeySequence : TQt
 {
 %TypeHeaderCode
-#include <qkeysequence.h>
+#include <tqkeysequence.h>
 %End
 
 public:
diff --git a/sip/qt/qlabel.sip b/sip/qt/qlabel.sip
index f12e572..99ac8ac 100644
--- a/sip/qt/qlabel.sip
+++ b/sip/qt/qlabel.sip
@@ -32,7 +32,7 @@
 class TQLabel : TQFrame
 {
 %TypeHeaderCode
-#include <qlabel.h>
+#include <tqlabel.h>
 %End
 
 public:
diff --git a/sip/qt/qlayout.sip b/sip/qt/qlayout.sip
index 4663282..ddc0a3d 100644
--- a/sip/qt/qlayout.sip
+++ b/sip/qt/qlayout.sip
@@ -103,7 +103,7 @@ This is a wrapper around the <Literal>TQLayoutIterator</Literal>
 class TQLayout : TQObject
 {
 %TypeHeaderCode
-#include <qlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -141,7 +141,7 @@ private:
 class TQGLayoutIterator
 {
 %TypeHeaderCode
-#include <qabstractlayout.h>
+#include <tqabstractlayout.h>
 %End
 
 public:
@@ -154,7 +154,7 @@ public:
 class TQLayoutIterator
 {
 %TypeHeaderCode
-#include <qabstractlayout.h>
+#include <tqabstractlayout.h>
 %End
 
 public:
@@ -177,7 +177,7 @@ public:
 class TQLayoutItem
 {
 %TypeHeaderCode
-#include <qabstractlayout.h>
+#include <tqabstractlayout.h>
 %End
 
 public:
@@ -218,7 +218,7 @@ public:
 class TQSpacerItem : TQLayoutItem
 {
 %TypeHeaderCode
-#include <qabstractlayout.h>
+#include <tqabstractlayout.h>
 %End
 
 public:
@@ -241,7 +241,7 @@ public:
 class TQWidgetItem : TQLayoutItem
 {
 %TypeHeaderCode
-#include <qabstractlayout.h>
+#include <tqabstractlayout.h>
 %End
 
 public:
@@ -264,7 +264,7 @@ public:
 class TQLayout : TQObject, TQLayoutItem
 {
 %TypeHeaderCode
-#include <qabstractlayout.h>
+#include <tqabstractlayout.h>
 %End
 
 public:
@@ -370,7 +370,7 @@ private:
 class TQGridLayout : TQLayout
 {
 %TypeHeaderCode
-#include <qlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -486,7 +486,7 @@ private:
 class TQBoxLayout : TQLayout
 {
 %TypeHeaderCode
-#include <qlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -560,7 +560,7 @@ private:
 class TQHBoxLayout : TQBoxLayout
 {
 %TypeHeaderCode
-#include <qlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -580,7 +580,7 @@ private:
 class TQVBoxLayout : TQBoxLayout
 {
 %TypeHeaderCode
-#include <qlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
diff --git a/sip/qt/qlcdnumber.sip b/sip/qt/qlcdnumber.sip
index 4515a68..c071f50 100644
--- a/sip/qt/qlcdnumber.sip
+++ b/sip/qt/qlcdnumber.sip
@@ -32,7 +32,7 @@
 class TQLCDNumber : TQFrame
 {
 %TypeHeaderCode
-#include <qlcdnumber.h>
+#include <tqlcdnumber.h>
 %End
 
 public:
diff --git a/sip/qt/qlibrary.sip b/sip/qt/qlibrary.sip
index 89ce16a..fa6c3c9 100644
--- a/sip/qt/qlibrary.sip
+++ b/sip/qt/qlibrary.sip
@@ -34,7 +34,7 @@
 class TQLibrary
 {
 %TypeHeaderCode
-#include <qlibrary.h>
+#include <tqlibrary.h>
 %End
 
 public:
diff --git a/sip/qt/qlineedit.sip b/sip/qt/qlineedit.sip
index 9c2a44d..e7f6372 100644
--- a/sip/qt/qlineedit.sip
+++ b/sip/qt/qlineedit.sip
@@ -59,7 +59,7 @@ This takes no parameters and returns the bool result and the
 class TQLineEdit : TQFrame
 {
 %TypeHeaderCode
-#include <qlineedit.h>
+#include <tqlineedit.h>
 %End
 
 public:
@@ -230,7 +230,7 @@ private:
 class TQLineEdit : TQWidget
 {
 %TypeHeaderCode
-#include <qlineedit.h>
+#include <tqlineedit.h>
 %End
 
 public:
diff --git a/sip/qt/qlist.sip b/sip/qt/qlist.sip
index 3b17360..8304d19 100644
--- a/sip/qt/qlist.sip
+++ b/sip/qt/qlist.sip
@@ -37,7 +37,7 @@ template<Type>
 %MappedType TQList<Type>
 {
 %TypeHeaderCode
-#include <qlist.h>
+#include <tqlist.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qlistbox.sip b/sip/qt/qlistbox.sip
index e19d8ea..f0724e3 100644
--- a/sip/qt/qlistbox.sip
+++ b/sip/qt/qlistbox.sip
@@ -58,7 +58,7 @@ containing the <Literal>bool</Literal> result and <Literal>yPos</Literal>.
 %If (- TQt_2_00)
 
 %ModuleHeaderCode
-#include <qlistbox.h>
+#include <tqlistbox.h>
 %End
 
 // List box item types.
@@ -71,7 +71,7 @@ const int LBI_UserDefined;
 class TQListBox : TQTableView
 {
 %TypeHeaderCode
-#include <qlistbox.h>
+#include <tqlistbox.h>
 %End
 
 public:
@@ -168,7 +168,7 @@ private:
 class TQListBox : TQScrollView
 {
 %TypeHeaderCode
-#include <qlistbox.h>
+#include <tqlistbox.h>
 %End
 
 public:
@@ -416,7 +416,7 @@ private:
 class TQListBoxItem
 {
 %TypeHeaderCode
-#include <qlistbox.h>
+#include <tqlistbox.h>
 %End
 
 public:
@@ -493,7 +493,7 @@ private:
 class TQListBoxText : TQListBoxItem
 {
 %TypeHeaderCode
-#include <qlistbox.h>
+#include <tqlistbox.h>
 %End
 
 public:
@@ -531,7 +531,7 @@ private:
 class TQListBoxPixmap : TQListBoxItem
 {
 %TypeHeaderCode
-#include <qlistbox.h>
+#include <tqlistbox.h>
 %End
 
 public:
diff --git a/sip/qt/qlistview.sip b/sip/qt/qlistview.sip
index d4e1698..d7ef8a1 100644
--- a/sip/qt/qlistview.sip
+++ b/sip/qt/qlistview.sip
@@ -61,7 +61,7 @@ call <Literal>takeItem()</Literal> and then <Literal>del()</Literal>.
 class TQListViewItem
 {
 %TypeHeaderCode
-#include <qlistview.h>
+#include <tqlistview.h>
 %End
 
 public:
@@ -144,7 +144,7 @@ protected:
 class TQListViewItem : TQt
 {
 %TypeHeaderCode
-#include <qlistview.h>
+#include <tqlistview.h>
 %End
 
 public:
@@ -295,7 +295,7 @@ protected:
 class TQListView : TQScrollView
 {
 %TypeHeaderCode
-#include <qlistview.h>
+#include <tqlistview.h>
 %End
 
 public:
@@ -603,7 +603,7 @@ private:
 class TQCheckListItem : TQListViewItem
 {
 %TypeHeaderCode
-#include <qlistview.h>
+#include <tqlistview.h>
 %End
 
 public:
@@ -726,7 +726,7 @@ protected:
 class TQListViewItemIterator
 {
 %TypeHeaderCode
-#include <qlistview.h>
+#include <tqlistview.h>
 %End
 
 public:
diff --git a/sip/qt/qlocale.sip b/sip/qt/qlocale.sip
index c68c1d1..cc17441 100644
--- a/sip/qt/qlocale.sip
+++ b/sip/qt/qlocale.sip
@@ -102,7 +102,7 @@ This returns a tuple of the <Literal>double</Literal> result and the
 class TQLocale
 {
 %TypeHeaderCode
-#include <qlocale.h>
+#include <tqlocale.h>
 %End
 
 public:
diff --git a/sip/qt/qmainwindow.sip b/sip/qt/qmainwindow.sip
index f582ce5..4bdb3b3 100644
--- a/sip/qt/qmainwindow.sip
+++ b/sip/qt/qmainwindow.sip
@@ -68,7 +68,7 @@ This returns a list of <Literal>TQToolBar</Literal> instances.  (TQt v2.1.0+)
 class TQMainWindow : TQWidget
 {
 %TypeHeaderCode
-#include <qmainwindow.h>
+#include <tqmainwindow.h>
 %End
 
 public:
diff --git a/sip/qt/qmemarray.sip b/sip/qt/qmemarray.sip
index a73b524..e22e1d8 100644
--- a/sip/qt/qmemarray.sip
+++ b/sip/qt/qmemarray.sip
@@ -36,7 +36,7 @@ converted to and from Python lists of the type.
 %MappedType TQMemArray<int>
 {
 %TypeHeaderCode
-#include <qmemarray.h>
+#include <tqmemarray.h>
 %End
 
 %ConvertFromTypeCode
@@ -93,7 +93,7 @@ template<TYPE>
 %MappedType TQMemArray<TYPE>
 {
 %TypeHeaderCode
-#include <qmemarray.h>
+#include <tqmemarray.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qmenubar.sip b/sip/qt/qmenubar.sip
index b0bb9fa..eff2db4 100644
--- a/sip/qt/qmenubar.sip
+++ b/sip/qt/qmenubar.sip
@@ -32,7 +32,7 @@
 class TQMenuBar : TQFrame, TQMenuData
 {
 %TypeHeaderCode
-#include <qmenubar.h>
+#include <tqmenubar.h>
 %End
 
 public:
diff --git a/sip/qt/qmenudata.sip b/sip/qt/qmenudata.sip
index c72151a..01b9868 100644
--- a/sip/qt/qmenudata.sip
+++ b/sip/qt/qmenudata.sip
@@ -54,7 +54,7 @@ Not implemented.
 class TQMenuItem
 {
 %TypeHeaderCode
-#include <qmenudata.h>
+#include <tqmenudata.h>
 %End
 
 public:
@@ -79,7 +79,7 @@ class TQMenuItem;
 class TQMenuData
 {
 %TypeHeaderCode
-#include <qmenudata.h>
+#include <tqmenudata.h>
 %End
 
 public:
@@ -274,7 +274,7 @@ private:
 class TQCustomMenuItem : TQt
 {
 %TypeHeaderCode
-#include <qmenudata.h>
+#include <tqmenudata.h>
 %End
 
 public:
diff --git a/sip/qt/qmessagebox.sip b/sip/qt/qmessagebox.sip
index a847d84..4070768 100644
--- a/sip/qt/qmessagebox.sip
+++ b/sip/qt/qmessagebox.sip
@@ -34,7 +34,7 @@
 class TQMessageBox : TQDialog
 {
 %TypeHeaderCode
-#include <qmessagebox.h>
+#include <tqmessagebox.h>
 %End
 
 public:
diff --git a/sip/qt/qmetaobject.sip b/sip/qt/qmetaobject.sip
index b4cb53c..5960339 100644
--- a/sip/qt/qmetaobject.sip
+++ b/sip/qt/qmetaobject.sip
@@ -50,7 +50,7 @@ Not implemented.
 class TQMetaObject
 {
 %TypeHeaderCode
-#include <qmetaobject.h>
+#include <tqmetaobject.h>
 %End
 
 public:
@@ -96,7 +96,7 @@ private:
 class TQMetaProperty
 {
 %TypeHeaderCode
-#include <qmetaobject.h>
+#include <tqmetaobject.h>
 %End
 
 public:
diff --git a/sip/qt/qmime.sip b/sip/qt/qmime.sip
index 53d48fe..f0ce87f 100644
--- a/sip/qt/qmime.sip
+++ b/sip/qt/qmime.sip
@@ -47,7 +47,7 @@
 class TQMimeSource
 {
 %TypeHeaderCode
-#include <qmime.h>
+#include <tqmime.h>
 %End
 
 public:
@@ -67,7 +67,7 @@ public:
 class TQMimeSourceFactory
 {
 %TypeHeaderCode
-#include <qmime.h>
+#include <tqmime.h>
 %End
 
 public:
diff --git a/sip/qt/qmotifplusstyle.sip b/sip/qt/qmotifplusstyle.sip
index 910cfdb..1f6f8fd 100644
--- a/sip/qt/qmotifplusstyle.sip
+++ b/sip/qt/qmotifplusstyle.sip
@@ -56,7 +56,7 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 class TQMotifPlusStyle : TQMotifStyle
 {
 %TypeHeaderCode
-#include <qmotifplusstyle.h>
+#include <tqmotifplusstyle.h>
 %End
 
 public:
diff --git a/sip/qt/qmotifstyle.sip b/sip/qt/qmotifstyle.sip
index 9e20296..0e0b979 100644
--- a/sip/qt/qmotifstyle.sip
+++ b/sip/qt/qmotifstyle.sip
@@ -59,7 +59,7 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the
 class TQMotifStyle : TQCommonStyle
 {
 %TypeHeaderCode
-#include <qmotifstyle.h>
+#include <tqmotifstyle.h>
 %End
 
 public:
diff --git a/sip/qt/qmovie.sip b/sip/qt/qmovie.sip
index 3b79830..b3fef65 100644
--- a/sip/qt/qmovie.sip
+++ b/sip/qt/qmovie.sip
@@ -47,7 +47,7 @@ passed as a parameter. (TQt v2.2.0+)
 class TQMovie
 {
 %TypeHeaderCode
-#include <qmovie.h>
+#include <tqmovie.h>
 %End
 
 public:
diff --git a/sip/qt/qmultilinedit.sip b/sip/qt/qmultilinedit.sip
index cc462be..cc3f347 100644
--- a/sip/qt/qmultilinedit.sip
+++ b/sip/qt/qmultilinedit.sip
@@ -71,7 +71,7 @@ This takes no parameters and returns a tuple of the bool result and the
 class TQMultiLineEdit : TQTextEdit
 {
 %TypeHeaderCode
-#include <qmultilineedit.h>
+#include <tqmultilineedit.h>
 %End
 
 public:
@@ -153,7 +153,7 @@ private:
 class TQMultiLineEdit : TQTableView
 {
 %TypeHeaderCode
-#include <qmultilinedit.h>
+#include <tqmultilinedit.h>
 %End
 
 public:
diff --git a/sip/qt/qmutex.sip b/sip/qt/qmutex.sip
index 3bf03bc..38104d5 100644
--- a/sip/qt/qmutex.sip
+++ b/sip/qt/qmutex.sip
@@ -42,7 +42,7 @@
 class TQMutex
 {
 %TypeHeaderCode
-#include <qmutex.h>
+#include <tqmutex.h>
 %End
 
 public:
@@ -65,7 +65,7 @@ private:
 class TQMutex : TQt
 {
 %TypeHeaderCode
-#include <qthread.h>
+#include <tqthread.h>
 %End
 
 public:
@@ -87,7 +87,7 @@ private:
 class TQMutexLocker
 {
 %TypeHeaderCode
-#include <qmutex.h>
+#include <tqmutex.h>
 %End
 
 public:
diff --git a/sip/qt/qnamespace.sip b/sip/qt/qnamespace.sip
index be20dc2..3d65485 100644
--- a/sip/qt/qnamespace.sip
+++ b/sip/qt/qnamespace.sip
@@ -34,7 +34,7 @@
 class TQt
 {
 %TypeHeaderCode
-#include <qnamespace.h>
+#include <tqnamespace.h>
 %End
 
 public:
diff --git a/sip/qt/qnetworkprotocol.sip b/sip/qt/qnetworkprotocol.sip
index deee868..d8f9d1e 100644
--- a/sip/qt/qnetworkprotocol.sip
+++ b/sip/qt/qnetworkprotocol.sip
@@ -48,7 +48,7 @@
 class TQNetworkProtocolFactoryBase
 {
 %TypeHeaderCode
-#include <qnetworkprotocol.h>
+#include <tqnetworkprotocol.h>
 %End
 
 public:
@@ -60,7 +60,7 @@ public:
 class TQNetworkProtocol : TQObject
 {
 %TypeHeaderCode
-#include <qnetworkprotocol.h>
+#include <tqnetworkprotocol.h>
 %End
 
 public:
@@ -193,7 +193,7 @@ private:
 class TQNetworkOperation : TQObject
 {
 %TypeHeaderCode
-#include <qnetworkprotocol.h>
+#include <tqnetworkprotocol.h>
 %End
 
 public:
diff --git a/sip/qt/qobject.sip b/sip/qt/qobject.sip
index d4daa63..78db056 100644
--- a/sip/qt/qobject.sip
+++ b/sip/qt/qobject.sip
@@ -63,8 +63,8 @@ supported.
 class TQObject : TQt
 {
 %TypeHeaderCode
-#include <qobject.h>
-#include <qapplication.h>
+#include <tqobject.h>
+#include <tqapplication.h>
 %End
 
 public:
@@ -700,7 +700,7 @@ SIP_PYOBJECT QT_TRANSLATE_NOOP(SIP_PYOBJECT,SIP_PYOBJECT);
 class TQObject
 {
 %TypeHeaderCode
-#include <qobject.h>
+#include <tqobject.h>
 %End
 
 public:
@@ -954,9 +954,9 @@ PyObject *pyqt3GetSender();
 
 #include <string.h>
 
-#include <qobject.h>
-#include <qvariant.h>
-#include <qmetaobject.h>
+#include <tqobject.h>
+#include <tqvariant.h>
+#include <tqmetaobject.h>
 #include <private/qucom_p.h>
 #include <private/qucomextra_p.h>
 
diff --git a/sip/qt/qobjectcleanuphandler.sip b/sip/qt/qobjectcleanuphandler.sip
index f3ddf16..83abc8e 100644
--- a/sip/qt/qobjectcleanuphandler.sip
+++ b/sip/qt/qobjectcleanuphandler.sip
@@ -34,7 +34,7 @@
 class TQObjectCleanupHandler : TQObject
 {
 %TypeHeaderCode
-#include <qobjectcleanuphandler.h>
+#include <tqobjectcleanuphandler.h>
 %End
 
 public:
diff --git a/sip/qt/qobjectlist.sip b/sip/qt/qobjectlist.sip
index eb323df..1ea6a5a 100644
--- a/sip/qt/qobjectlist.sip
+++ b/sip/qt/qobjectlist.sip
@@ -34,7 +34,7 @@ return type of a function or the type of an argument, a Python list of
 %MappedType TQObjectList
 {
 %TypeHeaderCode
-#include <qobjectlist.h>
+#include <tqobjectlist.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qpaintdevice.sip b/sip/qt/qpaintdevice.sip
index 89bddbb..dc2ad64 100644
--- a/sip/qt/qpaintdevice.sip
+++ b/sip/qt/qpaintdevice.sip
@@ -36,7 +36,7 @@ Not implemented.
 
 
 %ModuleHeaderCode
-#include <qpaintdevice.h>
+#include <tqpaintdevice.h>
 %End
 
 
@@ -82,7 +82,7 @@ void bitBlt(TQPaintDevice *,const TQPoint &,const TQPaintDevice *,
 class TQPaintDevice
 {
 %TypeHeaderCode
-#include <qpaintdevice.h>
+#include <tqpaintdevice.h>
 %End
 
 public:
diff --git a/sip/qt/qpaintdevicemetrics.sip b/sip/qt/qpaintdevicemetrics.sip
index 04500c8..ecabb8b 100644
--- a/sip/qt/qpaintdevicemetrics.sip
+++ b/sip/qt/qpaintdevicemetrics.sip
@@ -32,7 +32,7 @@
 class TQPaintDeviceMetrics
 {
 %TypeHeaderCode
-#include <qpaintdevicemetrics.h>
+#include <tqpaintdevicemetrics.h>
 %End
 
 public:
diff --git a/sip/qt/qpainter.sip b/sip/qt/qpainter.sip
index 5d42678..b959e2a 100644
--- a/sip/qt/qpainter.sip
+++ b/sip/qt/qpainter.sip
@@ -100,7 +100,7 @@ This returns a list of tab stops.
 %If (- TQt_2_00)
 
 %ModuleHeaderCode
-#include <qpainter.h>
+#include <tqpainter.h>
 %End
 
 enum BGMode {
@@ -121,7 +121,7 @@ enum PaintUnit {
 class TQPainter
 {
 %TypeHeaderCode
-#include <qpainter.h>
+#include <tqpainter.h>
 %End
 
 public:
@@ -354,7 +354,7 @@ private:
 class TQPainter : TQt
 {
 %TypeHeaderCode
-#include <qpainter.h>
+#include <tqpainter.h>
 %End
 
 public:
diff --git a/sip/qt/qpair.sip b/sip/qt/qpair.sip
index a9a76a3..22de053 100644
--- a/sip/qt/qpair.sip
+++ b/sip/qt/qpair.sip
@@ -36,7 +36,7 @@ converted to and from Python tuples of two elements.
 %MappedType TQPair<int,int>
 {
 %TypeHeaderCode
-#include <qpair.h>
+#include <tqpair.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qpalette.sip b/sip/qt/qpalette.sip
index 29d2581..f1489de 100644
--- a/sip/qt/qpalette.sip
+++ b/sip/qt/qpalette.sip
@@ -33,7 +33,7 @@
 class TQPalette
 {
 %TypeHeaderCode
-#include <qpalette.h>
+#include <tqpalette.h>
 %End
 
 public:
diff --git a/sip/qt/qpen.sip b/sip/qt/qpen.sip
index 87e5661..e6c9774 100644
--- a/sip/qt/qpen.sip
+++ b/sip/qt/qpen.sip
@@ -45,7 +45,7 @@ enum PenStyle {
 class TQPen
 {
 %TypeHeaderCode
-#include <qpen.h>
+#include <tqpen.h>
 %End
 
 public:
@@ -69,7 +69,7 @@ public:
 class TQPen : TQt
 {
 %TypeHeaderCode
-#include <qpen.h>
+#include <tqpen.h>
 %End
 
 public:
diff --git a/sip/qt/qpicture.sip b/sip/qt/qpicture.sip
index 014d7eb..bc93254 100644
--- a/sip/qt/qpicture.sip
+++ b/sip/qt/qpicture.sip
@@ -48,7 +48,7 @@ as a parameter.
 class TQPicture : TQPaintDevice
 {
 %TypeHeaderCode
-#include <qpicture.h>
+#include <tqpicture.h>
 %End
 
 public:
diff --git a/sip/qt/qpixmap.sip b/sip/qt/qpixmap.sip
index 0ef4284..a84b673 100644
--- a/sip/qt/qpixmap.sip
+++ b/sip/qt/qpixmap.sip
@@ -61,7 +61,7 @@ Not implemented.
 class TQPixmap : TQPaintDevice
 {
 %TypeHeaderCode
-#include <qpixmap.h>
+#include <tqpixmap.h>
 %End
 
 public:
@@ -156,7 +156,7 @@ protected:
 class TQPixmap : TQPaintDevice, TQt
 {
 %TypeHeaderCode
-#include <qpixmap.h>
+#include <tqpixmap.h>
 %End
 
 public:
diff --git a/sip/qt/qpixmapcache.sip b/sip/qt/qpixmapcache.sip
index 089296d..773397e 100644
--- a/sip/qt/qpixmapcache.sip
+++ b/sip/qt/qpixmapcache.sip
@@ -34,7 +34,7 @@
 class TQPixmapCache
 {
 %TypeHeaderCode
-#include <qpixmapcache.h>
+#include <tqpixmapcache.h>
 %End
 
 public:
diff --git a/sip/qt/qplatinumstyle.sip b/sip/qt/qplatinumstyle.sip
index 6d223d5..8a1a239 100644
--- a/sip/qt/qplatinumstyle.sip
+++ b/sip/qt/qplatinumstyle.sip
@@ -46,7 +46,7 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 class TQPlatinumStyle : TQWindowsStyle
 {
 %TypeHeaderCode
-#include <qplatinumstyle.h>
+#include <tqplatinumstyle.h>
 %End
 
 public:
diff --git a/sip/qt/qpoint.sip b/sip/qt/qpoint.sip
index 68c6561..53de29f 100644
--- a/sip/qt/qpoint.sip
+++ b/sip/qt/qpoint.sip
@@ -54,7 +54,7 @@ Not implemented.
 class TQPoint
 {
 %TypeHeaderCode
-#include <qpoint.h>
+#include <tqpoint.h>
 %End
 
 public:
diff --git a/sip/qt/qpointarray.sip b/sip/qt/qpointarray.sip
index f0daeea..dcffb19 100644
--- a/sip/qt/qpointarray.sip
+++ b/sip/qt/qpointarray.sip
@@ -90,7 +90,7 @@ Not implemented.
 class TQPointArray
 {
 %TypeHeaderCode
-#include <qpointarray.h>
+#include <tqpointarray.h>
 %End
 
 %TypeCode
diff --git a/sip/qt/qpopupmenu.sip b/sip/qt/qpopupmenu.sip
index 067e8cd..7d52991 100644
--- a/sip/qt/qpopupmenu.sip
+++ b/sip/qt/qpopupmenu.sip
@@ -61,7 +61,7 @@ ensures that the menu is deleted without having to explicity code it using
 class TQPopupMenu : TQTableView, TQMenuData
 {
 %TypeHeaderCode
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
 %End
 
 public:
@@ -150,7 +150,7 @@ private:
 class TQPopupMenu : TQFrame, TQMenuData
 {
 %TypeHeaderCode
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
 %End
 
 public:
diff --git a/sip/qt/qprintdialog.sip b/sip/qt/qprintdialog.sip
index 83cf681..c7d2513 100644
--- a/sip/qt/qprintdialog.sip
+++ b/sip/qt/qprintdialog.sip
@@ -35,7 +35,7 @@
 class TQPrintDialog : TQDialog
 {
 %TypeHeaderCode
-#include <qprintdialog.h>
+#include <tqprintdialog.h>
 %End
 
 public:
diff --git a/sip/qt/qprinter.sip b/sip/qt/qprinter.sip
index cc71284..b1bdd96 100644
--- a/sip/qt/qprinter.sip
+++ b/sip/qt/qprinter.sip
@@ -34,7 +34,7 @@
 class TQPrinter : TQPaintDevice
 {
 %TypeHeaderCode
-#include <qprinter.h>
+#include <tqprinter.h>
 %End
 
 public:
diff --git a/sip/qt/qprocess.sip b/sip/qt/qprocess.sip
index cd14067..2877471 100644
--- a/sip/qt/qprocess.sip
+++ b/sip/qt/qprocess.sip
@@ -34,7 +34,7 @@
 class TQProcess : TQObject
 {
 %TypeHeaderCode
-#include <qprocess.h>
+#include <tqprocess.h>
 %End
 
 public:
diff --git a/sip/qt/qprogressbar.sip b/sip/qt/qprogressbar.sip
index d4d4b93..4f4b5d4 100644
--- a/sip/qt/qprogressbar.sip
+++ b/sip/qt/qprogressbar.sip
@@ -32,7 +32,7 @@
 class TQProgressBar : TQFrame
 {
 %TypeHeaderCode
-#include <qprogressbar.h>
+#include <tqprogressbar.h>
 %End
 
 public:
diff --git a/sip/qt/qprogressdialog.sip b/sip/qt/qprogressdialog.sip
index 33ee6c6..07ec294 100644
--- a/sip/qt/qprogressdialog.sip
+++ b/sip/qt/qprogressdialog.sip
@@ -37,7 +37,7 @@ value.
 class TQProgressDialog : TQDialog
 {
 %TypeHeaderCode
-#include <qprogressdialog.h>
+#include <tqprogressdialog.h>
 %End
 
 public:
@@ -110,7 +110,7 @@ private:
 class TQProgressDialog : TQSemiModal
 {
 %TypeHeaderCode
-#include <qprogressdialog.h>
+#include <tqprogressdialog.h>
 %End
 
 public:
diff --git a/sip/qt/qptrlist.sip b/sip/qt/qptrlist.sip
index b3faa04..3ecff8c 100644
--- a/sip/qt/qptrlist.sip
+++ b/sip/qt/qptrlist.sip
@@ -37,7 +37,7 @@ template<Type>
 %MappedType TQPtrList<Type>
 {
 %TypeHeaderCode
-#include <qptrlist.h>
+#include <tqptrlist.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qpushbutton.sip b/sip/qt/qpushbutton.sip
index d9b4f60..69e961d 100644
--- a/sip/qt/qpushbutton.sip
+++ b/sip/qt/qpushbutton.sip
@@ -32,7 +32,7 @@
 class TQPushButton : TQButton
 {
 %TypeHeaderCode
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
 %End
 
 public:
diff --git a/sip/qt/qradiobutton.sip b/sip/qt/qradiobutton.sip
index 083e0eb..e30fedd 100644
--- a/sip/qt/qradiobutton.sip
+++ b/sip/qt/qradiobutton.sip
@@ -32,7 +32,7 @@
 class TQRadioButton : TQButton
 {
 %TypeHeaderCode
-#include <qradiobutton.h>
+#include <tqradiobutton.h>
 %End
 
 public:
diff --git a/sip/qt/qrangecontrol.sip b/sip/qt/qrangecontrol.sip
index e3e25da..77b38d4 100644
--- a/sip/qt/qrangecontrol.sip
+++ b/sip/qt/qrangecontrol.sip
@@ -32,7 +32,7 @@
 class TQRangeControl
 {
 %TypeHeaderCode
-#include <qrangecontrol.h>
+#include <tqrangecontrol.h>
 %End
 
 public:
diff --git a/sip/qt/qrect.sip b/sip/qt/qrect.sip
index 50575b1..0026b97 100644
--- a/sip/qt/qrect.sip
+++ b/sip/qt/qrect.sip
@@ -90,7 +90,7 @@ Not implemented. (TQt v2+)
 class TQRect
 {
 %TypeHeaderCode
-#include <qrect.h>
+#include <tqrect.h>
 %End
 
 public:
diff --git a/sip/qt/qregexp.sip b/sip/qt/qregexp.sip
index 9103f18..3bb3b0e 100644
--- a/sip/qt/qregexp.sip
+++ b/sip/qt/qregexp.sip
@@ -57,7 +57,7 @@ returns a tuple of the <Literal>int</Literal> result and the
 class TQRegExp
 {
 %TypeHeaderCode
-#include <qregexp.h>
+#include <tqregexp.h>
 %End
 
 public:
diff --git a/sip/qt/qregion.sip b/sip/qt/qregion.sip
index f73c83e..45d64b5 100644
--- a/sip/qt/qregion.sip
+++ b/sip/qt/qregion.sip
@@ -56,7 +56,7 @@ Not yet implemented. (TQt v2.2+)
 class TQRegion
 {
 %TypeHeaderCode
-#include <qregion.h>
+#include <tqregion.h>
 %End
 
 public:
diff --git a/sip/qt/qscrollbar.sip b/sip/qt/qscrollbar.sip
index d811a88..57abc14 100644
--- a/sip/qt/qscrollbar.sip
+++ b/sip/qt/qscrollbar.sip
@@ -32,7 +32,7 @@
 class TQScrollBar : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
-#include <qscrollbar.h>
+#include <tqscrollbar.h>
 %End
 
 public:
diff --git a/sip/qt/qscrollview.sip b/sip/qt/qscrollview.sip
index 19a00d8..47cfd84 100644
--- a/sip/qt/qscrollview.sip
+++ b/sip/qt/qscrollview.sip
@@ -54,7 +54,7 @@ values. (TQt v2+)
 class TQScrollView : TQFrame
 {
 %TypeHeaderCode
-#include <qscrollview.h>
+#include <tqscrollview.h>
 %End
 
 public:
diff --git a/sip/qt/qsemaphore.sip b/sip/qt/qsemaphore.sip
index e6c4fa8..82052a0 100644
--- a/sip/qt/qsemaphore.sip
+++ b/sip/qt/qsemaphore.sip
@@ -38,7 +38,7 @@ Python v2.0 or later.
 class TQSemaphore
 {
 %TypeHeaderCode
-#include <qsemaphore.h>
+#include <tqsemaphore.h>
 %End
 
 public:
@@ -91,7 +91,7 @@ private:
 class TQSemaphore : TQt
 {
 %TypeHeaderCode
-#include <qthread.h>
+#include <tqthread.h>
 %End
 
 public:
diff --git a/sip/qt/qsemimodal.sip b/sip/qt/qsemimodal.sip
index f17914e..ee7537e 100644
--- a/sip/qt/qsemimodal.sip
+++ b/sip/qt/qsemimodal.sip
@@ -35,7 +35,7 @@
 class TQSemiModal : TQWidget
 {
 %TypeHeaderCode
-#include <qsemimodal.h>
+#include <tqsemimodal.h>
 %End
 
 public:
diff --git a/sip/qt/qsessionmanager.sip b/sip/qt/qsessionmanager.sip
index 87af6c3..c6882d6 100644
--- a/sip/qt/qsessionmanager.sip
+++ b/sip/qt/qsessionmanager.sip
@@ -34,7 +34,7 @@
 class TQSessionManager : TQObject
 {
 %TypeHeaderCode
-#include <qsessionmanager.h>
+#include <tqsessionmanager.h>
 %End
 
 public:
diff --git a/sip/qt/qsettings.sip b/sip/qt/qsettings.sip
index b271787..75c02f2 100644
--- a/sip/qt/qsettings.sip
+++ b/sip/qt/qsettings.sip
@@ -104,7 +104,7 @@ Not implemented.
 class TQSettings
 {
 %TypeHeaderCode
-#include <qsettings.h>
+#include <tqsettings.h>
 %End
 
 public:
diff --git a/sip/qt/qsgistyle.sip b/sip/qt/qsgistyle.sip
index f7cf4d1..06c0ebc 100644
--- a/sip/qt/qsgistyle.sip
+++ b/sip/qt/qsgistyle.sip
@@ -46,7 +46,7 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 class TQSGIStyle : TQMotifStyle
 {
 %TypeHeaderCode
-#include <qsgistyle.h>
+#include <tqsgistyle.h>
 %End
 
 public:
diff --git a/sip/qt/qsignalmapper.sip b/sip/qt/qsignalmapper.sip
index 47cd9fd..2ac99e6 100644
--- a/sip/qt/qsignalmapper.sip
+++ b/sip/qt/qsignalmapper.sip
@@ -32,7 +32,7 @@
 class TQSignalMapper : TQObject
 {
 %TypeHeaderCode
-#include <qsignalmapper.h>
+#include <tqsignalmapper.h>
 %End
 
 public:
diff --git a/sip/qt/qsimplerichtext.sip b/sip/qt/qsimplerichtext.sip
index a44be99..9d9386c 100644
--- a/sip/qt/qsimplerichtext.sip
+++ b/sip/qt/qsimplerichtext.sip
@@ -34,7 +34,7 @@
 class TQSimpleRichText
 {
 %TypeHeaderCode
-#include <qsimplerichtext.h>
+#include <tqsimplerichtext.h>
 %End
 
 public:
diff --git a/sip/qt/qsize.sip b/sip/qt/qsize.sip
index e2f570d..a1d9704 100644
--- a/sip/qt/qsize.sip
+++ b/sip/qt/qsize.sip
@@ -54,7 +54,7 @@ Not implemented.
 class TQSize
 {
 %TypeHeaderCode
-#include <qsize.h>
+#include <tqsize.h>
 %End
 
 public:
diff --git a/sip/qt/qsizegrip.sip b/sip/qt/qsizegrip.sip
index f88f7dd..b2c9420 100644
--- a/sip/qt/qsizegrip.sip
+++ b/sip/qt/qsizegrip.sip
@@ -35,7 +35,7 @@
 class TQSizeGrip : TQWidget
 {
 %TypeHeaderCode
-#include <qsizegrip.h>
+#include <tqsizegrip.h>
 %End
 
 public:
diff --git a/sip/qt/qsizepolicy.sip b/sip/qt/qsizepolicy.sip
index 7fb1d75..a82c066 100644
--- a/sip/qt/qsizepolicy.sip
+++ b/sip/qt/qsizepolicy.sip
@@ -34,7 +34,7 @@
 class TQSizePolicy
 {
 %TypeHeaderCode
-#include <qsizepolicy.h>
+#include <tqsizepolicy.h>
 %End
 
 public:
diff --git a/sip/qt/qslider.sip b/sip/qt/qslider.sip
index 513eb38..e23e950 100644
--- a/sip/qt/qslider.sip
+++ b/sip/qt/qslider.sip
@@ -32,7 +32,7 @@
 class TQSlider : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
-#include <qslider.h>
+#include <tqslider.h>
 %End
 
 public:
diff --git a/sip/qt/qsocketnotifier.sip b/sip/qt/qsocketnotifier.sip
index ae93ec3..7a6e31e 100644
--- a/sip/qt/qsocketnotifier.sip
+++ b/sip/qt/qsocketnotifier.sip
@@ -32,7 +32,7 @@
 class TQSocketNotifier : TQObject
 {
 %TypeHeaderCode
-#include <qsocketnotifier.h>
+#include <tqsocketnotifier.h>
 %End
 
 public:
diff --git a/sip/qt/qsound.sip b/sip/qt/qsound.sip
index 8b6a944..d204348 100644
--- a/sip/qt/qsound.sip
+++ b/sip/qt/qsound.sip
@@ -35,7 +35,7 @@
 class TQSound : TQObject
 {
 %TypeHeaderCode
-#include <qsound.h>
+#include <tqsound.h>
 %End
 
 public:
diff --git a/sip/qt/qspinbox.sip b/sip/qt/qspinbox.sip
index 1f9025e..ae6ed4e 100644
--- a/sip/qt/qspinbox.sip
+++ b/sip/qt/qspinbox.sip
@@ -39,7 +39,7 @@ This returns a tuple of the <Literal>int</Literal> result and the modified
 class TQSpinBox : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
-#include <qspinbox.h>
+#include <tqspinbox.h>
 %End
 
 public:
@@ -131,7 +131,7 @@ private:
 class TQSpinBox : TQFrame, TQRangeControl
 {
 %TypeHeaderCode
-#include <qspinbox.h>
+#include <tqspinbox.h>
 %End
 
 public:
diff --git a/sip/qt/qsplashscreen.sip b/sip/qt/qsplashscreen.sip
index 69d2f5c..5cbb700 100644
--- a/sip/qt/qsplashscreen.sip
+++ b/sip/qt/qsplashscreen.sip
@@ -34,7 +34,7 @@
 class TQSplashScreen : TQWidget
 {
 %TypeHeaderCode
-#include <qsplashscreen.h>
+#include <tqsplashscreen.h>
 %End
 
 public:
diff --git a/sip/qt/qsplitter.sip b/sip/qt/qsplitter.sip
index b27ce7b..30f28b8 100644
--- a/sip/qt/qsplitter.sip
+++ b/sip/qt/qsplitter.sip
@@ -41,7 +41,7 @@ This takes the <Literal>id</Literal> parameter and returns the
 class TQSplitter : TQFrame
 {
 %TypeHeaderCode
-#include <qsplitter.h>
+#include <tqsplitter.h>
 %End
 
 public:
diff --git a/sip/qt/qstatusbar.sip b/sip/qt/qstatusbar.sip
index 5ab47fd..fda6701 100644
--- a/sip/qt/qstatusbar.sip
+++ b/sip/qt/qstatusbar.sip
@@ -32,7 +32,7 @@
 class TQStatusBar : TQWidget
 {
 %TypeHeaderCode
-#include <qstatusbar.h>
+#include <tqstatusbar.h>
 %End
 
 public:
diff --git a/sip/qt/qstring.sip b/sip/qt/qstring.sip
index 0ce1cbf..20b68de 100644
--- a/sip/qt/qstring.sip
+++ b/sip/qt/qstring.sip
@@ -177,7 +177,7 @@ This returns a tuple of the <Literal>double</Literal> result and the
 class TQChar
 {
 %TypeHeaderCode
-#include <qstring.h>
+#include <tqstring.h>
 %End
 
 public:
@@ -446,7 +446,7 @@ bool operator>(TQChar,TQChar);
 class TQString
 {
 %TypeHeaderCode
-#include <qstring.h>
+#include <tqstring.h>
 %End
 
 public:
@@ -819,7 +819,7 @@ public:
 %End
 
 %TypeCode
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 
 #if PY_VERSION_HEX >= 0x01060000
 // Convenience function for converting a TQString to a Python Unicode object.
@@ -978,7 +978,7 @@ bool operator>=(const TQString &,const TQString &);
 class TQString : TQByteArray
 {
 %TypeHeaderCode
-#include <qstring.h>
+#include <tqstring.h>
 %End
 
 public:
diff --git a/sip/qt/qstringlist.sip b/sip/qt/qstringlist.sip
index b48a60d..23ef47b 100644
--- a/sip/qt/qstringlist.sip
+++ b/sip/qt/qstringlist.sip
@@ -54,7 +54,7 @@ This does not return a value.
 class TQStringList
 {
 %TypeHeaderCode
-#include <qstringlist.h>
+#include <tqstringlist.h>
 %End
 
 public:
diff --git a/sip/qt/qstrlist.sip b/sip/qt/qstrlist.sip
index 6d31cf9..0fd3976 100644
--- a/sip/qt/qstrlist.sip
+++ b/sip/qt/qstrlist.sip
@@ -34,7 +34,7 @@ is used instead.
 %MappedType TQStrList
 {
 %TypeHeaderCode
-#include <qstrlist.h>
+#include <tqstrlist.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qstyle.sip b/sip/qt/qstyle.sip
index 358327b..bc52b87 100644
--- a/sip/qt/qstyle.sip
+++ b/sip/qt/qstyle.sip
@@ -74,7 +74,7 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the
 class TQStyleOption
 {
 %TypeHeaderCode
-#include <qstyle.h>
+#include <tqstyle.h>
 %End
 
 public:
@@ -152,7 +152,7 @@ class TQStyleHintReturn;
 class TQStyle : TQObject
 {
 %TypeHeaderCode
-#include <qstyle.h>
+#include <tqstyle.h>
 %End
 
 public:
diff --git a/sip/qt/qstylefactory.sip b/sip/qt/qstylefactory.sip
index faed8bc..99858bb 100644
--- a/sip/qt/qstylefactory.sip
+++ b/sip/qt/qstylefactory.sip
@@ -34,7 +34,7 @@
 class TQStyleFactory
 {
 %TypeHeaderCode
-#include <qstylefactory.h>
+#include <tqstylefactory.h>
 %End
 
 public:
diff --git a/sip/qt/qstylesheet.sip b/sip/qt/qstylesheet.sip
index 3b0d252..397757e 100644
--- a/sip/qt/qstylesheet.sip
+++ b/sip/qt/qstylesheet.sip
@@ -40,7 +40,7 @@
 class TQStyleSheetItem : TQt
 {
 %TypeHeaderCode
-#include <qstylesheet.h>
+#include <tqstylesheet.h>
 %End
 
 public:
@@ -190,7 +190,7 @@ public:
 class TQStyleSheet : TQObject
 {
 %TypeHeaderCode
-#include <qstylesheet.h>
+#include <tqstylesheet.h>
 %End
 
 public:
diff --git a/sip/qt/qsyntaxhighlighter.sip b/sip/qt/qsyntaxhighlighter.sip
index b0fd978..a6d7c24 100644
--- a/sip/qt/qsyntaxhighlighter.sip
+++ b/sip/qt/qsyntaxhighlighter.sip
@@ -34,7 +34,7 @@
 class TQSyntaxHighlighter : TQt
 {
 %TypeHeaderCode
-#include <qsyntaxhighlighter.h>
+#include <tqsyntaxhighlighter.h>
 %End
 
 public:
diff --git a/sip/qt/qtabbar.sip b/sip/qt/qtabbar.sip
index f3c8371..96d77e0 100644
--- a/sip/qt/qtabbar.sip
+++ b/sip/qt/qtabbar.sip
@@ -44,7 +44,7 @@ This returns a list of <Literal>TQTab</Literal> instances.
 class TQTab : TQt
 {
 %TypeHeaderCode
-#include <qtabbar.h>
+#include <tqtabbar.h>
 %End
 
 public:
@@ -72,7 +72,7 @@ public:
 class TQTab
 {
 %TypeHeaderCode
-#include <qtabbar.h>
+#include <tqtabbar.h>
 %End
 
 public:
@@ -96,7 +96,7 @@ public:
 class TQTabBar : TQWidget
 {
 %TypeHeaderCode
-#include <qtabbar.h>
+#include <tqtabbar.h>
 %End
 
 public:
diff --git a/sip/qt/qtabdialog.sip b/sip/qt/qtabdialog.sip
index 8e930e1..609e748 100644
--- a/sip/qt/qtabdialog.sip
+++ b/sip/qt/qtabdialog.sip
@@ -34,7 +34,7 @@
 class TQTabDialog : TQDialog
 {
 %TypeHeaderCode
-#include <qtabdialog.h>
+#include <tqtabdialog.h>
 %End
 
 public:
diff --git a/sip/qt/qtableview.sip b/sip/qt/qtableview.sip
index 3541ff9..2b099e5 100644
--- a/sip/qt/qtableview.sip
+++ b/sip/qt/qtableview.sip
@@ -49,7 +49,7 @@ the <Literal>bool</Literal> result and <Literal>yPos</Literal>.
 %If (- TQt_3_0_0)
 
 %ModuleHeaderCode
-#include <qtableview.h>
+#include <tqtableview.h>
 %End
 
 const uint Tbl_vScrollBar;
@@ -79,7 +79,7 @@ const uint Tbl_snapToGrid;
 class TQTableView : TQFrame
 {
 %TypeHeaderCode
-#include <qtableview.h>
+#include <tqtableview.h>
 %End
 
 public:
diff --git a/sip/qt/qtabwidget.sip b/sip/qt/qtabwidget.sip
index 34f19e6..9049644 100644
--- a/sip/qt/qtabwidget.sip
+++ b/sip/qt/qtabwidget.sip
@@ -34,7 +34,7 @@
 class TQTabWidget : TQWidget
 {
 %TypeHeaderCode
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
 %End
 
 public:
diff --git a/sip/qt/qtextbrowser.sip b/sip/qt/qtextbrowser.sip
index d9c60d3..ccd7da4 100644
--- a/sip/qt/qtextbrowser.sip
+++ b/sip/qt/qtextbrowser.sip
@@ -34,7 +34,7 @@
 class TQTextBrowser : TQTextEdit
 {
 %TypeHeaderCode
-#include <qtextbrowser.h>
+#include <tqtextbrowser.h>
 %End
 
 public:
@@ -77,7 +77,7 @@ private:
 class TQTextBrowser : TQTextView
 {
 %TypeHeaderCode
-#include <qtextbrowser.h>
+#include <tqtextbrowser.h>
 %End
 
 public:
diff --git a/sip/qt/qtextcodec.sip b/sip/qt/qtextcodec.sip
index 739fa95..792d938 100644
--- a/sip/qt/qtextcodec.sip
+++ b/sip/qt/qtextcodec.sip
@@ -59,7 +59,7 @@ updated <Literal>lenInOut</Literal>.
 class TQTextEncoder
 {
 %TypeHeaderCode
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 %End
 
 public:
@@ -70,7 +70,7 @@ public:
 class TQTextDecoder
 {
 %TypeHeaderCode
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 %End
 
 public:
@@ -81,7 +81,7 @@ public:
 class TQTextCodec
 {
 %TypeHeaderCode
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 %End
 
 public:
diff --git a/sip/qt/qtextedit.sip b/sip/qt/qtextedit.sip
index 4d2362c..81cf063 100644
--- a/sip/qt/qtextedit.sip
+++ b/sip/qt/qtextedit.sip
@@ -95,7 +95,7 @@ class TQTextCursor;
 class TQTextEdit : TQScrollView
 {
 %TypeHeaderCode
-#include <qtextedit.h>
+#include <tqtextedit.h>
 %End
 
 public:
diff --git a/sip/qt/qtextstream.sip b/sip/qt/qtextstream.sip
index d546eb2..d0e351b 100644
--- a/sip/qt/qtextstream.sip
+++ b/sip/qt/qtextstream.sip
@@ -78,7 +78,7 @@ Not implemented.
 class TQTextStream
 {
 %TypeHeaderCode
-#include <qtextstream.h>
+#include <tqtextstream.h>
 %End
 
 public:
@@ -196,7 +196,7 @@ private:
 class TQTextIStream : TQTextStream
 {
 %TypeHeaderCode
-#include <qtextstream.h>
+#include <tqtextstream.h>
 %End
 
 public:
@@ -214,7 +214,7 @@ private:
 class TQTextOStream : TQTextStream
 {
 %TypeHeaderCode
-#include <qtextstream.h>
+#include <tqtextstream.h>
 %End
 
 public:
diff --git a/sip/qt/qtextview.sip b/sip/qt/qtextview.sip
index c17b0d0..8f71e26 100644
--- a/sip/qt/qtextview.sip
+++ b/sip/qt/qtextview.sip
@@ -34,7 +34,7 @@
 class TQTextView : TQTextEdit
 {
 %TypeHeaderCode
-#include <qtextview.h>
+#include <tqtextview.h>
 %End
 
 public:
@@ -56,7 +56,7 @@ private:
 class TQTextView : TQScrollView
 {
 %TypeHeaderCode
-#include <qtextview.h>
+#include <tqtextview.h>
 %End
 
 public:
diff --git a/sip/qt/qthread.sip b/sip/qt/qthread.sip
index 6f47b61..e457535 100644
--- a/sip/qt/qthread.sip
+++ b/sip/qt/qthread.sip
@@ -35,7 +35,7 @@
 class TQThread : TQt /CreatesThread/
 {
 %TypeHeaderCode
-#include <qthread.h>
+#include <tqthread.h>
 %End
 
 public:
diff --git a/sip/qt/qtimer.sip b/sip/qt/qtimer.sip
index bb7fc9b..eba5c57 100644
--- a/sip/qt/qtimer.sip
+++ b/sip/qt/qtimer.sip
@@ -32,7 +32,7 @@
 class TQTimer : TQObject
 {
 %TypeHeaderCode
-#include <qtimer.h>
+#include <tqtimer.h>
 %End
 
 public:
diff --git a/sip/qt/qtoolbar.sip b/sip/qt/qtoolbar.sip
index 3f281da..31bf3d0 100644
--- a/sip/qt/qtoolbar.sip
+++ b/sip/qt/qtoolbar.sip
@@ -34,7 +34,7 @@
 class TQToolBar : TQDockWindow
 {
 %TypeHeaderCode
-#include <qtoolbar.h>
+#include <tqtoolbar.h>
 %End
 
 public:
@@ -82,7 +82,7 @@ private:
 class TQToolBar : TQWidget
 {
 %TypeHeaderCode
-#include <qtoolbar.h>
+#include <tqtoolbar.h>
 %End
 
 public:
diff --git a/sip/qt/qtoolbox.sip b/sip/qt/qtoolbox.sip
index 9e8e220..b896202 100644
--- a/sip/qt/qtoolbox.sip
+++ b/sip/qt/qtoolbox.sip
@@ -34,7 +34,7 @@
 class TQToolBox : TQFrame
 {
 %TypeHeaderCode
-#include <qtoolbox.h>
+#include <tqtoolbox.h>
 %End
 
 public:
diff --git a/sip/qt/qtoolbutton.sip b/sip/qt/qtoolbutton.sip
index d640a8c..64c03a9 100644
--- a/sip/qt/qtoolbutton.sip
+++ b/sip/qt/qtoolbutton.sip
@@ -32,7 +32,7 @@
 class TQToolButton : TQButton
 {
 %TypeHeaderCode
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
 %End
 
 public:
diff --git a/sip/qt/qtooltip.sip b/sip/qt/qtooltip.sip
index eb9a073..47694d4 100644
--- a/sip/qt/qtooltip.sip
+++ b/sip/qt/qtooltip.sip
@@ -38,7 +38,7 @@
 class TQToolTipGroup : TQObject
 {
 %TypeHeaderCode
-#include <qtooltip.h>
+#include <tqtooltip.h>
 %End
 
 public:
@@ -78,7 +78,7 @@ private:
 class TQToolTip
 {
 %TypeHeaderCode
-#include <qtooltip.h>
+#include <tqtooltip.h>
 %End
 
 public:
@@ -111,7 +111,7 @@ protected:
 class TQToolTip : TQt
 {
 %TypeHeaderCode
-#include <qtooltip.h>
+#include <tqtooltip.h>
 %End
 
 public:
diff --git a/sip/qt/qtranslator.sip b/sip/qt/qtranslator.sip
index e368b7c..73f0bb6 100644
--- a/sip/qt/qtranslator.sip
+++ b/sip/qt/qtranslator.sip
@@ -40,7 +40,7 @@
 class TQTranslatorMessage
 {
 %TypeHeaderCode
-#include <qtranslator.h>
+#include <tqtranslator.h>
 %End
 
 public:
@@ -86,7 +86,7 @@ public:
 class TQTranslator : TQObject
 {
 %TypeHeaderCode
-#include <qtranslator.h>
+#include <tqtranslator.h>
 %End
 
 public:
diff --git a/sip/qt/qurl.sip b/sip/qt/qurl.sip
index 2e1006e..aaad338 100644
--- a/sip/qt/qurl.sip
+++ b/sip/qt/qurl.sip
@@ -36,7 +36,7 @@ operators.
 class TQUrl
 {
 %TypeHeaderCode
-#include <qurl.h>
+#include <tqurl.h>
 %End
 
 public:
diff --git a/sip/qt/qurlinfo.sip b/sip/qt/qurlinfo.sip
index 2f1e06b..8a7573c 100644
--- a/sip/qt/qurlinfo.sip
+++ b/sip/qt/qurlinfo.sip
@@ -35,7 +35,7 @@
 class TQUrlInfo
 {
 %TypeHeaderCode
-#include <qurlinfo.h>
+#include <tqurlinfo.h>
 %End
 
 public:
diff --git a/sip/qt/qurloperator.sip b/sip/qt/qurloperator.sip
index 522e1b2..a078020 100644
--- a/sip/qt/qurloperator.sip
+++ b/sip/qt/qurloperator.sip
@@ -40,7 +40,7 @@ This returns a tuple of the <Literal>bool</Literal> result and the
 class TQUrlOperator : TQObject, TQUrl
 {
 %TypeHeaderCode
-#include <qurloperator.h>
+#include <tqurloperator.h>
 %End
 
 public:
diff --git a/sip/qt/quuid.sip b/sip/qt/quuid.sip
index ff9eda0..6d50e40 100644
--- a/sip/qt/quuid.sip
+++ b/sip/qt/quuid.sip
@@ -34,7 +34,7 @@
 class TQUuid
 {
 %TypeHeaderCode
-#include <quuid.h>
+#include <tquuid.h>
 %End
 
 public:
diff --git a/sip/qt/qvalidator.sip b/sip/qt/qvalidator.sip
index fa0f781..dd90564 100644
--- a/sip/qt/qvalidator.sip
+++ b/sip/qt/qvalidator.sip
@@ -75,7 +75,7 @@ updated <Literal>pos</Literal>.
 class TQValidator : TQObject
 {
 %TypeHeaderCode
-#include <qvalidator.h>
+#include <tqvalidator.h>
 %End
 
 public:
@@ -123,7 +123,7 @@ private:
 class TQIntValidator : TQValidator
 {
 %TypeHeaderCode
-#include <qvalidator.h>
+#include <tqvalidator.h>
 %End
 
 public:
@@ -162,7 +162,7 @@ private:
 class TQDoubleValidator : TQValidator
 {
 %TypeHeaderCode
-#include <qvalidator.h>
+#include <tqvalidator.h>
 %End
 
 public:
@@ -207,7 +207,7 @@ private:
 class TQRegExpValidator : TQValidator
 {
 %TypeHeaderCode
-#include <qvalidator.h>
+#include <tqvalidator.h>
 %End
 
 public:
diff --git a/sip/qt/qvaluelist.sip b/sip/qt/qvaluelist.sip
index 55bf35e..e64fb30 100644
--- a/sip/qt/qvaluelist.sip
+++ b/sip/qt/qvaluelist.sip
@@ -37,7 +37,7 @@ template<Type>
 %MappedType TQValueList<Type>
 {
 %TypeHeaderCode
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 %End
 
 %ConvertFromTypeCode
@@ -123,7 +123,7 @@ template<Type>
 %MappedType TQValueList<int>
 {
 %TypeHeaderCode
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qvariant.sip b/sip/qt/qvariant.sip
index 3c7a134..221da93 100644
--- a/sip/qt/qvariant.sip
+++ b/sip/qt/qvariant.sip
@@ -198,7 +198,7 @@ Not yet implemented.
 class TQVariant
 {
 %TypeHeaderCode
-#include <qvariant.h>
+#include <tqvariant.h>
 %End
 
 public:
diff --git a/sip/qt/qvbox.sip b/sip/qt/qvbox.sip
index c8900c3..1072b7e 100644
--- a/sip/qt/qvbox.sip
+++ b/sip/qt/qvbox.sip
@@ -34,7 +34,7 @@
 class TQVBox : TQHBox
 {
 %TypeHeaderCode
-#include <qvbox.h>
+#include <tqvbox.h>
 %End
 
 public:
diff --git a/sip/qt/qvbuttongroup.sip b/sip/qt/qvbuttongroup.sip
index 0a88885..83bff03 100644
--- a/sip/qt/qvbuttongroup.sip
+++ b/sip/qt/qvbuttongroup.sip
@@ -34,7 +34,7 @@
 class TQVButtonGroup : TQButtonGroup
 {
 %TypeHeaderCode
-#include <qvbuttongroup.h>
+#include <tqvbuttongroup.h>
 %End
 
 public:
diff --git a/sip/qt/qvgroupbox.sip b/sip/qt/qvgroupbox.sip
index 1ef6a0b..b52dd40 100644
--- a/sip/qt/qvgroupbox.sip
+++ b/sip/qt/qvgroupbox.sip
@@ -34,7 +34,7 @@
 class TQVGroupBox : TQGroupBox
 {
 %TypeHeaderCode
-#include <qvgroupbox.h>
+#include <tqvgroupbox.h>
 %End
 
 public:
diff --git a/sip/qt/qwaitcondition.sip b/sip/qt/qwaitcondition.sip
index 00c1e94..311ffb0 100644
--- a/sip/qt/qwaitcondition.sip
+++ b/sip/qt/qwaitcondition.sip
@@ -36,7 +36,7 @@
 class TQWaitCondition
 {
 %TypeHeaderCode
-#include <qwaitcondition.h>
+#include <tqwaitcondition.h>
 %End
 
 public:
@@ -60,7 +60,7 @@ private:
 class TQWaitCondition : TQt
 {
 %TypeHeaderCode
-#include <qthread.h>
+#include <tqthread.h>
 %End
 
 public:
diff --git a/sip/qt/qwhatsthis.sip b/sip/qt/qwhatsthis.sip
index a93f1d3..a517613 100644
--- a/sip/qt/qwhatsthis.sip
+++ b/sip/qt/qwhatsthis.sip
@@ -34,7 +34,7 @@
 class TQWhatsThis
 {
 %TypeHeaderCode
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
 %End
 
 public:
@@ -52,7 +52,7 @@ public:
 class TQWhatsThis : TQt
 {
 %TypeHeaderCode
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
 %End
 
 public:
diff --git a/sip/qt/qwidget.sip b/sip/qt/qwidget.sip
index c6da89c..07ceda7 100644
--- a/sip/qt/qwidget.sip
+++ b/sip/qt/qwidget.sip
@@ -60,7 +60,7 @@ This has been renamed to <Literal>raiseW</Literal> in Python.
 class TQWidget : TQObject, TQPaintDevice
 {
 %TypeHeaderCode
-#include <qwidget.h>
+#include <tqwidget.h>
 %End
 
 public:
diff --git a/sip/qt/qwidgetlist.sip b/sip/qt/qwidgetlist.sip
index 804eef0..9010b86 100644
--- a/sip/qt/qwidgetlist.sip
+++ b/sip/qt/qwidgetlist.sip
@@ -34,7 +34,7 @@ instances is used instead.
 %MappedType TQWidgetList
 {
 %TypeHeaderCode
-#include <qwidgetlist.h>
+#include <tqwidgetlist.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qt/qwidgetstack.sip b/sip/qt/qwidgetstack.sip
index 59aacc2..0f9ad7c 100644
--- a/sip/qt/qwidgetstack.sip
+++ b/sip/qt/qwidgetstack.sip
@@ -32,7 +32,7 @@
 class TQWidgetStack : TQFrame
 {
 %TypeHeaderCode
-#include <qwidgetstack.h>
+#include <tqwidgetstack.h>
 %End
 
 public:
diff --git a/sip/qt/qwindow.sip b/sip/qt/qwindow.sip
index 9b1d511..7c34d16 100644
--- a/sip/qt/qwindow.sip
+++ b/sip/qt/qwindow.sip
@@ -34,7 +34,7 @@
 class TQWindow : TQWidget
 {
 %TypeHeaderCode
-#include <qwindow.h>
+#include <tqwindow.h>
 %End
 
 public:
diff --git a/sip/qt/qwindowdefs.sip b/sip/qt/qwindowdefs.sip
index 3b1afdc..8e7da10 100644
--- a/sip/qt/qwindowdefs.sip
+++ b/sip/qt/qwindowdefs.sip
@@ -30,7 +30,7 @@ All constant values defined by TQt have equivalent constants defined to Python.
 
 
 %ModuleHeaderCode
-#include <qwindowdefs.h>
+#include <tqwindowdefs.h>
 %End
 
 
diff --git a/sip/qt/qwindowsstyle.sip b/sip/qt/qwindowsstyle.sip
index 5f4ed19..d6ed9eb 100644
--- a/sip/qt/qwindowsstyle.sip
+++ b/sip/qt/qwindowsstyle.sip
@@ -69,7 +69,7 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the
 class TQWindowsStyle : TQCommonStyle
 {
 %TypeHeaderCode
-#include <qwindowsstyle.h>
+#include <tqwindowsstyle.h>
 %End
 
 public:
diff --git a/sip/qt/qwizard.sip b/sip/qt/qwizard.sip
index fd50b45..9385df8 100644
--- a/sip/qt/qwizard.sip
+++ b/sip/qt/qwizard.sip
@@ -35,7 +35,7 @@
 class TQWizard : TQDialog
 {
 %TypeHeaderCode
-#include <qwizard.h>
+#include <tqwizard.h>
 %End
 
 public:
diff --git a/sip/qt/qwmatrix.sip b/sip/qt/qwmatrix.sip
index ee482de..a6a6828 100644
--- a/sip/qt/qwmatrix.sip
+++ b/sip/qt/qwmatrix.sip
@@ -81,7 +81,7 @@ values. (TQt v2+)
 class TQWMatrix
 {
 %TypeHeaderCode
-#include <qwmatrix.h>
+#include <tqwmatrix.h>
 %End
 
 public:
diff --git a/sip/qt/qworkspace.sip b/sip/qt/qworkspace.sip
index 8c7d993..e38dcd3 100644
--- a/sip/qt/qworkspace.sip
+++ b/sip/qt/qworkspace.sip
@@ -35,7 +35,7 @@
 class TQWorkspace : TQWidget
 {
 %TypeHeaderCode
-#include <qworkspace.h>
+#include <tqworkspace.h>
 %End
 
 public:
diff --git a/sip/qtcanvas/qcanvas.sip b/sip/qtcanvas/qcanvas.sip
index cb78d10..fd11eaa 100644
--- a/sip/qtcanvas/qcanvas.sip
+++ b/sip/qtcanvas/qcanvas.sip
@@ -134,7 +134,7 @@ The <Literal>pixmaps</Literal> argument is a Python list of TQPixmap instances.
 %MappedType TQCanvasItemList
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 %ConvertFromTypeCode
@@ -189,7 +189,7 @@ The <Literal>pixmaps</Literal> argument is a Python list of TQPixmap instances.
 class TQCanvasItem : TQt
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -352,7 +352,7 @@ private:
 class TQCanvas : TQObject
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -467,7 +467,7 @@ private:
 class TQCanvasView : TQScrollView
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -504,7 +504,7 @@ private:
 class TQCanvasPixmap : TQPixmap
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -531,7 +531,7 @@ private:
 class TQCanvasPixmapArray
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -565,7 +565,7 @@ private:
 class TQCanvasSprite : TQCanvasItem
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -651,7 +651,7 @@ private:
 class TQCanvasPolygonalItem : TQCanvasItem
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -688,7 +688,7 @@ protected:
 class TQCanvasRectangle : TQCanvasPolygonalItem
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -716,7 +716,7 @@ protected:
 class TQCanvasPolygon : TQCanvasPolygonalItem
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -740,7 +740,7 @@ protected:
 class TQCanvasSpline : TQCanvasPolygon
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -759,7 +759,7 @@ public:
 class TQCanvasLine : TQCanvasPolygonalItem
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -786,7 +786,7 @@ protected:
 class TQCanvasEllipse : TQCanvasPolygonalItem
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
@@ -814,7 +814,7 @@ protected:
 class TQCanvasText : TQCanvasItem
 {
 %TypeHeaderCode
-#include <qcanvas.h>
+#include <tqcanvas.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintilla.sip b/sip/qtext/qextscintilla.sip
index e7609b9..82260c4 100644
--- a/sip/qtext/qextscintilla.sip
+++ b/sip/qtext/qextscintilla.sip
@@ -27,7 +27,7 @@
 class QextScintilla : QextScintillaBase
 {
 %TypeHeaderCode
-#include <qextscintilla.h>
+#include <tqextscintilla.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillaapis.sip b/sip/qtext/qextscintillaapis.sip
index 8d92e26..f19af01 100644
--- a/sip/qtext/qextscintillaapis.sip
+++ b/sip/qtext/qextscintillaapis.sip
@@ -27,7 +27,7 @@
 class QextScintillaAPIs
 {
 %TypeHeaderCode
-#include <qextscintillaapis.h>
+#include <tqextscintillaapis.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillabase.sip b/sip/qtext/qextscintillabase.sip
index a309ee7..1fc9bdc 100644
--- a/sip/qtext/qextscintillabase.sip
+++ b/sip/qtext/qextscintillabase.sip
@@ -27,7 +27,7 @@
 class QextScintillaBase : TQWidget
 {
 %TypeHeaderCode
-#include <qextscintillabase.h>
+#include <tqextscintillabase.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillacommand.sip b/sip/qtext/qextscintillacommand.sip
index b423a5b..f7efbc8 100644
--- a/sip/qtext/qextscintillacommand.sip
+++ b/sip/qtext/qextscintillacommand.sip
@@ -27,7 +27,7 @@
 class QextScintillaCommand
 {
 %TypeHeaderCode
-#include <qextscintillacommand.h>
+#include <tqextscintillacommand.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillacommandset.sip b/sip/qtext/qextscintillacommandset.sip
index 8d04f82..26ae97e 100644
--- a/sip/qtext/qextscintillacommandset.sip
+++ b/sip/qtext/qextscintillacommandset.sip
@@ -27,7 +27,7 @@
 class QextScintillaCommandSet
 {
 %TypeHeaderCode
-#include <qextscintillacommandset.h>
+#include <tqextscintillacommandset.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintilladocument.sip b/sip/qtext/qextscintilladocument.sip
index f66166d..a8086a6 100644
--- a/sip/qtext/qextscintilladocument.sip
+++ b/sip/qtext/qextscintilladocument.sip
@@ -29,7 +29,7 @@
 class QextScintillaDocument
 {
 %TypeHeaderCode
-#include <qextscintilladocument.h>
+#include <tqextscintilladocument.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexer.sip b/sip/qtext/qextscintillalexer.sip
index 4ab290a..6601906 100644
--- a/sip/qtext/qextscintillalexer.sip
+++ b/sip/qtext/qextscintillalexer.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexer : TQObject
 {
 %TypeHeaderCode
-#include <qextscintillalexer.h>
+#include <tqextscintillalexer.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerbash.sip b/sip/qtext/qextscintillalexerbash.sip
index eb71b13..0dd2d02 100644
--- a/sip/qtext/qextscintillalexerbash.sip
+++ b/sip/qtext/qextscintillalexerbash.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerBash : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerbash.h>
+#include <tqextscintillalexerbash.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerbatch.sip b/sip/qtext/qextscintillalexerbatch.sip
index aa20a4f..990d6ed 100644
--- a/sip/qtext/qextscintillalexerbatch.sip
+++ b/sip/qtext/qextscintillalexerbatch.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerBatch : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerbatch.h>
+#include <tqextscintillalexerbatch.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexercpp.sip b/sip/qtext/qextscintillalexercpp.sip
index 3ce192d..8d41dd0 100644
--- a/sip/qtext/qextscintillalexercpp.sip
+++ b/sip/qtext/qextscintillalexercpp.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerCPP : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexercpp.h>
+#include <tqextscintillalexercpp.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexercsharp.sip b/sip/qtext/qextscintillalexercsharp.sip
index f095269..1734289 100644
--- a/sip/qtext/qextscintillalexercsharp.sip
+++ b/sip/qtext/qextscintillalexercsharp.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerCSharp : QextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <qextscintillalexercsharp.h>
+#include <tqextscintillalexercsharp.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexercss.sip b/sip/qtext/qextscintillalexercss.sip
index e54b5e1..9dd72e1 100644
--- a/sip/qtext/qextscintillalexercss.sip
+++ b/sip/qtext/qextscintillalexercss.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerCSS : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexercss.h>
+#include <tqextscintillalexercss.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerdiff.sip b/sip/qtext/qextscintillalexerdiff.sip
index 49d82ad..31ae4ab 100644
--- a/sip/qtext/qextscintillalexerdiff.sip
+++ b/sip/qtext/qextscintillalexerdiff.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerDiff : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerdiff.h>
+#include <tqextscintillalexerdiff.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerhtml.sip b/sip/qtext/qextscintillalexerhtml.sip
index deb7320..d0aad95 100644
--- a/sip/qtext/qextscintillalexerhtml.sip
+++ b/sip/qtext/qextscintillalexerhtml.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerHTML : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerhtml.h>
+#include <tqextscintillalexerhtml.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexeridl.sip b/sip/qtext/qextscintillalexeridl.sip
index 408d3fe..8ab42d9 100644
--- a/sip/qtext/qextscintillalexeridl.sip
+++ b/sip/qtext/qextscintillalexeridl.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerIDL : QextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <qextscintillalexeridl.h>
+#include <tqextscintillalexeridl.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerjava.sip b/sip/qtext/qextscintillalexerjava.sip
index dbb8b03..edacf64 100644
--- a/sip/qtext/qextscintillalexerjava.sip
+++ b/sip/qtext/qextscintillalexerjava.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerJava : QextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <qextscintillalexerjava.h>
+#include <tqextscintillalexerjava.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerjavascript.sip b/sip/qtext/qextscintillalexerjavascript.sip
index a19b902..551e3eb 100644
--- a/sip/qtext/qextscintillalexerjavascript.sip
+++ b/sip/qtext/qextscintillalexerjavascript.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerJavaScript : QextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <qextscintillalexerjavascript.h>
+#include <tqextscintillalexerjavascript.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerlua.sip b/sip/qtext/qextscintillalexerlua.sip
index 12c725f..9983cce 100644
--- a/sip/qtext/qextscintillalexerlua.sip
+++ b/sip/qtext/qextscintillalexerlua.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerLua : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerlua.h>
+#include <tqextscintillalexerlua.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexermakefile.sip b/sip/qtext/qextscintillalexermakefile.sip
index 90d210e..8a28358 100644
--- a/sip/qtext/qextscintillalexermakefile.sip
+++ b/sip/qtext/qextscintillalexermakefile.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerMakefile : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexermakefile.h>
+#include <tqextscintillalexermakefile.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerperl.sip b/sip/qtext/qextscintillalexerperl.sip
index 06bdd7c..bc7f521 100644
--- a/sip/qtext/qextscintillalexerperl.sip
+++ b/sip/qtext/qextscintillalexerperl.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerPerl : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerperl.h>
+#include <tqextscintillalexerperl.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerpov.sip b/sip/qtext/qextscintillalexerpov.sip
index 6812baa..9489f26 100644
--- a/sip/qtext/qextscintillalexerpov.sip
+++ b/sip/qtext/qextscintillalexerpov.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerPOV : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerpov.h>
+#include <tqextscintillalexerpov.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerproperties.sip b/sip/qtext/qextscintillalexerproperties.sip
index b880ce9..847394f 100644
--- a/sip/qtext/qextscintillalexerproperties.sip
+++ b/sip/qtext/qextscintillalexerproperties.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerProperties : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerproperties.h>
+#include <tqextscintillalexerproperties.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerpython.sip b/sip/qtext/qextscintillalexerpython.sip
index 5e3b883..842bb2a 100644
--- a/sip/qtext/qextscintillalexerpython.sip
+++ b/sip/qtext/qextscintillalexerpython.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerPython : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerpython.h>
+#include <tqextscintillalexerpython.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerruby.sip b/sip/qtext/qextscintillalexerruby.sip
index f7c0a99..dfbc7f4 100644
--- a/sip/qtext/qextscintillalexerruby.sip
+++ b/sip/qtext/qextscintillalexerruby.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerRuby : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerruby.h>
+#include <tqextscintillalexerruby.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexersql.sip b/sip/qtext/qextscintillalexersql.sip
index 5f601eb..f4b5459 100644
--- a/sip/qtext/qextscintillalexersql.sip
+++ b/sip/qtext/qextscintillalexersql.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerSQL : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexersql.h>
+#include <tqextscintillalexersql.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexertex.sip b/sip/qtext/qextscintillalexertex.sip
index 8320b59..9450286 100644
--- a/sip/qtext/qextscintillalexertex.sip
+++ b/sip/qtext/qextscintillalexertex.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerTeX : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexertex.h>
+#include <tqextscintillalexertex.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillamacro.sip b/sip/qtext/qextscintillamacro.sip
index d5261f1..1876af4 100644
--- a/sip/qtext/qextscintillamacro.sip
+++ b/sip/qtext/qextscintillamacro.sip
@@ -27,7 +27,7 @@
 class QextScintillaMacro : TQObject
 {
 %TypeHeaderCode
-#include <qextscintillamacro.h>
+#include <tqextscintillamacro.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillaprinter.sip b/sip/qtext/qextscintillaprinter.sip
index b19a312..2d5b9bb 100644
--- a/sip/qtext/qextscintillaprinter.sip
+++ b/sip/qtext/qextscintillaprinter.sip
@@ -27,7 +27,7 @@
 class QextScintillaPrinter : TQPrinter
 {
 %TypeHeaderCode
-#include <qextscintillaprinter.h>
+#include <tqextscintillaprinter.h>
 %End
 
 public:
diff --git a/sip/qtgl/qgl.sip b/sip/qtgl/qgl.sip
index 0f949be..b40e630 100644
--- a/sip/qtgl/qgl.sip
+++ b/sip/qtgl/qgl.sip
@@ -59,7 +59,7 @@ const char *qGLVersion();
 class TQGL
 {
 %TypeHeaderCode
-#include <qgl.h>
+#include <tqgl.h>
 %End
 
 public:
@@ -89,7 +89,7 @@ public:
 class TQGLFormat : TQGL
 {
 %TypeHeaderCode
-#include <qgl.h>
+#include <tqgl.h>
 %End
 
 public:
@@ -135,7 +135,7 @@ public:
 class TQGLContext : TQGL
 {
 %TypeHeaderCode
-#include <qgl.h>
+#include <tqgl.h>
 %End
 
 public:
@@ -197,7 +197,7 @@ private:
 class TQGLWidget : TQWidget, TQGL
 {
 %TypeHeaderCode
-#include <qgl.h>
+#include <tqgl.h>
 %End
 
 public:
diff --git a/sip/qtgl/qglcolormap.sip b/sip/qtgl/qglcolormap.sip
index 591662a..1e19527 100644
--- a/sip/qtgl/qglcolormap.sip
+++ b/sip/qtgl/qglcolormap.sip
@@ -40,7 +40,7 @@ Not yet implemented.
 class TQGLColormap
 {
 %TypeHeaderCode
-#include <qglcolormap.h>
+#include <tqglcolormap.h>
 %End
 
 public:
diff --git a/sip/qtnetwork/qdns.sip b/sip/qtnetwork/qdns.sip
index 3d53ae1..9ddf6f6 100644
--- a/sip/qtnetwork/qdns.sip
+++ b/sip/qtnetwork/qdns.sip
@@ -35,7 +35,7 @@
 class TQDns : TQObject
 {
 %TypeHeaderCode
-#include <qdns.h>
+#include <tqdns.h>
 %End
 
 public:
@@ -106,7 +106,7 @@ signals:
 %MappedType TQValueList<TQHostAddress>
 {
 %TypeHeaderCode
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 %End
 
 %ConvertFromTypeCode
@@ -162,7 +162,7 @@ signals:
 %MappedType TQValueList<TQDns::MailServer>
 {
 %TypeHeaderCode
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 %End
 
 %ConvertFromTypeCode
@@ -218,7 +218,7 @@ signals:
 %MappedType TQValueList<TQDns::Server>
 {
 %TypeHeaderCode
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qtnetwork/qftp.sip b/sip/qtnetwork/qftp.sip
index e1e7613..73dca92 100644
--- a/sip/qtnetwork/qftp.sip
+++ b/sip/qtnetwork/qftp.sip
@@ -42,7 +42,7 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
 class TQFtp : TQNetworkProtocol
 {
 %TypeHeaderCode
-#include <qftp.h>
+#include <tqftp.h>
 %End
 
 public:
diff --git a/sip/qtnetwork/qhostaddress.sip b/sip/qtnetwork/qhostaddress.sip
index 4862672..006acfb 100644
--- a/sip/qtnetwork/qhostaddress.sip
+++ b/sip/qtnetwork/qhostaddress.sip
@@ -62,7 +62,7 @@ Not yet implemented.
 class TQHostAddress
 {
 %TypeHeaderCode
-#include <qhostaddress.h>
+#include <tqhostaddress.h>
 %End
 
 public:
diff --git a/sip/qtnetwork/qhttp.sip b/sip/qtnetwork/qhttp.sip
index 966cccf..dfd9381 100644
--- a/sip/qtnetwork/qhttp.sip
+++ b/sip/qtnetwork/qhttp.sip
@@ -61,7 +61,7 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
 class TQHttpHeader
 {
 %TypeHeaderCode
-#include <qhttp.h>
+#include <tqhttp.h>
 %End
 
 public:
@@ -101,7 +101,7 @@ protected:
 class TQHttpResponseHeader : TQHttpHeader
 {
 %TypeHeaderCode
-#include <qhttp.h>
+#include <tqhttp.h>
 %End
 
 public:
@@ -124,7 +124,7 @@ protected:
 class TQHttpRequestHeader : TQHttpHeader
 {
 %TypeHeaderCode
-#include <qhttp.h>
+#include <tqhttp.h>
 %End
 
 public:
@@ -155,7 +155,7 @@ protected:
 class TQHttp : TQNetworkProtocol
 {
 %TypeHeaderCode
-#include <qhttp.h>
+#include <tqhttp.h>
 %End
 
 public:
diff --git a/sip/qtnetwork/qlocalfs.sip b/sip/qtnetwork/qlocalfs.sip
index 59f15eb..47f9e50 100644
--- a/sip/qtnetwork/qlocalfs.sip
+++ b/sip/qtnetwork/qlocalfs.sip
@@ -35,7 +35,7 @@
 class TQLocalFs : TQNetworkProtocol
 {
 %TypeHeaderCode
-#include <qlocalfs.h>
+#include <tqlocalfs.h>
 %End
 
 public:
diff --git a/sip/qtnetwork/qnetwork.sip b/sip/qtnetwork/qnetwork.sip
index ef4db4b..2413b2a 100644
--- a/sip/qtnetwork/qnetwork.sip
+++ b/sip/qtnetwork/qnetwork.sip
@@ -24,8 +24,8 @@
 %If (TQt_2_2_0 -)
 
 %ModuleHeaderCode
-#include <qglobal.h>
-#include <qnetwork.h>
+#include <tqglobal.h>
+#include <tqnetwork.h>
 %End
 
 void qInitNetworkProtocols();
diff --git a/sip/qtnetwork/qserversocket.sip b/sip/qtnetwork/qserversocket.sip
index ce83d7b..9bf2101 100644
--- a/sip/qtnetwork/qserversocket.sip
+++ b/sip/qtnetwork/qserversocket.sip
@@ -34,7 +34,7 @@
 class TQServerSocket : TQObject
 {
 %TypeHeaderCode
-#include <qserversocket.h>
+#include <tqserversocket.h>
 %End
 
 public:
diff --git a/sip/qtnetwork/qsocket.sip b/sip/qtnetwork/qsocket.sip
index cde11e3..7e7dd83 100644
--- a/sip/qtnetwork/qsocket.sip
+++ b/sip/qtnetwork/qsocket.sip
@@ -62,7 +62,7 @@ as a parameter.
 class TQSocket : TQObject, TQIODevice
 {
 %TypeHeaderCode
-#include <qsocket.h>
+#include <tqsocket.h>
 %End
 
 public:
diff --git a/sip/qtnetwork/qsocketdevice.sip b/sip/qtnetwork/qsocketdevice.sip
index b9249d8..cd39996 100644
--- a/sip/qtnetwork/qsocketdevice.sip
+++ b/sip/qtnetwork/qsocketdevice.sip
@@ -51,7 +51,7 @@ as a parameter.
 class TQSocketDevice : TQIODevice
 {
 %TypeHeaderCode
-#include <qsocketdevice.h>
+#include <tqsocketdevice.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpeapplication.sip b/sip/qtpe/qpeapplication.sip
index 3be3ae6..5b76b22 100644
--- a/sip/qtpe/qpeapplication.sip
+++ b/sip/qtpe/qpeapplication.sip
@@ -29,8 +29,8 @@
 class TQPEApplication : TQApplication
 {
 %TypeHeaderCode
-#include <qpe/qpeapplication.h>
-#include <qwidgetlist.h>
+#include <tqpe/qpeapplication.h>
+#include <tqwidgetlist.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpeapplnk.sip b/sip/qtpe/qpeapplnk.sip
index 9bf07fa..7738f0c 100644
--- a/sip/qtpe/qpeapplnk.sip
+++ b/sip/qtpe/qpeapplnk.sip
@@ -30,7 +30,7 @@
 class AppLnk
 {
 %TypeHeaderCode
-#include <qpe/applnk.h>
+#include <tqpe/applnk.h>
 %End
 
 public:
@@ -91,7 +91,7 @@ protected:
 class DocLnk : AppLnk
 {
 %TypeHeaderCode
-#include <qpe/applnk.h>
+#include <tqpe/applnk.h>
 %End
 
 public:
@@ -110,7 +110,7 @@ protected:
 class AppLnkSet
 {
 %TypeHeaderCode
-#include <qpe/applnk.h>
+#include <tqpe/applnk.h>
 %End
 
 public:
@@ -139,7 +139,7 @@ private:
 class DocLnkSet : AppLnkSet
 {
 %TypeHeaderCode
-#include <qpe/applnk.h>
+#include <tqpe/applnk.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpeconfig.sip b/sip/qtpe/qpeconfig.sip
index e816101..39c788f 100644
--- a/sip/qtpe/qpeconfig.sip
+++ b/sip/qtpe/qpeconfig.sip
@@ -29,7 +29,7 @@
 class Config
 {
 %TypeHeaderCode
-#include <qpe/config.h>
+#include <tqpe/config.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpefilemanager.sip b/sip/qtpe/qpefilemanager.sip
index abd4cce..bc7d76e 100644
--- a/sip/qtpe/qpefilemanager.sip
+++ b/sip/qtpe/qpefilemanager.sip
@@ -29,7 +29,7 @@
 class FileManager
 {
 %TypeHeaderCode
-#include <qpe/filemanager.h>
+#include <tqpe/filemanager.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpefileselector.sip b/sip/qtpe/qpefileselector.sip
index 044cd59..a7d3d01 100644
--- a/sip/qtpe/qpefileselector.sip
+++ b/sip/qtpe/qpefileselector.sip
@@ -29,7 +29,7 @@
 class FileSelectorItem : TQListViewItem
 {
 %TypeHeaderCode
-#include <qpe/fileselector.h>
+#include <tqpe/fileselector.h>
 %End
 
 public:
@@ -42,7 +42,7 @@ public:
 class FileSelector : TQVBox
 {
 %TypeHeaderCode
-#include <qpe/fileselector.h>
+#include <tqpe/fileselector.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpefontdatabase.sip b/sip/qtpe/qpefontdatabase.sip
index 4b9eb9c..1b250ed 100644
--- a/sip/qtpe/qpefontdatabase.sip
+++ b/sip/qtpe/qpefontdatabase.sip
@@ -31,7 +31,7 @@
 class FontDatabase : TQFontDatabase
 {
 %TypeHeaderCode
-#include <qpe/fontdatabase.h>
+#include <tqpe/fontdatabase.h>
 %End
 
 public:
@@ -50,7 +50,7 @@ public:
 class FontDatabase
 {
 %TypeHeaderCode
-#include <qpe/fontdatabase.h>
+#include <tqpe/fontdatabase.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpeglobal.sip b/sip/qtpe/qpeglobal.sip
index 89a32be..0810f65 100644
--- a/sip/qtpe/qpeglobal.sip
+++ b/sip/qtpe/qpeglobal.sip
@@ -29,7 +29,7 @@
 class Global
 {
 %TypeHeaderCode
-#include <qpe/global.h>
+#include <tqpe/global.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpemenubar.sip b/sip/qtpe/qpemenubar.sip
index faaa50f..d572cef 100644
--- a/sip/qtpe/qpemenubar.sip
+++ b/sip/qtpe/qpemenubar.sip
@@ -29,7 +29,7 @@
 class TQPEMenuBar : TQMenuBar
 {
 %TypeHeaderCode
-#include <qpe/qpemenubar.h>
+#include <tqpe/qpemenubar.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpemenubutton.sip b/sip/qtpe/qpemenubutton.sip
index 24538c3..7d5da05 100644
--- a/sip/qtpe/qpemenubutton.sip
+++ b/sip/qtpe/qpemenubutton.sip
@@ -29,7 +29,7 @@
 class MenuButton : TQPushButton
 {
 %TypeHeaderCode
-#include <qpe/menubutton.h>
+#include <tqpe/menubutton.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpeqcopenvelope.sip b/sip/qtpe/qpeqcopenvelope.sip
index 49e0c39..cabb169 100644
--- a/sip/qtpe/qpeqcopenvelope.sip
+++ b/sip/qtpe/qpeqcopenvelope.sip
@@ -29,7 +29,7 @@
 class TQCopEnvelope : TQDataStream
 {
 %TypeHeaderCode
-#include <qpe/qcopenvelope_qws.h>
+#include <tqpe/qcopenvelope_qws.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpeqdawg.sip b/sip/qtpe/qpeqdawg.sip
index e681b9c..fa24f47 100644
--- a/sip/qtpe/qpeqdawg.sip
+++ b/sip/qtpe/qpeqdawg.sip
@@ -29,7 +29,7 @@
 class TQDawg
 {
 %TypeHeaderCode
-#include <qpe/qdawg.h>
+#include <tqpe/qdawg.h>
 %End
 
 public:
diff --git a/sip/qtpe/qperesource.sip b/sip/qtpe/qperesource.sip
index 79b940d..5a25680 100644
--- a/sip/qtpe/qperesource.sip
+++ b/sip/qtpe/qperesource.sip
@@ -29,7 +29,7 @@
 class Resource
 {
 %TypeHeaderCode
-#include <qpe/resource.h>
+#include <tqpe/resource.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpetimestring.sip b/sip/qtpe/qpetimestring.sip
index 21961d1..47dda55 100644
--- a/sip/qtpe/qpetimestring.sip
+++ b/sip/qtpe/qpetimestring.sip
@@ -29,7 +29,7 @@
 class DateFormat
 {
 %TypeHeaderCode
-#include <qpe/timestring.h>
+#include <tqpe/timestring.h>
 %End
 
 public:
diff --git a/sip/qtpe/qpetoolbar.sip b/sip/qtpe/qpetoolbar.sip
index 541cb92..10fd387 100644
--- a/sip/qtpe/qpetoolbar.sip
+++ b/sip/qtpe/qpetoolbar.sip
@@ -29,7 +29,7 @@
 class TQPEToolBar : TQToolBar
 {
 %TypeHeaderCode
-#include <qpe/qpetoolbar.h>
+#include <tqpe/qpetoolbar.h>
 %End
 
 public:
diff --git a/sip/qtpe/qtpemod.sip b/sip/qtpe/qtpemod.sip
index a00a1a3..b0051ed 100644
--- a/sip/qtpe/qtpemod.sip
+++ b/sip/qtpe/qtpemod.sip
@@ -32,7 +32,7 @@
 
 
 %ModuleHeaderCode
-#include <qpe/version.h>
+#include <tqpe/version.h>
 %End
 
 const char *TQPE_VERSION;
diff --git a/sip/qtsql/qdatabrowser.sip b/sip/qtsql/qdatabrowser.sip
index 47d5df7..8730c5a 100644
--- a/sip/qtsql/qdatabrowser.sip
+++ b/sip/qtsql/qdatabrowser.sip
@@ -38,7 +38,7 @@ This has been renamed <Literal>delOnCursor</Literal> in Python.
 class TQDataBrowser : TQWidget
 {
 %TypeHeaderCode
-#include <qdatabrowser.h>
+#include <tqdatabrowser.h>
 %End
 
 public:
diff --git a/sip/qtsql/qdatatable.sip b/sip/qtsql/qdatatable.sip
index 87b8a0b..267c980 100644
--- a/sip/qtsql/qdatatable.sip
+++ b/sip/qtsql/qdatatable.sip
@@ -34,7 +34,7 @@
 class TQDataTable : TQTable
 {
 %TypeHeaderCode
-#include <qdatatable.h>
+#include <tqdatatable.h>
 %End
 
 public:
diff --git a/sip/qtsql/qdataview.sip b/sip/qtsql/qdataview.sip
index 2f48579..70d9cd6 100644
--- a/sip/qtsql/qdataview.sip
+++ b/sip/qtsql/qdataview.sip
@@ -34,7 +34,7 @@
 class TQDataView : TQWidget
 {
 %TypeHeaderCode
-#include <qdataview.h>
+#include <tqdataview.h>
 %End
 
 public:
diff --git a/sip/qtsql/qeditorfactory.sip b/sip/qtsql/qeditorfactory.sip
index 05024c1..c343455 100644
--- a/sip/qtsql/qeditorfactory.sip
+++ b/sip/qtsql/qeditorfactory.sip
@@ -34,7 +34,7 @@
 class TQEditorFactory : TQObject
 {
 %TypeHeaderCode
-#include <qeditorfactory.h>
+#include <tqeditorfactory.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsql.sip b/sip/qtsql/qsql.sip
index 39386f9..f27a18d 100644
--- a/sip/qtsql/qsql.sip
+++ b/sip/qtsql/qsql.sip
@@ -34,7 +34,7 @@
 class TQSql
 {
 %TypeHeaderCode
-#include <qsql.h>
+#include <tqsql.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqlcursor.sip b/sip/qtsql/qsqlcursor.sip
index ff9ec2b..f667cad 100644
--- a/sip/qtsql/qsqlcursor.sip
+++ b/sip/qtsql/qsqlcursor.sip
@@ -55,7 +55,7 @@ This has been renamed <Literal>execQuery</Literal> in Python.
 class TQSqlCursor : TQSqlRecord, TQSqlQuery
 {
 %TypeHeaderCode
-#include <qsqlcursor.h>
+#include <tqsqlcursor.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqldatabase.sip b/sip/qtsql/qsqldatabase.sip
index 3a91d98..e7d3bf4 100644
--- a/sip/qtsql/qsqldatabase.sip
+++ b/sip/qtsql/qsqldatabase.sip
@@ -38,7 +38,7 @@ This has been renamed <Literal>execStatement</Literal> in Python.
 class TQSqlDatabase : TQObject
 {
 %TypeHeaderCode
-#include <qsqldatabase.h>
+#include <tqsqldatabase.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqldriver.sip b/sip/qtsql/qsqldriver.sip
index ee8a3ab..841d5a9 100644
--- a/sip/qtsql/qsqldriver.sip
+++ b/sip/qtsql/qsqldriver.sip
@@ -34,7 +34,7 @@
 class TQSqlDriver : TQObject
 {
 %TypeHeaderCode
-#include <qsqldriver.h>
+#include <tqsqldriver.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqleditorfactory.sip b/sip/qtsql/qsqleditorfactory.sip
index b8aaa76..3880938 100644
--- a/sip/qtsql/qsqleditorfactory.sip
+++ b/sip/qtsql/qsqleditorfactory.sip
@@ -34,7 +34,7 @@
 class TQSqlEditorFactory : TQEditorFactory
 {
 %TypeHeaderCode
-#include <qsqleditorfactory.h>
+#include <tqsqleditorfactory.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqlerror.sip b/sip/qtsql/qsqlerror.sip
index e23d84e..5fd4bfb 100644
--- a/sip/qtsql/qsqlerror.sip
+++ b/sip/qtsql/qsqlerror.sip
@@ -34,7 +34,7 @@
 class TQSqlError
 {
 %TypeHeaderCode
-#include <qsqlerror.h>
+#include <tqsqlerror.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqlfield.sip b/sip/qtsql/qsqlfield.sip
index 40f0ce0..d3bd2ba 100644
--- a/sip/qtsql/qsqlfield.sip
+++ b/sip/qtsql/qsqlfield.sip
@@ -40,7 +40,7 @@
 class TQSqlField
 {
 %TypeHeaderCode
-#include <qsqlfield.h>
+#include <tqsqlfield.h>
 %End
 
 public:
@@ -64,7 +64,7 @@ public:
 class TQSqlFieldInfo
 {
 %TypeHeaderCode
-#include <qsqlfield.h>
+#include <tqsqlfield.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqlform.sip b/sip/qtsql/qsqlform.sip
index 8d00d1d..d21032a 100644
--- a/sip/qtsql/qsqlform.sip
+++ b/sip/qtsql/qsqlform.sip
@@ -34,7 +34,7 @@
 class TQSqlForm : TQObject
 {
 %TypeHeaderCode
-#include <qsqlform.h>
+#include <tqsqlform.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqlindex.sip b/sip/qtsql/qsqlindex.sip
index 300fc2f..c839a44 100644
--- a/sip/qtsql/qsqlindex.sip
+++ b/sip/qtsql/qsqlindex.sip
@@ -34,7 +34,7 @@
 class TQSqlIndex : TQSqlRecord
 {
 %TypeHeaderCode
-#include <qsqlindex.h>
+#include <tqsqlindex.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqlpropertymap.sip b/sip/qtsql/qsqlpropertymap.sip
index 169be86..f40098d 100644
--- a/sip/qtsql/qsqlpropertymap.sip
+++ b/sip/qtsql/qsqlpropertymap.sip
@@ -41,7 +41,7 @@ This problem may be addressed in a future release of PyTQt.
 class TQSqlPropertyMap
 {
 %TypeHeaderCode
-#include <qsqlpropertymap.h>
+#include <tqsqlpropertymap.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqlquery.sip b/sip/qtsql/qsqlquery.sip
index 42ffb98..a41eb57 100644
--- a/sip/qtsql/qsqlquery.sip
+++ b/sip/qtsql/qsqlquery.sip
@@ -54,7 +54,7 @@ This has been renamed <Literal>execQuery</Literal> in Python. (TQt v3.1+)
 class TQSqlQuery
 {
 %TypeHeaderCode
-#include <qsqlquery.h>
+#include <tqsqlquery.h>
 %End
 
 public:
diff --git a/sip/qtsql/qsqlrecord.sip b/sip/qtsql/qsqlrecord.sip
index e79df10..bfe08b8 100644
--- a/sip/qtsql/qsqlrecord.sip
+++ b/sip/qtsql/qsqlrecord.sip
@@ -41,7 +41,7 @@
 class TQSqlRecord
 {
 %TypeHeaderCode
-#include <qsqlrecord.h>
+#include <tqsqlrecord.h>
 %End
 
 public:
@@ -90,7 +90,7 @@ public:
 %MappedType TQSqlRecordInfo
 {
 %TypeHeaderCode
-#include <qsqlrecord.h>
+#include <tqsqlrecord.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/qtsql/qsqlresult.sip b/sip/qtsql/qsqlresult.sip
index 39f5e0f..25f1189 100644
--- a/sip/qtsql/qsqlresult.sip
+++ b/sip/qtsql/qsqlresult.sip
@@ -34,7 +34,7 @@
 class TQSqlResult
 {
 %TypeHeaderCode
-#include <qsqlresult.h>
+#include <tqsqlresult.h>
 %End
 
 protected:
diff --git a/sip/qtsql/qsqlselectcursor.sip b/sip/qtsql/qsqlselectcursor.sip
index 3a60e53..595e7ae 100644
--- a/sip/qtsql/qsqlselectcursor.sip
+++ b/sip/qtsql/qsqlselectcursor.sip
@@ -46,7 +46,7 @@ This has been renamed <Literal>execQuery</Literal> in Python.
 class TQSqlSelectCursor : TQSqlCursor
 {
 %TypeHeaderCode
-#include <qsqlselectcursor.h>
+#include <tqsqlselectcursor.h>
 %End
 
 public:
diff --git a/sip/qttable/qtable.sip b/sip/qttable/qtable.sip
index 885a14a..b903ffb 100644
--- a/sip/qttable/qtable.sip
+++ b/sip/qttable/qtable.sip
@@ -60,7 +60,7 @@
 class TQTableSelection
 {
 %TypeHeaderCode
-#include <qtable.h>
+#include <tqtable.h>
 %End
 
 public:
@@ -93,7 +93,7 @@ public:
 class TQTableItem : TQt
 {
 %TypeHeaderCode
-#include <qtable.h>
+#include <tqtable.h>
 %End
 
 public:
@@ -182,7 +182,7 @@ protected:
 class TQComboTableItem : TQTableItem
 {
 %TypeHeaderCode
-#include <qtable.h>
+#include <tqtable.h>
 %End
 
 public:
@@ -218,7 +218,7 @@ public:
 class TQCheckTableItem : TQTableItem
 {
 %TypeHeaderCode
-#include <qtable.h>
+#include <tqtable.h>
 %End
 
 public:
@@ -248,7 +248,7 @@ public:
 class TQTable : TQScrollView
 {
 %TypeHeaderCode
-#include <qtable.h>
+#include <tqtable.h>
 %End
 
 public:
diff --git a/sip/qtui/qwidgetfactory.sip b/sip/qtui/qwidgetfactory.sip
index 6907b61..e3b9c78 100644
--- a/sip/qtui/qwidgetfactory.sip
+++ b/sip/qtui/qwidgetfactory.sip
@@ -35,7 +35,7 @@
 class TQWidgetFactory
 {
 %TypeHeaderCode
-#include <qwidgetfactory.h>
+#include <tqwidgetfactory.h>
 %End
 
 public:
diff --git a/sip/qtxml/qdom.sip b/sip/qtxml/qdom.sip
index e33c03b..40b9150 100644
--- a/sip/qtxml/qdom.sip
+++ b/sip/qtxml/qdom.sip
@@ -260,7 +260,7 @@ Not yet implemented.  (TQt v3.2.0+)
 class TQDomImplementation
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -282,7 +282,7 @@ public:
 class TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -386,7 +386,7 @@ public:
 class TQDomNodeList
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -403,7 +403,7 @@ public:
 class TQDomDocumentType : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -427,7 +427,7 @@ public:
 class TQDomDocument : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -601,7 +601,7 @@ public:
 class TQDomNamedNodeMap
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -630,7 +630,7 @@ public:
 class TQDomDocumentFragment : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -645,7 +645,7 @@ public:
 class TQDomCharacterData : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -671,7 +671,7 @@ public:
 class TQDomAttr : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -695,7 +695,7 @@ public:
 class TQDomElement : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -755,7 +755,7 @@ public:
 class TQDomText : TQDomCharacterData
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -772,7 +772,7 @@ public:
 class TQDomComment : TQDomCharacterData
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -787,7 +787,7 @@ public:
 class TQDomCDATASection : TQDomText
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -802,7 +802,7 @@ public:
 class TQDomNotation : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -820,7 +820,7 @@ public:
 class TQDomEntity : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -839,7 +839,7 @@ public:
 class TQDomEntityReference : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public:
@@ -854,7 +854,7 @@ public:
 class TQDomProcessingInstruction : TQDomNode
 {
 %TypeHeaderCode
-#include <qdom.h>
+#include <tqdom.h>
 %End
 
 public: