152 files changed, 410 insertions, 410 deletions
diff --git a/src/codecs/tqtextcodec.cpp b/src/codecs/tqtextcodec.cpp
index 8a4bacc8c..c5cdedc3c 100644
--- a/src/codecs/tqtextcodec.cpp
+++ b/src/codecs/tqtextcodec.cpp
@@ -66,7 +66,7 @@
 #include "tqjpunicode.h"
 #include "tqsjiscodec.h"
 #endif // TQT_NO_BIG_CODECS
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "tqstrlist.h"
 #include "tqstring.h"
 #include "../tools/qlocale_p.h"
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index dd01e3aaa..4f82b6350 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -55,7 +55,7 @@
 #include "ntqgridview.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
-#include "ntqsettings.h"
+#include "tqsettings.h"
 #include "tqpopupmenu.h"
 
 #ifdef TQ_WS_MAC
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index aeef03304..e24c4a9c3 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -42,8 +42,8 @@
 
 #ifndef TQT_NO_PRINTDIALOG
 
-#include "ntqfiledialog.h"
-#include "ntqfile.h"
+#include "tqfiledialog.h"
+#include "tqfile.h"
 #include "tqtextstream.h"
 #include "ntqcombobox.h"
 #include "ntqframe.h"
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index aa0433f50..cfd0f5b06 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -6,7 +6,7 @@ dialogs {
 	HEADERS	+= $$DIALOGS_H/ntqcolordialog.h \
 		  $$DIALOGS_H/ntqdialog.h \
 		  $$DIALOGS_H/ntqerrormessage.h \
-		  $$DIALOGS_H/ntqfiledialog.h \
+		  $$DIALOGS_H/tqfiledialog.h \
 		  $$DIALOGS_H/ntqfontdialog.h \
 		  $$DIALOGS_H/ntqmessagebox.h \
 		  $$DIALOGS_H/ntqprogressdialog.h \
@@ -14,15 +14,15 @@ dialogs {
 		  $$DIALOGS_H/ntqwizard.h \
 		  $$DIALOGS_H/ntqinputdialog.h
 
-        !embedded:mac:SOURCES  += $$DIALOGS_CPP/qfiledialog_mac.cpp $$DIALOGS_CPP/qcolordialog_mac.cpp
-	win32:SOURCES += $$DIALOGS_CPP/qfiledialog_win.cpp
+        !embedded:mac:SOURCES  += $$DIALOGS_CPP/tqfiledialog_mac.cpp $$DIALOGS_CPP/qcolordialog_mac.cpp
+	win32:SOURCES += $$DIALOGS_CPP/tqfiledialog_win.cpp
 	unix:SOURCES += $$DIALOGS_CPP/qprintdialog.cpp
 	unix:HEADERS   += $$DIALOGS_H/ntqprintdialog.h 
 
 	SOURCES += $$DIALOGS_CPP/qcolordialog.cpp \
 		  $$DIALOGS_CPP/qdialog.cpp \
 		  $$DIALOGS_CPP/qerrormessage.cpp \
-		  $$DIALOGS_CPP/qfiledialog.cpp \
+		  $$DIALOGS_CPP/tqfiledialog.cpp \
 		  $$DIALOGS_CPP/qfontdialog.cpp \
 		  $$DIALOGS_CPP/qmessagebox.cpp \
 		  $$DIALOGS_CPP/qprogressdialog.cpp \
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 084e48edb..711ce2a73 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -50,7 +50,7 @@
 # undef truncate
 #endif
 
-#include "ntqfiledialog.h"
+#include "tqfiledialog.h"
 
 #ifndef TQT_NO_FILEDIALOG
 
@@ -64,7 +64,7 @@
 #include "tqcstring.h"
 #include "ntqcursor.h"
 #include "tqdragobject.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "ntqguardedptr.h"
 #include "ntqhbox.h"
 #include "ntqheader.h"
@@ -77,7 +77,7 @@
 #include "tqmap.h"
 #include "ntqmessagebox.h"
 #include "tqmime.h"
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 #include "tqobjectlist.h"
 #include "ntqpainter.h"
 #include "tqpopupmenu.h"
@@ -2165,7 +2165,7 @@ static TQStringList makeFiltersList( const TQString &filter )
 }
 
 /*!
-  \class TQFileDialog ntqfiledialog.h
+  \class TQFileDialog tqfiledialog.h
   \brief The TQFileDialog class provides dialogs that allow users to select files or directories.
   \ingroup dialogs
   \mainclass
@@ -2325,7 +2325,7 @@ static TQStringList makeFiltersList( const TQString &filter )
   For more information about creating a TQFilePreview widget see
   \l{TQFilePreview}.
 
-  <img src=qfiledlg-m.png> <img src=qfiledlg-w.png>
+  <img src=tqfiledlg-m.png> <img src=tqfiledlg-w.png>
 
 */
 
@@ -4969,7 +4969,7 @@ void TQFileDialog::keyPressEvent( TQKeyEvent * ke )
 }
 
 
-/*! \class TQFileIconProvider ntqfiledialog.h
+/*! \class TQFileIconProvider tqfiledialog.h
 
   \brief The TQFileIconProvider class provides icons for TQFileDialog to
   use.
@@ -5059,7 +5059,7 @@ TQFileIconProvider * TQFileDialog::iconProvider()
 
 #if defined(TQ_WS_WIN)
 
-// ### FIXME: this code is duplicated in qdns.cpp
+// ### FIXME: this code is duplicated in tqdns.cpp
 static TQString getWindowsRegString( HKEY key, const TQString &subKey )
 {
     TQString s;
@@ -6446,7 +6446,7 @@ void TQFileDialog::goBack()
 // preview widget from TQWidget and from this class' indeed.
 
 /*!
-  \class TQFilePreview ntqfiledialog.h
+  \class TQFilePreview tqfiledialog.h
   \ingroup misc
   \brief The TQFilePreview class provides file previewing in TQFileDialog.
 
@@ -6462,7 +6462,7 @@ void TQFileDialog::goBack()
   TQFileDialog::setInfoPreview(), TQFileDialog::setInfoPreviewEnabled(),
   TQFileDialog::setContentsPreviewEnabled().
 
-  For an example of a preview widget see qt/examples/qdir/qdir.cpp.
+  For an example of a preview widget see qt/examples/tqdir/tqdir.cpp.
 */
 
 /*!
@@ -6482,6 +6482,6 @@ TQFilePreview::TQFilePreview()
 */
 
 
-#include "qfiledialog.moc"
+#include "tqfiledialog.moc"
 
 #endif
diff --git a/src/dialogs/ntqfiledialog.h b/src/dialogs/tqfiledialog.h
index be3cdf4ac..b57be85a9 100644
--- a/src/dialogs/ntqfiledialog.h
+++ b/src/dialogs/tqfiledialog.h
@@ -55,10 +55,10 @@ class TQFileDialogPrivate;
 class TQFileDialogTQFileListView;
 
 #ifndef QT_H
-#include "ntqdir.h"
+#include "tqdir.h"
 #include "ntqdialog.h"
-#include "ntqurloperator.h"
-#include "ntqurlinfo.h"
+#include "tqurloperator.h"
+#include "tqurlinfo.h"
 #endif // QT_H
 
 #if __GNUC__ - 0 > 3
diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h
index b2c88ce4d..6c1687e9d 100644
--- a/src/kernel/ntqasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "tqtimer.h"
 #endif // QT_H
 
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h
index 1c66e5950..75741a597 100644
--- a/src/kernel/ntqeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #endif // QT_H
 
 #ifdef Q_QDOC
diff --git a/src/kernel/ntqpicture.h b/src/kernel/ntqpicture.h
index e6b5bc912..3ef2867e9 100644
--- a/src/kernel/ntqpicture.h
+++ b/src/kernel/ntqpicture.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqpaintdevice.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #endif // QT_H
 
 #ifndef TQT_NO_PICTURE
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index e9b0343a4..5c9058a14 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -27,12 +27,12 @@
 #include "tqcstring.h"
 #include "tqstring.h"
 #include "tqptrlist.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "ntqkeysequence.h"
 #include "ntqwindowdefs.h"
 #include "ntqgdict.h"
 #include "ntqfont.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqpair.h"
 #include "ntqpoint.h"
 #include <stdio.h>
@@ -55,7 +55,7 @@
 #include "ntqfontmetrics.h"
 #include "tqdict.h"
 #include "ntqevent.h"
-#include "ntqhostaddress.h"
+#include "tqhostaddress.h"
 #include "tqstringlist.h"
 #include "ntqcolor.h"
 #include <tqdom.h>
@@ -73,9 +73,9 @@
 #include <tqtoolbutton.h>
 #include "tqstyle.h"
 #include "ntqframe.h"
-#include "ntqfile.h"
-#include "ntqfileinfo.h"
-#include "ntqurlinfo.h"
+#include "tqfile.h"
+#include "tqfileinfo.h"
+#include "tqurlinfo.h"
 #include "tqwidgetlist.h"
 #include <ntqcombobox.h>
 #include "ntqgroupbox.h"
@@ -83,7 +83,7 @@
 #include <tqdataview.h>
 #include "ntqdockwindow.h"
 #include "ntqcommonstyle.h"
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 #include <tqeuckrcodec.h>
 #include <tqgb18030codec.h>
 #include "ntqgcache.h"
@@ -100,11 +100,11 @@
 #include "ntqhbox.h"
 #include <ntqhbuttongroup.h>
 #include <ntqhgroupbox.h>
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #include <ntqeventloop.h>
-#include <ntqhttp.h>
+#include <tqhttp.h>
 #include <tqaction.h>
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqimage.h"
 #include <tqimageformatplugin.h>
 #include "ntqlineedit.h"
@@ -123,12 +123,12 @@
 #include <ntqinputdialog.h>
 #include "ntqscrollbar.h"
 #include "ntqscrollview.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 #include "ntqwindowsstyle.h"
 #include "ntqconnection.h"
 #include "tqbitmap.h"
 #include "ntqvariant.h"
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include <ntqmessagebox.h>
 #include "ntqmetaobject.h"
 #include "ntqheader.h"
@@ -137,8 +137,8 @@
 #include <ntqmovie.h>
 #include "tqptrvector.h"
 #include "tqmutex.h"
-#include <ntqnetwork.h>
-#include <ntqftp.h>
+#include <tqnetwork.h>
+#include <tqftp.h>
 #include "ntqguardedptr.h"
 #include <tqobjectcleanuphandler.h>
 #include "tqsqlfield.h"
@@ -161,7 +161,7 @@
 #include "tqpopupmenu.h"
 #include <ntqprintdialog.h>
 #include <ntqprinter.h>
-#include <ntqprocess.h>
+#include <tqprocess.h>
 #include "ntqprogressbar.h"
 #include <tqasciicache.h>
 #include "tqptrdict.h"
@@ -174,29 +174,29 @@
 #include <ntqdial.h>
 #include <ntqdockarea.h>
 #include "tqregexp.h"
-#include <ntqclipboard.h>
+#include <tqclipboard.h>
 #include <tqhebrewcodec.h>
 #include <ntqlistbox.h>
 #include <ntqgridview.h>
 #include "tqsemaphore.h"
 #include <ntqprogressdialog.h>
-#include "ntqsocketdevice.h"
+#include "tqsocketdevice.h"
 #include <tqsessionmanager.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 #include <ntqsgistyle.h>
 #include <ntqfontdialog.h>
 #include "tqtimer.h"
-#include <ntqsignalmapper.h>
-#include <ntqsignalslotimp.h>
+#include <tqsignalmapper.h>
+#include <tqsignalslotimp.h>
 #include <ntqsimplerichtext.h>
 #include "ntqwmatrix.h"
 #include <tqsizegrip.h>
 #include <ntqabstractlayout.h>
 #include <tqsjiscodec.h>
 #include <ntqslider.h>
-#include <ntqsocket.h>
-#include <ntqserversocket.h>
-#include <ntqdns.h>
+#include <tqsocket.h>
+#include <tqserversocket.h>
+#include <tqdns.h>
 #include <ntqsound.h>
 #include <ntqspinbox.h>
 #include <ntqsplashscreen.h>
@@ -244,9 +244,9 @@
 #include <tqtooltip.h>
 #include "ntqdesktopwidget.h"
 #include <tqtsciicodec.h>
-#include "ntqurl.h"
-#include "ntqurloperator.h"
-#include <ntqfiledialog.h>
+#include "tqurl.h"
+#include "tqurloperator.h"
+#include <tqfiledialog.h>
 #include <tqutfcodec.h>
 #include <ntquuid.h>
 #include <ntqvalidator.h>
@@ -269,7 +269,7 @@
 #include <ntqwizard.h>
 #include <ntqpainter.h>
 #include <tqworkspace.h>
-#include <ntqlocalfs.h>
+#include <tqlocalfs.h>
 #include <tqxml.h>
 
 #if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX )
@@ -297,8 +297,8 @@
 #include "private/qucom_p.h"
 #include "private/qucomextra_p.h"
 #include "private/qpluginmanager_p.h"
-#include "private/qdir_p.h"
-#include "private/qsettings_p.h"
+#include "private/tqdir_p.h"
+#include "private/tqsettings_p.h"
 #include "private/tqsqlextension_p.h"
 #include "private/qdialogbuttons_p.h"
 #include "private/tqwidgetinterface_p.h"
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 00d9c3f05..b11c6b427 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_ACCEL
 
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "ntqapplication.h"
 #include "tqwidget.h"
 #include "tqptrlist.h"
@@ -50,7 +50,7 @@
 #include "ntqguardedptr.h"
 #include "tqstatusbar.h"
 #include "ntqdockwindow.h"
-#include "ntqsignalslotimp.h"
+#include "tqsignalslotimp.h"
 /*!
     \class TQAccel ntqaccel.h
     \brief The TQAccel class handles keyboard accelerator and shortcut keys.
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index ee1395619..8f456790c 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -52,14 +52,14 @@
 #include "tqtextcodec.h"
 #include "tqsessionmanager.h"
 #include "tqdragobject.h"
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 #include "ntqcursor.h"
 #include "tqstyle.h"
 #include "tqstylefactory.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "ntqmessagebox.h"
-#include "ntqdir.h"
-#include "ntqfileinfo.h"
+#include "tqdir.h"
+#include "tqfileinfo.h"
 #ifdef TQ_WS_WIN
 #include "qinputcontext_p.h"
 #endif
diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h
index 7f6fbf9f9..6cb61e4ce 100644
--- a/src/kernel/qapplication_p.h
+++ b/src/kernel/qapplication_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qapplication_*.cpp, tqwidget*.cpp, qcolor_x11.cpp, qfiledialog.cpp
+// of qapplication_*.cpp, tqwidget*.cpp, qcolor_x11.cpp, tqfiledialog.cpp
 // and many other.  This header file may change from version to version
 // without notice, or even be removed.
 //
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 47524c6a5..444271514 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -75,18 +75,18 @@
 #include "ntqpixmapcache.h"
 #include "tqdatetime.h"
 #include "tqtextcodec.h"
-#include "ntqdatastream.h"
-#include "ntqbuffer.h"
-#include "ntqsocketnotifier.h"
+#include "tqdatastream.h"
+#include "tqbuffer.h"
+#include "tqsocketnotifier.h"
 #include "tqsessionmanager.h"
 #include "tqvaluelist.h"
 #include "tqdict.h"
 #include "ntqguardedptr.h"
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 #include "ntqwhatsthis.h" // ######## dependency
-#include "ntqsettings.h"
+#include "tqsettings.h"
 #include "tqstylefactory.h"
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 
 // Input method stuff - UNFINISHED
 #ifndef TQT_NO_IM
@@ -99,7 +99,7 @@
 #endif
 
 #if defined(QT_DEBUG) && defined(Q_OS_LINUX)
-# include "ntqfile.h"
+# include "tqfile.h"
 #endif
 
 #include "qt_x11_p.h"
@@ -435,8 +435,8 @@ TQ_EXPORT TQTextCodec * qt_input_mapper = 0;
 
 TQ_EXPORT Time	tqt_x_time = CurrentTime;
 TQ_EXPORT Time	tqt_x_user_time = CurrentTime;
-extern bool     qt_check_clipboard_sentinel(); //def in qclipboard_x11.cpp
-extern bool	qt_check_selection_sentinel(); //def in qclipboard_x11.cpp
+extern bool     qt_check_clipboard_sentinel(); //def in tqclipboard_x11.cpp
+extern bool	qt_check_selection_sentinel(); //def in tqclipboard_x11.cpp
 
 static void	qt_save_rootinfo();
 bool	tqt_try_modal( TQWidget *, XEvent * );
diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp
index c4811e758..4d3acff73 100644
--- a/src/kernel/qasyncio.cpp
+++ b/src/kernel/qasyncio.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqasyncio.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include <stdlib.h>
 
 #ifndef TQT_NO_ASYNC_IO
diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp
index 0e74dc462..8d7a72935 100644
--- a/src/kernel/qcolor.cpp
+++ b/src/kernel/qcolor.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcolor.h"
 #include "ntqnamespace.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 #include <stdio.h>
 
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index 7d1b0a160..08100ccb7 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -44,7 +44,7 @@
 
 #include "tqbitmap.h"
 #include "tqimage.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 
 /*!
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index f7a073612..dffa45ce6 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -42,7 +42,7 @@
 #include "tqbitmap.h"
 #include "tqimage.h"
 #include "ntqapplication.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqnamespace.h"
 #include "qt_x11_p.h"
 #include <X11/cursorfont.h>
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 99f1dba77..8910d7a11 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -47,7 +47,7 @@
 #include "ntqpainter.h"
 #include "tqdict.h"
 #include "tqcache.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqapplication.h"
 #include "ntqcleanuphandler.h"
 #include "tqstringlist.h"
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 837c81421..1ced79556 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -57,7 +57,7 @@
 #include "ntqrect.h"
 #include "tqptrlist.h"
 #include "tqcstring.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #endif // QT_H
 
 class TQWidget;
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index c30853d02..56b22fbbf 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_IMAGEIO_JPEG
 
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "ntqjpegio.h"
 
 #include <stdio.h>      // jpeglib needs this to be pre-included
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index 5c46cbd74..63e08c830 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -44,7 +44,7 @@
 
 #include "tqimage.h"
 #include "ntqasyncimageio.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "ntqmngio.h"
 
 // Define XMD_H prohibits the included headers of libmng.h to typedef INT32.
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp
index 548310dab..8bd2d8b8f 100644
--- a/src/kernel/qmotifdnd_x11.cpp
+++ b/src/kernel/qmotifdnd_x11.cpp
@@ -95,7 +95,7 @@ static ushort num_src_targets ;
 
 extern bool qt_motifdnd_active;
 
-// this stuff is copied from qclipboard_x11.cpp
+// this stuff is copied from tqclipboard_x11.cpp
 
 extern bool qt_xclb_wait_for_event( Display *dpy, Window win, int type,
 				    XEvent *event, int timeout );
@@ -704,7 +704,7 @@ const char *qt_motifdnd_format( int n )
 
     Atom target = src_targets[n];
 
-    // duplicated from qclipboard_x11.cpp - not the best solution
+    // duplicated from tqclipboard_x11.cpp - not the best solution
     static Atom xa_utf8_string = *qt_xdnd_str_to_atom( "UTF8_STRING" );
     static Atom xa_text = *qt_xdnd_str_to_atom( "TEXT" );
     static Atom xa_compound_text = *qt_xdnd_str_to_atom( "COMPOUND_TEXT" );
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index ea6f99942..a26f03d7f 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -45,8 +45,8 @@
 #include "tqptrlist.h"
 #include "tqbitmap.h"
 #include "ntqmovie.h"
-#include "ntqfile.h"
-#include "ntqbuffer.h"
+#include "tqfile.h"
+#include "tqbuffer.h"
 #include "tqobject.h"
 #include "ntqpixmapcache.h"
 
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 731708b77..a74ca938a 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -43,7 +43,7 @@
 #include "tqbitmap.h"
 #include "tqptrstack.h"
 #include "tqptrdict.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqwidget.h"
 #include "tqimage.h"
 #include "ntqpaintdevicemetrics.h"
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index f8de8c9a5..bfb62de41 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -436,7 +436,7 @@ static void init_gc_cache()
 // #define GC_CACHE_STAT
 #if defined(GC_CACHE_STAT)
 #include "tqtextstream.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 
 static int g_numhits    = 0;
 static int g_numcreates = 0;
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index b1ed971f9..43009fe7b 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -41,7 +41,7 @@
 #include "ntqpalette.h"
 
 #ifndef TQT_NO_PALETTE
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqcleanuphandler.h"
 
 /*****************************************************************************
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index 912fbfb5b..45e706cb1 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -45,8 +45,8 @@
 #include "ntqpainter.h"
 #include "ntqpixmap.h"
 #include "tqimage.h"
-#include "ntqfile.h"
-#include "ntqdatastream.h"
+#include "tqfile.h"
+#include "tqdatastream.h"
 #include "ntqpaintdevicemetrics.h"
 
 #ifndef TQT_NO_SVG
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 33fca8ffd..c39a86e67 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -44,14 +44,14 @@
 #include "tqimage.h"
 #include "tqwidget.h"
 #include "ntqpainter.h"
-#include "ntqdatastream.h"
-#include "ntqbuffer.h"
+#include "tqdatastream.h"
+#include "tqbuffer.h"
 #include "tqobjectlist.h"
 #include "ntqapplication.h"
 #include <private/qinternal_p.h>
 #include "tqmime.h"
 #include "tqdragobject.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 
 /*!
     \class TQPixmap ntqpixmap.h
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index 134aacd1c..c2db400ac 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_IMAGEIO_PNG
 
 #include "ntqasyncimageio.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 
 #include <png.h>
 #if PNG_LIBPNG_VER>=10500
diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp
index d3c409ef3..e3f620f9e 100644
--- a/src/kernel/qpoint.cpp
+++ b/src/kernel/qpoint.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqpoint.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 
 /*!
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp
index 4a4031ff6..ccba1122e 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/qpointarray.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqpointarray.h"
 #include "ntqrect.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqwmatrix.h"
 #include <stdarg.h>
 
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index b70e809df..8bd04b845 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -64,11 +64,11 @@
 #include "tqstring.h"
 #include "tqdict.h"
 #include "tqmemarray.h"
-#include "ntqfile.h"
-#include "ntqbuffer.h"
+#include "tqfile.h"
+#include "tqbuffer.h"
 #include "tqintdict.h"
 #include "tqtextcodec.h"
-#include "ntqsettings.h"
+#include "tqsettings.h"
 #include "tqmap.h"
 #include "ntqfontdatabase.h"
 #include "tqregexp.h"
@@ -5155,7 +5155,7 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes )
     scriptUsed = -1;
 
 #ifdef TQ_WS_X11
-    // append qsettings fontpath
+    // append tqsettings fontpath
     TQSettings settings;
     embedFonts = settings.readBoolEntry( "/qt/embedFonts", TRUE );
 
@@ -5207,7 +5207,7 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes )
     }
     XFreeFontPath(font_path);
 
-    // append qsettings fontpath
+    // append tqsettings fontpath
     TQStringList fp = settings.readListEntry( "/qt/fontPath", ':' );
     if ( !fp.isEmpty() )
         fontpath += fp;
diff --git a/src/kernel/qrect.cpp b/src/kernel/qrect.cpp
index f3bc3ff65..db941c3b1 100644
--- a/src/kernel/qrect.cpp
+++ b/src/kernel/qrect.cpp
@@ -40,7 +40,7 @@
 
 #define	 TQRECT_C
 #include "ntqrect.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 /*!
     \class TQRect
diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp
index 105f96430..cc8fae37d 100644
--- a/src/kernel/qregion.cpp
+++ b/src/kernel/qregion.cpp
@@ -40,8 +40,8 @@
 
 #include "ntqregion.h"
 #include "ntqpointarray.h"
-#include "ntqbuffer.h"
-#include "ntqdatastream.h"
+#include "tqbuffer.h"
+#include "tqdatastream.h"
 
 // BEING REVISED: paul
 /*!
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 55a7d8380..c10856a0d 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqregion.h"
 #include "ntqpointarray.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqimage.h"
 #include "tqbitmap.h"
 #include "qt_x11_p.h"
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 0228a58fe..eb31aa554 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -46,10 +46,10 @@
 #include "tqstringlist.h"
 #include "ntqfont.h"
 #include "tqtextstream.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "ntqapplication.h"
 #include "tqmap.h"
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #include "tqstylesheet.h"
 #include "tqmime.h"
 #include "tqimage.h"
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 11d34e476..ea0d8f212 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_SOUND
 
 #include "tqptrdict.h"
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #include "ntqapplication.h"
 
 
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index eca64009e..5cbddd2db 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -11,7 +11,7 @@ kernel {
 		  $$KERNEL_H/ntqasyncio.h \
 		  $$KERNEL_H/tqbitmap.h \
 		  $$KERNEL_H/ntqbrush.h \
-		  $$KERNEL_H/ntqclipboard.h \
+		  $$KERNEL_H/tqclipboard.h \
 		  $$KERNEL_H/ntqcolor.h \
 		  $$KERNEL_P/qcolor_p.h \
 		  $$KERNEL_H/ntqconnection.h \
@@ -44,7 +44,7 @@ kernel {
 		  $$KERNEL_H/tqmime.h \
 		  $$KERNEL_H/ntqmovie.h \
 		  $$KERNEL_H/ntqnamespace.h \
-		  $$KERNEL_H/ntqnetworkprotocol.h \
+		  $$KERNEL_H/tqnetworkprotocol.h \
 		  $$KERNEL_H/tqobject.h \
  		  $$KERNEL_H/tqobjectcleanuphandler.h \
 		  $$KERNEL_H/tqobjectdefs.h \
@@ -63,26 +63,26 @@ kernel {
 		  $$KERNEL_H/ntqpoint.h \
 		  $$KERNEL_H/ntqpolygonscanner.h \
 		  $$KERNEL_H/ntqprinter.h \
-		  $$KERNEL_H/ntqprocess.h \
+		  $$KERNEL_H/tqprocess.h \
 		  $$KERNEL_H/ntqrect.h \
 		  $$KERNEL_H/ntqregion.h \
 		  $$KERNEL_H/tqsessionmanager.h \
-		  $$KERNEL_H/ntqsignal.h \
-		  $$KERNEL_H/ntqsignalmapper.h \
-		  $$KERNEL_H/ntqsignalslotimp.h \
+		  $$KERNEL_H/tqsignal.h \
+		  $$KERNEL_H/tqsignalmapper.h \
+		  $$KERNEL_H/tqsignalslotimp.h \
 		  $$KERNEL_H/tqsize.h \
 		  $$KERNEL_H/tqsizegrip.h \
 		  $$KERNEL_H/tqsizepolicy.h \
-		  $$KERNEL_H/ntqsocketnotifier.h \
+		  $$KERNEL_H/tqsocketnotifier.h \
 		  $$KERNEL_H/ntqsound.h \
 		  $$KERNEL_H/tqstyle.h \
 		  $$KERNEL_H/tqstylesheet.h \
 		  $$KERNEL_H/tqthread.h \
 		  $$KERNEL_H/tqtimer.h \
-		  $$KERNEL_H/ntqurl.h \
-		  $$KERNEL_H/ntqlocalfs.h \
-		  $$KERNEL_H/ntqurloperator.h \
-		  $$KERNEL_H/ntqurlinfo.h \
+		  $$KERNEL_H/tqurl.h \
+		  $$KERNEL_H/tqlocalfs.h \
+		  $$KERNEL_H/tqurloperator.h \
+		  $$KERNEL_H/tqurlinfo.h \
 		  $$KERNEL_H/tqwidget.h \
 		  $$KERNEL_H/tqwidgetintdict.h \
 		  $$KERNEL_H/tqwidgetlist.h \
@@ -111,7 +111,7 @@ kernel {
 		  } 
 		  
 	win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \
-		  $$KERNEL_CPP/qclipboard_win.cpp \
+		  $$KERNEL_CPP/tqclipboard_win.cpp \
 		  $$KERNEL_CPP/qcolor_win.cpp \
 		  $$KERNEL_CPP/qcursor_win.cpp \
 		  $$KERNEL_CPP/qdesktopwidget_win.cpp \
@@ -122,7 +122,7 @@ kernel {
 		  $$KERNEL_CPP/tqmime_win.cpp \
 		  $$KERNEL_CPP/qpixmap_win.cpp \
 		  $$KERNEL_CPP/qprinter_win.cpp \
-		  $$KERNEL_CPP/qprocess_win.cpp \
+		  $$KERNEL_CPP/tqprocess_win.cpp \
 		  $$KERNEL_CPP/qpaintdevice_win.cpp \
 		  $$KERNEL_CPP/qpainter_win.cpp \
 		  $$KERNEL_CPP/qregion_win.cpp \
@@ -134,7 +134,7 @@ kernel {
 
 	unix:x11 {
 	      SOURCES += $$KERNEL_CPP/qapplication_x11.cpp \
-		          $$KERNEL_CPP/qclipboard_x11.cpp \
+		          $$KERNEL_CPP/tqclipboard_x11.cpp \
 			  $$KERNEL_CPP/qcolor_x11.cpp \
 			  $$KERNEL_CPP/qcursor_x11.cpp \
 			  $$KERNEL_CPP/qdnd_x11.cpp \
@@ -164,7 +164,7 @@ kernel {
 	}
         !embedded:!x11:mac {
 	      SOURCES += $$KERNEL_CPP/qapplication_mac.cpp \
-		          $$KERNEL_CPP/qclipboard_mac.cpp \
+		          $$KERNEL_CPP/tqclipboard_mac.cpp \
 			  $$KERNEL_CPP/qcolor_mac.cpp \
 			  $$KERNEL_CPP/qcursor_mac.cpp \
 			  $$KERNEL_CPP/tqmime_mac.cpp \
@@ -190,7 +190,7 @@ kernel {
            }
 
         }
-	unix:SOURCES += $$KERNEL_CPP/qprocess_unix.cpp \
+	unix:SOURCES += $$KERNEL_CPP/tqprocess_unix.cpp \
 		        $$KERNEL_CPP/tqthread_unix.cpp
 
 	SOURCES += $$KERNEL_CPP/qabstractlayout.cpp \
@@ -200,7 +200,7 @@ kernel {
 		  $$KERNEL_CPP/qasyncimageio.cpp \
 		  $$KERNEL_CPP/qasyncio.cpp \
 		  $$KERNEL_CPP/tqbitmap.cpp \
-		  $$KERNEL_CPP/qclipboard.cpp \
+		  $$KERNEL_CPP/tqclipboard.cpp \
 		  $$KERNEL_CPP/qcolor.cpp \
 		  $$KERNEL_CPP/qcolor_p.cpp \
 		  $$KERNEL_CPP/qconnection.cpp \
@@ -224,7 +224,7 @@ kernel {
 		  $$KERNEL_CPP/qmetaobject.cpp \
 		  $$KERNEL_CPP/tqmime.cpp \
 		  $$KERNEL_CPP/qmovie.cpp \
-		  $$KERNEL_CPP/qnetworkprotocol.cpp \
+		  $$KERNEL_CPP/tqnetworkprotocol.cpp \
 		  $$KERNEL_CPP/tqobject.cpp \
 		  $$KERNEL_CPP/tqobjectcleanuphandler.cpp \
 		  $$KERNEL_CPP/qpainter.cpp \
@@ -237,23 +237,23 @@ kernel {
 		  $$KERNEL_CPP/qpoint.cpp \
 		  $$KERNEL_CPP/qpolygonscanner.cpp \
 		  $$KERNEL_CPP/qprinter.cpp \
-		  $$KERNEL_CPP/qprocess.cpp \
+		  $$KERNEL_CPP/tqprocess.cpp \
 		  $$KERNEL_CPP/qrect.cpp \
 		  $$KERNEL_CPP/qregion.cpp \
-		  $$KERNEL_CPP/qsignal.cpp \
-		  $$KERNEL_CPP/qsignalmapper.cpp \
+		  $$KERNEL_CPP/tqsignal.cpp \
+		  $$KERNEL_CPP/tqsignalmapper.cpp \
 		  $$KERNEL_CPP/tqsize.cpp \
 		  $$KERNEL_CPP/tqsizegrip.cpp \
 		  $$KERNEL_CPP/tqstyle.cpp \
-		  $$KERNEL_CPP/qsocketnotifier.cpp \
+		  $$KERNEL_CPP/tqsocketnotifier.cpp \
 		  $$KERNEL_CPP/qsound.cpp \
 		  $$KERNEL_CPP/tqstylesheet.cpp \
 		  $$KERNEL_CPP/tqthread.cpp \
 		  $$KERNEL_CPP/tqtimer.cpp \
-		  $$KERNEL_CPP/qurl.cpp \
-		  $$KERNEL_CPP/qlocalfs.cpp \
-		  $$KERNEL_CPP/qurloperator.cpp \
-		  $$KERNEL_CPP/qurlinfo.cpp \
+		  $$KERNEL_CPP/tqurl.cpp \
+		  $$KERNEL_CPP/tqlocalfs.cpp \
+		  $$KERNEL_CPP/tqurloperator.cpp \
+		  $$KERNEL_CPP/tqurlinfo.cpp \
 		  $$KERNEL_CPP/tqwidget.cpp \
 		  $$KERNEL_CPP/qwmatrix.cpp \
 		  $$KERNEL_CPP/qvariant.cpp \
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 42c741e8a..cda1735ae 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -56,14 +56,14 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 
 #ifndef TQT_NO_TRANSLATION
 
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #include "tqwidgetlist.h"
 #include "tqintdict.h"
 #include "tqstring.h"
 #include "ntqapplication.h"
-#include "ntqfile.h"
-#include "ntqbuffer.h"
-#include "ntqdatastream.h"
+#include "tqfile.h"
+#include "tqbuffer.h"
+#include "tqdatastream.h"
 #include "tqmap.h"
 #include "ntqtl.h"
 
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 1de08c389..19e8f85ac 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -54,7 +54,7 @@
 #include "ntqcolor.h"
 #include "ntqpalette.h"
 #include "tqiconset.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqregion.h"
 #include "ntqpointarray.h"
 #include "tqbitmap.h"
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index dae4bc74b..6c881b208 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqwmatrix.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqregion.h"
 #if defined(TQ_WS_X11)
 double qsincos( double, bool calcCos );		// defined in qpainter_x11.cpp
diff --git a/src/kernel/qclipboard.cpp b/src/kernel/tqclipboard.cpp
index 416a5926f..37393b7c4 100644
--- a/src/kernel/qclipboard.cpp
+++ b/src/kernel/tqclipboard.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 
 #ifndef TQT_NO_CLIPBOARD
 
@@ -48,7 +48,7 @@
 #include "ntqpixmap.h"
 
 /*!
-    \class TQClipboard ntqclipboard.h
+    \class TQClipboard tqclipboard.h
     \brief The TQClipboard class provides access to the window system clipboard.
 
     \ingroup io
diff --git a/src/kernel/ntqclipboard.h b/src/kernel/tqclipboard.h
index 0202f78de..0202f78de 100644
--- a/src/kernel/ntqclipboard.h
+++ b/src/kernel/tqclipboard.h
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/tqclipboard_x11.cpp
index 056b3de91..5c78b7ee5 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/tqclipboard_x11.cpp
@@ -60,7 +60,7 @@
 # undef open
 #endif
 
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 
 #ifndef TQT_NO_CLIPBOARD
 
@@ -69,7 +69,7 @@
 #include "tqbitmap.h"
 #include "tqdatetime.h"
 #include "tqdragobject.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqtextcodec.h"
 #include "tqvaluelist.h"
 #include "tqmap.h"
diff --git a/src/kernel/tqdragobject.cpp b/src/kernel/tqdragobject.cpp
index 68678e7d6..3c8921a59 100644
--- a/src/kernel/tqdragobject.cpp
+++ b/src/kernel/tqdragobject.cpp
@@ -50,10 +50,10 @@
 #include "ntqapplication.h"
 #include "ntqpoint.h"
 #include "tqwidget.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "ntqgif.h"
 #include "tqregexp.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 #include <ctype.h>
 
 // both a struct for storing stuff in and a wrapper to avoid polluting
@@ -578,7 +578,7 @@ TQWidget * TQDragObject::source()
 
     TQDragObject is the base class for all data that needs to be
     transferred between and within applications, both for drag and
-    drop and for the \link ntqclipboard.html clipboard\endlink.
+    drop and for the \link tqclipboard.html clipboard\endlink.
 
     See the \link dnd.html Drag-and-drop documentation\endlink for an
     overview of how to provide drag and drop in your application.
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index 5f45e2fdc..e7afa87f1 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -40,10 +40,10 @@
 
 #include "tqimage.h"
 #include "tqregexp.h"
-#include "ntqfile.h"
-#include "ntqdatastream.h"
+#include "tqfile.h"
+#include "tqdatastream.h"
 #include "tqtextstream.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqptrlist.h"
 #include "ntqasyncimageio.h"
 #include "ntqpngio.h"
diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/tqlocalfs.cpp
index 6932c4152..b6b525c8d 100644
--- a/src/kernel/qlocalfs.cpp
+++ b/src/kernel/tqlocalfs.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "ntqlocalfs.h"
+#include "tqlocalfs.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL
 
-#include "ntqfileinfo.h"
-#include "ntqfile.h"
-#include "ntqurlinfo.h"
+#include "tqfileinfo.h"
+#include "tqfile.h"
+#include "tqurlinfo.h"
 #include "ntqapplication.h"
-#include "ntqurloperator.h"
+#include "tqurloperator.h"
 #include "ntqguardedptr.h"
 
 //#define TQLOCALFS_DEBUG
 
 
 /*!
-    \class TQLocalFs ntqlocalfs.h
+    \class TQLocalFs tqlocalfs.h
     \brief The TQLocalFs class is an implementation of a
     TQNetworkProtocol that works on the local file system.
 \if defined(commercial)
diff --git a/src/kernel/ntqlocalfs.h b/src/kernel/tqlocalfs.h
index 2ee4fad0d..010855c7b 100644
--- a/src/kernel/ntqlocalfs.h
+++ b/src/kernel/tqlocalfs.h
@@ -42,8 +42,8 @@
 #define TQLOCALFS_H
 
 #ifndef QT_H
-#include "ntqnetworkprotocol.h"
-#include "ntqdir.h"
+#include "tqnetworkprotocol.h"
+#include "tqdir.h"
 #endif // QT_H
 
 #ifndef TQT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/tqmime.cpp b/src/kernel/tqmime.cpp
index 984d88be4..14e8f8306 100644
--- a/src/kernel/tqmime.cpp
+++ b/src/kernel/tqmime.cpp
@@ -42,12 +42,12 @@
 
 #include "tqmap.h"
 #include "tqstringlist.h"
-#include "ntqfileinfo.h"
-#include "ntqdir.h"
+#include "tqfileinfo.h"
+#include "tqdir.h"
 #include "tqdragobject.h"
 #include "ntqcleanuphandler.h"
 #include "ntqapplication.h" // ### for now
-#include "ntqclipboard.h" // ### for now
+#include "tqclipboard.h" // ### for now
 
 /*!
     \class TQMimeSource tqmime.h
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/tqnetworkprotocol.cpp
index 718a7ac11..a595c2d0e 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/tqnetworkprotocol.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL
 
-#include "ntqlocalfs.h"
-#include "ntqurloperator.h"
+#include "tqlocalfs.h"
+#include "tqurloperator.h"
 #include "tqtimer.h"
 #include "tqmap.h"
 #include "tqptrqueue.h"
@@ -99,7 +99,7 @@ public:
 };
 
 /*!
-    \class TQNetworkProtocol ntqnetworkprotocol.h
+    \class TQNetworkProtocol tqnetworkprotocol.h
     \brief The TQNetworkProtocol class provides a common API for network protocols.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/tqnetworkprotocol.h
index 55c7436da..df30cb5ca 100644
--- a/src/kernel/ntqnetworkprotocol.h
+++ b/src/kernel/tqnetworkprotocol.h
@@ -42,7 +42,7 @@
 #define TQNETWORKPROTOCOL_H
 
 #ifndef QT_H
-#include "ntqurlinfo.h"
+#include "tqurlinfo.h"
 #include "tqstring.h"
 #include "tqdict.h"
 #include "tqobject.h"
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index 293f374e5..ac7a405ef 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -42,7 +42,7 @@
 #include "ntqapplication.h"
 #include "tqobject.h"
 #include "tqobjectlist.h"
-#include "ntqsignalslotimp.h"
+#include "tqsignalslotimp.h"
 #include "tqregexp.h"
 #include "ntqmetaobject.h"
 #include <private/qucom_p.h>
diff --git a/src/kernel/qprocess.cpp b/src/kernel/tqprocess.cpp
index f052c9cb8..b3837d7d9 100644
--- a/src/kernel/qprocess.cpp
+++ b/src/kernel/tqprocess.cpp
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "ntqprocess.h"
+#include "tqprocess.h"
 
 #ifndef TQT_NO_PROCESS
 
@@ -53,7 +53,7 @@
 
 
 /*!
-    \class TQProcess ntqprocess.h
+    \class TQProcess tqprocess.h
 
     \brief The TQProcess class is used to start external programs and
     to communicate with them.
diff --git a/src/kernel/ntqprocess.h b/src/kernel/tqprocess.h
index 69dba4d6c..40b6c11a5 100644
--- a/src/kernel/ntqprocess.h
+++ b/src/kernel/tqprocess.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqobject.h"
 #include "tqstringlist.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 #endif // QT_H
 
 #ifndef TQT_NO_PROCESS
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/tqprocess_unix.cpp
index a8ed9e4da..e065de514 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/tqprocess_unix.cpp
@@ -45,14 +45,14 @@
 #undef connect
 #endif
 
-#include "ntqprocess.h"
+#include "tqprocess.h"
 
 #ifndef TQT_NO_PROCESS
 
 #include "ntqapplication.h"
 #include "tqptrqueue.h"
 #include "tqptrlist.h"
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #include "tqtimer.h"
 #include "ntqcleanuphandler.h"
 #include "tqregexp.h"
@@ -201,7 +201,7 @@ private:
     TQSocketNotifier *sn;
 };
 
-static void qprocess_cleanup()
+static void tqprocess_cleanup()
 {
     delete TQProcessPrivate::procManager;
     TQProcessPrivate::procManager = 0;
@@ -359,7 +359,7 @@ void TQProcessManager::cleanup()
 void TQProcessManager::removeMe()
 {
     if ( procList->count() == 0 ) {
-	tqRemovePostRoutine(qprocess_cleanup);
+	tqRemovePostRoutine(tqprocess_cleanup);
 	TQProcessPrivate::procManager = 0;
 	delete this;
     }
@@ -469,7 +469,7 @@ void TQProcessManager::sigchldHnd( int fd )
 	sn->setEnabled( TRUE );
 }
 
-#include "qprocess_unix.moc"
+#include "tqprocess_unix.moc"
 
 
 /***********************************************************************
@@ -545,7 +545,7 @@ void TQProcessPrivate::newProc( pid_t pid, TQProcess *process )
     proc = new TQProc( pid, process );
     if ( procManager == 0 ) {
 	procManager = new TQProcessManager;
-	tqAddPostRoutine(qprocess_cleanup);
+	tqAddPostRoutine(tqprocess_cleanup);
     }
     // the TQProcessManager takes care of deleting the TQProc instances
     procManager->append( proc );
@@ -792,7 +792,7 @@ bool TQProcess::start( TQStringList *env )
     // in case the process exits quickly.
     if ( d->procManager == 0 ) {
 	d->procManager = new TQProcessManager;
-	tqAddPostRoutine(qprocess_cleanup);
+	tqAddPostRoutine(tqprocess_cleanup);
     }
 
     // fork and exec
diff --git a/src/kernel/qsignal.cpp b/src/kernel/tqsignal.cpp
index f9c6c233a..22e325031 100644
--- a/src/kernel/qsignal.cpp
+++ b/src/kernel/tqsignal.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "ntqmetaobject.h"
 #include "ntqguardedptr.h"
 
 /*!
-    \class TQSignal ntqsignal.h
+    \class TQSignal tqsignal.h
     \brief The TQSignal class can be used to send signals for classes
     that don't inherit TQObject.
 
@@ -67,7 +67,7 @@
 
     Example:
     \code
-	#include <ntqsignal.h>
+	#include <tqsignal.h>
 
 	class MyClass
 	{
diff --git a/src/kernel/ntqsignal.h b/src/kernel/tqsignal.h
index bb3875a09..bb3875a09 100644
--- a/src/kernel/ntqsignal.h
+++ b/src/kernel/tqsignal.h
diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/tqsignalmapper.cpp
index aff53a3c2..08a7b9400 100644
--- a/src/kernel/qsignalmapper.cpp
+++ b/src/kernel/tqsignalmapper.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsignalmapper.h"
+#include "tqsignalmapper.h"
 #ifndef TQT_NO_SIGNALMAPPER
 #include "tqptrdict.h"
 
@@ -67,7 +67,7 @@ public:
 };
 
 /*!
-    \class TQSignalMapper ntqsignalmapper.h
+    \class TQSignalMapper tqsignalmapper.h
     \brief The TQSignalMapper class bundles signals from identifiable senders.
 
     \ingroup io
diff --git a/src/kernel/ntqsignalmapper.h b/src/kernel/tqsignalmapper.h
index aed7e72d4..aed7e72d4 100644
--- a/src/kernel/ntqsignalmapper.h
+++ b/src/kernel/tqsignalmapper.h
diff --git a/src/kernel/ntqsignalslotimp.h b/src/kernel/tqsignalslotimp.h
index 80c18b5d2..80c18b5d2 100644
--- a/src/kernel/ntqsignalslotimp.h
+++ b/src/kernel/tqsignalslotimp.h
diff --git a/src/kernel/tqsize.cpp b/src/kernel/tqsize.cpp
index ba9c3df6b..f35ad18a5 100644
--- a/src/kernel/tqsize.cpp
+++ b/src/kernel/tqsize.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqsize.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 
 /*!
diff --git a/src/kernel/qsocketnotifier.cpp b/src/kernel/tqsocketnotifier.cpp
index b89a512ed..1a6390893 100644
--- a/src/kernel/qsocketnotifier.cpp
+++ b/src/kernel/tqsocketnotifier.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #include "ntqapplication.h"
 #include "ntqevent.h"
 #include "ntqeventloop.h"
@@ -50,7 +50,7 @@
 
 
 /*!
-    \class TQSocketNotifier ntqsocketnotifier.h
+    \class TQSocketNotifier tqsocketnotifier.h
     \brief The TQSocketNotifier class provides support for socket callbacks.
 
     \ingroup io
diff --git a/src/kernel/ntqsocketnotifier.h b/src/kernel/tqsocketnotifier.h
index 717be3898..717be3898 100644
--- a/src/kernel/ntqsocketnotifier.h
+++ b/src/kernel/tqsocketnotifier.h
diff --git a/src/kernel/tqtimer.cpp b/src/kernel/tqtimer.cpp
index 11fecf81f..3d19923e8 100644
--- a/src/kernel/tqtimer.cpp
+++ b/src/kernel/tqtimer.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqtimer.h"
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "tqobjectlist.h"
 
 /*!
diff --git a/src/kernel/tqttdeintegration_x11.cpp b/src/kernel/tqttdeintegration_x11.cpp
index cf96ba280..c1b99f188 100644
--- a/src/kernel/tqttdeintegration_x11.cpp
+++ b/src/kernel/tqttdeintegration_x11.cpp
@@ -4,7 +4,7 @@
 #include "tqttdeintegration_x11_p.h"
 
 #include <ntqcolordialog.h>
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqfontdialog.h>
 #include <ntqlibrary.h>
 #include <tqregexp.h>
diff --git a/src/kernel/qurl.cpp b/src/kernel/tqurl.cpp
index 827e6875d..d2fcd9c59 100644
--- a/src/kernel/qurl.cpp
+++ b/src/kernel/tqurl.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqurl.h"
+#include "tqurl.h"
 
 #ifndef TQT_NO_URL
 
-#include "ntqdir.h"
+#include "tqdir.h"
 
 #include <stdlib.h>
 
@@ -92,7 +92,7 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
 
 
 /*!
-    \class TQUrl ntqurl.h
+    \class TQUrl tqurl.h
 
     \brief The TQUrl class provides a URL parser and simplifies working with URLs.
 \if defined(commercial)
diff --git a/src/kernel/ntqurl.h b/src/kernel/tqurl.h
index 741719d44..741719d44 100644
--- a/src/kernel/ntqurl.h
+++ b/src/kernel/tqurl.h
diff --git a/src/kernel/qurlinfo.cpp b/src/kernel/tqurlinfo.cpp
index 30ea9738d..5f1c9e519 100644
--- a/src/kernel/qurlinfo.cpp
+++ b/src/kernel/tqurlinfo.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqurlinfo.h"
+#include "tqurlinfo.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL
 
-#include "ntqurloperator.h"
-#include "ntqdir.h"
+#include "tqurloperator.h"
+#include "tqdir.h"
 #include <limits.h>
 
 class TQUrlInfoPrivate
@@ -81,7 +81,7 @@ public:
 
 
 /*!
-    \class TQUrlInfo ntqurlinfo.h
+    \class TQUrlInfo tqurlinfo.h
     \brief The TQUrlInfo class stores information about URLs.
 
     \ingroup io
@@ -243,7 +243,7 @@ TQUrlInfo::TQUrlInfo( const TQUrl &url, int permissions, const TQString &owner,
 
 /*!
     Sets the name of the URL to \a name. The name is the full text,
-    for example, "http://doc.trolltech.com/ntqurlinfo.html".
+    for example, "http://doc.trolltech.com/tqurlinfo.html".
 
     If you call this function for an invalid URL info, this function
     turns it into a valid one.
diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/tqurlinfo.h
index 8c0269f84..8c0269f84 100644
--- a/src/kernel/ntqurlinfo.h
+++ b/src/kernel/tqurlinfo.h
diff --git a/src/kernel/qurloperator.cpp b/src/kernel/tqurloperator.cpp
index 5dc39e29c..f7705bc2e 100644
--- a/src/kernel/qurloperator.cpp
+++ b/src/kernel/tqurloperator.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "ntqurloperator.h"
+#include "tqurloperator.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL
 
-#include "ntqurlinfo.h"
-#include "ntqnetworkprotocol.h"
+#include "tqurlinfo.h"
+#include "tqnetworkprotocol.h"
 #include "tqmap.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 #include "tqptrdict.h"
 #include "ntqguardedptr.h"
 
@@ -89,7 +89,7 @@ public:
 };
 
 /*!
-    \class TQUrlOperator ntqurloperator.h
+    \class TQUrlOperator tqurloperator.h
 
     \brief The TQUrlOperator class provides common operations on URLs.
 \if defined(commercial)
diff --git a/src/kernel/ntqurloperator.h b/src/kernel/tqurloperator.h
index eedc6bb29..bad14db39 100644
--- a/src/kernel/ntqurloperator.h
+++ b/src/kernel/tqurloperator.h
@@ -43,9 +43,9 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqurl.h"
+#include "tqurl.h"
 #include "tqptrlist.h"
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 #include "tqstringlist.h" // TQString->TQStringList conversion
 #endif // QT_H
 
diff --git a/src/kernel/tqwidget_p.h b/src/kernel/tqwidget_p.h
index 7dff862e5..0c0eb9460 100644
--- a/src/kernel/tqwidget_p.h
+++ b/src/kernel/tqwidget_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qapplication_*.cpp, tqwidget*.cpp and qfiledialog.cpp.  This header
+// of qapplication_*.cpp, tqwidget*.cpp and tqfiledialog.cpp.  This header
 // file may change from version to version without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/libqt.map b/src/libqt.map
index 05875f9b0..999b36eac 100644
--- a/src/libqt.map
+++ b/src/libqt.map
@@ -7,17 +7,17 @@
   local:
   extern "C++"
   {
-	QClipboardWatcher::*;
+	TQClipboardWatcher::*;
 	QColorLuminancePicker::*;
 	QErrorMessageTextView::*;
 	QETWidget::*;
 	QFDProgress*;
-	QFileDialogQFileListView::*;
-	QFtpDTP::*;
-	QFtpPI*;
-	QHttpNormalRequest::*;
-	QHttpRequest::*;
-	QHttpResponseHeader::*;
+	TQFileDialogTQFileListView::*;
+	TQFtpDTP::*;
+	TQFtpPI*;
+	TQHttpNormalRequest::*;
+	TQHttpRequest::*;
+	TQHttpResponseHeader::*;
 	TQMainWindowLayout::*;
 	Q*Private::*;    # collides with QGuardedPtrPrivate
 	QPSPrinter*;
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index 95b2c796b..dabdef560 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -12,20 +12,20 @@ INCLUDEPATH	+= $$QT_SOURCE_TREE/include ../tools .
 DEPENDPATH	+= $$QT_SOURCE_TREE/include ../tools .
 LIBS		=
 OBJECTS_DIR	= .
-SOURCES		= ../tools/qbuffer.cpp	    \
+SOURCES		= ../tools/tqbuffer.cpp	    \
 		  ../tools/tqptrcollection.cpp  \
 		  ../tools/tqcstring.cpp	    \
-		  ../tools/qdatastream.cpp  \
+		  ../tools/tqdatastream.cpp  \
 		  ../tools/tqdatetime.cpp    \
-		  ../tools/qfile.cpp	    \
-		  ../tools/qdir.cpp	    \
-		  ../tools/qfileinfo.cpp    \
+		  ../tools/tqfile.cpp	    \
+		  ../tools/tqdir.cpp	    \
+		  ../tools/tqfileinfo.cpp    \
 		  ../tools/qgarray.cpp	    \
 		  ../tools/qgdict.cpp	    \
 		  ../tools/qglist.cpp	    \
 		  ../tools/qglobal.cpp	    \
 		  ../tools/qgvector.cpp	    \
-		  ../tools/qiodevice.cpp    \
+		  ../tools/tqiodevice.cpp    \
 		  ../tools/tqregexp.cpp	    \
 		  ../tools/tqstring.cpp	    \
 		  ../tools/qlocale.cpp	    \
@@ -45,8 +45,8 @@ isEmpty(QT_PRODUCT)|contains(QT_PRODUCT, qt-internal) {
     SOURCES   += moc_yacc.cpp
 }
 
-unix:SOURCES	+= ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
-win32:SOURCES	+= ../tools/qfile_win.cpp ../tools/qdir_win.cpp ../tools/qfileinfo_win.cpp
+unix:SOURCES	+= ../tools/tqfile_unix.cpp ../tools/tqdir_unix.cpp ../tools/tqfileinfo_unix.cpp
+win32:SOURCES	+= ../tools/tqfile_win.cpp ../tools/tqdir_win.cpp ../tools/tqfileinfo_win.cpp
 macx:LIBS	+= -framework Carbon
 
 target.path=$$bins.path
diff --git a/src/moc/moc.y b/src/moc/moc.y
index e41c644f2..1691c5805 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -62,8 +62,8 @@ void yyerror( const char *msg );
 #include "tqasciidict.h"
 #include "tqdatetime.h"
 #include "tqdict.h"
-#include "ntqfile.h"
-#include "ntqdir.h"
+#include "tqfile.h"
+#include "tqdir.h"
 #include "tqptrlist.h"
 #include "tqregexp.h"
 #include "tqstrlist.h"
@@ -3117,7 +3117,7 @@ void generateClass()		      // generate C++ source code for a class
 	if ( !predef_call_func && !included_list_headers ) {
 	    // yes we need it, because otherwise TQT_VERSION may not be defined
 	    fprintf( out, "\n#include <%stqobjectdefs.h>\n", (const char*)g->qtPath );
-	    fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "#include <%stqsignalslotimp.h>\n", (const char*)g->qtPath );
 	    included_list_headers = TRUE;
 	}
 
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index 9135ff29b..dcf19ab2a 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -75,8 +75,8 @@ void yyerror( const char *msg );
 #include "tqasciidict.h"
 #include "tqdatetime.h"
 #include "tqdict.h"
-#include "ntqfile.h"
-#include "ntqdir.h"
+#include "tqfile.h"
+#include "tqdir.h"
 #include "tqptrlist.h"
 #include "tqregexp.h"
 #include "tqstrlist.h"
@@ -5992,7 +5992,7 @@ void generateClass()		      // generate C++ source code for a class
 	if ( !predef_call_func && !included_list_headers ) {
 	    // yes we need it, because otherwise TQT_VERSION may not be defined
 	    fprintf( out, "\n#include <%stqobjectdefs.h>\n", (const char*)g->qtPath );
-	    fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "#include <%stqsignalslotimp.h>\n", (const char*)g->qtPath );
 	    included_list_headers = TRUE;
 	}
 
diff --git a/src/network/qt_network.pri b/src/network/qt_network.pri
index e5f17a996..72b7642af 100644
--- a/src/network/qt_network.pri
+++ b/src/network/qt_network.pri
@@ -1,23 +1,23 @@
 # TQt network module
 
 network {
-	HEADERS += $$NETWORK_H/ntqdns.h \
-		    $$NETWORK_H/ntqftp.h \
-		    $$NETWORK_H/ntqhttp.h \
-		    $$NETWORK_H/ntqhostaddress.h \
-		    $$NETWORK_H/ntqnetwork.h \
-		    $$NETWORK_H/ntqserversocket.h \
-		    $$NETWORK_H/ntqsocket.h \
-		    $$NETWORK_H/ntqsocketdevice.h
-	NETWORK_SOURCES	= $$NETWORK_CPP/qdns.cpp \
-		    $$NETWORK_CPP/qftp.cpp \
-		    $$NETWORK_CPP/qhttp.cpp \
-		    $$NETWORK_CPP/qhostaddress.cpp \
-		    $$NETWORK_CPP/qnetwork.cpp \
-		    $$NETWORK_CPP/qserversocket.cpp \
-		    $$NETWORK_CPP/qsocket.cpp \
-		    $$NETWORK_CPP/qsocketdevice.cpp
-	unix:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_unix.cpp
-	win32:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_win.cpp
+	HEADERS += $$NETWORK_H/tqdns.h \
+		    $$NETWORK_H/tqftp.h \
+		    $$NETWORK_H/tqhttp.h \
+		    $$NETWORK_H/tqhostaddress.h \
+		    $$NETWORK_H/tqnetwork.h \
+		    $$NETWORK_H/tqserversocket.h \
+		    $$NETWORK_H/tqsocket.h \
+		    $$NETWORK_H/tqsocketdevice.h
+	NETWORK_SOURCES	= $$NETWORK_CPP/tqdns.cpp \
+		    $$NETWORK_CPP/tqftp.cpp \
+		    $$NETWORK_CPP/tqhttp.cpp \
+		    $$NETWORK_CPP/tqhostaddress.cpp \
+		    $$NETWORK_CPP/tqnetwork.cpp \
+		    $$NETWORK_CPP/tqserversocket.cpp \
+		    $$NETWORK_CPP/tqsocket.cpp \
+		    $$NETWORK_CPP/tqsocketdevice.cpp
+	unix:NETWORK_SOURCES += $$NETWORK_CPP/tqsocketdevice_unix.cpp
+	win32:NETWORK_SOURCES += $$NETWORK_CPP/tqsocketdevice_win.cpp
 	SOURCES    += $$NETWORK_SOURCES
 }
diff --git a/src/network/qdns.cpp b/src/network/tqdns.cpp
index 7ae3a53f4..4b215eb1d 100644
--- a/src/network/qdns.cpp
+++ b/src/network/tqdns.cpp
@@ -60,7 +60,7 @@
 # undef socket
 #endif
 
-#include "ntqdns.h"
+#include "tqdns.h"
 
 #ifndef TQT_NO_DNS
 
@@ -73,9 +73,9 @@
 #include "tqptrvector.h"
 #include "tqstrlist.h"
 #include "tqptrdict.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "tqtextstream.h"
-#include "ntqsocketdevice.h"
+#include "tqsocketdevice.h"
 #include "ntqcleanuphandler.h"
 #include <limits.h>
 #ifdef Q_OS_MAC
@@ -89,7 +89,7 @@ static TQ_UINT16 id; // ### seeded started by now()
 
 static TQDateTime * originOfTime = 0;
 
-static TQCleanupHandler<TQDateTime> qdns_cleanup_time;
+static TQCleanupHandler<TQDateTime> tqdns_cleanup_time;
 
 static TQ_UINT32 now()
 {
@@ -98,7 +98,7 @@ static TQ_UINT32 now()
 
     originOfTime = new TQDateTime( TQDateTime::currentDateTime() );
     ::id = originOfTime->time().msec() * 60 + originOfTime->time().second();
-    qdns_cleanup_time.add( &originOfTime );
+    tqdns_cleanup_time.add( &originOfTime );
     return 0;
 }
 
@@ -113,7 +113,7 @@ static bool ipv6support = FALSE;
 
 #if defined(Q_MODERN_RES_API)
 #else
-static int qdns_res_init()
+static int tqdns_res_init()
 {
 #ifdef Q_OS_MAC
     typedef int (*PtrRes_init)();
@@ -1605,7 +1605,7 @@ void TQDnsSocket::answer()
 
 
 /*!
-    \class TQDns ntqdns.h
+    \class TQDns tqdns.h
     \brief The TQDns class provides asynchronous DNS lookups.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2321,7 +2321,7 @@ typedef struct {
 #endif
 typedef DWORD (WINAPI *GNP)( PFIXED_INFO, PULONG );
 
-// ### FIXME: this code is duplicated in qfiledialog.cpp
+// ### FIXME: this code is duplicated in tqfiledialog.cpp
 static TQString getWindowsRegString( HKEY key, const TQString &subKey )
 {
     TQString s;
@@ -2612,7 +2612,7 @@ void TQDns::doResInit()
 	if ( *res.defdname )
 	    domains->append( TQString::fromLatin1( res.defdname ).lower() );
 #else
-	qdns_res_init();
+	tqdns_res_init();
 	int i;
 	// find the name servers to use
 	for( i=0; i < MAXNS && i < _res.nscount; i++ )
diff --git a/src/network/ntqdns.h b/src/network/tqdns.h
index 491b6fce5..703edb229 100644
--- a/src/network/ntqdns.h
+++ b/src/network/tqdns.h
@@ -43,8 +43,8 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqhostaddress.h"
-#include "ntqsocketnotifier.h"
+#include "tqhostaddress.h"
+#include "tqsocketnotifier.h"
 #include "tqstringlist.h"
 #endif // QT_H
 
diff --git a/src/network/qftp.cpp b/src/network/tqftp.cpp
index 259e7826a..8c7dbb184 100644
--- a/src/network/qftp.cpp
+++ b/src/network/tqftp.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "ntqftp.h"
+#include "tqftp.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL_FTP
 
-#include "ntqsocket.h"
-#include "ntqsocketdevice.h"
-#include "ntqurlinfo.h"
-#include "ntqurloperator.h"
+#include "tqsocket.h"
+#include "tqsocketdevice.h"
+#include "tqurlinfo.h"
+#include "tqurloperator.h"
 #include "tqstringlist.h"
 #include "tqregexp.h"
 #include "tqtimer.h"
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #include "tqptrdict.h" // binary compatibility
 
 #ifndef TQT_NO_TEXTCODEC
@@ -1062,7 +1062,7 @@ static void delete_d( const TQFtp* foo )
  *
  *********************************************************************/
 /*!
-    \class TQFtp ntqftp.h
+    \class TQFtp tqftp.h
     \brief The TQFtp class provides an implementation of the FTP protocol.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2412,6 +2412,6 @@ void TQFtp::error( int )
 {
 }
 
-#include "qftp.moc"
+#include "tqftp.moc"
 
 #endif // TQT_NO_NETWORKPROTOCOL_FTP
diff --git a/src/network/ntqftp.h b/src/network/tqftp.h
index 91100e39d..593b21fc0 100644
--- a/src/network/ntqftp.h
+++ b/src/network/tqftp.h
@@ -43,8 +43,8 @@
 
 #ifndef QT_H
 #include "tqstring.h" // char*->TQString conversion
-#include "ntqurlinfo.h"
-#include "ntqnetworkprotocol.h"
+#include "tqurlinfo.h"
+#include "tqnetworkprotocol.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qhostaddress.cpp b/src/network/tqhostaddress.cpp
index 5ea478175..07d08c492 100644
--- a/src/network/qhostaddress.cpp
+++ b/src/network/tqhostaddress.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqhostaddress.h"
+#include "tqhostaddress.h"
 #include "tqstringlist.h"
 
 #ifndef TQT_NO_NETWORK
@@ -83,7 +83,7 @@ TQHostAddressPrivate::TQHostAddressPrivate(const Q_IPV6ADDR &a_) : a(0), isIp4(F
 }
 
 /*!
-    \class TQHostAddress ntqhostaddress.h
+    \class TQHostAddress tqhostaddress.h
     \brief The TQHostAddress class provides an IP address.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqhostaddress.h b/src/network/tqhostaddress.h
index 0d5a884df..0d5a884df 100644
--- a/src/network/ntqhostaddress.h
+++ b/src/network/tqhostaddress.h
diff --git a/src/network/qhttp.cpp b/src/network/tqhttp.cpp
index 9569b2080..6bf6f1740 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/tqhttp.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "ntqhttp.h"
+#include "tqhttp.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL_HTTP
 
-#include "ntqsocket.h"
+#include "tqsocket.h"
 #include "tqtextstream.h"
 #include "tqmap.h"
 #include "tqstring.h"
 #include "tqstringlist.h"
 #include "tqcstring.h"
-#include "ntqbuffer.h"
-#include "ntqurloperator.h"
+#include "tqbuffer.h"
+#include "tqurloperator.h"
 #include "tqtimer.h"
 #include "private/qinternal_p.h"
 
@@ -332,7 +332,7 @@ void TQHttpCloseRequest::start( TQHttp *http )
  ****************************************************/
 
 /*!
-    \class TQHttpHeader ntqhttp.h
+    \class TQHttpHeader tqhttp.h
     \brief The TQHttpHeader class contains header information for HTTP.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -674,7 +674,7 @@ void TQHttpHeader::setContentType( const TQString& type )
  ****************************************************/
 
 /*!
-    \class TQHttpResponseHeader ntqhttp.h
+    \class TQHttpResponseHeader tqhttp.h
     \brief The TQHttpResponseHeader class contains response header information for HTTP.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -837,7 +837,7 @@ TQString TQHttpResponseHeader::toString() const
  ****************************************************/
 
 /*!
-    \class TQHttpRequestHeader ntqhttp.h
+    \class TQHttpRequestHeader tqhttp.h
     \brief The TQHttpRequestHeader class contains request header information for
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -1011,7 +1011,7 @@ TQString TQHttpRequestHeader::toString() const
  *
  ****************************************************/
 /*!
-    \class TQHttp ntqhttp.h
+    \class TQHttp tqhttp.h
     \brief The TQHttp class provides an implementation of the HTTP protocol.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqhttp.h b/src/network/tqhttp.h
index 9a2667d7b..f1e68454f 100644
--- a/src/network/ntqhttp.h
+++ b/src/network/tqhttp.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 #include "tqstringlist.h"
 #endif // QT_H
 
diff --git a/src/network/qnetwork.cpp b/src/network/tqnetwork.cpp
index f0af49fef..8da37cb6c 100644
--- a/src/network/qnetwork.cpp
+++ b/src/network/tqnetwork.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "ntqnetwork.h"
+#include "tqnetwork.h"
 
 #ifndef TQT_NO_NETWORK
 
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 
 // protocols
-#include "ntqftp.h"
-#include "ntqhttp.h"
+#include "tqftp.h"
+#include "tqhttp.h"
 
-/*! \file ntqnetwork.h */
+/*! \file tqnetwork.h */
 /*!
     \relates TQUrlOperator
 
@@ -56,7 +56,7 @@
     You must call this function before you use TQUrlOperator for
     these protocols.
 
-    This function is declared in \l ntqnetwork.h.
+    This function is declared in \l tqnetwork.h.
 */
 void tqInitNetworkProtocols()
 {
diff --git a/src/network/ntqnetwork.h b/src/network/tqnetwork.h
index 7f6de06d3..7f6de06d3 100644
--- a/src/network/ntqnetwork.h
+++ b/src/network/tqnetwork.h
diff --git a/src/network/qserversocket.cpp b/src/network/tqserversocket.cpp
index 44728d742..456add216 100644
--- a/src/network/qserversocket.cpp
+++ b/src/network/tqserversocket.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqserversocket.h"
+#include "tqserversocket.h"
 
 #ifndef TQT_NO_NETWORK
 
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 
 class TQServerSocketPrivate {
 public:
@@ -54,7 +54,7 @@ public:
 
 
 /*!
-    \class TQServerSocket ntqserversocket.h
+    \class TQServerSocket tqserversocket.h
     \brief The TQServerSocket class provides a TCP-based server.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqserversocket.h b/src/network/tqserversocket.h
index ab9c242ed..2ceefb41e 100644
--- a/src/network/ntqserversocket.h
+++ b/src/network/tqserversocket.h
@@ -43,8 +43,8 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqhostaddress.h"
-#include "ntqsocketdevice.h" // ### remove or keep for users' convenience?
+#include "tqhostaddress.h"
+#include "tqsocketdevice.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 #ifndef TQT_NO_NETWORK
 
diff --git a/src/network/qsocket.cpp b/src/network/tqsocket.cpp
index 17050c9c1..3a088c514 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/tqsocket.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqsocket.h"
+#include "tqsocket.h"
 #ifndef TQT_NO_NETWORK
 #include "tqptrlist.h"
 #include "tqtimer.h"
-#include "ntqsocketdevice.h"
-#include "ntqdns.h"
+#include "tqsocketdevice.h"
+#include "tqdns.h"
 #include "private/qinternal_p.h"
 
 #include <string.h>
@@ -224,7 +224,7 @@ void TQSocketPrivate::setSocketDevice( TQSocket *q, TQSocketDevice *device )
 }
 
 /*!
-    \class TQSocket ntqsocket.h
+    \class TQSocket tqsocket.h
     \brief The TQSocket class provides a buffered TCP connection.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqsocket.h b/src/network/tqsocket.h
index 4946e81f5..5af4a21ab 100644
--- a/src/network/ntqsocket.h
+++ b/src/network/tqsocket.h
@@ -43,8 +43,8 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqiodevice.h"
-#include "ntqhostaddress.h" // int->TQHostAddress conversion
+#include "tqiodevice.h"
+#include "tqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
 #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qsocketdevice.cpp b/src/network/tqsocketdevice.cpp
index 803cca84b..1c6ce552f 100644
--- a/src/network/qsocketdevice.cpp
+++ b/src/network/tqsocketdevice.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsocketdevice.h"
+#include "tqsocketdevice.h"
 #ifndef TQT_NO_NETWORK
 
 #include "ntqwindowdefs.h"
@@ -60,7 +60,7 @@ public:
 
 
 /*!
-    \class TQSocketDevice ntqsocketdevice.h
+    \class TQSocketDevice tqsocketdevice.h
     \brief The TQSocketDevice class provides a platform-independent low-level socket API.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqsocketdevice.h b/src/network/tqsocketdevice.h
index cad469017..b87dbc07d 100644
--- a/src/network/ntqsocketdevice.h
+++ b/src/network/tqsocketdevice.h
@@ -42,8 +42,8 @@
 #define TQSOCKETDEVICE_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
-#include "ntqhostaddress.h" // int->TQHostAddress conversion
+#include "tqiodevice.h"
+#include "tqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
 #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/tqsocketdevice_unix.cpp
index 9ac0b605e..0727f6a14 100644
--- a/src/network/qsocketdevice_unix.cpp
+++ b/src/network/tqsocketdevice_unix.cpp
@@ -80,7 +80,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol)
 # undef socket
 #endif
 
-#include "ntqsocketdevice.h"
+#include "tqsocketdevice.h"
 
 #ifndef TQT_NO_NETWORK
 
diff --git a/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
index a63ddf37d..de7fde7e2 100644
--- a/src/sql/drivers/sqlite/tqsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
@@ -16,7 +16,7 @@
 
 #include <tqdatetime.h>
 #include <tqregexp.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqptrvector.h>
 #if !defined TQ_WS_WIN32
 #  include <unistd.h>
diff --git a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
index d1cc24ec8..f75feaa1b 100644
--- a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
+++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
@@ -17,7 +17,7 @@
 #include <tqdatetime.h>
 #include <tqvaluevector.h>
 #include <tqregexp.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <sqlite3.h>
 #include <tqptrvector.h>
 #if !defined TQ_WS_WIN32
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 2d449fd9c..64115edf3 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -718,7 +718,7 @@ typedef TQ_UINT64		TQ_ULLONG;	// unsigned long long
 
 
 //
-// Data stream functions is provided by many classes (defined in ntqdatastream.h)
+// Data stream functions is provided by many classes (defined in tqdatastream.h)
 //
 
 class TQCString;
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index cc7647da9..2d95ce54a 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -40,8 +40,8 @@
 
 #ifndef TQT_NO_COMPONENT
 #include <ntqapplication.h>
-#include <ntqsettings.h>
-#include <ntqfileinfo.h>
+#include <tqsettings.h>
+#include <tqfileinfo.h>
 #include <tqdatetime.h>
 #include <ntqcleanuphandler.h>
 #ifndef NO_ERRNO_H
diff --git a/src/tools/qcomponentfactory.cpp b/src/tools/qcomponentfactory.cpp
index 12fe33e10..0186e7843 100644
--- a/src/tools/qcomponentfactory.cpp
+++ b/src/tools/qcomponentfactory.cpp
@@ -41,9 +41,9 @@
 #include "qcomponentfactory_p.h"
 
 #ifndef TQT_NO_COMPONENT
-#include "ntqsettings.h"
+#include "tqsettings.h"
 #include <private/qcomlibrary_p.h>
-#include "ntqdir.h"
+#include "tqdir.h"
 #include "ntqapplication.h"
 
 /*!
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 6bf19b125..2d4027527 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -182,7 +182,7 @@ SeeAlso: ???
 Feature: DIR
 Section: File I/O
 Requires: STRINGLIST REGEXP
-Name: QDir
+Name: TQDir
 SeeAlso: ???
 
 Feature: PALETTE
@@ -200,7 +200,7 @@ SeeAlso: ???
 Feature: DATASTREAM
 Section: File I/O
 Requires:
-Name: QDataStream
+Name: TQDataStream
 SeeAlso: ???
 
 Feature: LIBRARY
@@ -224,7 +224,7 @@ SeeAlso: ???
 Feature: SIGNALMAPPER
 Section: Widgets
 Requires:
-Name: QSignalMapper
+Name: TQSignalMapper
 SeeAlso: ???
 
 Feature: IMAGEIO
@@ -1006,7 +1006,7 @@ SeeAlso: ???
 Feature: FILEDIALOG
 Section: Widgets
 Requires: MESSAGEBOX LISTVIEW NETWORKPROTOCOL COMBOBOX DIALOG REGEXP_CAPTURE TOOLBUTTON BUTTONGROUP VBOX SPLITTER PROGRESSBAR WIDGETSTACK DATESTRING
-Name: QFileDialog
+Name: TQFileDialog
 SeeAlso: ???
 
 Feature: FONTDIALOG
diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp
index 50d2816ee..dd35d64e3 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/qgdict.cpp
@@ -41,7 +41,7 @@
 #include "ntqgdict.h"
 #include "tqptrlist.h"
 #include "tqstring.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include <ctype.h>
 
 /*!
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index 95e66b38f..7ffa66d4d 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqglist.h"
 #include "ntqgvector.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqvaluelist.h"
 
 #if defined(TQT_THREAD_SUPPORT)
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp
index 3a7c321fd..b2b5bf63d 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/qgpluginmanager.cpp
@@ -40,7 +40,7 @@
 #ifndef TQT_NO_COMPONENT
 #include "qcomlibrary_p.h"
 #include "tqmap.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 
 /*
   The following co-occurrence code is borrowed from TQt Linguist.
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index 1c6c8669e..03b502c0b 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -48,7 +48,7 @@
 #include "ntqgvector.h"
 #include "ntqglist.h"
 #include "tqstring.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include <stdlib.h>
 
 #ifdef TQT_THREAD_SUPPORT
diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp
index 002f33215..6b586fcdf 100644
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/qlibrary.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 #include <private/qlibrary_p.h>
 #include <tqstringlist.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 
 #ifndef TQT_NO_LIBRARY
 
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index dc9fa2753..c4cced519 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -6,21 +6,21 @@ tools {
 		  $$TOOLS_H/tqasciicache.h \
 		  $$TOOLS_H/tqasciidict.h \
 		  $$TOOLS_H/tqbitarray.h \
-		  $$TOOLS_H/ntqbuffer.h \
+		  $$TOOLS_H/tqbuffer.h \
 		  $$TOOLS_H/tqcache.h \
 		  $$TOOLS_H/ntqcleanuphandler.h \
 		  $$TOOLS_P/qcomponentfactory_p.h \
 		  $$TOOLS_P/qcomlibrary_p.h \
 		  $$TOOLS_H/tqcstring.h \
-		  $$TOOLS_H/ntqdatastream.h \
+		  $$TOOLS_H/tqdatastream.h \
 		  $$TOOLS_H/tqdatetime.h \
 		  $$TOOLS_H/tqdeepcopy.h \
 		  $$TOOLS_H/tqdict.h \
-		  $$TOOLS_H/ntqdir.h \
-		  $$TOOLS_P/qdir_p.h \
-		  $$TOOLS_H/ntqfile.h \
-		  $$TOOLS_P/qfiledefs_p.h \
-		  $$TOOLS_H/ntqfileinfo.h \
+		  $$TOOLS_H/tqdir.h \
+		  $$TOOLS_P/tqdir_p.h \
+		  $$TOOLS_H/tqfile.h \
+		  $$TOOLS_P/tqfiledefs_p.h \
+		  $$TOOLS_H/tqfileinfo.h \
 		  $$TOOLS_H/ntqgarray.h \
 		  $$TOOLS_H/ntqgcache.h \
 		  $$TOOLS_H/ntqgdict.h \
@@ -31,7 +31,7 @@ tools {
 		  $$TOOLS_H/ntqgvector.h \
 		  $$TOOLS_H/tqintcache.h \
 		  $$TOOLS_H/tqintdict.h \
-		  $$TOOLS_H/ntqiodevice.h \
+		  $$TOOLS_H/tqiodevice.h \
 		  $$TOOLS_H/ntqlibrary.h \
 		  $$TOOLS_P/qlibrary_p.h \
 		  $$TOOLS_H/ntqlocale.h \
@@ -47,8 +47,8 @@ tools {
 		  $$TOOLS_H/tqptrqueue.h \
 		  $$TOOLS_H/tqregexp.h \
 		  $$TOOLS_H/tqsemaphore.h \
-		  $$TOOLS_H/ntqsettings.h \
-		  $$TOOLS_P/qsettings_p.h \
+		  $$TOOLS_H/tqsettings.h \
+		  $$TOOLS_P/tqsettings_p.h \
 		  $$TOOLS_H/ntqshared.h \
 		  $$TOOLS_H/tqptrstack.h \
 		  $$TOOLS_H/tqstring.h \
@@ -68,11 +68,11 @@ tools {
 		  $$TOOLS_P/qucom_p.h \
 		  $$TOOLS_H/ntquuid.h
 
-	win32:SOURCES += $$TOOLS_CPP/qdir_win.cpp \
-	 	  $$TOOLS_CPP/qfile_win.cpp \
-		  $$TOOLS_CPP/qfileinfo_win.cpp \
+	win32:SOURCES += $$TOOLS_CPP/tqdir_win.cpp \
+	 	  $$TOOLS_CPP/tqfile_win.cpp \
+		  $$TOOLS_CPP/tqfileinfo_win.cpp \
 		  $$TOOLS_CPP/qlibrary_win.cpp \
-		  $$TOOLS_CPP/qsettings_win.cpp \
+		  $$TOOLS_CPP/tqsettings_win.cpp \
 		  $$TOOLS_CPP/tqmutex_win.cpp \
 		  $$TOOLS_CPP/tqwaitcondition_win.cpp \
 		  $$TOOLS_CPP/tqthreadstorage_win.cpp \
@@ -81,25 +81,25 @@ tools {
 	win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp
 
 	wince-* {
-		SOURCES -= $$TOOLS_CPP/qdir_win.cpp \
-			   $$TOOLS_CPP/qfile_win.cpp \
-			   $$TOOLS_CPP/qfileinfo_win.cpp
-		SOURCES += $$TOOLS_CPP/qdir_wce.cpp \
-			   $$TOOLS_CPP/qfile_wce.cpp \
-			   $$TOOLS_CPP/qfileinfo_wce.cpp
+		SOURCES -= $$TOOLS_CPP/tqdir_win.cpp \
+			   $$TOOLS_CPP/tqfile_win.cpp \
+			   $$TOOLS_CPP/tqfileinfo_win.cpp
+		SOURCES += $$TOOLS_CPP/tqdir_wce.cpp \
+			   $$TOOLS_CPP/tqfile_wce.cpp \
+			   $$TOOLS_CPP/tqfileinfo_wce.cpp
 	}
 
-        offmac:SOURCES += $$TOOLS_CPP/qdir_mac.cpp \
-		  $$TOOLS_CPP/qfile_mac.cpp \
-		  $$TOOLS_CPP/qfileinfo_mac.cpp
-	else:unix:SOURCES += $$TOOLS_CPP/qdir_unix.cpp \
-		  $$TOOLS_CPP/qfile_unix.cpp \
-		  $$TOOLS_CPP/qfileinfo_unix.cpp \
+        offmac:SOURCES += $$TOOLS_CPP/tqdir_mac.cpp \
+		  $$TOOLS_CPP/tqfile_mac.cpp \
+		  $$TOOLS_CPP/tqfileinfo_mac.cpp
+	else:unix:SOURCES += $$TOOLS_CPP/tqdir_unix.cpp \
+		  $$TOOLS_CPP/tqfile_unix.cpp \
+		  $$TOOLS_CPP/tqfileinfo_unix.cpp \
 		  $$TOOLS_CPP/tqmutex_unix.cpp \
 		  $$TOOLS_CPP/tqthreadstorage_unix.cpp \
 		  $$TOOLS_CPP/tqwaitcondition_unix.cpp
 
-        mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
+        mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/tqsettings_mac.cpp
 	mac {
 		SOURCES+=3rdparty/dlcompat/dlfcn.c
 		INCLUDEPATH+=3rdparty/dlcompat
@@ -107,16 +107,16 @@ tools {
 	unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
 
 	SOURCES += $$TOOLS_CPP/tqbitarray.cpp \
-		  $$TOOLS_CPP/qbuffer.cpp \
+		  $$TOOLS_CPP/tqbuffer.cpp \
 		  $$TOOLS_CPP/qcomponentfactory.cpp \
 		  $$TOOLS_CPP/qcomlibrary.cpp \
 		  $$TOOLS_CPP/tqcstring.cpp \
-		  $$TOOLS_CPP/qdatastream.cpp \
+		  $$TOOLS_CPP/tqdatastream.cpp \
 		  $$TOOLS_CPP/tqdatetime.cpp \
 		  $$TOOLS_CPP/tqdeepcopy.cpp \
-		  $$TOOLS_CPP/qdir.cpp \
-		  $$TOOLS_CPP/qfile.cpp \
-		  $$TOOLS_CPP/qfileinfo.cpp \
+		  $$TOOLS_CPP/tqdir.cpp \
+		  $$TOOLS_CPP/tqfile.cpp \
+		  $$TOOLS_CPP/tqfileinfo.cpp \
 		  $$TOOLS_CPP/qgarray.cpp \
 		  $$TOOLS_CPP/qgcache.cpp \
 		  $$TOOLS_CPP/qgdict.cpp \
@@ -124,7 +124,7 @@ tools {
 		  $$TOOLS_CPP/qglobal.cpp \
 		  $$TOOLS_CPP/qgpluginmanager.cpp \
 		  $$TOOLS_CPP/qgvector.cpp \
-		  $$TOOLS_CPP/qiodevice.cpp \
+		  $$TOOLS_CPP/tqiodevice.cpp \
 		  $$TOOLS_CPP/qlibrary.cpp \
 		  $$TOOLS_CPP/qlocale.cpp \
 		  $$TOOLS_CPP/tqmap.cpp \
@@ -133,7 +133,7 @@ tools {
 		  $$TOOLS_CPP/tqregexp.cpp \
 		  $$TOOLS_CPP/tqstring.cpp \
 		  $$TOOLS_CPP/tqsemaphore.cpp \
-		  $$TOOLS_CPP/qsettings.cpp \
+		  $$TOOLS_CPP/tqsettings.cpp \
 		  $$TOOLS_CPP/tqstringlist.cpp \
 		  $$TOOLS_CPP/tqtextstream.cpp \
 		  $$TOOLS_CPP/qunicodetables.cpp \
diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp
index 34b6e3db7..b07eadd09 100644
--- a/src/tools/quuid.cpp
+++ b/src/tools/quuid.cpp
@@ -38,7 +38,7 @@
 
 #include "ntquuid.h"
 
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 /*!
     \class TQUuid ntquuid.h
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index cb5ce9c17..64422497e 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -7,9 +7,9 @@
 #include <tqobject.h>
 #include <ntqpoint.h>
 #include <ntqrect.h>
-#include <ntqsignalslotimp.h>
+#include <tqsignalslotimp.h>
 #include <tqwidget.h>
-#include <ntqhttp.h>
+#include <tqhttp.h>
 #include <private/tqsqlextension_p.h>
 #include <tqsqlindex.h>
 #include <ntqtable.h>
diff --git a/src/tools/tqbitarray.cpp b/src/tools/tqbitarray.cpp
index 283a99406..5eb33b92b 100644
--- a/src/tools/tqbitarray.cpp
+++ b/src/tools/tqbitarray.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqbitarray.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 #define SHBLOCK	 ((bitarr_data*)(sharedBlock()))
 
diff --git a/src/tools/qbuffer.cpp b/src/tools/tqbuffer.cpp
index b1707d78d..827f5c187 100644
--- a/src/tools/qbuffer.cpp
+++ b/src/tools/tqbuffer.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include <stdlib.h>
 
 /*!
-    \class TQBuffer ntqbuffer.h
+    \class TQBuffer tqbuffer.h
     \reentrant
     \brief The TQBuffer class is an I/O device that operates on a TQByteArray.
 
diff --git a/src/tools/ntqbuffer.h b/src/tools/tqbuffer.h
index 66f84e86f..ff5899826 100644
--- a/src/tools/ntqbuffer.h
+++ b/src/tools/tqbuffer.h
@@ -42,7 +42,7 @@
 #define TQBUFFER_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/tools/tqcstring.cpp b/src/tools/tqcstring.cpp
index d4af46412..8c09d227c 100644
--- a/src/tools/tqcstring.cpp
+++ b/src/tools/tqcstring.cpp
@@ -41,7 +41,7 @@
 
 #include "tqstring.h"
 #include "tqregexp.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 #ifdef TQT_THREAD_SUPPORT
 #  include <private/tqmutexpool_p.h>
diff --git a/src/tools/qdatastream.cpp b/src/tools/tqdatastream.cpp
index d5b7162f7..f2980a4e1 100644
--- a/src/tools/qdatastream.cpp
+++ b/src/tools/tqdatastream.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 #ifndef TQT_NO_DATASTREAM
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -52,7 +52,7 @@
 #endif
 
 /*!
-    \class TQDataStream ntqdatastream.h
+    \class TQDataStream tqdatastream.h
     \reentrant
     \brief The TQDataStream class provides serialization of binary data
     to a TQIODevice.
diff --git a/src/tools/ntqdatastream.h b/src/tools/tqdatastream.h
index 2d4063475..5111a2fb9 100644
--- a/src/tools/ntqdatastream.h
+++ b/src/tools/tqdatastream.h
@@ -42,7 +42,7 @@
 #define TQDATASTREAM_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/tools/tqdatetime.cpp b/src/tools/tqdatetime.cpp
index 5253fa50e..49ae68bb4 100644
--- a/src/tools/tqdatetime.cpp
+++ b/src/tools/tqdatetime.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 
 #include "tqdatetime.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqregexp.h"
 
 #include <stdio.h>
diff --git a/src/tools/qdir.cpp b/src/tools/tqdir.cpp
index 4ca6be4aa..21bea6afd 100644
--- a/src/tools/qdir.cpp
+++ b/src/tools/tqdir.cpp
@@ -39,11 +39,11 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 
 #ifndef TQT_NO_DIR
-#include <private/qdir_p.h>
-#include "ntqfileinfo.h"
+#include <private/tqdir_p.h>
+#include "tqfileinfo.h"
 #include "tqregexp.h"
 #include "tqstringlist.h"
 #include "tqdeepcopy.h"
@@ -151,7 +151,7 @@ const bool CaseSensitiveFS = TRUE;
     (excluding symbolic links), sorted by size, smallest first:
     \code
     #include <stdio.h>
-    #include <ntqdir.h>
+    #include <tqdir.h>
 
     int main( int argc, char **argv )
     {
diff --git a/src/tools/ntqdir.h b/src/tools/tqdir.h
index 04bd409ea..41ba93e8c 100644
--- a/src/tools/ntqdir.h
+++ b/src/tools/tqdir.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqglobal.h"
 #include "tqstrlist.h"
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qdir_p.h b/src/tools/tqdir_p.h
index a0309648b..d6c6fb2e8 100644
--- a/src/tools/qdir_p.h
+++ b/src/tools/tqdir_p.h
@@ -46,7 +46,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qdir.cpp and qdir_*.cpp.
+// of tqdir.cpp and tqdir_*.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/tools/qdir_unix.cpp b/src/tools/tqdir_unix.cpp
index e4418f8e6..3587a706a 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/tqdir_unix.cpp
@@ -39,12 +39,12 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 
 #ifndef TQT_NO_DIR
 
-#include "qdir_p.h"
-#include "ntqfileinfo.h"
+#include "tqdir_p.h"
+#include "tqfileinfo.h"
 #include "tqregexp.h"
 #include "tqstringlist.h"
 
diff --git a/src/tools/qfile.cpp b/src/tools/tqfile.cpp
index d5dae9a7e..06a127fc2 100644
--- a/src/tools/qfile.cpp
+++ b/src/tools/tqfile.cpp
@@ -50,7 +50,7 @@
 # undef truncate
 #endif
 
-#include "ntqfile.h"
+#include "tqfile.h"
 #ifndef NO_ERRNO_H
 #include <errno.h>
 #endif
@@ -78,7 +78,7 @@ public:
 extern bool qt_file_access( const TQString& fn, int t );
 
 /*!
-    \class TQFile ntqfile.h
+    \class TQFile tqfile.h
     \reentrant
     \brief The TQFile class is an I/O device that operates on files.
 
diff --git a/src/tools/ntqfile.h b/src/tools/tqfile.h
index ba2d9e103..f40e1e585 100644
--- a/src/tools/ntqfile.h
+++ b/src/tools/tqfile.h
@@ -42,7 +42,7 @@
 #define TQFILE_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqstring.h"
 #include <stdio.h>
 #endif // QT_H
diff --git a/src/tools/qfile_unix.cpp b/src/tools/tqfile_unix.cpp
index f28899483..a56466cda 100644
--- a/src/tools/qfile_unix.cpp
+++ b/src/tools/tqfile_unix.cpp
@@ -52,7 +52,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 # undef truncate
 #endif
 
-#include "ntqfile.h"
+#include "tqfile.h"
 #include <errno.h>
 #include <limits.h>
 
diff --git a/src/tools/qfiledefs_p.h b/src/tools/tqfiledefs_p.h
index 62d55583f..83f84d47b 100644
--- a/src/tools/qfiledefs_p.h
+++ b/src/tools/tqfiledefs_p.h
@@ -46,7 +46,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qfileinfo*.cpp.  This header file may change from version to version
+// of tqfileinfo*.cpp.  This header file may change from version to version
 // without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/tools/qfileinfo.cpp b/src/tools/tqfileinfo.cpp
index 60a39346a..e9ba95680 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/tqfileinfo.cpp
@@ -40,10 +40,10 @@
 
 #include "qplatformdefs.h"
 
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #include "tqdatetime.h"
-#include "ntqdir.h"
-#include "qfiledefs_p.h"
+#include "tqdir.h"
+#include "tqfiledefs_p.h"
 #include "tqdeepcopy.h"
 #if defined(QT_LARGEFILE_SUPPORT)
 #include <limits.h>
diff --git a/src/tools/ntqfileinfo.h b/src/tools/tqfileinfo.h
index 3c4e3b3a3..41a764481 100644
--- a/src/tools/ntqfileinfo.h
+++ b/src/tools/tqfileinfo.h
@@ -42,7 +42,7 @@
 #define TQFILEINFO_H
 
 #ifndef QT_H
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "tqdatetime.h"
 #endif // QT_H
 
diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/tqfileinfo_unix.cpp
index 159b43ae2..300515e3a 100644
--- a/src/tools/qfileinfo_unix.cpp
+++ b/src/tools/tqfileinfo_unix.cpp
@@ -39,10 +39,10 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "ntqfileinfo.h"
-#include "qfiledefs_p.h"
+#include "tqfileinfo.h"
+#include "tqfiledefs_p.h"
 #include "tqdatetime.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 
 #include <limits.h>
 #if defined(Q_OS_MAC)
diff --git a/src/tools/qiodevice.cpp b/src/tools/tqiodevice.cpp
index cf069aa22..014a18d46 100644
--- a/src/tools/qiodevice.cpp
+++ b/src/tools/tqiodevice.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 
 /*!
-    \class TQIODevice ntqiodevice.h
+    \class TQIODevice tqiodevice.h
     \reentrant
 
     \brief The TQIODevice class is the base class of I/O devices.
diff --git a/src/tools/ntqiodevice.h b/src/tools/tqiodevice.h
index 712288d8e..712288d8e 100644
--- a/src/tools/ntqiodevice.h
+++ b/src/tools/tqiodevice.h
diff --git a/src/tools/tqmap.h b/src/tools/tqmap.h
index 97a21883a..a173e7575 100644
--- a/src/tools/tqmap.h
+++ b/src/tools/tqmap.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqglobal.h"
 #include "ntqshared.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqpair.h"
 #include "tqvaluelist.h"
 #endif // QT_H
diff --git a/src/tools/tqpair.h b/src/tools/tqpair.h
index cd1614685..5b197d8d4 100644
--- a/src/tools/tqpair.h
+++ b/src/tools/tqpair.h
@@ -42,7 +42,7 @@
 
 #ifndef QT_H
 #include "ntqglobal.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 template <class T1, class T2>
diff --git a/src/tools/qsettings.cpp b/src/tools/tqsettings.cpp
index e76fc6ca7..a2ef55da7 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/tqsettings.cpp
@@ -53,17 +53,17 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 # undef truncate
 #endif
 
-#include "ntqsettings.h"
+#include "tqsettings.h"
 
 #ifndef TQT_NO_SETTINGS
 
-#include "ntqdir.h"
-#include "ntqfile.h"
-#include "ntqfileinfo.h"
+#include "tqdir.h"
+#include "tqfile.h"
+#include "tqfileinfo.h"
 #include "tqmap.h"
 #include "tqtextstream.h"
 #include "tqregexp.h"
-#include <private/qsettings_p.h>
+#include <private/tqsettings_p.h>
 #ifndef NO_ERRNO_H
 #include <errno.h>
 #endif
@@ -1995,7 +1995,7 @@ TQStringList TQSettings::readListEntry(const TQString &key, bool *ok )
 }
 
 #ifdef Q_OS_MAC
-void qt_setSettingsBasePath(const TQString &); //qsettings_mac.cpp
+void qt_setSettingsBasePath(const TQString &); //tqsettings_mac.cpp
 #endif
 
 /*!
diff --git a/src/tools/ntqsettings.h b/src/tools/tqsettings.h
index ee8e8e3b2..ee8e8e3b2 100644
--- a/src/tools/ntqsettings.h
+++ b/src/tools/tqsettings.h
diff --git a/src/tools/qsettings_p.h b/src/tools/tqsettings_p.h
index 75318492d..75318492d 100644
--- a/src/tools/qsettings_p.h
+++ b/src/tools/tqsettings_p.h
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index 86b1add58..58a377cd7 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -52,7 +52,7 @@
 
 #include "tqstring.h"
 #include "tqregexp.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #ifndef TQT_NO_TEXTCODEC
 #include "tqtextcodec.h"
 #endif
diff --git a/src/tools/tqstringlist.cpp b/src/tools/tqstringlist.cpp
index 8e08a4f08..43637c203 100644
--- a/src/tools/tqstringlist.cpp
+++ b/src/tools/tqstringlist.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_STRINGLIST
 #include "tqregexp.h"
 #include "tqstrlist.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqtl.h"
 
 /*!
diff --git a/src/tools/tqstrlist.h b/src/tools/tqstrlist.h
index 4bbcc2ca0..2815b609e 100644
--- a/src/tools/tqstrlist.h
+++ b/src/tools/tqstrlist.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqstring.h"
 #include "tqptrlist.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 #if defined(Q_QDOC)
diff --git a/src/tools/tqstrvec.h b/src/tools/tqstrvec.h
index d80bfb979..2490c828b 100644
--- a/src/tools/tqstrvec.h
+++ b/src/tools/tqstrvec.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqstring.h"
 #include "tqptrvector.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 class TQ_EXPORT TQStrVec : public TQPtrVector<char>
diff --git a/src/tools/tqtextstream.cpp b/src/tools/tqtextstream.cpp
index 0a911b0ed..20f6301e9 100644
--- a/src/tools/tqtextstream.cpp
+++ b/src/tools/tqtextstream.cpp
@@ -43,8 +43,8 @@
 #ifndef TQT_NO_TEXTSTREAM
 #include "tqtextcodec.h"
 #include "tqregexp.h"
-#include "ntqbuffer.h"
-#include "ntqfile.h"
+#include "tqbuffer.h"
+#include "tqfile.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/src/tools/tqtextstream.h b/src/tools/tqtextstream.h
index ab2366b39..acfea9704 100644
--- a/src/tools/tqtextstream.h
+++ b/src/tools/tqtextstream.h
@@ -42,7 +42,7 @@
 #define TQTEXTSTREAM_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqstring.h"
 #include <stdio.h>
 #endif // QT_H
diff --git a/src/tools/tqvaluelist.h b/src/tools/tqvaluelist.h
index 4056290df..8a5bcb841 100644
--- a/src/tools/tqvaluelist.h
+++ b/src/tools/tqvaluelist.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqtl.h"
 #include "ntqshared.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 #ifndef TQT_NO_STL
diff --git a/src/tools/tqvaluevector.h b/src/tools/tqvaluevector.h
index 90dc45e10..fd45bce85 100644
--- a/src/tools/tqvaluevector.h
+++ b/src/tools/tqvaluevector.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqtl.h"
 #include "ntqshared.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 #ifndef TQT_NO_STL
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 296547aff..787f20926 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -50,7 +50,7 @@
 #include "ntqdrawutil.h"
 #include "ntqfontmetrics.h"
 #include "ntqpixmap.h"
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 #include "ntqapplication.h"
 #include "ntqvalidator.h"
 #include "tqdragobject.h"
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index d8e9c1033..e19cae977 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -43,7 +43,7 @@
 #include "ntqpainter.h"
 #include "ntqscrollbar.h"
 #include "ntqcursor.h"
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 #include "ntqpixmap.h"
 #include "tqregexp.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index e00b9c159..0c42ab611 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -458,7 +458,7 @@ void TQIconViewItemLineEdit::focusOutEvent( TQFocusEvent *e )
 
     See TQIconView::dragObject() for more information.
 
-    See the \l fileiconview/qfileiconview.cpp and
+    See the \l fileiconview/tqfileiconview.cpp and
     \l iconview/simple_dd/main.cpp examples.
 */
 
@@ -561,8 +561,8 @@ bool TQIconDragData::operator==( const TQIconDragData &i ) const
     The fileiconview example program demonstrates the use of the
     TQIconDrag class including subclassing and reimplementing
     dragObject(), format(), encodedData() and canDecode(). See the files
-    \c qt/examples/fileiconview/qfileiconview.h and
-    \c qt/examples/fileiconview/qfileiconview.cpp.
+    \c qt/examples/fileiconview/tqfileiconview.h and
+    \c qt/examples/fileiconview/tqfileiconview.cpp.
 
     \sa TQMimeSource::format()
 */
diff --git a/src/widgets/tqmenudata.h b/src/widgets/tqmenudata.h
index 18fb739ee..69ab1ca5b 100644
--- a/src/widgets/tqmenudata.h
+++ b/src/widgets/tqmenudata.h
@@ -46,7 +46,7 @@
 #include "tqiconset.h" // conversion TQPixmap->TQIconset
 #include "ntqkeysequence.h"
 #include "tqstring.h"
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "ntqfont.h"
 #endif // QT_H
 
diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp
index 9827c25bc..03152ac1a 100644
--- a/src/widgets/tqtextbrowser.cpp
+++ b/src/widgets/tqtextbrowser.cpp
@@ -48,7 +48,7 @@
 
 #include "tqvaluestack.h"
 #include "stdio.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "tqtextstream.h"
 #include "ntqlayout.h"
 #include "tqbitmap.h"
@@ -56,7 +56,7 @@
 #include "tqimage.h"
 #include "ntqsimplerichtext.h"
 #include "tqdragobject.h"
-#include "ntqurl.h"
+#include "tqurl.h"
 #include "ntqcursor.h"
 
 /*!
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 9e9b6d8fc..dd7c1116b 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -62,12 +62,12 @@
 #include "ntqlistbox.h"
 #include "ntqvbox.h"
 #include "ntqapplication.h"
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 #include "ntqcolordialog.h"
 #include "ntqfontdialog.h"
 #include "tqstylesheet.h"
 #include "tqdragobject.h"
-#include "ntqurl.h"
+#include "tqurl.h"
 #include "ntqcursor.h"
 #include "tqregexp.h"
 #include "tqpopupmenu.h"
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index da1c85ade..9997a741d 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -42,7 +42,7 @@
 
 #include "ntqpainter.h"
 #include "ntqpaintdevicemetrics.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "tqmap.h"
 #include "tqregexp.h"
 #include "tqvaluelist.h"
diff --git a/src/xml/tqdom.cpp b/src/xml/tqdom.cpp
index af3ef4810..2d8e684c8 100644
--- a/src/xml/tqdom.cpp
+++ b/src/xml/tqdom.cpp
@@ -47,9 +47,9 @@
 #include "tqdict.h"
 #include "tqtextstream.h"
 #include "tqtextcodec.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqregexp.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 
 /*
   ### old todo comments -- I don't know if they still apply...
diff --git a/src/xml/tqxml.cpp b/src/xml/tqxml.cpp
index 052a44f89..d6fe43026 100644
--- a/src/xml/tqxml.cpp
+++ b/src/xml/tqxml.cpp
@@ -40,7 +40,7 @@
 
 #include "tqxml.h"
 #include "tqtextcodec.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqregexp.h"
 #include "tqptrstack.h"
 #include "tqmap.h"
diff --git a/src/xml/tqxml.h b/src/xml/tqxml.h
index d55004993..a7fb1d3c1 100644
--- a/src/xml/tqxml.h
+++ b/src/xml/tqxml.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqtextstream.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "tqstring.h"
 #include "tqstringlist.h"
 #include "tqvaluevector.h"