64 files changed, 134 insertions, 134 deletions
diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h
index 2d0302a9d..4ea410f4c 100644
--- a/src/kernel/ntqaccessible.h
+++ b/src/kernel/ntqaccessible.h
@@ -42,7 +42,7 @@
 #ifndef QT_H
 #include "tqobject.h"
 #include <private/qcom_p.h>
-#include "ntqrect.h"
+#include "tqrect.h"
 #include "ntqguardedptr.h"
 #include "tqmemarray.h"
 #endif // QT_H
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index 3568ad454..fc4448089 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqdesktopwidget.h"
 #include "tqasciidict.h"
-#include "ntqpalette.h"
+#include "tqpalette.h"
 #include "ntqtranslator.h"
 #include "tqstrlist.h"
 #include "tqstringlist.h"
diff --git a/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h
index 1e9b183fb..aeb36d2f0 100644
--- a/src/kernel/ntqcursor.h
+++ b/src/kernel/ntqcursor.h
@@ -42,7 +42,7 @@
 #define TQCURSOR_H
 
 #ifndef QT_H
-#include "ntqpoint.h"
+#include "tqpoint.h"
 #include "ntqshared.h"
 #endif // QT_H
 
diff --git a/src/kernel/ntqevent.h b/src/kernel/ntqevent.h
index 769244360..f05fc2c94 100644
--- a/src/kernel/ntqevent.h
+++ b/src/kernel/ntqevent.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqwindowdefs.h"
-#include "ntqregion.h"
+#include "tqregion.h"
 #include "ntqnamespace.h"
 #include "tqmime.h"
 #include "tqpair.h"
diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/ntqsimplerichtext.h
index 0f19a3971..8d3d9ad8b 100644
--- a/src/kernel/ntqsimplerichtext.h
+++ b/src/kernel/ntqsimplerichtext.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqnamespace.h"
 #include "tqstring.h"
-#include "ntqregion.h"
+#include "tqregion.h"
 #endif // QT_H
 
 #ifndef TQT_NO_RICHTEXT
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index ae3c2820d..51eb62b33 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -34,16 +34,16 @@
 #include "tqfont.h"
 #include "tqdatastream.h"
 #include "tqpair.h"
-#include "ntqpoint.h"
+#include "tqpoint.h"
 #include <stdio.h>
 #include "tqtextstream.h"
 #include "tqfontinfo.h"
 #include "tqsizepolicy.h"
 #include "ntqtl.h"
 #include "tqsize.h"
-#include "ntqrect.h"
+#include "tqrect.h"
 #include "tqbitarray.h"
-#include "ntqregion.h"
+#include "tqregion.h"
 #include "tqsql.h"
 #include "tqstrlist.h"
 #include "tqvaluelist.h"
@@ -62,11 +62,11 @@
 #include "tqobject.h"
 #include <ntqdrawutil.h>
 #include "tqbrush.h"
-#include "ntqpalette.h"
+#include "tqpalette.h"
 #include "tqwidget.h"
 #include "tqjpunicode.h"
 #include "tqtextcodec.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #include <ntqtabbar.h>
 #include "tqiconset.h"
 #include "ntqbutton.h"
@@ -88,7 +88,7 @@
 #include <tqgb18030codec.h>
 #include "ntqgcache.h"
 #include <ntqgif.h>
-#include <ntqglcolormap.h>
+#include <tqglcolormap.h>
 #include <tqcache.h>
 #include <tqdropsite.h>
 #include "ntqgplugin.h"
@@ -111,7 +111,7 @@
 #include <tqintcache.h>
 #include "tqintdict.h"
 #include "ntqmotifstyle.h"
-#include "ntqpicture.h"
+#include "tqpicture.h"
 #include <tqjiscodec.h>
 #include <tqeucjpcodec.h>
 #include <ntqkeycode.h>
@@ -146,21 +146,21 @@
 #include <tqobjectlist.h>
 #include <tqcolordialog.h>
 #include <tqpaintdevicemetrics.h>
-#include "ntqpointarray.h"
+#include "tqpointarray.h"
 #include "tqmenudata.h"
 #include <ntqlistview.h>
-#include "ntqpen.h"
+#include "tqpen.h"
 #include "tqdragobject.h"
 #include <tqiconview.h>
-#include <ntqpixmapcache.h>
+#include <tqpixmapcache.h>
 #include <ntqplatinumstyle.h>
-#include <ntqpngio.h>
+#include <tqpngio.h>
 #include <ntqcursor.h>
 #include <ntqerrormessage.h>
 #include <ntqpolygonscanner.h>
 #include "tqpopupmenu.h"
 #include <ntqprintdialog.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <tqprocess.h>
 #include "ntqprogressbar.h"
 #include <tqasciicache.h>
@@ -189,7 +189,7 @@
 #include <tqsignalmapper.h>
 #include <tqsignalslotimp.h>
 #include <ntqsimplerichtext.h>
-#include "ntqwmatrix.h"
+#include "tqwmatrix.h"
 #include <tqsizegrip.h>
 #include <ntqabstractlayout.h>
 #include <tqsjiscodec.h>
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 3c6e43185..fbe329e98 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -72,7 +72,7 @@
 #include "tqwidgetintdict.h"
 #include "tqbitarray.h"
 #include "tqpainter.h"
-#include "ntqpixmapcache.h"
+#include "tqpixmapcache.h"
 #include "tqdatetime.h"
 #include "tqtextcodec.h"
 #include "tqdatastream.h"
diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp
index 7e571418f..8abb9216f 100644
--- a/src/kernel/qdrawutil.cpp
+++ b/src/kernel/qdrawutil.cpp
@@ -41,7 +41,7 @@
 #include "ntqdrawutil.h"
 #ifndef TQT_NO_DRAWUTIL
 #include "tqbitmap.h"
-#include "ntqpixmapcache.h"
+#include "tqpixmapcache.h"
 #include "ntqapplication.h"
 #include "tqpainter.h"
 
diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
index a714333d9..82afee051 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/qinternal.cpp
@@ -40,7 +40,7 @@
 
 #include "private/qinternal_p.h"
 #include "tqwidget.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #include "tqpainter.h"
 #include "ntqcleanuphandler.h"
 
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 1ced79556..8992497e6 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -54,7 +54,7 @@
 //
 #ifndef QT_H
 #include "ntqnamespace.h"
-#include "ntqrect.h"
+#include "tqrect.h"
 #include "tqptrlist.h"
 #include "tqcstring.h"
 #include "tqiodevice.h"
diff --git a/src/kernel/qpolygonscanner.cpp b/src/kernel/qpolygonscanner.cpp
index 95ebcff71..44d59e7b8 100644
--- a/src/kernel/qpolygonscanner.cpp
+++ b/src/kernel/qpolygonscanner.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqpolygonscanner.h"
-#include "ntqpointarray.h"
+#include "tqpointarray.h"
 #include <stdlib.h>
 
 
diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/qpsprinter_p.h
index 47939b1db..46d93b4b2 100644
--- a/src/kernel/qpsprinter_p.h
+++ b/src/kernel/qpsprinter_p.h
@@ -48,7 +48,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qpsprinter.cpp and qprinter_x11.cpp.
+// of qpsprinter.cpp and tqprinter_x11.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
@@ -58,7 +58,7 @@
 
 
 #ifndef QT_H
-#include "ntqprinter.h"
+#include "tqprinter.h"
 #include "tqtextstream.h"
 #endif // QT_H
 
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index c9e40ef84..8ef3396df 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -56,7 +56,7 @@
 #ifndef QT_H
 #include "tqstring.h"
 #include "tqptrlist.h"
-#include "ntqrect.h"
+#include "tqrect.h"
 #include "tqfontmetrics.h"
 #include "tqintdict.h"
 #include "tqmap.h"
@@ -68,7 +68,7 @@
 #include "tqvaluestack.h"
 #include "tqobject.h"
 #include "tqdict.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #include "tqstylesheet.h"
 #include "tqptrvector.h"
 #include "tqpainter.h"
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index b84aab65d..bbf0f30bb 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -37,7 +37,7 @@
 #include "qscriptengine_p.h"
 
 #include "tqstring.h"
-#include "ntqrect.h"
+#include "tqrect.h"
 #include "tqfont.h"
 #include <private/qunicodetables_p.h>
 #include "tqtextengine_p.h"
diff --git a/src/kernel/qt_gfx.pri b/src/kernel/qt_gfx.pri
index f0124824e..c66f3141e 100644
--- a/src/kernel/qt_gfx.pri
+++ b/src/kernel/qt_gfx.pri
@@ -98,8 +98,8 @@ jpeg {
 else:DEFINES += TQT_NO_IMAGEIO_JPEG
 
 #png support
-HEADERS+=$$KERNEL_H/ntqpngio.h
-SOURCES+=$$KERNEL_CPP/qpngio.cpp
+HEADERS+=$$KERNEL_H/tqpngio.h
+SOURCES+=$$KERNEL_CPP/tqpngio.cpp
 png {
         system-png {
 	    unix:LIBS  += -lpng
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 946fdbd96..c56afb6b2 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -53,19 +53,19 @@ kernel {
 		  $$KERNEL_H/tqpaintdevice.h \
 		  $$KERNEL_H/tqpainter.h \
 		  $$KERNEL_P/tqpainter_p.h \
-		  $$KERNEL_H/ntqpalette.h \
+		  $$KERNEL_H/tqpalette.h \
 		  $$KERNEL_H/tqpaintdevicemetrics.h \
-		  $$KERNEL_H/ntqpen.h \
-		  $$KERNEL_H/ntqpicture.h \
-		  $$KERNEL_H/ntqpixmap.h \
-		  $$KERNEL_H/ntqpixmapcache.h \
-		  $$KERNEL_H/ntqpointarray.h \
-		  $$KERNEL_H/ntqpoint.h \
+		  $$KERNEL_H/tqpen.h \
+		  $$KERNEL_H/tqpicture.h \
+		  $$KERNEL_H/tqpixmap.h \
+		  $$KERNEL_H/tqpixmapcache.h \
+		  $$KERNEL_H/tqpointarray.h \
+		  $$KERNEL_H/tqpoint.h \
 		  $$KERNEL_H/ntqpolygonscanner.h \
-		  $$KERNEL_H/ntqprinter.h \
+		  $$KERNEL_H/tqprinter.h \
 		  $$KERNEL_H/tqprocess.h \
-		  $$KERNEL_H/ntqrect.h \
-		  $$KERNEL_H/ntqregion.h \
+		  $$KERNEL_H/tqrect.h \
+		  $$KERNEL_H/tqregion.h \
 		  $$KERNEL_H/tqsessionmanager.h \
 		  $$KERNEL_H/tqsignal.h \
 		  $$KERNEL_H/tqsignalmapper.h \
@@ -87,7 +87,7 @@ kernel {
 		  $$KERNEL_H/tqwidgetintdict.h \
 		  $$KERNEL_H/tqwidgetlist.h \
 		  $$KERNEL_H/ntqwindowdefs.h \
-		  $$KERNEL_H/ntqwmatrix.h \
+		  $$KERNEL_H/tqwmatrix.h \
 		  $$KERNEL_H/ntqvariant.h \
 		  $$KERNEL_P/qrichtext_p.h \
 		  $$KERNEL_P/qinternal_p.h \
@@ -120,12 +120,12 @@ kernel {
 		  $$KERNEL_CPP/tqfont_win.cpp \
 		  $$KERNEL_CPP/qinputcontext_win.cpp \
 		  $$KERNEL_CPP/tqmime_win.cpp \
-		  $$KERNEL_CPP/qpixmap_win.cpp \
-		  $$KERNEL_CPP/qprinter_win.cpp \
+		  $$KERNEL_CPP/tqpixmap_win.cpp \
+		  $$KERNEL_CPP/tqprinter_win.cpp \
 		  $$KERNEL_CPP/tqprocess_win.cpp \
 		  $$KERNEL_CPP/tqpaintdevice_win.cpp \
 		  $$KERNEL_CPP/tqpainter_win.cpp \
-		  $$KERNEL_CPP/qregion_win.cpp \
+		  $$KERNEL_CPP/tqregion_win.cpp \
 		  $$KERNEL_CPP/qsound_win.cpp \
 		  $$KERNEL_CPP/tqthread_win.cpp \
 		  $$KERNEL_CPP/tqwidget_win.cpp \
@@ -143,10 +143,10 @@ kernel {
 			  $$KERNEL_CPP/qinputcontext.cpp \
 			  $$KERNEL_CPP/qinputcontext_x11.cpp \
 			  $$KERNEL_CPP/qmotifdnd_x11.cpp \
-			  $$KERNEL_CPP/qpixmap_x11.cpp \
+			  $$KERNEL_CPP/tqpixmap_x11.cpp \
 			  $$KERNEL_CPP/tqpaintdevice_x11.cpp \
 			  $$KERNEL_CPP/tqpainter_x11.cpp \
-			  $$KERNEL_CPP/qregion_x11.cpp \
+			  $$KERNEL_CPP/tqregion_x11.cpp \
 			  $$KERNEL_CPP/qsound_x11.cpp \
 			  $$KERNEL_CPP/tqwidget_x11.cpp \
 			  $$KERNEL_CPP/tqwidgetcreate_x11.cpp \
@@ -170,18 +170,18 @@ kernel {
 			  $$KERNEL_CPP/tqmime_mac.cpp \
 			  $$KERNEL_CPP/qdnd_mac.cpp \
 			  $$KERNEL_CPP/qdesktopwidget_mac.cpp \
-			  $$KERNEL_CPP/qpixmap_mac.cpp \
-			  $$KERNEL_CPP/qprinter_mac.cpp \
+			  $$KERNEL_CPP/tqpixmap_mac.cpp \
+			  $$KERNEL_CPP/tqprinter_mac.cpp \
 			  $$KERNEL_CPP/tqpaintdevice_mac.cpp \
 			  $$KERNEL_CPP/tqpainter_mac.cpp \
-			  $$KERNEL_CPP/qregion_mac.cpp \
+			  $$KERNEL_CPP/tqregion_mac.cpp \
 			  $$KERNEL_CPP/tqwidget_mac.cpp \
 			  $$KERNEL_CPP/qeventloop_mac.cpp \
 			  $$KERNEL_CPP/tqfont_mac.cpp \
 			  $$KERNEL_CPP/tqfontengine_mac.cpp
              DEFINES += QMAC_ONE_PIXEL_LOCK
         } else:unix {
-	   SOURCES += $$KERNEL_CPP/qprinter_unix.cpp \
+	   SOURCES += $$KERNEL_CPP/tqprinter_unix.cpp \
 	              $$KERNEL_CPP/qpsprinter.cpp
            glibmainloop {
               SOURCES += $$KERNEL_CPP/qeventloop_unix_glib.cpp
@@ -228,18 +228,18 @@ kernel {
 		  $$KERNEL_CPP/tqobject.cpp \
 		  $$KERNEL_CPP/tqobjectcleanuphandler.cpp \
 		  $$KERNEL_CPP/tqpainter.cpp \
-		  $$KERNEL_CPP/qpalette.cpp \
+		  $$KERNEL_CPP/tqpalette.cpp \
 		  $$KERNEL_CPP/tqpaintdevicemetrics.cpp \
-		  $$KERNEL_CPP/qpicture.cpp \
-		  $$KERNEL_CPP/qpixmap.cpp \
-		  $$KERNEL_CPP/qpixmapcache.cpp \
-		  $$KERNEL_CPP/qpointarray.cpp \
-		  $$KERNEL_CPP/qpoint.cpp \
+		  $$KERNEL_CPP/tqpicture.cpp \
+		  $$KERNEL_CPP/tqpixmap.cpp \
+		  $$KERNEL_CPP/tqpixmapcache.cpp \
+		  $$KERNEL_CPP/tqpointarray.cpp \
+		  $$KERNEL_CPP/tqpoint.cpp \
 		  $$KERNEL_CPP/qpolygonscanner.cpp \
-		  $$KERNEL_CPP/qprinter.cpp \
+		  $$KERNEL_CPP/tqprinter.cpp \
 		  $$KERNEL_CPP/tqprocess.cpp \
-		  $$KERNEL_CPP/qrect.cpp \
-		  $$KERNEL_CPP/qregion.cpp \
+		  $$KERNEL_CPP/tqrect.cpp \
+		  $$KERNEL_CPP/tqregion.cpp \
 		  $$KERNEL_CPP/tqsignal.cpp \
 		  $$KERNEL_CPP/tqsignalmapper.cpp \
 		  $$KERNEL_CPP/tqsize.cpp \
@@ -255,7 +255,7 @@ kernel {
 		  $$KERNEL_CPP/tqurloperator.cpp \
 		  $$KERNEL_CPP/tqurlinfo.cpp \
 		  $$KERNEL_CPP/tqwidget.cpp \
-		  $$KERNEL_CPP/qwmatrix.cpp \
+		  $$KERNEL_CPP/tqwmatrix.cpp \
 		  $$KERNEL_CPP/qvariant.cpp \
 		  $$KERNEL_CPP/qrichtext.cpp \
 		  $$KERNEL_CPP/qinternal.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index bfd957097..54ca333f9 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -32,7 +32,7 @@
 #include <ntqmetaobject.h>  // All moc genereated code has this include
 #include <tqobject.h>
 #include <tqpainter.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <qplatformdefs.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 3f8944ab7..ac3157676 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -45,18 +45,18 @@
 #include "tqstring.h"
 #include "tqcstring.h"
 #include "tqfont.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #include "tqimage.h"
 #include "tqbrush.h"
-#include "ntqpoint.h"
-#include "ntqrect.h"
+#include "tqpoint.h"
+#include "tqrect.h"
 #include "tqsize.h"
 #include "tqcolor.h"
-#include "ntqpalette.h"
+#include "tqpalette.h"
 #include "tqiconset.h"
 #include "tqdatastream.h"
-#include "ntqregion.h"
-#include "ntqpointarray.h"
+#include "tqregion.h"
+#include "tqpointarray.h"
 #include "tqbitmap.h"
 #include "ntqcursor.h"
 #include "tqdatetime.h"
@@ -64,7 +64,7 @@
 #include "ntqshared.h"
 #include "tqbitarray.h"
 #include "ntqkeysequence.h"
-#include "ntqpen.h"
+#include "tqpen.h"
 
 #ifndef DBL_DIG
 #define DBL_DIG 10
diff --git a/src/kernel/tqbitmap.h b/src/kernel/tqbitmap.h
index 22307b551..c74f37241 100644
--- a/src/kernel/tqbitmap.h
+++ b/src/kernel/tqbitmap.h
@@ -42,7 +42,7 @@
 #define TQBITMAP_H
 
 #ifndef QT_H
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/tqclipboard.cpp b/src/kernel/tqclipboard.cpp
index 37393b7c4..f7c2836f5 100644
--- a/src/kernel/tqclipboard.cpp
+++ b/src/kernel/tqclipboard.cpp
@@ -45,7 +45,7 @@
 #include "ntqapplication.h"
 #include "qapplication_p.h"
 #include "tqdragobject.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 
 /*!
     \class TQClipboard tqclipboard.h
diff --git a/src/kernel/tqdragobject.cpp b/src/kernel/tqdragobject.cpp
index 3c8921a59..f8557de55 100644
--- a/src/kernel/tqdragobject.cpp
+++ b/src/kernel/tqdragobject.cpp
@@ -48,7 +48,7 @@
 #include "tqdragobject.h"
 #include "tqtextcodec.h"
 #include "ntqapplication.h"
-#include "ntqpoint.h"
+#include "tqpoint.h"
 #include "tqwidget.h"
 #include "tqbuffer.h"
 #include "ntqgif.h"
diff --git a/src/kernel/tqfontmetrics.h b/src/kernel/tqfontmetrics.h
index 814a411e6..b635a864e 100644
--- a/src/kernel/tqfontmetrics.h
+++ b/src/kernel/tqfontmetrics.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqfont.h"
-#include "ntqrect.h"
+#include "tqrect.h"
 #endif // QT_H
 
 class TQTextCodec;
diff --git a/src/kernel/tqiconset.h b/src/kernel/tqiconset.h
index 66fc71146..7caa24b74 100644
--- a/src/kernel/tqiconset.h
+++ b/src/kernel/tqiconset.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #endif // QT_H
 
 #ifndef TQT_NO_ICONSET
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index 58b8a1221..733bb10d7 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -46,13 +46,13 @@
 #include "tqbuffer.h"
 #include "tqptrlist.h"
 #include "ntqasyncimageio.h"
-#include "ntqpngio.h"
+#include "tqpngio.h"
 #include "ntqmngio.h"
 #include "ntqjpegio.h"
 #include "tqmap.h"
 #include <private/qpluginmanager_p.h>
 #include "tqimageformatinterface_p.h"
-#include "ntqwmatrix.h"
+#include "tqwmatrix.h"
 #include "ntqapplication.h"
 #include "tqmime.h"
 #include "tqdragobject.h"
diff --git a/src/kernel/tqimage.h b/src/kernel/tqimage.h
index b65b1de43..605b3551c 100644
--- a/src/kernel/tqimage.h
+++ b/src/kernel/tqimage.h
@@ -42,7 +42,7 @@
 #define TQIMAGE_H
 
 #ifndef QT_H
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #include "tqstrlist.h"
 #include "tqstringlist.h"
 #endif // QT_H
diff --git a/src/kernel/tqmovie.cpp b/src/kernel/tqmovie.cpp
index d12ff2f6c..54743cbd6 100644
--- a/src/kernel/tqmovie.cpp
+++ b/src/kernel/tqmovie.cpp
@@ -48,7 +48,7 @@
 #include "tqfile.h"
 #include "tqbuffer.h"
 #include "tqobject.h"
-#include "ntqpixmapcache.h"
+#include "tqpixmapcache.h"
 
 #ifndef TQT_NO_MOVIE
 
diff --git a/src/kernel/tqmovie.h b/src/kernel/tqmovie.h
index 8e92ec6d4..c340590e8 100644
--- a/src/kernel/tqmovie.h
+++ b/src/kernel/tqmovie.h
@@ -42,7 +42,7 @@
 #define TQMOVIE_H
 
 #ifndef QT_H
-#include "ntqpixmap.h" // ### remove or keep for users' convenience?
+#include "tqpixmap.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
 #ifndef TQT_NO_MOVIE
diff --git a/src/kernel/tqpaintdevice.h b/src/kernel/tqpaintdevice.h
index 2b9cd421f..9e6cc6697 100644
--- a/src/kernel/tqpaintdevice.h
+++ b/src/kernel/tqpaintdevice.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqwindowdefs.h"
-#include "ntqrect.h"
+#include "tqrect.h"
 #endif // QT_H
 
 class TQIODevice;
diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp
index 325d11eea..5303d5549 100644
--- a/src/kernel/tqpainter.cpp
+++ b/src/kernel/tqpainter.cpp
@@ -3083,7 +3083,7 @@ TQRect TQPainter::boundingRect( const TQRect &r, int flags,
  *****************************************************************************/
 
 /*!
-    \class TQPen ntqpen.h
+    \class TQPen tqpen.h
     \brief The TQPen class defines how a TQPainter should draw lines and outlines
     of shapes.
 
diff --git a/src/kernel/tqpainter.h b/src/kernel/tqpainter.h
index bd2799577..29a10406d 100644
--- a/src/kernel/tqpainter.h
+++ b/src/kernel/tqpainter.h
@@ -46,11 +46,11 @@
 #include "tqcolor.h"
 #include "tqfontmetrics.h"
 #include "tqfontinfo.h"
-#include "ntqregion.h"
-#include "ntqpen.h"
+#include "tqregion.h"
+#include "tqpen.h"
 #include "tqbrush.h"
-#include "ntqpointarray.h"
-#include "ntqwmatrix.h"
+#include "tqpointarray.h"
+#include "tqwmatrix.h"
 #endif // QT_H
 
 class TQTextCodec;
diff --git a/src/kernel/tqpainter_x11.cpp b/src/kernel/tqpainter_x11.cpp
index e61b2fab2..22d892d17 100644
--- a/src/kernel/tqpainter_x11.cpp
+++ b/src/kernel/tqpainter_x11.cpp
@@ -44,7 +44,7 @@
 #include "tqpainter.h"
 #include "tqwidget.h"
 #include "tqbitmap.h"
-#include "ntqpixmapcache.h"
+#include "tqpixmapcache.h"
 #include "tqtextcodec.h"
 #include "tqpaintdevicemetrics.h"
 
@@ -137,7 +137,7 @@ static const TQt::HANDLE rendhd = 0;
 #endif
 
 // hack, so we don't have to make TQRegion::clipRectangles() public or include
-// X11 headers in ntqregion.h
+// X11 headers in tqregion.h
 inline void *qt_getClipRects( const TQRegion &r, int &num )
 {
     return r.clipRectangles( num );
@@ -2925,7 +2925,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h,
     }
 #else
     // for now we'll just output the original and let the postscript
-    // code make what it can of it.  qpicture will be unhappy.
+    // code make what it can of it.  tqpicture will be unhappy.
     drawTile( this, x, y, w, h, pixmap, sx, sy );
 #endif
 }
diff --git a/src/kernel/qpalette.cpp b/src/kernel/tqpalette.cpp
index 43009fe7b..6ae0459d1 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/tqpalette.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqpalette.h"
+#include "tqpalette.h"
 
 #ifndef TQT_NO_PALETTE
 #include "tqdatastream.h"
@@ -49,7 +49,7 @@
  *****************************************************************************/
 
 /*!
-    \class TQColorGroup ntqpalette.h
+    \class TQColorGroup tqpalette.h
     \brief The TQColorGroup class contains a group of widget colors.
 
     \ingroup appearance
@@ -513,7 +513,7 @@ bool TQColorGroup::operator==( const TQColorGroup &g ) const
  *****************************************************************************/
 
 /*!
-    \class TQPalette ntqpalette.h
+    \class TQPalette tqpalette.h
 
     \brief The TQPalette class contains color groups for each widget state.
 
diff --git a/src/kernel/ntqpalette.h b/src/kernel/tqpalette.h
index 9f0ca13f0..9f0ca13f0 100644
--- a/src/kernel/ntqpalette.h
+++ b/src/kernel/tqpalette.h
diff --git a/src/kernel/ntqpen.h b/src/kernel/tqpen.h
index 3a0a0f8d0..3a0a0f8d0 100644
--- a/src/kernel/ntqpen.h
+++ b/src/kernel/tqpen.h
diff --git a/src/kernel/qpicture.cpp b/src/kernel/tqpicture.cpp
index 35dd8439a..3ab6a000b 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/tqpicture.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqpicture.h"
+#include "tqpicture.h"
 
 #ifndef TQT_NO_PICTURE
 
 #include "tqpainter.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #include "tqimage.h"
 #include "tqfile.h"
 #include "tqdatastream.h"
@@ -54,7 +54,7 @@
 #endif
 
 /*!
-    \class TQPicture ntqpicture.h
+    \class TQPicture tqpicture.h
     \brief The TQPicture class is a paint device that records and
     replays TQPainter commands.
 
diff --git a/src/kernel/ntqpicture.h b/src/kernel/tqpicture.h
index 28512b61f..28512b61f 100644
--- a/src/kernel/ntqpicture.h
+++ b/src/kernel/tqpicture.h
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/tqpixmap.cpp
index 148b06da6..460dfc64d 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/tqpixmap.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 
 #include "tqbitmap.h"
 #include "tqimage.h"
@@ -54,7 +54,7 @@
 #include "tqfile.h"
 
 /*!
-    \class TQPixmap ntqpixmap.h
+    \class TQPixmap tqpixmap.h
     \brief The TQPixmap class is an off-screen, pixel-based paint device.
 
     \ingroup graphics
diff --git a/src/kernel/ntqpixmap.h b/src/kernel/tqpixmap.h
index 70609d4a7..70609d4a7 100644
--- a/src/kernel/ntqpixmap.h
+++ b/src/kernel/tqpixmap.h
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/tqpixmap_x11.cpp
index 1b5be8410..b1e6c6894 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/tqpixmap_x11.cpp
@@ -70,7 +70,7 @@
 #include "tqbitmap.h"
 #include "tqpaintdevicemetrics.h"
 #include "tqimage.h"
-#include "ntqwmatrix.h"
+#include "tqwmatrix.h"
 #include "ntqapplication.h"
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/tqpixmapcache.cpp
index 9eb09466c..a61b0aa71 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/tqpixmapcache.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqpixmapcache.h"
+#include "tqpixmapcache.h"
 #include "tqcache.h"
 #include "tqobject.h"
 #include "ntqcleanuphandler.h"
@@ -46,7 +46,7 @@
 
 // REVISED: paul
 /*!
-    \class TQPixmapCache ntqpixmapcache.h
+    \class TQPixmapCache tqpixmapcache.h
 
     \brief The TQPixmapCache class provides an application-global cache for
     pixmaps.
diff --git a/src/kernel/ntqpixmapcache.h b/src/kernel/tqpixmapcache.h
index 2f2d1372d..9cff8f18b 100644
--- a/src/kernel/ntqpixmapcache.h
+++ b/src/kernel/tqpixmapcache.h
@@ -42,7 +42,7 @@
 #define TQPIXMAPCACHE_H
 
 #ifndef QT_H
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpngio.cpp b/src/kernel/tqpngio.cpp
index c2db400ac..16d17eb6f 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/tqpngio.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqpngio.h"
+#include "tqpngio.h"
 
 #ifndef TQT_NO_IMAGEIO_PNG
 
@@ -751,7 +751,7 @@ void write_png_image(TQImageIO* iio)
 }
 
 /*!
-    \class TQPNGImagePacker ntqpngio.h
+    \class TQPNGImagePacker tqpngio.h
     \brief The TQPNGImagePacker class creates well-compressed PNG animations.
 
     \ingroup images
@@ -966,7 +966,7 @@ class TQPNGFormatType : public TQImageFormatType
 
 
 /*
-  \class TQPNGFormat ntqpngio.h
+  \class TQPNGFormat tqpngio.h
   \brief The TQPNGFormat class provides an incremental image decoder for PNG
   image format.
 
diff --git a/src/kernel/ntqpngio.h b/src/kernel/tqpngio.h
index 42c85c653..42c85c653 100644
--- a/src/kernel/ntqpngio.h
+++ b/src/kernel/tqpngio.h
diff --git a/src/kernel/qpoint.cpp b/src/kernel/tqpoint.cpp
index e3f620f9e..e9237521c 100644
--- a/src/kernel/qpoint.cpp
+++ b/src/kernel/tqpoint.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqpoint.h"
+#include "tqpoint.h"
 #include "tqdatastream.h"
 
 
 /*!
-    \class TQPoint ntqpoint.h
+    \class TQPoint tqpoint.h
     \brief The TQPoint class defines a point in the plane.
 
     \ingroup images
diff --git a/src/kernel/ntqpoint.h b/src/kernel/tqpoint.h
index c38e379b2..c38e379b2 100644
--- a/src/kernel/ntqpoint.h
+++ b/src/kernel/tqpoint.h
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/tqpointarray.cpp
index ccba1122e..9d7bafccc 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/tqpointarray.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "ntqpointarray.h"
-#include "ntqrect.h"
+#include "tqpointarray.h"
+#include "tqrect.h"
 #include "tqdatastream.h"
-#include "ntqwmatrix.h"
+#include "tqwmatrix.h"
 #include <stdarg.h>
 
 const double Q_PI = 3.14159265358979323846;   // pi // one more useful comment
 
 
 /*!
-    \class TQPointArray ntqpointarray.h
+    \class TQPointArray tqpointarray.h
     \brief The TQPointArray class provides an array of points.
 
     \ingroup images
diff --git a/src/kernel/ntqpointarray.h b/src/kernel/tqpointarray.h
index 515935ac7..386910f15 100644
--- a/src/kernel/ntqpointarray.h
+++ b/src/kernel/tqpointarray.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqmemarray.h"
-#include "ntqpoint.h"
+#include "tqpoint.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qprinter.cpp b/src/kernel/tqprinter.cpp
index 37ef9af8f..eaaa3854f 100644
--- a/src/kernel/qprinter.cpp
+++ b/src/kernel/tqprinter.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "ntqprinter.h"
-#include "qprinter_p.h"
+#include "tqprinter.h"
+#include "tqprinter_p.h"
 
 #ifndef TQT_NO_PRINTER
 
 /*!
-    \class TQPrinter ntqprinter.h
+    \class TQPrinter tqprinter.h
     \brief The TQPrinter class is a paint device that paints on a printer.
 
     \ingroup images
diff --git a/src/kernel/ntqprinter.h b/src/kernel/tqprinter.h
index de561901a..de561901a 100644
--- a/src/kernel/ntqprinter.h
+++ b/src/kernel/tqprinter.h
diff --git a/src/kernel/qprinter_p.h b/src/kernel/tqprinter_p.h
index 3b01895dd..a9e46a9f3 100644
--- a/src/kernel/qprinter_p.h
+++ b/src/kernel/tqprinter_p.h
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_PRINTER
 
 #ifndef QT_H
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqshared.h>
 #include <tqstring.h>
 #include <tqsize.h>
diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp
index 0c7cdfa6b..b5ae63926 100644
--- a/src/kernel/qprinter_unix.cpp
+++ b/src/kernel/tqprinter_unix.cpp
@@ -47,7 +47,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 # undef open
 #endif
 
-#include "ntqprinter.h"
+#include "tqprinter.h"
 
 #ifndef TQT_NO_PRINTER
 
@@ -55,7 +55,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 #include "qpsprinter_p.h"
 #include "ntqprintdialog.h"
 #include "ntqapplication.h"
-#include "qprinter_p.h"
+#include "tqprinter_p.h"
 
 #include <unistd.h> // For ::sleep()
 #include <stdlib.h>
diff --git a/src/kernel/qrect.cpp b/src/kernel/tqrect.cpp
index db941c3b1..9e45f1fab 100644
--- a/src/kernel/qrect.cpp
+++ b/src/kernel/tqrect.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #define	 TQRECT_C
-#include "ntqrect.h"
+#include "tqrect.h"
 #include "tqdatastream.h"
 
 /*!
diff --git a/src/kernel/ntqrect.h b/src/kernel/tqrect.h
index d7dd2886b..d7dd2886b 100644
--- a/src/kernel/ntqrect.h
+++ b/src/kernel/tqrect.h
diff --git a/src/kernel/qregion.cpp b/src/kernel/tqregion.cpp
index cc8fae37d..c15811ebd 100644
--- a/src/kernel/qregion.cpp
+++ b/src/kernel/tqregion.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "ntqregion.h"
-#include "ntqpointarray.h"
+#include "tqregion.h"
+#include "tqpointarray.h"
 #include "tqbuffer.h"
 #include "tqdatastream.h"
 
 // BEING REVISED: paul
 /*!
-    \class TQRegion ntqregion.h
+    \class TQRegion tqregion.h
     \brief The TQRegion class specifies a clip region for a painter.
 
     \ingroup images
diff --git a/src/kernel/ntqregion.h b/src/kernel/tqregion.h
index 8ab8966af..51b3ac9b1 100644
--- a/src/kernel/ntqregion.h
+++ b/src/kernel/tqregion.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqshared.h"
-#include "ntqrect.h"
+#include "tqrect.h"
 #endif // QT_H
 
 #ifdef TQ_WS_X11
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/tqregion_x11.cpp
index c10856a0d..801aadb6d 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/tqregion_x11.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "ntqregion.h"
-#include "ntqpointarray.h"
+#include "tqregion.h"
+#include "tqpointarray.h"
 #include "tqbuffer.h"
 #include "tqimage.h"
 #include "tqbitmap.h"
diff --git a/src/kernel/tqsize.h b/src/kernel/tqsize.h
index 5ac364822..6bfb60865 100644
--- a/src/kernel/tqsize.h
+++ b/src/kernel/tqsize.h
@@ -42,7 +42,7 @@
 #define TQSIZE_H
 
 #ifndef QT_H
-#include "ntqpoint.h" // ### change to ntqwindowdefs.h?
+#include "tqpoint.h" // ### change to ntqwindowdefs.h?
 #endif // QT_H
 
 class TQ_EXPORT TQSize
diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp
index a8403969d..9bf8c4509 100644
--- a/src/kernel/tqstyle.cpp
+++ b/src/kernel/tqstyle.cpp
@@ -43,7 +43,7 @@
 #include "ntqapplication.h"
 #include "tqpainter.h"
 #include "tqbitmap.h"
-#include "ntqpixmapcache.h"
+#include "tqpixmapcache.h"
 #include "ntqframe.h"
 #include "ntqlayout.h"
 #include "ntqlistview.h"
diff --git a/src/kernel/tqstyle.h b/src/kernel/tqstyle.h
index 15ecd20fe..d0f3712f0 100644
--- a/src/kernel/tqstyle.h
+++ b/src/kernel/tqstyle.h
@@ -42,7 +42,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #include "tqcolor.h"
 #include "tqiconset.h"
 #include "ntqtabbar.h"
diff --git a/src/kernel/tqtextlayout_p.h b/src/kernel/tqtextlayout_p.h
index 64c7f64db..58dced19b 100644
--- a/src/kernel/tqtextlayout_p.h
+++ b/src/kernel/tqtextlayout_p.h
@@ -40,7 +40,7 @@
 #ifndef QT_H
 #include "tqstring.h"
 #include "ntqnamespace.h"
-#include "ntqrect.h"
+#include "tqrect.h"
 #endif // QT_H
 
 class TQTextEngine;
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index f1f1798d3..65f97e615 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -46,7 +46,7 @@
 #include "tqptrdict.h"
 #include "ntqfocusdata.h"
 #include "ntqcursor.h"
-#include "ntqpixmap.h"
+#include "tqpixmap.h"
 #include "ntqapplication.h"
 #include "qapplication_p.h"
 #include "tqbrush.h"
diff --git a/src/kernel/tqwidget.h b/src/kernel/tqwidget.h
index 9e1c3a07a..f683af712 100644
--- a/src/kernel/tqwidget.h
+++ b/src/kernel/tqwidget.h
@@ -45,7 +45,7 @@
 #include "ntqwindowdefs.h"
 #include "tqobject.h"
 #include "tqpaintdevice.h"
-#include "ntqpalette.h"
+#include "tqpalette.h"
 #include "tqfont.h"
 #include "tqfontmetrics.h"
 #include "tqfontinfo.h"
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/tqwmatrix.cpp
index 78dc80c0d..eb5ce5087 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/tqwmatrix.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "ntqwmatrix.h"
+#include "tqwmatrix.h"
 #include "tqdatastream.h"
-#include "ntqregion.h"
+#include "tqregion.h"
 #if defined(TQ_WS_X11)
 double qsincos( double, bool calcCos );		// defined in tqpainter_x11.cpp
 #else
@@ -52,7 +52,7 @@ double qsincos( double, bool calcCos );		// defined in tqpainter_x11.cpp
 #ifndef TQT_NO_WMATRIX
 
 /*!
-    \class TQWMatrix ntqwmatrix.h
+    \class TQWMatrix tqwmatrix.h
     \brief The TQWMatrix class specifies 2D transformations of a
     coordinate system.
 
diff --git a/src/kernel/ntqwmatrix.h b/src/kernel/tqwmatrix.h
index 1a7153b79..7ac138804 100644
--- a/src/kernel/ntqwmatrix.h
+++ b/src/kernel/tqwmatrix.h
@@ -43,9 +43,9 @@
 
 #ifndef QT_H
 #include "ntqwindowdefs.h"
-#include "ntqpointarray.h"
-#include "ntqrect.h"
-#include "ntqregion.h"
+#include "tqpointarray.h"
+#include "tqrect.h"
+#include "tqregion.h"
 #endif // QT_H
 
 #ifndef TQT_NO_WMATRIX