Rename private q* headers into equivalent tq*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

123 files changed, 181 insertions, 181 deletions

diff --git a/src/codecs/tqtextcodecfactory.cpp b/src/codecs/tqtextcodecfactory.cpp
index 9e081c51c..36782644f 100644
--- a/src/codecs/tqtextcodecfactory.cpp
+++ b/src/codecs/tqtextcodecfactory.cpp
@@ -45,7 +45,7 @@
 #ifndef TQT_NO_COMPONENT
 #include "ntqapplication.h"
 #include "tqcleanuphandler.h"
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include "tqtextcodecinterface_p.h"
 
 #ifdef TQT_THREAD_SUPPORT
diff --git a/src/codecs/tqtextcodecinterface_p.h b/src/codecs/tqtextcodecinterface_p.h
index 541889e2d..714c1567d 100644
--- a/src/codecs/tqtextcodecinterface_p.h
+++ b/src/codecs/tqtextcodecinterface_p.h
@@ -44,7 +44,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qpsprinter.cpp and tqprinter_x11.cpp.
+// of tqpsprinter.cpp and tqprinter_x11.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
@@ -53,7 +53,7 @@
 //
 
 #ifndef QT_H
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #endif // QT_H
 
 #ifndef TQT_NO_TEXTCODEC
diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp
index 42853e00a..919a1ed38 100644
--- a/src/dialogs/tqdialog.cpp
+++ b/src/dialogs/tqdialog.cpp
@@ -673,7 +673,7 @@ bool TQDialog::event( TQEvent *e )
 
 #if defined(TQ_WS_X11)
 extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
-#include <private/qt_x11_p.h>
+#include <private/tqt_x11_p.h>
 #undef FocusIn
 // defined in qapplication_x11.cpp
 extern Atom qt_net_wm_full_placement;
diff --git a/src/inputmethod/tqinputcontextfactory.cpp b/src/inputmethod/tqinputcontextfactory.cpp
index 95fc40766..e6f1fb3af 100644
--- a/src/inputmethod/tqinputcontextfactory.cpp
+++ b/src/inputmethod/tqinputcontextfactory.cpp
@@ -50,7 +50,7 @@
 #include <stdlib.h>
 
 #include "tqcleanuphandler.h"
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #ifndef TQT_NO_COMPONENT
 
 
diff --git a/src/inputmethod/tqinputcontextinterface_p.h b/src/inputmethod/tqinputcontextinterface_p.h
index 195be7fe9..e21a016da 100644
--- a/src/inputmethod/tqinputcontextinterface_p.h
+++ b/src/inputmethod/tqinputcontextinterface_p.h
@@ -49,7 +49,7 @@
 //
 
 #ifndef QT_H
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #endif // QT_H
 
 #ifndef TQT_NO_IM
diff --git a/src/kernel/makepsheader.pl b/src/kernel/makepsheader.pl
index b842e1465..4452b8404 100755
--- a/src/kernel/makepsheader.pl
+++ b/src/kernel/makepsheader.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
-open(INPUT, 'qpsprinter.ps')
-  or die "Can't open qpsprinter.ps";
+open(INPUT, 'tqpsprinter.ps')
+  or die "Can't open tqpsprinter.ps";
 
 $dontcompress = 1;
 while(<INPUT>) {
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index c1d8345b1..ec94e78b5 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -92,7 +92,7 @@
 #ifndef TQT_NO_IM
 #include "tqinputcontext.h"
 #endif // TQT_NO_IM
-#include "qinternal_p.h" // shared double buffer cleanup
+#include "tqinternal_p.h" // shared double buffer cleanup
 
 #if defined(TQT_THREAD_SUPPORT)
 # include "tqthread.h"
@@ -102,7 +102,7 @@
 # include "tqfile.h"
 #endif
 
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #if !defined(TQT_NO_XFTFREETYPE)
 // XFree86 4.0.3 implementation is missing XftInitFtLibrary forward
@@ -849,7 +849,7 @@ void qt_x11_intern_atom( const char *name, Atom *result)
 }
 
 
-static void qt_x11_process_intern_atoms()
+static void tqt_x11_process_intern_atoms()
 {
     if ( atoms_to_be_created ) {
 #if defined(XlibSpecificationRelease) && (XlibSpecificationRelease >= 6)
@@ -2084,7 +2084,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 	qt_x11_motifdnd_init();
 
 	// Finally create all atoms
-	qt_x11_process_intern_atoms();
+	tqt_x11_process_intern_atoms();
 
         // look for broken window managers
         qt_detect_broken_window_manager();
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index 4d4dad5f5..571045f48 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -55,7 +55,7 @@
 #include "tqbitmap.h"
 #include "tqpainter.h"
 
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 // conflict resolution
 
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 315b931fd..84a383a5d 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -4,7 +4,7 @@ kernel {
 	KERNEL_P	= kernel
 	HEADERS += \
 		  $$KERNEL_H/tqaccel.h \
-		  $$KERNEL_P/qucomextra_p.h \
+		  $$KERNEL_P/tqucomextra_p.h \
 		  $$KERNEL_H/ntqapplication.h \
 		  $$KERNEL_P/qapplication_p.h \
 		  $$KERNEL_H/tqasyncimageio.h \
@@ -89,11 +89,11 @@ kernel {
 		  $$KERNEL_H/tqwindowdefs.h \
 		  $$KERNEL_H/tqwmatrix.h \
 		  $$KERNEL_H/tqvariant.h \
-		  $$KERNEL_P/qrichtext_p.h \
-		  $$KERNEL_P/qinternal_p.h \
+		  $$KERNEL_P/tqrichtext_p.h \
+		  $$KERNEL_P/tqinternal_p.h \
 		  $$KERNEL_H/tqgplugin.h \
 		  $$KERNEL_H/tqsimplerichtext.h \
-		  $$KERNEL_CPP/qscriptengine_p.h \
+		  $$KERNEL_CPP/tqscriptengine_p.h \
 		  $$KERNEL_CPP/tqtextengine_p.h \
 		  $$KERNEL_CPP/tqfontengine_p.h \
 		  $$KERNEL_CPP/tqtextlayout_p.h
@@ -182,7 +182,7 @@ kernel {
              DEFINES += QMAC_ONE_PIXEL_LOCK
         } else:unix {
 	   SOURCES += $$KERNEL_CPP/tqprinter_unix.cpp \
-	              $$KERNEL_CPP/qpsprinter.cpp
+	              $$KERNEL_CPP/tqpsprinter.cpp
            glibmainloop {
               SOURCES += $$KERNEL_CPP/tqeventloop_unix_glib.cpp
            } else {
@@ -194,7 +194,7 @@ kernel {
 		        $$KERNEL_CPP/tqthread_unix.cpp
 
 	SOURCES += $$KERNEL_CPP/tqabstractlayout.cpp \
-		  $$KERNEL_CPP/qucomextra.cpp \
+		  $$KERNEL_CPP/tqucomextra.cpp \
 		  $$KERNEL_CPP/tqaccel.cpp \
 		  $$KERNEL_CPP/qapplication.cpp \
 		  $$KERNEL_CPP/tqasyncimageio.cpp \
@@ -257,16 +257,16 @@ kernel {
 		  $$KERNEL_CPP/tqwidget.cpp \
 		  $$KERNEL_CPP/tqwmatrix.cpp \
 		  $$KERNEL_CPP/tqvariant.cpp \
-		  $$KERNEL_CPP/qrichtext.cpp \
-		  $$KERNEL_CPP/qinternal.cpp \
-		  $$KERNEL_CPP/qrichtext_p.cpp \
+		  $$KERNEL_CPP/tqrichtext.cpp \
+		  $$KERNEL_CPP/tqinternal.cpp \
+		  $$KERNEL_CPP/tqrichtext_p.cpp \
 		  $$KERNEL_CPP/tqgplugin.cpp \
 		  $$KERNEL_CPP/tqsimplerichtext.cpp \
-		  $$KERNEL_CPP/qscriptengine.cpp \
+		  $$KERNEL_CPP/tqscriptengine.cpp \
 		  $$KERNEL_CPP/tqtextlayout.cpp \
 		  $$KERNEL_CPP/tqtextengine.cpp
 
-	unix:HEADERS   += $$KERNEL_P/qpsprinter_p.h \
+	unix:HEADERS   += $$KERNEL_P/tqpsprinter_p.h \
 			  $$KERNEL_H/tqfontdatabase.h
 
 	accessibility {
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 690551eb6..1420944ef 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -22,7 +22,7 @@
 #    endif
 #  endif
 #include <tqmap.h>		    // I must be first!
-#include <private/qucomextra_p.h>  // All moc genereated code has this include
+#include <private/tqucomextra_p.h>  // All moc genereated code has this include
 #include <ntqapplication.h>
 #include <tqbitmap.h>
 #include <tqcursor.h>
diff --git a/src/kernel/qtaddons_x11.cpp b/src/kernel/qtaddons_x11.cpp
index ad1ea7e00..089466ec7 100644
--- a/src/kernel/qtaddons_x11.cpp
+++ b/src/kernel/qtaddons_x11.cpp
@@ -22,7 +22,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #if !defined(TQT_NO_XFTFREETYPE) && !defined(QT_XFT2)
 
diff --git a/src/kernel/tqaccessible.cpp b/src/kernel/tqaccessible.cpp
index 6cbe717e6..5a43e402b 100644
--- a/src/kernel/tqaccessible.cpp
+++ b/src/kernel/tqaccessible.cpp
@@ -42,7 +42,7 @@
 
 #include "tqptrdict.h"
 #include "tqmetaobject.h"
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include "ntqapplication.h"
 #include <stdlib.h>
 
diff --git a/src/kernel/tqaccessible.h b/src/kernel/tqaccessible.h
index ead26b9b0..8cedf1b2c 100644
--- a/src/kernel/tqaccessible.h
+++ b/src/kernel/tqaccessible.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include "tqrect.h"
 #include "tqguardedptr.h"
 #include "tqmemarray.h"
diff --git a/src/kernel/tqclipboard_x11.cpp b/src/kernel/tqclipboard_x11.cpp
index e20708f54..16af49f8e 100644
--- a/src/kernel/tqclipboard_x11.cpp
+++ b/src/kernel/tqclipboard_x11.cpp
@@ -73,7 +73,7 @@
 #include "tqtextcodec.h"
 #include "tqvaluelist.h"
 #include "tqmap.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 #include "qapplication_p.h"
 
 
diff --git a/src/kernel/tqcolor_x11.cpp b/src/kernel/tqcolor_x11.cpp
index f5cfc024a..09a8b8880 100644
--- a/src/kernel/tqcolor_x11.cpp
+++ b/src/kernel/tqcolor_x11.cpp
@@ -44,7 +44,7 @@
 #include "tqpaintdevice.h"
 #include "ntqapplication.h"
 #include "qapplication_p.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 // NOT REVISED
 
diff --git a/src/kernel/tqcursor_x11.cpp b/src/kernel/tqcursor_x11.cpp
index 9facf093c..3724706c2 100644
--- a/src/kernel/tqcursor_x11.cpp
+++ b/src/kernel/tqcursor_x11.cpp
@@ -44,7 +44,7 @@
 #include "ntqapplication.h"
 #include "tqdatastream.h"
 #include "tqnamespace.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 #include <X11/cursorfont.h>
 
 #ifndef TQT_NO_XCURSOR
diff --git a/src/kernel/tqdesktopwidget_x11.cpp b/src/kernel/tqdesktopwidget_x11.cpp
index 5adc611bc..2a9e5bd9e 100644
--- a/src/kernel/tqdesktopwidget_x11.cpp
+++ b/src/kernel/tqdesktopwidget_x11.cpp
@@ -39,7 +39,7 @@
 #include "tqdesktopwidget.h"
 #include "ntqapplication.h"
 #include "tqobjectlist.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 #include <cstdlib>
 
 // defined in tqwidget_x11.cpp
diff --git a/src/kernel/tqeventloop_x11.cpp b/src/kernel/tqeventloop_x11.cpp
index b90ce7456..743d48e70 100644
--- a/src/kernel/tqeventloop_x11.cpp
+++ b/src/kernel/tqeventloop_x11.cpp
@@ -41,7 +41,7 @@
 #include "ntqapplication.h"
 #include "tqbitarray.h"
 #include "tqcolor_p.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #if defined(TQT_THREAD_SUPPORT)
 #  include "tqmutex.h"
diff --git a/src/kernel/tqeventloop_x11_glib.cpp b/src/kernel/tqeventloop_x11_glib.cpp
index f16fa1017..28069fe1b 100644
--- a/src/kernel/tqeventloop_x11_glib.cpp
+++ b/src/kernel/tqeventloop_x11_glib.cpp
@@ -44,7 +44,7 @@
 #include "ntqapplication.h"
 #include "tqbitarray.h"
 #include "tqcolor_p.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #if defined(TQT_THREAD_SUPPORT)
 #  include "tqmutex.h"
diff --git a/src/kernel/tqfont.cpp b/src/kernel/tqfont.cpp
index a3e21c655..e058e49d4 100644
--- a/src/kernel/tqfont.cpp
+++ b/src/kernel/tqfont.cpp
@@ -55,7 +55,7 @@
 #include "tqpaintdevicemetrics.h"
 #endif
 
-#include <private/qunicodetables_p.h>
+#include <private/tqunicodetables_p.h>
 #include "tqfontdata_p.h"
 #include "tqfontengine_p.h"
 #include "tqpainter_p.h"
diff --git a/src/kernel/tqfont.h b/src/kernel/tqfont.h
index 27f5269e2..435b604df 100644
--- a/src/kernel/tqfont.h
+++ b/src/kernel/tqfont.h
@@ -193,9 +193,9 @@ public:
     static void cleanup();
     static void cacheStatistics();
 
-    // a copy of this lives in qunicodetables.cpp, as we can't include
+    // a copy of this lives in tqunicodetables.cpp, as we can't include
     // tqfont.h it in tools/. Do not modify without changing the script
-    // enum in qunicodetable_p.h aswell.
+    // enum in tqunicodetable_p.h aswell.
     enum Script {
 	// European Alphabetic Scripts
 	Latin,
diff --git a/src/kernel/tqfont_x11.cpp b/src/kernel/tqfont_x11.cpp
index a54e13dc2..373a82a5f 100644
--- a/src/kernel/tqfont_x11.cpp
+++ b/src/kernel/tqfont_x11.cpp
@@ -55,12 +55,12 @@
 #include "tqtextcodec.h"
 
 #include <private/tqfontcodecs_p.h>
-#include <private/qunicodetables_p.h>
+#include <private/tqunicodetables_p.h>
 #include "tqfontdata_p.h"
 #include "tqfontengine_p.h"
 #include "tqtextengine_p.h"
 
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #include <time.h>
 #include <stdlib.h>
diff --git a/src/kernel/tqfontdatabase.cpp b/src/kernel/tqfontdatabase.cpp
index 33f10900f..0702bb67f 100644
--- a/src/kernel/tqfontdatabase.cpp
+++ b/src/kernel/tqfontdatabase.cpp
@@ -45,7 +45,7 @@
 #include <tqtl.h>
 #include <ntqapplication.h>
 
-#include <private/qunicodetables_p.h>
+#include <private/tqunicodetables_p.h>
 #include "tqfontengine_p.h"
 
 #include <tqcleanuphandler.h>
diff --git a/src/kernel/tqfontdatabase_x11.cpp b/src/kernel/tqfontdatabase_x11.cpp
index 49de442cd..23f1f541c 100644
--- a/src/kernel/tqfontdatabase_x11.cpp
+++ b/src/kernel/tqfontdatabase_x11.cpp
@@ -43,7 +43,7 @@
 #include <tqdatetime.h>
 #include <tqpaintdevicemetrics.h>
 
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/src/kernel/tqfontengine_p.h b/src/kernel/tqfontengine_p.h
index 559972746..dcd306fc0 100644
--- a/src/kernel/tqfontengine_p.h
+++ b/src/kernel/tqfontengine_p.h
@@ -219,7 +219,7 @@ private:
 #endif
 
 #ifdef TQ_WS_X11
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 
 struct TransformedFont
@@ -406,7 +406,7 @@ class TQTextEngine;
 
 #ifndef TQT_NO_XFTFREETYPE
 
-#include "qscriptengine_p.h"
+#include "tqscriptengine_p.h"
 #include "tqtextengine_p.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
diff --git a/src/kernel/tqfontengine_x11.cpp b/src/kernel/tqfontengine_x11.cpp
index 8002c42df..1157bbb57 100644
--- a/src/kernel/tqfontengine_x11.cpp
+++ b/src/kernel/tqfontengine_x11.cpp
@@ -51,12 +51,12 @@
 #include "tqpainter.h"
 #include "tqimage.h"
 
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #include "tqfont.h"
 #include "tqtextengine_p.h"
 
-#include <private/qunicodetables_p.h>
+#include <private/tqunicodetables_p.h>
 
 #include <limits.h>
 
@@ -2234,7 +2234,7 @@ TQFontEngine::Type TQFontEngineXft::type() const
 
 #ifndef TQT_NO_XFTFREETYPE
 
-#include "qscriptengine_p.h"
+#include "tqscriptengine_p.h"
 
 //#define OT_DEBUG
 
diff --git a/src/kernel/tqgplugin.cpp b/src/kernel/tqgplugin.cpp
index c0cfd8f47..606e856fb 100644
--- a/src/kernel/tqgplugin.cpp
+++ b/src/kernel/tqgplugin.cpp
@@ -40,7 +40,7 @@
 
 #ifndef TQT_NO_COMPONENT
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 
 TQGPlugin::TQGPlugin()
     : _iface( 0 )
diff --git a/src/kernel/tqgplugin.h b/src/kernel/tqgplugin.h
index 88212515b..30e350cd2 100644
--- a/src/kernel/tqgplugin.h
+++ b/src/kernel/tqgplugin.h
@@ -74,9 +74,9 @@
 #define Q_PLUGIN_FLAGS_STRING "01"
 #endif
 
-// this is duplicated at Q_UCM_VERIFICATION_DATA in qcom_p.h
+// this is duplicated at Q_UCM_VERIFICATION_DATA in tqcom_p.h
 // NOTE: if you change pattern, you MUST change the pattern in
-// qcomlibrary.cpp as well.  changing the pattern will break all
+// tqcomlibrary.cpp as well.  changing the pattern will break all
 // backwards compatibility as well (no old plugins will be loaded).
 #ifndef Q_PLUGIN_VERIFICATION_DATA
 #  define Q_PLUGIN_VERIFICATION_DATA \
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index 0a2995ede..50ed52222 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -50,7 +50,7 @@
 #include "tqmngio.h"
 #include "tqjpegio.h"
 #include "tqmap.h"
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include "tqimageformatinterface_p.h"
 #include "tqwmatrix.h"
 #include "ntqapplication.h"
diff --git a/src/kernel/tqimageformatinterface_p.h b/src/kernel/tqimageformatinterface_p.h
index 8abe49c2d..685b92012 100644
--- a/src/kernel/tqimageformatinterface_p.h
+++ b/src/kernel/tqimageformatinterface_p.h
@@ -40,7 +40,7 @@
 #define TQIMAGEFORMATINTERFACE_P_H
 
 #ifndef QT_H
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #endif // QT_H
 
 #if __GNUC__ - 0 > 3
diff --git a/src/kernel/tqinputcontext_p.h b/src/kernel/tqinputcontext_p.h
index e7b94e9cc..b2df28c2b 100644
--- a/src/kernel/tqinputcontext_p.h
+++ b/src/kernel/tqinputcontext_p.h
@@ -63,7 +63,7 @@ class TQString;
 #ifdef TQ_WS_X11
 #include "tqmemarray.h"
 #include "tqwindowdefs.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 #endif
 
 #ifdef TQ_WS_WIN
diff --git a/src/kernel/tqinputcontext_x11.cpp b/src/kernel/tqinputcontext_x11.cpp
index d0f8699b3..7377b264c 100644
--- a/src/kernel/tqinputcontext_x11.cpp
+++ b/src/kernel/tqinputcontext_x11.cpp
@@ -45,7 +45,7 @@
 #include "ntqapplication.h"
 #include "tqwidget.h"
 
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 /*!
     This function may be overridden only if input method is depending
diff --git a/src/kernel/qinternal.cpp b/src/kernel/tqinternal.cpp
index 96297bb8d..11243d1d2 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/tqinternal.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "private/qinternal_p.h"
+#include "private/tqinternal_p.h"
 #include "tqwidget.h"
 #include "tqpixmap.h"
 #include "tqpainter.h"
diff --git a/src/kernel/qinternal_p.h b/src/kernel/tqinternal_p.h
index d8c29cc67..d8c29cc67 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/tqinternal_p.h
diff --git a/src/kernel/tqmotifdnd_x11.cpp b/src/kernel/tqmotifdnd_x11.cpp
index 8bd2d8b8f..cf5867aeb 100644
--- a/src/kernel/tqmotifdnd_x11.cpp
+++ b/src/kernel/tqmotifdnd_x11.cpp
@@ -73,7 +73,7 @@ in doc/dnd.doc, where the documentation system can see it. */
 #ifndef TQT_NO_DRAGANDDROP
 
 #include "tqwidget.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #include <stdlib.h>
 
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index 1e376c21e..84361e501 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -45,8 +45,8 @@
 #include "tqsignalslotimp.h"
 #include "tqregexp.h"
 #include "tqmetaobject.h"
-#include <private/qucom_p.h>
-#include "qucomextra_p.h"
+#include <private/tqucom_p.h>
+#include "tqucomextra_p.h"
 #include "tqptrvector.h"
 
 // TQStyleControlElementData
diff --git a/src/kernel/tqpaintdevice_x11.cpp b/src/kernel/tqpaintdevice_x11.cpp
index 5a1ce8302..37bdfa83e 100644
--- a/src/kernel/tqpaintdevice_x11.cpp
+++ b/src/kernel/tqpaintdevice_x11.cpp
@@ -44,7 +44,7 @@
 #include "tqwidget.h"
 #include "tqbitmap.h"
 #include "ntqapplication.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 
 /*!
diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp
index b2c0d5fba..b66f16d2b 100644
--- a/src/kernel/tqpainter.cpp
+++ b/src/kernel/tqpainter.cpp
@@ -48,7 +48,7 @@
 #include "tqimage.h"
 #include "tqpaintdevicemetrics.h"
 #include "ntqapplication.h"
-#include "qrichtext_p.h"
+#include "tqrichtext_p.h"
 #include "tqregexp.h"
 #include "tqcleanuphandler.h"
 #include <string.h>
diff --git a/src/kernel/tqpainter_x11.cpp b/src/kernel/tqpainter_x11.cpp
index 22d892d17..d419b3411 100644
--- a/src/kernel/tqpainter_x11.cpp
+++ b/src/kernel/tqpainter_x11.cpp
@@ -48,7 +48,7 @@
 #include "tqtextcodec.h"
 #include "tqpaintdevicemetrics.h"
 
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #include "tqtextlayout_p.h"
 #include "tqfontdata_p.h"
diff --git a/src/kernel/tqpicture.cpp b/src/kernel/tqpicture.cpp
index 3ab6a000b..c0fb3d008 100644
--- a/src/kernel/tqpicture.cpp
+++ b/src/kernel/tqpicture.cpp
@@ -50,7 +50,7 @@
 #include "tqpaintdevicemetrics.h"
 
 #ifndef TQT_NO_SVG
-#include "private/qsvgdevice_p.h"
+#include "private/tqsvgdevice_p.h"
 #endif
 
 /*!
diff --git a/src/kernel/tqpixmap.cpp b/src/kernel/tqpixmap.cpp
index 460dfc64d..4a40d821b 100644
--- a/src/kernel/tqpixmap.cpp
+++ b/src/kernel/tqpixmap.cpp
@@ -48,7 +48,7 @@
 #include "tqbuffer.h"
 #include "tqobjectlist.h"
 #include "ntqapplication.h"
-#include <private/qinternal_p.h>
+#include <private/tqinternal_p.h>
 #include "tqmime.h"
 #include "tqdragobject.h"
 #include "tqfile.h"
diff --git a/src/kernel/tqpixmap_x11.cpp b/src/kernel/tqpixmap_x11.cpp
index b1e6c6894..9f8c6b7d1 100644
--- a/src/kernel/tqpixmap_x11.cpp
+++ b/src/kernel/tqpixmap_x11.cpp
@@ -72,7 +72,7 @@
 #include "tqimage.h"
 #include "tqwmatrix.h"
 #include "ntqapplication.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #include <stdlib.h>
 
diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp
index 06eeabbdd..2899d86df 100644
--- a/src/kernel/tqprinter_unix.cpp
+++ b/src/kernel/tqprinter_unix.cpp
@@ -52,7 +52,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 #ifndef TQT_NO_PRINTER
 
 #include "tqpaintdevicemetrics.h"
-#include "qpsprinter_p.h"
+#include "tqpsprinter_p.h"
 #include "tqprintdialog.h"
 #include "ntqapplication.h"
 #include "tqprinter_p.h"
diff --git a/src/kernel/tqprocess.cpp b/src/kernel/tqprocess.cpp
index b3837d7d9..db2318a30 100644
--- a/src/kernel/tqprocess.cpp
+++ b/src/kernel/tqprocess.cpp
@@ -46,7 +46,7 @@
 #ifndef TQT_NO_PROCESS
 
 #include "ntqapplication.h"
-#include "private/qinternal_p.h"
+#include "private/tqinternal_p.h"
 
 
 //#define QT_QPROCESS_DEBUG
diff --git a/src/kernel/tqprocess_unix.cpp b/src/kernel/tqprocess_unix.cpp
index c3bb2ba70..d85b64d71 100644
--- a/src/kernel/tqprocess_unix.cpp
+++ b/src/kernel/tqprocess_unix.cpp
@@ -56,7 +56,7 @@
 #include "tqtimer.h"
 #include "tqcleanuphandler.h"
 #include "tqregexp.h"
-#include "private/qinternal_p.h"
+#include "private/tqinternal_p.h"
 
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/tqpsprinter.cpp
index 3d18d6008..80e00ae23 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/tqpsprinter.cpp
@@ -50,7 +50,7 @@
 # undef truncate
 #endif
 
-#include "qpsprinter_p.h"
+#include "tqpsprinter_p.h"
 
 #ifndef TQT_NO_PRINTER
 
@@ -73,7 +73,7 @@
 #include "tqfontdatabase.h"
 #include "tqregexp.h"
 #include "tqbitmap.h"
-#include <private/qunicodetables_p.h>
+#include <private/tqunicodetables_p.h>
 
 #if defined(Q_OS_WIN32)
 #include <io.h>
@@ -86,7 +86,7 @@
 #endif
 
 #ifdef TQ_WS_X11
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 #ifdef None
 #undef None
 #endif
diff --git a/src/kernel/qpsprinter.ps b/src/kernel/tqpsprinter.ps
index 12a4c4077..e73dd9510 100644
--- a/src/kernel/qpsprinter.ps
+++ b/src/kernel/tqpsprinter.ps
@@ -1,6 +1,6 @@
-% the postscript header we use for our qpsprinter in uncompressed and commented form.
+% the postscript header we use for our tqpsprinter in uncompressed and commented form.
 % use the makepsheader perl script to generate a compressed version of this header
-% you can then paste into qpsprinter.cpp
+% you can then paste into tqpsprinter.cpp
 %
 % some compression of the code is done by the makepsheader script, so we don't need to 
 % write too criptically here. 
@@ -162,7 +162,7 @@
 %
 %    string uc string
 %
-%%% Warning: if you change the method here, change the table in qpsprinter.cpp:compress()!
+%%% Warning: if you change the method here, change the table in tqpsprinter.cpp:compress()!
 /uc {
   /rL 0 d
   0
diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/tqpsprinter_p.h
index 46d93b4b2..33e888c91 100644
--- a/src/kernel/qpsprinter_p.h
+++ b/src/kernel/tqpsprinter_p.h
@@ -48,7 +48,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qpsprinter.cpp and tqprinter_x11.cpp.
+// of tqpsprinter.cpp and tqprinter_x11.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/kernel/tqregion_x11.cpp b/src/kernel/tqregion_x11.cpp
index 801aadb6d..a42b0f11e 100644
--- a/src/kernel/tqregion_x11.cpp
+++ b/src/kernel/tqregion_x11.cpp
@@ -43,7 +43,7 @@
 #include "tqbuffer.h"
 #include "tqimage.h"
 #include "tqbitmap.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 #include <stdlib.h>
 
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/tqrichtext.cpp
index 247e181d9..9866a6c9c 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/tqrichtext.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qrichtext_p.h"
+#include "tqrichtext_p.h"
 
 #ifndef TQT_NO_RICHTEXT
 
@@ -63,7 +63,7 @@
 #include "tqstyle.h"
 #include "tqcleanuphandler.h"
 #include "tqtextengine_p.h"
-#include <private/qunicodetables_p.h>
+#include <private/tqunicodetables_p.h>
 
 #include <stdlib.h>
 
diff --git a/src/kernel/qrichtext_p.cpp b/src/kernel/tqrichtext_p.cpp
index 022eb13de..e9417d2a9 100644
--- a/src/kernel/qrichtext_p.cpp
+++ b/src/kernel/tqrichtext_p.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qrichtext_p.h"
+#include "tqrichtext_p.h"
 
 #ifndef TQT_NO_RICHTEXT
 
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/tqrichtext_p.h
index 1032c74eb..1032c74eb 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/tqrichtext_p.h
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/tqscriptengine.cpp
index bbf0f30bb..2d97c84d5 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/tqscriptengine.cpp
@@ -34,12 +34,12 @@
 **
 **********************************************************************/
 
-#include "qscriptengine_p.h"
+#include "tqscriptengine_p.h"
 
 #include "tqstring.h"
 #include "tqrect.h"
 #include "tqfont.h"
-#include <private/qunicodetables_p.h>
+#include <private/tqunicodetables_p.h>
 #include "tqtextengine_p.h"
 #include "tqfontengine_p.h"
 #include <stdlib.h>
@@ -1614,9 +1614,9 @@ static bool arabic_shape(TQShaperItem *item)
 }
 
 #if defined(TQ_WS_X11)
-# include "qscriptengine_x11.cpp"
+# include "tqscriptengine_x11.cpp"
 #elif defined(TQ_WS_WIN)
-# include "qscriptengine_win.cpp"
+# include "tqscriptengine_win.cpp"
 #elif defined(TQ_WS_MAC)
-# include "qscriptengine_mac.cpp"
+# include "tqscriptengine_mac.cpp"
 #endif
diff --git a/src/kernel/qscriptengine_p.h b/src/kernel/tqscriptengine_p.h
index 77dd87b96..77dd87b96 100644
--- a/src/kernel/qscriptengine_p.h
+++ b/src/kernel/tqscriptengine_p.h
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/tqscriptengine_x11.cpp
index 5d22fdf49..5d22fdf49 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/tqscriptengine_x11.cpp
diff --git a/src/kernel/tqsimplerichtext.cpp b/src/kernel/tqsimplerichtext.cpp
index eccf9190d..4c98f1fd3 100644
--- a/src/kernel/tqsimplerichtext.cpp
+++ b/src/kernel/tqsimplerichtext.cpp
@@ -41,7 +41,7 @@
 #include "tqsimplerichtext.h"
 
 #ifndef TQT_NO_RICHTEXT
-#include "qrichtext_p.h"
+#include "tqrichtext_p.h"
 #include "ntqapplication.h"
 
 class TQSimpleRichTextData
diff --git a/src/kernel/tqsizegrip.cpp b/src/kernel/tqsizegrip.cpp
index 18ff03d28..017c3e6a0 100644
--- a/src/kernel/tqsizegrip.cpp
+++ b/src/kernel/tqsizegrip.cpp
@@ -47,7 +47,7 @@
 #include "tqstyle.h"
 
 #if defined(TQ_WS_X11)
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 extern Atom qt_sizegrip;			// defined in qapplication_x11.cpp
 #elif defined (TQ_WS_WIN )
 #include "tqobjectlist.h"
diff --git a/src/kernel/tqstylesheet.cpp b/src/kernel/tqstylesheet.cpp
index dbc8d4670..c03cc792e 100644
--- a/src/kernel/tqstylesheet.cpp
+++ b/src/kernel/tqstylesheet.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_RICHTEXT
 
-#include "private/qrichtext_p.h"
+#include "private/tqrichtext_p.h"
 #include "tqlayout.h"
 #include "tqpainter.h"
 #include "tqcleanuphandler.h"
diff --git a/src/kernel/tqt3.h b/src/kernel/tqt3.h
index 8a04bdf30..cff4b0895 100644
--- a/src/kernel/tqt3.h
+++ b/src/kernel/tqt3.h
@@ -272,30 +272,30 @@
 #include <tqxml.h>
 
 #if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX )
-#include <private/qcom_p.h>
-#include <private/qucom_p.h>
-#include "private/qcom_p.h"
+#include <private/tqcom_p.h>
+#include <private/tqucom_p.h>
+#include "private/tqcom_p.h"
 #include "private/tqimageformatinterface_p.h"
 #include "private/tqisciicodec_p.h"
 #include "private/tqlayoutengine_p.h"
-#include "private/qcomlibrary_p.h"
-#include "private/qeffects_p.h"
+#include "private/tqcomlibrary_p.h"
+#include "private/tqeffects_p.h"
 #include "private/tqgpluginmanager_p.h"
-#include "private/qinternal_p.h"
+#include "private/tqinternal_p.h"
 #include "private/tqsqldriverinterface_p.h"
 #include "private/tqsqlmanager_p.h"
 #include "private/qlock_p.h"
 #include "private/tqcomponentfactory_p.h"
 #include "private/tqstyleinterface_p.h"
-#include "private/qrichtext_p.h"
-#include "private/qsvgdevice_p.h"
+#include "private/tqrichtext_p.h"
+#include "private/tqsvgdevice_p.h"
 #include "private/tqfontcodecs_p.h"
 #include "private/tqtextcodecinterface_p.h"
-#include "private/qpsprinter_p.h"
-#include "private/qtitlebar_p.h"
-#include "private/qucom_p.h"
-#include "private/qucomextra_p.h"
-#include "private/qpluginmanager_p.h"
+#include "private/tqpsprinter_p.h"
+#include "private/tqtitlebar_p.h"
+#include "private/tqucom_p.h"
+#include "private/tqucomextra_p.h"
+#include "private/tqpluginmanager_p.h"
 #include "private/tqdir_p.h"
 #include "private/tqsettings_p.h"
 #include "private/tqsqlextension_p.h"
diff --git a/src/kernel/qt_x11.pri b/src/kernel/tqt_x11.pri
index c81055eb3..c81055eb3 100644
--- a/src/kernel/qt_x11.pri
+++ b/src/kernel/tqt_x11.pri
diff --git a/src/kernel/qt_x11_p.h b/src/kernel/tqt_x11_p.h
index 23bdb7eaa..5d807238a 100644
--- a/src/kernel/qt_x11_p.h
+++ b/src/kernel/tqt_x11_p.h
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#ifndef QT_X11_H
-#define QT_X11_H
+#ifndef TQT_X11_H
+#define TQT_X11_H
 
 
 //
@@ -277,4 +277,4 @@ extern "C" char *XSetIMValues( XIM /* im */, ... );
 #endif // QT_MITSHM
 
 
-#endif // QT_X11_H
+#endif // TQT_X11_H
diff --git a/src/kernel/tqtextengine.cpp b/src/kernel/tqtextengine.cpp
index 8280340c9..6c046a5b8 100644
--- a/src/kernel/tqtextengine.cpp
+++ b/src/kernel/tqtextengine.cpp
@@ -38,12 +38,12 @@
 
 #include "tqtextengine_p.h"
 
-#include "qscriptengine_p.h"
+#include "tqscriptengine_p.h"
 #include <tqfont.h>
 #include "tqfontdata_p.h"
 #include "tqfontengine_p.h"
 #include <tqstring.h>
-#include <private/qunicodetables_p.h>
+#include <private/tqunicodetables_p.h>
 #include <stdlib.h>
 
 // -----------------------------------------------------------------------------------------------------
diff --git a/src/kernel/qucomextra.cpp b/src/kernel/tqucomextra.cpp
index 4e0de283c..f44355adc 100644
--- a/src/kernel/qucomextra.cpp
+++ b/src/kernel/tqucomextra.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qucomextra_p.h"
+#include "tqucomextra_p.h"
 #include <tqvariant.h>
 
 
diff --git a/src/kernel/qucomextra_p.h b/src/kernel/tqucomextra_p.h
index ad4dacb5c..57f6b37a6 100644
--- a/src/kernel/qucomextra_p.h
+++ b/src/kernel/tqucomextra_p.h
@@ -54,7 +54,7 @@
 //
 
 #ifndef QT_H
-#include <private/qucom_p.h>
+#include <private/tqucom_p.h>
 #endif // QT_H
 
 #if __GNUC__ - 0 > 3
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index cc16871a7..2f90c4905 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -50,7 +50,7 @@
 #include "tqtextcodec.h"
 #include "tqdatetime.h"
 #include "tqcursor.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 #include <stdlib.h>
 
 // NOT REVISED
diff --git a/src/kernel/tqwidgetcreate_x11.cpp b/src/kernel/tqwidgetcreate_x11.cpp
index b34fe9613..33ec8c20f 100644
--- a/src/kernel/tqwidgetcreate_x11.cpp
+++ b/src/kernel/tqwidgetcreate_x11.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqwidget.h"
-#include "qt_x11_p.h"
+#include "tqt_x11_p.h"
 
 
 /*
diff --git a/src/libqt.map b/src/libqt.map
index 9134b5638..fe7884041 100644
--- a/src/libqt.map
+++ b/src/libqt.map
@@ -20,10 +20,10 @@
 	TQHttpResponseHeader::*;
 	TQMainWindowLayout::*;
 	Q*Private::*;    # collides with TQGuardedPtrPrivate
-	QPSPrinter*;
+	TQPSPrinter*;
 	Q*RegExpEngine::*;
 	Q*SvgDevice::*;
-	*QSvgDeviceState*;
+	*TQSvgDeviceState*;
 	ImgElement::*;
 	PixElement::*;
 	QRenameEdit::*;
@@ -36,7 +36,7 @@
 	QSVChildRec::*;
 	qt_xdnd_*;
 	QTipLabel::*;
-	QUnicodeTables::*;
+	TQUnicodeTables::*;
 	QViewportWidget::*;
 	QWFlagWidget::*;
 	TQWorkspaceChild::*;
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index e26c4893f..b8ff335d7 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -29,7 +29,7 @@ SOURCES		= ../tools/tqbuffer.cpp	    \
 		  ../tools/tqregexp.cpp	    \
 		  ../tools/tqstring.cpp	    \
 		  ../tools/tqlocale.cpp	    \
-                  ../tools/qunicodetables.cpp \
+                  ../tools/tqunicodetables.cpp \
 		  ../tools/tqstringlist.cpp  \
 		  ../tools/tqtextstream.cpp  \
 		  ../tools/tqbitarray.cpp    \
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 5f9ffa10a..7eb667842 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -2906,7 +2906,7 @@ void generateClass()		      // generate C++ source code for a class
 	}
 	fprintf( out, "#include <%stqmetaobject.h>\n", (const char*)g->qtPath );
 	fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath );
-	fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath );
+	fprintf( out, "#include <%sprivate/tqucomextra_p.h>\n", (const char*)g->qtPath );
 	fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision );
 	fprintf( out, "#error \"This file was generated using the moc from %s."
 		 " It\"\n#error \"cannot be used with the include files from"
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index d038c0b7e..83994e260 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -5781,7 +5781,7 @@ void generateClass()		      // generate C++ source code for a class
 	}
 	fprintf( out, "#include <%stqmetaobject.h>\n", (const char*)g->qtPath );
 	fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath );
-	fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath );
+	fprintf( out, "#include <%sprivate/tqucomextra_p.h>\n", (const char*)g->qtPath );
 	fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision );
 	fprintf( out, "#error \"This file was generated using the moc from %s."
 		 " It\"\n#error \"cannot be used with the include files from"
diff --git a/src/network/tqhttp.cpp b/src/network/tqhttp.cpp
index 6bf6f1740..389a731c7 100644
--- a/src/network/tqhttp.cpp
+++ b/src/network/tqhttp.cpp
@@ -51,7 +51,7 @@
 #include "tqbuffer.h"
 #include "tqurloperator.h"
 #include "tqtimer.h"
-#include "private/qinternal_p.h"
+#include "private/tqinternal_p.h"
 
 //#define TQHTTP_DEBUG
 
diff --git a/src/network/tqsocket.cpp b/src/network/tqsocket.cpp
index 3a088c514..9314318d1 100644
--- a/src/network/tqsocket.cpp
+++ b/src/network/tqsocket.cpp
@@ -44,7 +44,7 @@
 #include "tqtimer.h"
 #include "tqsocketdevice.h"
 #include "tqdns.h"
-#include "private/qinternal_p.h"
+#include "private/tqinternal_p.h"
 
 #include <string.h>
 #ifndef NO_ERRNO_H
diff --git a/src/opengl/tqgl.cpp b/src/opengl/tqgl.cpp
index 991d697af..4ec6dec30 100644
--- a/src/opengl/tqgl.cpp
+++ b/src/opengl/tqgl.cpp
@@ -49,7 +49,7 @@ static TQGLFormat* qgl_default_format = 0;
 static TQGLFormat* qgl_default_overlay_format = 0;
 
 #if defined(TQ_WS_X11)
-#include "private/qt_x11_p.h"
+#include "private/tqt_x11_p.h"
 #define INT32 dummy_INT32
 #define INT8 dummy_INT8
 #include <GL/glx.h>
diff --git a/src/qt.pro b/src/qt.pro
index 903d9b396..17de6ea1b 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -128,7 +128,7 @@ largefile {
 include($$KERNEL_CPP/qt_compat.pri)
 
 #platforms
-x11:include($$KERNEL_CPP/qt_x11.pri)
+x11:include($$KERNEL_CPP/tqt_x11.pri)
 mac:include($$KERNEL_CPP/qt_mac.pri)
 win32:include($$KERNEL_CPP/qt_win.pri)
 
@@ -168,14 +168,14 @@ unix {
 wince-* {
 	CONFIG -= incremental
 	message( ...removing plugin stuff... (not permanent) )
-	HEADERS -= $$TOOLS_CPP/qcomlibrary.h \
+	HEADERS -= $$TOOLS_CPP/tqcomlibrary.h \
 		   $$KERNEL_CPP/tqgplugin.h \
 		   $$KERNEL_CPP/tqimageformatplugin.h \
 		   $$STYLES_CPP/tqstyleplugin.h \
 		   $$CODECS_CPP/tqtextcodecplugin.h \
 		   $$WIDGETS_CPP/tqwidgetplugin.h
 
-	SOURCES -= $$TOOLS_CPP/qcomlibrary.cpp \
+	SOURCES -= $$TOOLS_CPP/tqcomlibrary.cpp \
 		   $$KERNEL_CPP/tqgplugin.cpp \
 		   $$KERNEL_CPP/tqimageformatplugin.cpp \
 		   $$STYLES_CPP/tqstyleplugin.cpp \
diff --git a/src/sql/drivers/odbc/tqsql_odbc.cpp b/src/sql/drivers/odbc/tqsql_odbc.cpp
index a9a3aa468..82dd6247d 100644
--- a/src/sql/drivers/odbc/tqsql_odbc.cpp
+++ b/src/sql/drivers/odbc/tqsql_odbc.cpp
@@ -47,7 +47,7 @@
 #endif
 #include <tqdatetime.h>
 #include <private/tqsqlextension_p.h>
-#include <private/qinternal_p.h>
+#include <private/tqinternal_p.h>
 #include <stdlib.h>
 
 // undefine this to prevent initial check of the ODBC driver
diff --git a/src/sql/tqsqldatabase.cpp b/src/sql/tqsqldatabase.cpp
index 1f8cfe6c2..ccdaea94d 100644
--- a/src/sql/tqsqldatabase.cpp
+++ b/src/sql/tqsqldatabase.cpp
@@ -79,7 +79,7 @@
 #include "tqsqlresult.h"
 #include "tqsqldriver.h"
 #include "tqsqldriverinterface_p.h"
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include <private/tqsqlextension_p.h>
 #include "tqobject.h"
 #include "tqguardedptr.h"
diff --git a/src/sql/tqsqldriverinterface_p.h b/src/sql/tqsqldriverinterface_p.h
index 851770366..c15efac58 100644
--- a/src/sql/tqsqldriverinterface_p.h
+++ b/src/sql/tqsqldriverinterface_p.h
@@ -54,7 +54,7 @@
 //
 
 #ifndef QT_H
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/styles/tqcommonstyle.cpp b/src/styles/tqcommonstyle.cpp
index 287bc5e8b..02b878c38 100644
--- a/src/styles/tqcommonstyle.cpp
+++ b/src/styles/tqcommonstyle.cpp
@@ -71,7 +71,7 @@
 #include "private/tqdialogbuttons_p.h"
 #include <limits.h>
 #include <tqpixmap.h>
-#include "../widgets/qtitlebar_p.h"
+#include "../widgets/tqtitlebar_p.h"
 #include <tqtoolbox.h>
 
 /*!
diff --git a/src/styles/tqstylefactory.cpp b/src/styles/tqstylefactory.cpp
index 29a3ad5ec..d66fbe72d 100644
--- a/src/styles/tqstylefactory.cpp
+++ b/src/styles/tqstylefactory.cpp
@@ -68,7 +68,7 @@ TQString p2qstring(const unsigned char *c); //tqglobal.cpp
 #endif
 #include <stdlib.h>
 
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #ifndef TQT_NO_COMPONENT
 class TQStyleFactoryPrivate : public TQObject
 {
diff --git a/src/styles/tqstyleinterface_p.h b/src/styles/tqstyleinterface_p.h
index 500dcfef3..5c8bd42db 100644
--- a/src/styles/tqstyleinterface_p.h
+++ b/src/styles/tqstyleinterface_p.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #endif // QT_H
 
 #ifndef TQT_NO_STYLE
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index c8eacaee8..36c144e99 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -10,7 +10,7 @@ tools {
 		  $$TOOLS_H/tqcache.h \
 		  $$TOOLS_H/tqcleanuphandler.h \
 		  $$TOOLS_P/tqcomponentfactory_p.h \
-		  $$TOOLS_P/qcomlibrary_p.h \
+		  $$TOOLS_P/tqcomlibrary_p.h \
 		  $$TOOLS_H/tqcstring.h \
 		  $$TOOLS_H/tqdatastream.h \
 		  $$TOOLS_H/tqdatetime.h \
@@ -40,7 +40,7 @@ tools {
 		  $$TOOLS_H/tqmutex.h \
 		  $$TOOLS_P/tqmutex_p.h \
 		  $$TOOLS_P/tqmutexpool_p.h \
-		  $$TOOLS_P/qpluginmanager_p.h \
+		  $$TOOLS_P/tqpluginmanager_p.h \
 		  $$TOOLS_H/tqptrcollection.h \
 		  $$TOOLS_H/tqptrdict.h \
 		  $$TOOLS_H/tqptrqueue.h \
@@ -57,14 +57,14 @@ tools {
 		  $$TOOLS_H/tqtextstream.h \
 		  $$TOOLS_P/tqthreadinstance_p.h \
 		  $$TOOLS_H/tqthreadstorage.h\
-		  $$TOOLS_P/qunicodetables_p.h \
+		  $$TOOLS_P/tqunicodetables_p.h \
 		  $$TOOLS_H/tqptrvector.h \
 	          $$TOOLS_H/tqvaluelist.h \
 		  $$TOOLS_H/tqvaluestack.h \
 		  $$TOOLS_H/tqvaluevector.h \
 		  $$TOOLS_H/tqwaitcondition.h \
-		  $$TOOLS_P/qcom_p.h \
-		  $$TOOLS_P/qucom_p.h \
+		  $$TOOLS_P/tqcom_p.h \
+		  $$TOOLS_P/tqucom_p.h \
 		  $$TOOLS_H/tquuid.h
 
 	win32:SOURCES += $$TOOLS_CPP/tqdir_win.cpp \
@@ -75,7 +75,7 @@ tools {
 		  $$TOOLS_CPP/tqmutex_win.cpp \
 		  $$TOOLS_CPP/tqwaitcondition_win.cpp \
 		  $$TOOLS_CPP/tqthreadstorage_win.cpp \
-		  $$TOOLS_CPP/qcriticalsection_p.cpp
+		  $$TOOLS_CPP/tqcriticalsection_p.cpp
 
 	win32-borland:SOURCES += $$TOOLS_CPP/tqwinexport.cpp
 
@@ -108,7 +108,7 @@ tools {
 	SOURCES += $$TOOLS_CPP/tqbitarray.cpp \
 		  $$TOOLS_CPP/tqbuffer.cpp \
 		  $$TOOLS_CPP/tqcomponentfactory.cpp \
-		  $$TOOLS_CPP/qcomlibrary.cpp \
+		  $$TOOLS_CPP/tqcomlibrary.cpp \
 		  $$TOOLS_CPP/tqcstring.cpp \
 		  $$TOOLS_CPP/tqdatastream.cpp \
 		  $$TOOLS_CPP/tqdatetime.cpp \
@@ -135,8 +135,8 @@ tools {
 		  $$TOOLS_CPP/tqsettings.cpp \
 		  $$TOOLS_CPP/tqstringlist.cpp \
 		  $$TOOLS_CPP/tqtextstream.cpp \
-		  $$TOOLS_CPP/qunicodetables.cpp \
-		  $$TOOLS_CPP/qucom.cpp \
+		  $$TOOLS_CPP/tqunicodetables.cpp \
+		  $$TOOLS_CPP/tqucom.cpp \
 		  $$TOOLS_CPP/tquuid.cpp
 
         irix-cc* {
diff --git a/src/tools/qcom_p.h b/src/tools/tqcom_p.h
index 0c9d60d01..9ff7ece64 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/tqcom_p.h
@@ -291,7 +291,7 @@ public:		   \
 
 // this is duplicated at Q_PLUGIN_VERIFICATION_DATA in tqgplugin.h
 // NOTE: if you change pattern, you MUST change the pattern in
-// qcomlibrary.cpp as well.  changing the pattern will break all
+// tqcomlibrary.cpp as well.  changing the pattern will break all
 // backwards compatibility as well (no old plugins will be loaded).
 #ifndef Q_UCM_VERIFICATION_DATA
 #  define Q_UCM_VERIFICATION_DATA \
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/tqcomlibrary.cpp
index 5f40bdc9f..5c2510130 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/tqcomlibrary.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "qcomlibrary_p.h"
+#include "tqcomlibrary_p.h"
 
 #ifndef TQT_NO_COMPONENT
 #include <ntqapplication.h>
diff --git a/src/tools/qcomlibrary_p.h b/src/tools/tqcomlibrary_p.h
index ede724194..e803a236c 100644
--- a/src/tools/qcomlibrary_p.h
+++ b/src/tools/tqcomlibrary_p.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include "qcom_p.h"
+#include "tqcom_p.h"
 #include "tqlibrary.h"
 #endif // QT_H
 
diff --git a/src/tools/tqcomponentfactory.cpp b/src/tools/tqcomponentfactory.cpp
index 6bac4b618..3b05e94de 100644
--- a/src/tools/tqcomponentfactory.cpp
+++ b/src/tools/tqcomponentfactory.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_COMPONENT
 #include "tqsettings.h"
-#include <private/qcomlibrary_p.h>
+#include <private/tqcomlibrary_p.h>
 #include "tqdir.h"
 #include "ntqapplication.h"
 
diff --git a/src/tools/tqcomponentfactory_p.h b/src/tools/tqcomponentfactory_p.h
index 89399152f..ea45d7455 100644
--- a/src/tools/tqcomponentfactory_p.h
+++ b/src/tools/tqcomponentfactory_p.h
@@ -42,7 +42,7 @@
 #define TQCOMPONENTFACTORY_P_H
 
 #ifndef QT_H
-#include "qcom_p.h"
+#include "tqcom_p.h"
 #endif // QT_H
 
 //
diff --git a/src/tools/qcriticalsection_p.cpp b/src/tools/tqcriticalsection_p.cpp
index 20c2127b0..a6203b0c8 100644
--- a/src/tools/qcriticalsection_p.cpp
+++ b/src/tools/tqcriticalsection_p.cpp
@@ -40,7 +40,7 @@
 
 #include "qt_windows.h"
 
-#include <private/qcriticalsection_p.h>
+#include <private/tqcriticalsection_p.h>
 
 class TQCriticalSectionPrivate 
 {
diff --git a/src/tools/qcriticalsection_p.h b/src/tools/tqcriticalsection_p.h
index 330e141e1..330e141e1 100644
--- a/src/tools/qcriticalsection_p.h
+++ b/src/tools/tqcriticalsection_p.h
diff --git a/src/tools/tqgpluginmanager.cpp b/src/tools/tqgpluginmanager.cpp
index d53e4f5f5..94b5a6435 100644
--- a/src/tools/tqgpluginmanager.cpp
+++ b/src/tools/tqgpluginmanager.cpp
@@ -38,7 +38,7 @@
 
 #include "tqgpluginmanager_p.h"
 #ifndef TQT_NO_COMPONENT
-#include "qcomlibrary_p.h"
+#include "tqcomlibrary_p.h"
 #include "tqmap.h"
 #include "tqdir.h"
 
@@ -205,7 +205,7 @@ static int similarity( const TQString& s1, const TQString& s2 )
 }
 
 /*!
-  \class TQPluginManager qpluginmanager.h
+  \class TQPluginManager tqpluginmanager.h
   \reentrant
   \brief The TQPluginManager class provides basic functions to access a certain kind of functionality in libraries.
   \ingroup componentmodel
diff --git a/src/tools/tqgpluginmanager_p.h b/src/tools/tqgpluginmanager_p.h
index 946fe3bc4..123936627 100644
--- a/src/tools/tqgpluginmanager_p.h
+++ b/src/tools/tqgpluginmanager_p.h
@@ -44,7 +44,7 @@
 #include "tqlibrary.h"
 #include "tquuid.h"
 #include "tqstringlist.h"
-#include "qcom_p.h"
+#include "tqcom_p.h"
 #endif // QT_H
 
 //
diff --git a/src/tools/qpluginmanager_p.h b/src/tools/tqpluginmanager_p.h
index 4e42eed0f..4e42eed0f 100644
--- a/src/tools/qpluginmanager_p.h
+++ b/src/tools/tqpluginmanager_p.h
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index 5247289df..318f1aa77 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -59,7 +59,7 @@
 #include "tqlocale.h"
 #include "tqlocale_p.h"
 
-#include "qunicodetables_p.h"
+#include "tqunicodetables_p.h"
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/tools/qucom.cpp b/src/tools/tqucom.cpp
index 8444c7f3b..3ab50a7a9 100644
--- a/src/tools/qucom.cpp
+++ b/src/tools/tqucom.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "private/qucom_p.h"
-#include "private/qucomextra_p.h"
+#include "private/tqucom_p.h"
+#include "private/tqucomextra_p.h"
 
 #include "tqvariant.h"
 
diff --git a/src/tools/qucom_p.h b/src/tools/tqucom_p.h
index 761d5cee4..761d5cee4 100644
--- a/src/tools/qucom_p.h
+++ b/src/tools/tqucom_p.h
diff --git a/src/tools/qunicodetables.cpp b/src/tools/tqunicodetables.cpp
index b442bcbff..ee3ed918b 100644
--- a/src/tools/qunicodetables.cpp
+++ b/src/tools/tqunicodetables.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "qunicodetables_p.h"
+#include "tqunicodetables_p.h"
 
 /* -------------------------------------------------------------------------
  * unicode information
@@ -64,7 +64,7 @@ and using perl-5.10
  * -------------------------------------------------------------------------
  */
 
-/* Perl script to generate (run perl -x tools/qunicodetables.cpp)
+/* Perl script to generate (run perl -x tools/tqunicodetables.cpp)
 
 #!perl
 
diff --git a/src/tools/qunicodetables_p.h b/src/tools/tqunicodetables_p.h
index 18045f470..18045f470 100644
--- a/src/tools/qunicodetables_p.h
+++ b/src/tools/tqunicodetables_p.h
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 9cb2f4b55..489279278 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -46,7 +46,7 @@ widgets {
 		  $$WIDGETS_H/tqsyntaxhighlighter.h \
 		  $$WIDGETS_P/tqsyntaxhighlighter_p.h \
 		  $$WIDGETS_H/tqtabwidget.h \
-		  $$WIDGETS_P/qtitlebar_p.h \
+		  $$WIDGETS_P/tqtitlebar_p.h \
 		  $$WIDGETS_H/tqtoolbar.h \
 		  $$WIDGETS_H/tqtoolbox.h \
 		  $$WIDGETS_H/tqtoolbutton.h \
@@ -108,7 +108,7 @@ widgets {
 		  $$WIDGETS_CPP/tqsyntaxhighlighter.cpp \
 		  $$WIDGETS_CPP/tqtabbar.cpp \
 		  $$WIDGETS_CPP/tqtabwidget.cpp \
-		  $$WIDGETS_CPP/qtitlebar.cpp \
+		  $$WIDGETS_CPP/tqtitlebar.cpp \
 		  $$WIDGETS_CPP/tqtoolbar.cpp \
 		  $$WIDGETS_CPP/tqtoolbox.cpp \
 		  $$WIDGETS_CPP/tqtoolbutton.cpp \
@@ -121,7 +121,7 @@ widgets {
 		  $$WIDGETS_CPP/tqwidgetstack.cpp \
 		  $$WIDGETS_CPP/tqaction.cpp \
 		  $$WIDGETS_CPP/tqdatetimeedit.cpp \
-		  $$WIDGETS_CPP/qeffects.cpp \
+		  $$WIDGETS_CPP/tqeffects.cpp \
 		  $$WIDGETS_CPP/tqtextview.cpp \
 		  $$WIDGETS_CPP/tqtextbrowser.cpp \
 		  $$WIDGETS_CPP/tqtextedit.cpp \
diff --git a/src/widgets/tqbutton.cpp b/src/widgets/tqbutton.cpp
index 333ff6270..088f9cc6a 100644
--- a/src/widgets/tqbutton.cpp
+++ b/src/widgets/tqbutton.cpp
@@ -50,7 +50,7 @@
 #include "tqpushbutton.h"
 #include "tqradiobutton.h"
 #include "tqguardedptr.h"
-#include "../kernel/qinternal_p.h"
+#include "../kernel/tqinternal_p.h"
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "tqaccessible.h"
diff --git a/src/widgets/tqcombobox.cpp b/src/widgets/tqcombobox.cpp
index cc97ffeda..1f0ff2e9d 100644
--- a/src/widgets/tqcombobox.cpp
+++ b/src/widgets/tqcombobox.cpp
@@ -50,7 +50,7 @@
 #include "ntqapplication.h"
 #include "tqlineedit.h"
 #include "tqbitmap.h"
-#include "qeffects_p.h"
+#include "tqeffects_p.h"
 #include "tqstringlist.h"
 #include "tqcombobox.h"
 #include "tqstyle.h"
diff --git a/src/widgets/tqdatetimeedit.cpp b/src/widgets/tqdatetimeedit.cpp
index 6e32d3aaf..a01a14694 100644
--- a/src/widgets/tqdatetimeedit.cpp
+++ b/src/widgets/tqdatetimeedit.cpp
@@ -42,8 +42,8 @@
 
 #ifndef TQT_NO_DATETIMEEDIT
 
-#include "../kernel/qinternal_p.h"
-#include "../kernel/qrichtext_p.h"
+#include "../kernel/tqinternal_p.h"
+#include "../kernel/tqrichtext_p.h"
 #include "tqrangecontrol.h"
 #include "ntqapplication.h"
 #include "tqpixmap.h"
diff --git a/src/widgets/tqdockwindow.cpp b/src/widgets/tqdockwindow.cpp
index 4bfe58a8a..e07a550af 100644
--- a/src/widgets/tqdockwindow.cpp
+++ b/src/widgets/tqdockwindow.cpp
@@ -44,7 +44,7 @@
 #include "tqdesktopwidget.h"
 #include "tqdockarea.h"
 #include "tqwidgetresizehandler_p.h"
-#include "qtitlebar_p.h"
+#include "tqtitlebar_p.h"
 #include "tqpainter.h"
 #include "ntqapplication.h"
 #include "tqtoolbutton.h"
diff --git a/src/widgets/qeffects.cpp b/src/widgets/tqeffects.cpp
index 5fce0e854..792456119 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/tqeffects.cpp
@@ -41,7 +41,7 @@
 #include "ntqapplication.h"
 #ifndef TQT_NO_EFFECTS
 #include "tqwidget.h"
-#include "qeffects_p.h"
+#include "tqeffects_p.h"
 #include "tqpixmap.h"
 #include "tqimage.h"
 #include "tqtimer.h"
@@ -620,7 +620,7 @@ void TQRollEffect::scroll()
   Delete this after timeout
 */
 
-#include "qeffects.moc"
+#include "tqeffects.moc"
 
 /*!
     Scroll widget \a w in \a time ms. \a orient may be 1 (vertical), 2
diff --git a/src/widgets/qeffects_p.h b/src/widgets/tqeffects_p.h
index 4d9845c01..6dad1b23f 100644
--- a/src/widgets/qeffects_p.h
+++ b/src/widgets/tqeffects_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qeffects.cpp, tqcombobox.cpp, tqpopupmenu.cpp and tqtooltip.cpp.
+// of tqeffects.cpp, tqcombobox.cpp, tqpopupmenu.cpp and tqtooltip.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index 35b144b81..7af1babc8 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -69,7 +69,7 @@
 #include "tqptrdict.h"
 #include "tqstringlist.h"
 #include "tqcleanuphandler.h"
-#include "private/qrichtext_p.h"
+#include "private/tqrichtext_p.h"
 #include "tqstyle.h"
 
 #include <limits.h>
diff --git a/src/widgets/tqlineedit.cpp b/src/widgets/tqlineedit.cpp
index 150e7f1d6..46b1df641 100644
--- a/src/widgets/tqlineedit.cpp
+++ b/src/widgets/tqlineedit.cpp
@@ -60,7 +60,7 @@
 #include "tqguardedptr.h"
 #include "tqstyle.h"
 #include "tqwhatsthis.h"
-#include "../kernel/qinternal_p.h"
+#include "../kernel/tqinternal_p.h"
 #include "private/tqtextlayout_p.h"
 #include "tqvaluevector.h"
 #if defined(Q_OS_LINUX)
diff --git a/src/widgets/tqlistview.cpp b/src/widgets/tqlistview.cpp
index 54473b6c5..477743c2a 100644
--- a/src/widgets/tqlistview.cpp
+++ b/src/widgets/tqlistview.cpp
@@ -63,7 +63,7 @@
 #include "tqtooltip.h"
 #include "tqstyle.h"
 #include "tqstylesheet.h"
-#include "../kernel/qinternal_p.h"
+#include "../kernel/tqinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "tqaccessible.h"
 #endif
diff --git a/src/widgets/tqmenubar.cpp b/src/widgets/tqmenubar.cpp
index 8bedca7a4..8577bda56 100644
--- a/src/widgets/tqmenubar.cpp
+++ b/src/widgets/tqmenubar.cpp
@@ -52,7 +52,7 @@
 #include "tqguardedptr.h"
 #include "tqlayout.h"
 #include "tqcleanuphandler.h"
-#include "../kernel/qinternal_p.h"
+#include "../kernel/tqinternal_p.h"
 #include "tqstyle.h"
 #include "tqtimer.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
diff --git a/src/widgets/tqmultilineedit.cpp b/src/widgets/tqmultilineedit.cpp
index 8311291b3..1ee4b712e 100644
--- a/src/widgets/tqmultilineedit.cpp
+++ b/src/widgets/tqmultilineedit.cpp
@@ -51,7 +51,7 @@
 #include "tqpopupmenu.h"
 #include "tqtimer.h"
 #include "tqdict.h"
-#include "../kernel/qrichtext_p.h"
+#include "../kernel/tqrichtext_p.h"
 
 
 /*!
diff --git a/src/widgets/tqpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp
index 2e68598d6..e614a328c 100644
--- a/src/widgets/tqpopupmenu.cpp
+++ b/src/widgets/tqpopupmenu.cpp
@@ -51,7 +51,7 @@
 #include "tqwhatsthis.h"
 #include "tqobjectlist.h"
 #include "tqguardedptr.h"
-#include "qeffects_p.h"
+#include "tqeffects_p.h"
 #include "tqcursor.h"
 #include "tqstyle.h"
 #include "tqtimer.h"
diff --git a/src/widgets/tqprogressbar.cpp b/src/widgets/tqprogressbar.cpp
index 7efa4ce48..2b3f5074a 100644
--- a/src/widgets/tqprogressbar.cpp
+++ b/src/widgets/tqprogressbar.cpp
@@ -45,7 +45,7 @@
 #include "tqpixmap.h"
 #include "tqstyle.h"
 #include "tqwmatrix.h"
-#include "../kernel/qinternal_p.h"
+#include "../kernel/tqinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "tqaccessible.h"
 #endif
diff --git a/src/widgets/tqsyntaxhighlighter.cpp b/src/widgets/tqsyntaxhighlighter.cpp
index 223f7930c..f124b7ce2 100644
--- a/src/widgets/tqsyntaxhighlighter.cpp
+++ b/src/widgets/tqsyntaxhighlighter.cpp
@@ -42,7 +42,7 @@
 #include "private/tqsyntaxhighlighter_p.h"
 
 #ifndef TQT_NO_SYNTAXHIGHLIGHTER
-#include "../kernel/qrichtext_p.h"
+#include "../kernel/tqrichtext_p.h"
 #include "tqtextedit.h"
 #include "tqtimer.h"
 
diff --git a/src/widgets/tqsyntaxhighlighter_p.h b/src/widgets/tqsyntaxhighlighter_p.h
index c4d7deabf..c72094f92 100644
--- a/src/widgets/tqsyntaxhighlighter_p.h
+++ b/src/widgets/tqsyntaxhighlighter_p.h
@@ -43,7 +43,7 @@
 
 #ifndef TQT_NO_SYNTAXHIGHLIGHTER
 #include "tqsyntaxhighlighter.h"
-#include "private/qrichtext_p.h"
+#include "private/tqrichtext_p.h"
 
 class TQSyntaxHighlighterPrivate
 {
diff --git a/src/widgets/tqtabbar.cpp b/src/widgets/tqtabbar.cpp
index 7c9ebb2c4..cba1906c8 100644
--- a/src/widgets/tqtabbar.cpp
+++ b/src/widgets/tqtabbar.cpp
@@ -47,7 +47,7 @@
 #include "tqpainter.h"
 #include "tqiconset.h"
 #include "tqcursor.h"
-#include "../kernel/qinternal_p.h"
+#include "../kernel/tqinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "tqaccessible.h"
 #endif
diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp
index 69ae10d56..161757d19 100644
--- a/src/widgets/tqtextbrowser.cpp
+++ b/src/widgets/tqtextbrowser.cpp
@@ -40,7 +40,7 @@
 
 #include "tqtextbrowser.h"
 #ifndef TQT_NO_TEXTBROWSER
-#include "../kernel/qrichtext_p.h"
+#include "../kernel/tqrichtext_p.h"
 
 #include "ntqapplication.h"
 #include "tqlayout.h"
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 2c8bf3ba4..baddd23c5 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -47,7 +47,7 @@
 #include "tqinputcontext.h"
 #endif
 
-#include "../kernel/qrichtext_p.h"
+#include "../kernel/tqrichtext_p.h"
 #include "tqpainter.h"
 #include "tqpen.h"
 #include "tqbrush.h"
@@ -74,7 +74,7 @@
 #include "tqptrstack.h"
 #include "tqmetaobject.h"
 #include "tqtextbrowser.h"
-#include <private/qucom_p.h>
+#include <private/tqucom_p.h>
 #include "private/tqsyntaxhighlighter_p.h"
 #include <tqguardedptr.h>
 
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/tqtitlebar.cpp
index f0aa7bce8..83bb8c125 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/tqtitlebar.cpp
@@ -40,7 +40,7 @@
 
 #include "qplatformdefs.h"
 
-#include "qtitlebar_p.h"
+#include "tqtitlebar_p.h"
 
 #ifndef TQT_NO_TITLEBAR
 
@@ -54,7 +54,7 @@
 #include "tqtimer.h"
 #include "tqpainter.h"
 #include "tqstyle.h"
-#include "private/qinternal_p.h"
+#include "private/tqinternal_p.h"
 #ifndef TQT_NO_WORKSPACE
 #include "tqworkspace.h"
 #endif
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/tqtitlebar_p.h
index e3d20023e..e3d20023e 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/tqtitlebar_p.h
diff --git a/src/widgets/tqtooltip.cpp b/src/widgets/tqtooltip.cpp
index ee0a097fe..e044be6ea 100644
--- a/src/widgets/tqtooltip.cpp
+++ b/src/widgets/tqtooltip.cpp
@@ -43,7 +43,7 @@
 #include "ntqapplication.h"
 #include "tqguardedptr.h"
 #include "tqtimer.h"
-#include "qeffects_p.h"
+#include "tqeffects_p.h"
 
 static bool globally_enabled = TRUE;
 
diff --git a/src/widgets/tqwidgetinterface_p.h b/src/widgets/tqwidgetinterface_p.h
index 28986af38..81a158cc5 100644
--- a/src/widgets/tqwidgetinterface_p.h
+++ b/src/widgets/tqwidgetinterface_p.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include "tqiconset.h"
 #endif // QT_H
 
diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp
index 2ab278119..1677b3a41 100644
--- a/src/workspace/tqworkspace.cpp
+++ b/src/workspace/tqworkspace.cpp
@@ -41,7 +41,7 @@
 #include "tqworkspace.h"
 #ifndef TQT_NO_WORKSPACE
 #include "ntqapplication.h"
-#include "../widgets/qtitlebar_p.h"
+#include "../widgets/tqtitlebar_p.h"
 #include "tqobjectlist.h"
 #include "tqlayout.h"
 #include "tqtoolbutton.h"
diff --git a/src/xml/qt_xml.pri b/src/xml/qt_xml.pri
index 82fb0c4e0..9adf04487 100644
--- a/src/xml/qt_xml.pri
+++ b/src/xml/qt_xml.pri
@@ -1,8 +1,8 @@
 # TQt xml module
 
 xml {
-	HEADERS += $$XML_H/tqxml.h $$XML_H/tqdom.h $$XML_CPP/qsvgdevice_p.h
-	SOURCES += $$XML_CPP/tqxml.cpp $$XML_CPP/tqdom.cpp $$XML_CPP/qsvgdevice.cpp
+	HEADERS += $$XML_H/tqxml.h $$XML_H/tqdom.h $$XML_CPP/tqsvgdevice_p.h
+	SOURCES += $$XML_CPP/tqxml.cpp $$XML_CPP/tqdom.cpp $$XML_CPP/tqsvgdevice.cpp
 	win32-borland {
 		QMAKE_CFLAGS_WARN_ON	+= -w-use
 		QMAKE_CXXFLAGS_WARN_ON	+= -w-use
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/tqsvgdevice.cpp
index e6dfb86a0..1b92d8d6e 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/tqsvgdevice.cpp
@@ -36,7 +36,7 @@
 **
 *****************************************************************************/
 
-#include <private/qsvgdevice_p.h>
+#include <private/tqsvgdevice_p.h>
 
 #ifndef TQT_NO_SVG
 
@@ -117,7 +117,7 @@ static TQSvgTypeMap *qSvgTypeMap=0; // element types
 static TQMap<TQString,TQString> *qSvgColMap=0; // recognized color keyword names
 
 /*!
-    \class TQSvgDevice qsvgdevice.h
+    \class TQSvgDevice tqsvgdevice.h
     \brief The TQSvgDevice class provides a paint device for SVG vector graphics.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/xml/qsvgdevice_p.h b/src/xml/tqsvgdevice_p.h
index ffdec75fd..ffdec75fd 100644
--- a/src/xml/qsvgdevice_p.h
+++ b/src/xml/tqsvgdevice_p.h