Update to latest tqt3 automated conversion

106 files changed, 367 insertions, 367 deletions

diff --git a/src/tools/qasciicache.h b/src/tools/ntqasciicache.h
index 42c8a86c..7323635c 100644
--- a/src/tools/qasciicache.h
+++ b/src/tools/ntqasciicache.h
@@ -42,7 +42,7 @@
 #define TQASCIICACHE_H
 
 #ifndef QT_H
-#include "qgcache.h"
+#include "ntqgcache.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qasciidict.h b/src/tools/ntqasciidict.h
index 16bf4914..ef09bc02 100644
--- a/src/tools/qasciidict.h
+++ b/src/tools/ntqasciidict.h
@@ -42,7 +42,7 @@
 #define TQASCIIDICT_H
 
 #ifndef QT_H
-#include "qgdict.h"
+#include "ntqgdict.h"
 #endif // QT_H
 
 template<class type>
@@ -119,5 +119,5 @@ public:
 };
 
 #define Q_DEFINED_QASCIIDICT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQASCIIDICT_H
diff --git a/src/tools/qbitarray.h b/src/tools/ntqbitarray.h
index 2e50875a..45a022e6 100644
--- a/src/tools/qbitarray.h
+++ b/src/tools/ntqbitarray.h
@@ -42,7 +42,7 @@
 #define TQBITARRAY_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qbuffer.h b/src/tools/ntqbuffer.h
index e638a83e..ba5aea33 100644
--- a/src/tools/qbuffer.h
+++ b/src/tools/ntqbuffer.h
@@ -42,8 +42,8 @@
 #define TQBUFFER_H
 
 #ifndef QT_H
-#include "qiodevice.h"
-#include "qstring.h"
+#include "ntqiodevice.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qcache.h b/src/tools/ntqcache.h
index 1ecbe254..9d747e34 100644
--- a/src/tools/qcache.h
+++ b/src/tools/ntqcache.h
@@ -42,7 +42,7 @@
 #define TQCACHE_H
 
 #ifndef QT_H
-#include "qgcache.h"
+#include "ntqgcache.h"
 #endif // QT_H
 
 template<class type>
diff --git a/src/tools/qcleanuphandler.h b/src/tools/ntqcleanuphandler.h
index e90975ff..e1dc339b 100644
--- a/src/tools/qcleanuphandler.h
+++ b/src/tools/ntqcleanuphandler.h
@@ -40,7 +40,7 @@
 #define TQCLEANUPHANDLER_H
 
 #ifndef QT_H
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 template<class Type>
diff --git a/src/tools/qcstring.h b/src/tools/ntqcstring.h
index 96eb9f80..f3893f63 100644
--- a/src/tools/qcstring.h
+++ b/src/tools/ntqcstring.h
@@ -43,7 +43,7 @@
 #define TQCSTRING_H
 
 #ifndef QT_H
-#include "qmemarray.h"
+#include "ntqmemarray.h"
 #endif // QT_H
 
 #include <string.h>
@@ -392,5 +392,5 @@ Q_EXPORT inline const TQCString operator+( char c1, const TQCString &s2 )
     tmp += s2;
     return tmp;
 }
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQCSTRING_H
diff --git a/src/tools/qdatastream.h b/src/tools/ntqdatastream.h
index c531b6cf..73fa584c 100644
--- a/src/tools/qdatastream.h
+++ b/src/tools/ntqdatastream.h
@@ -42,8 +42,8 @@
 #define TQDATASTREAM_H
 
 #ifndef QT_H
-#include "qiodevice.h"
-#include "qstring.h"
+#include "ntqiodevice.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_DATASTREAM
diff --git a/src/tools/qdatetime.h b/src/tools/ntqdatetime.h
index 9a5b858c..4c5a3b4f 100644
--- a/src/tools/qdatetime.h
+++ b/src/tools/ntqdatetime.h
@@ -42,8 +42,8 @@
 #define TQDATETIME_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qnamespace.h"
+#include "ntqstring.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qdeepcopy.h b/src/tools/ntqdeepcopy.h
index fe8a5ddd..abe1fc8f 100644
--- a/src/tools/qdeepcopy.h
+++ b/src/tools/ntqdeepcopy.h
@@ -42,7 +42,7 @@
 #define TQDEEPCOPY_H
 
 #ifndef QT_H
-#  include "qglobal.h"
+#  include "ntqglobal.h"
 #endif // QT_H
 
 template <class T>
diff --git a/src/tools/qdict.h b/src/tools/ntqdict.h
index dc3b2fdc..d363538d 100644
--- a/src/tools/qdict.h
+++ b/src/tools/ntqdict.h
@@ -42,7 +42,7 @@
 #define TQDICT_H
 
 #ifndef QT_H
-#include "qgdict.h"
+#include "ntqgdict.h"
 #endif // QT_H
 
 template<class type>
@@ -119,5 +119,5 @@ public:
 };
 
 #define Q_DEFINED_QDICT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQDICT_H
diff --git a/src/tools/qdir.h b/src/tools/ntqdir.h
index c178ca49..87083f8f 100644
--- a/src/tools/qdir.h
+++ b/src/tools/ntqdir.h
@@ -42,9 +42,9 @@
 #define TQDIR_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qstrlist.h"
-#include "qfileinfo.h"
+#include "ntqglobal.h"
+#include "ntqstrlist.h"
+#include "ntqfileinfo.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qfeatures.h b/src/tools/ntqfeatures.h
index 6e0a3818..6e0a3818 100644
--- a/src/tools/qfeatures.h
+++ b/src/tools/ntqfeatures.h
diff --git a/src/tools/qfile.h b/src/tools/ntqfile.h
index c8255e1c..40ad4685 100644
--- a/src/tools/qfile.h
+++ b/src/tools/ntqfile.h
@@ -42,8 +42,8 @@
 #define TQFILE_H
 
 #ifndef QT_H
-#include "qiodevice.h"
-#include "qstring.h"
+#include "ntqiodevice.h"
+#include "ntqstring.h"
 #include <stdio.h>
 #endif // QT_H
 
diff --git a/src/tools/qfileinfo.h b/src/tools/ntqfileinfo.h
index bd41896e..36cf4d7a 100644
--- a/src/tools/qfileinfo.h
+++ b/src/tools/ntqfileinfo.h
@@ -42,8 +42,8 @@
 #define TQFILEINFO_H
 
 #ifndef QT_H
-#include "qfile.h"
-#include "qdatetime.h"
+#include "ntqfile.h"
+#include "ntqdatetime.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qgarray.h b/src/tools/ntqgarray.h
index ee8cdca1..76a5cf34 100644
--- a/src/tools/qgarray.h
+++ b/src/tools/ntqgarray.h
@@ -42,7 +42,7 @@
 #define TQGARRAY_H
 
 #ifndef QT_H
-#include "qshared.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qgcache.h b/src/tools/ntqgcache.h
index 6cfabbc8..d9a3e1ed 100644
--- a/src/tools/qgcache.h
+++ b/src/tools/ntqgcache.h
@@ -42,9 +42,9 @@
 #define TQGCACHE_H
 
 #ifndef QT_H
-#include "qptrcollection.h"
-#include "qglist.h"
-#include "qgdict.h"
+#include "ntqptrcollection.h"
+#include "ntqglist.h"
+#include "ntqgdict.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qgdict.h b/src/tools/ntqgdict.h
index dd4b04a5..5465fd2f 100644
--- a/src/tools/qgdict.h
+++ b/src/tools/ntqgdict.h
@@ -42,8 +42,8 @@
 #define TQGDICT_H
 
 #ifndef QT_H
-#include "qptrcollection.h"
-#include "qstring.h"
+#include "ntqptrcollection.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 class TQGDictIterator;
diff --git a/src/tools/qgeneric.h b/src/tools/ntqgeneric.h
index af1ec86e..b82f1884 100644
--- a/src/tools/qgeneric.h
+++ b/src/tools/ntqgeneric.h
@@ -41,6 +41,6 @@
 #ifndef TQGENERIC_H
 #define TQGENERIC_H
 
-#error "do not include qgeneric.h any more"
+#error "do not include ntqgeneric.h any more"
 
 #endif // TQGENERIC_H
diff --git a/src/tools/qglist.h b/src/tools/ntqglist.h
index 568a2b90..41363a2f 100644
--- a/src/tools/qglist.h
+++ b/src/tools/ntqglist.h
@@ -42,7 +42,7 @@
 #define TQGLIST_H
 
 #ifndef QT_H
-#include "qptrcollection.h"
+#include "ntqptrcollection.h"
 #endif // QT_H
 
 class Q_EXPORT TQLNode
diff --git a/src/tools/qglobal.h b/src/tools/ntqglobal.h
index b888c7be..34d9acea 100644
--- a/src/tools/qglobal.h
+++ b/src/tools/ntqglobal.h
@@ -750,7 +750,7 @@ typedef Q_UINT64		Q_ULLONG;	// unsigned long long
 
 
 //
-// Data stream functions is provided by many classes (defined in qdatastream.h)
+// Data stream functions is provided by many classes (defined in ntqdatastream.h)
 //
 
 class TQDataStream;
@@ -777,7 +777,7 @@ class TQDataStream;
 #elif defined(TQCONFIG_LARGE)
 #include "qconfig-large.h"
 #else // everything...
-#include "qconfig.h"
+#include "ntqconfig.h"
 #endif
 #endif
 
@@ -787,7 +787,7 @@ class TQDataStream;
 #endif
 
 // prune to local config
-#include "qmodules.h"
+#include "ntqmodules.h"
 #ifndef QT_MODULE_DIALOGS
 # define QT_NO_DIALOG
 #endif
@@ -843,7 +843,7 @@ class TQDataStream;
 #endif
 
 #ifndef QT_H
-#include "qfeatures.h"
+#include "ntqfeatures.h"
 #endif /* QT_H */
 
 
diff --git a/src/tools/qgvector.h b/src/tools/ntqgvector.h
index 0e388c0c..40667c6a 100644
--- a/src/tools/qgvector.h
+++ b/src/tools/ntqgvector.h
@@ -42,7 +42,7 @@
 #define TQGVECTOR_H
 
 #ifndef QT_H
-#include "qptrcollection.h"
+#include "ntqptrcollection.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qintcache.h b/src/tools/ntqintcache.h
index b3401b62..11661805 100644
--- a/src/tools/qintcache.h
+++ b/src/tools/ntqintcache.h
@@ -42,7 +42,7 @@
 #define TQINTCACHE_H
 
 #ifndef QT_H
-#include "qgcache.h"
+#include "ntqgcache.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qintdict.h b/src/tools/ntqintdict.h
index e6a70c5d..16262585 100644
--- a/src/tools/qintdict.h
+++ b/src/tools/ntqintdict.h
@@ -42,7 +42,7 @@
 #define TQINTDICT_H
 
 #ifndef QT_H
-#include "qgdict.h"
+#include "ntqgdict.h"
 #endif // QT_H
 
 template<class type>
@@ -115,5 +115,5 @@ public:
 };
 
 #define Q_DEFINED_QINTDICT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQINTDICT_H
diff --git a/src/tools/qiodevice.h b/src/tools/ntqiodevice.h
index 2d8d7aff..65c4c59d 100644
--- a/src/tools/qiodevice.h
+++ b/src/tools/ntqiodevice.h
@@ -42,8 +42,8 @@
 #define TQIODEVICE_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qcstring.h"
+#include "ntqglobal.h"
+#include "ntqcstring.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qlibrary.h b/src/tools/ntqlibrary.h
index 899333fc..385726b8 100644
--- a/src/tools/qlibrary.h
+++ b/src/tools/ntqlibrary.h
@@ -42,7 +42,7 @@
 #define TQLIBRARY_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_LIBRARY
@@ -81,6 +81,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 #define Q_DEFINED_QLIBRARY
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif //QT_NO_LIBRARY
 #endif //TQLIBRARY_H
diff --git a/src/tools/qlocale.h b/src/tools/ntqlocale.h
index 955669c9..231203f4 100644
--- a/src/tools/qlocale.h
+++ b/src/tools/ntqlocale.h
@@ -39,7 +39,7 @@
 #ifndef TQLOCALE_H
 #define TQLOCALE_H
 
-#include "qstring.h"
+#include "ntqstring.h"
 
 struct TQLocalePrivate;
 
diff --git a/src/tools/qmap.h b/src/tools/ntqmap.h
index 372e6da6..7c0d375c 100644
--- a/src/tools/qmap.h
+++ b/src/tools/ntqmap.h
@@ -42,11 +42,11 @@
 #define TQMAP_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qshared.h"
-#include "qdatastream.h"
-#include "qpair.h"
-#include "qvaluelist.h"
+#include "ntqglobal.h"
+#include "ntqshared.h"
+#include "ntqdatastream.h"
+#include "ntqpair.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 #ifndef QT_NO_STL
@@ -873,5 +873,5 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>
 #endif
 
 #define Q_DEFINED_QMAP
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQMAP_H
diff --git a/src/tools/qmemarray.h b/src/tools/ntqmemarray.h
index 81414fd9..48367116 100644
--- a/src/tools/qmemarray.h
+++ b/src/tools/ntqmemarray.h
@@ -42,7 +42,7 @@
 #define TQMEMARRAY_H
 
 #ifndef QT_H
-#include "qgarray.h"
+#include "ntqgarray.h"
 #endif // QT_H
 
 
@@ -117,5 +117,5 @@ public:
 #endif
 
 #define Q_DEFINED_QMEMARRAY
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQARRAY_H
diff --git a/src/tools/qmutex.h b/src/tools/ntqmutex.h
index f5c4ed22..90c5150c 100644
--- a/src/tools/qmutex.h
+++ b/src/tools/ntqmutex.h
@@ -42,7 +42,7 @@
 #define TQMUTEX_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #if defined(QT_THREAD_SUPPORT)
diff --git a/src/tools/qpair.h b/src/tools/ntqpair.h
index 38f6598d..60f73f96 100644
--- a/src/tools/qpair.h
+++ b/src/tools/ntqpair.h
@@ -41,8 +41,8 @@
 #define TQPAIR_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qdatastream.h"
+#include "ntqglobal.h"
+#include "ntqdatastream.h"
 #endif // QT_H
 
 template <class T1, class T2>
diff --git a/src/tools/qptrcollection.h b/src/tools/ntqptrcollection.h
index bf20091e..5f0690af 100644
--- a/src/tools/qptrcollection.h
+++ b/src/tools/ntqptrcollection.h
@@ -41,7 +41,7 @@
 #define TQPTRCOLLECTION_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qptrdict.h b/src/tools/ntqptrdict.h
index 510caa89..181492bd 100644
--- a/src/tools/qptrdict.h
+++ b/src/tools/ntqptrdict.h
@@ -42,7 +42,7 @@
 #define TQPTRDICT_H
 
 #ifndef QT_H
-#include "qgdict.h"
+#include "ntqgdict.h"
 #endif // QT_H
 
 template<class type>
diff --git a/src/tools/qptrlist.h b/src/tools/ntqptrlist.h
index 6e741e8b..4482d0a9 100644
--- a/src/tools/qptrlist.h
+++ b/src/tools/ntqptrlist.h
@@ -40,7 +40,7 @@
 #define TQPTRLIST_H
 
 #ifndef QT_H
-#include "qglist.h"
+#include "ntqglist.h"
 #endif // QT_H
 
 template<class type>
@@ -190,6 +190,6 @@ public:
 #endif
 
 #define Q_DEFINED_QPTRLIST
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 
 #endif // TQPTRLIST_H
diff --git a/src/tools/qptrqueue.h b/src/tools/ntqptrqueue.h
index 68b2a0b8..0c1bd5e6 100644
--- a/src/tools/qptrqueue.h
+++ b/src/tools/ntqptrqueue.h
@@ -42,7 +42,7 @@
 #define TQPTRTQUEUE_H
 
 #ifndef QT_H
-#include "qglist.h"
+#include "ntqglist.h"
 #endif // QT_H
 
 template<class type>
diff --git a/src/tools/qptrstack.h b/src/tools/ntqptrstack.h
index 75245407..913dae35 100644
--- a/src/tools/qptrstack.h
+++ b/src/tools/ntqptrstack.h
@@ -42,7 +42,7 @@
 #define TQPTRSTACK_H
 
 #ifndef QT_H
-#include "qglist.h"
+#include "ntqglist.h"
 #endif // QT_H
 
 template<class type>
diff --git a/src/tools/qptrvector.h b/src/tools/ntqptrvector.h
index c05db8ae..046dc948 100644
--- a/src/tools/qptrvector.h
+++ b/src/tools/ntqptrvector.h
@@ -42,7 +42,7 @@
 #define TQPTRVECTOR_H
 
 #ifndef QT_H
-#include "qgvector.h"
+#include "ntqgvector.h"
 #endif // QT_H
 
 template<class type>
@@ -114,5 +114,5 @@ template<class type> inline void TQPtrVector<type>::deleteItem( TQPtrCollection:
 #endif
 
 #define Q_DEFINED_QPTRVECTOR
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQVECTOR_H
diff --git a/src/tools/qregexp.h b/src/tools/ntqregexp.h
index 4276a5f3..07557222 100644
--- a/src/tools/qregexp.h
+++ b/src/tools/ntqregexp.h
@@ -42,7 +42,7 @@
 #define TQREGEXP_H
 
 #ifndef QT_H
-#include "qstringlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_REGEXP
diff --git a/src/tools/qsemaphore.h b/src/tools/ntqsemaphore.h
index c2776834..8b246054 100644
--- a/src/tools/qsemaphore.h
+++ b/src/tools/ntqsemaphore.h
@@ -42,7 +42,7 @@
 #define TQSEMAPHORE_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #if defined(QT_THREAD_SUPPORT)
diff --git a/src/tools/qsettings.h b/src/tools/ntqsettings.h
index 25158f2f..5c4b24ca 100644
--- a/src/tools/qsettings.h
+++ b/src/tools/ntqsettings.h
@@ -42,8 +42,8 @@
 #define TQSETTINGS_H
 
 #ifndef QT_H
-#include "qdatetime.h"
-#include "qstringlist.h"
+#include "ntqdatetime.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_SETTINGS
diff --git a/src/tools/qshared.h b/src/tools/ntqshared.h
index 90bbbf94..7f02c772 100644
--- a/src/tools/qshared.h
+++ b/src/tools/ntqshared.h
@@ -42,7 +42,7 @@
 #define TQSHARED_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qsortedlist.h b/src/tools/ntqsortedlist.h
index da0ecaed..5923e3f1 100644
--- a/src/tools/qsortedlist.h
+++ b/src/tools/ntqsortedlist.h
@@ -42,7 +42,7 @@
 #define TQSORTEDLIST_H
 
 #ifndef QT_H
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qstring.h b/src/tools/ntqstring.h
index 20056e66..85dacc8c 100644
--- a/src/tools/qstring.h
+++ b/src/tools/ntqstring.h
@@ -42,7 +42,7 @@
 #define TQSTRING_H
 
 #ifndef QT_H
-#include "qcstring.h"
+#include "ntqcstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_CAST_ASCII
@@ -1111,5 +1111,5 @@ extern Q_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 );
 #endif
 
 #define Q_DEFINED_QSTRING
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQSTRING_H
diff --git a/src/tools/qstringlist.h b/src/tools/ntqstringlist.h
index a25c24a2..b5f857d5 100644
--- a/src/tools/qstringlist.h
+++ b/src/tools/ntqstringlist.h
@@ -42,9 +42,9 @@
 #define TQSTRINGLIST_H
 
 #ifndef QT_H
-#include "qvaluelist.h"
-#include "qstring.h"
-#include "qstrlist.h"
+#include "ntqvaluelist.h"
+#include "ntqstring.h"
+#include "ntqstrlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_STRINGLIST
diff --git a/src/tools/qstrlist.h b/src/tools/ntqstrlist.h
index dfbcb303..67d88048 100644
--- a/src/tools/qstrlist.h
+++ b/src/tools/ntqstrlist.h
@@ -42,9 +42,9 @@
 #define TQSTRLIST_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qptrlist.h"
-#include "qdatastream.h"
+#include "ntqstring.h"
+#include "ntqptrlist.h"
+#include "ntqdatastream.h"
 #endif // QT_H
 
 #if defined(Q_QDOC)
diff --git a/src/tools/qstrvec.h b/src/tools/ntqstrvec.h
index 4b9ff24a..8eb7afd8 100644
--- a/src/tools/qstrvec.h
+++ b/src/tools/ntqstrvec.h
@@ -42,9 +42,9 @@
 #define TQSTRVEC_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qptrvector.h"
-#include "qdatastream.h"
+#include "ntqstring.h"
+#include "ntqptrvector.h"
+#include "ntqdatastream.h"
 #endif // QT_H
 
 class Q_EXPORT TQStrVec : public TQPtrVector<char>
diff --git a/src/tools/qtextstream.h b/src/tools/ntqtextstream.h
index fcc8baad..a99c8e26 100644
--- a/src/tools/qtextstream.h
+++ b/src/tools/ntqtextstream.h
@@ -42,8 +42,8 @@
 #define TQTEXTSTREAM_H
 
 #ifndef QT_H
-#include "qiodevice.h"
-#include "qstring.h"
+#include "ntqiodevice.h"
+#include "ntqstring.h"
 #include <stdio.h>
 #endif // QT_H
 
diff --git a/src/tools/qthreadstorage.h b/src/tools/ntqthreadstorage.h
index 3fdcaa9e..acce6dba 100644
--- a/src/tools/qthreadstorage.h
+++ b/src/tools/ntqthreadstorage.h
@@ -42,7 +42,7 @@
 #ifdef QT_THREAD_SUPPORT
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 class Q_EXPORT TQThreadStorageData
diff --git a/src/tools/qtl.h b/src/tools/ntqtl.h
index 2cdf10e9..ae8c5af8 100644
--- a/src/tools/qtl.h
+++ b/src/tools/ntqtl.h
@@ -42,9 +42,9 @@
 #define TQTL_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qtextstream.h"
-#include "qstring.h"
+#include "ntqglobal.h"
+#include "ntqtextstream.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTSTREAM
diff --git a/src/tools/quuid.h b/src/tools/ntquuid.h
index 0ea4ccf6..f518f3e7 100644
--- a/src/tools/quuid.h
+++ b/src/tools/ntquuid.h
@@ -42,7 +42,7 @@
 #define TQUUID_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #include <string.h>
diff --git a/src/tools/qvaluelist.h b/src/tools/ntqvaluelist.h
index f47bc874..c217a789 100644
--- a/src/tools/qvaluelist.h
+++ b/src/tools/ntqvaluelist.h
@@ -42,9 +42,9 @@
 #define TQVALUELIST_H
 
 #ifndef QT_H
-#include "qtl.h"
-#include "qshared.h"
-#include "qdatastream.h"
+#include "ntqtl.h"
+#include "ntqshared.h"
+#include "ntqdatastream.h"
 #endif // QT_H
 
 #ifndef QT_NO_STL
@@ -666,5 +666,5 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<
 
 #define Q_DEFINED_QVALUELIST
 #define Q_DEFINED_QVALUELIST
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQVALUELIST_H
diff --git a/src/tools/qvaluestack.h b/src/tools/ntqvaluestack.h
index 3415750f..1c1259fb 100644
--- a/src/tools/qvaluestack.h
+++ b/src/tools/ntqvaluestack.h
@@ -42,7 +42,7 @@
 #define TQVALUESTACK_H
 
 #ifndef QT_H
-#include "qvaluelist.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qvaluevector.h b/src/tools/ntqvaluevector.h
index e2fe25be..bef40f54 100644
--- a/src/tools/qvaluevector.h
+++ b/src/tools/ntqvaluevector.h
@@ -42,9 +42,9 @@
 #include <cstddef>
 
 #ifndef QT_H
-#include "qtl.h"
-#include "qshared.h"
-#include "qdatastream.h"
+#include "ntqtl.h"
+#include "ntqshared.h"
+#include "ntqdatastream.h"
 #endif // QT_H
 
 #ifndef QT_NO_STL
@@ -573,5 +573,5 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVecto
 #endif // QT_NO_DATASTREAM
 
 #define Q_DEFINED_QVALUEVECTOR
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQVALUEVECTOR_H
diff --git a/src/tools/qwaitcondition.h b/src/tools/ntqwaitcondition.h
index 5dc66a7d..6e603880 100644
--- a/src/tools/qwaitcondition.h
+++ b/src/tools/ntqwaitcondition.h
@@ -42,7 +42,7 @@
 #define TQWAITCONDITION_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #if defined(QT_THREAD_SUPPORT)
diff --git a/src/tools/qwinexport.h b/src/tools/ntqwinexport.h
index 0936ade6..0936ade6 100644
--- a/src/tools/qwinexport.h
+++ b/src/tools/ntqwinexport.h
diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp
index 08e0bd9b..c1433887 100644
--- a/src/tools/qbitarray.cpp
+++ b/src/tools/qbitarray.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qbitarray.h"
-#include "qdatastream.h"
+#include "ntqbitarray.h"
+#include "ntqdatastream.h"
 
 #define SHBLOCK	 ((bitarr_data*)(sharedBlock()))
 
 
 /*!
-    \class TQBitVal qbitarray.h
+    \class TQBitVal ntqbitarray.h
     \reentrant
     \brief The TQBitVal class is an internal class, used with TQBitArray.
 
@@ -84,7 +84,7 @@
 
 
 /*!
-    \class TQBitArray qbitarray.h
+    \class TQBitArray ntqbitarray.h
     \reentrant
     \brief The TQBitArray class provides an array of bits.
 
diff --git a/src/tools/qbuffer.cpp b/src/tools/qbuffer.cpp
index ebf3dd0e..75bb35da 100644
--- a/src/tools/qbuffer.cpp
+++ b/src/tools/qbuffer.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qbuffer.h"
+#include "ntqbuffer.h"
 #include <stdlib.h>
 
 /*!
-    \class TQBuffer qbuffer.h
+    \class TQBuffer ntqbuffer.h
     \reentrant
     \brief The TQBuffer class is an I/O device that operates on a TQByteArray.
 
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index 6992f94e..0bf1f4ae 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -52,8 +52,8 @@
 //
 
 #ifndef QT_H
-#include "qstringlist.h"
-#include "quuid.h"
+#include "ntqstringlist.h"
+#include "ntquuid.h"
 #endif // QT_H
 
 #if __GNUC__ - 0 > 3
@@ -289,7 +289,7 @@ public:		   \
 #endif
 #endif
 
-// this is duplicated at Q_PLUGIN_VERIFICATION_DATA in qgplugin.h
+// this is duplicated at Q_PLUGIN_VERIFICATION_DATA in ntqgplugin.h
 // NOTE: if you change pattern, you MUST change the pattern in
 // qcomlibrary.cpp as well.  changing the pattern will break all
 // backwards compatibility as well (no old plugins will be loaded).
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 08287bcf..c6d22e2e 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -39,11 +39,11 @@
 #include "qcomlibrary_p.h"
 
 #ifndef QT_NO_COMPONENT
-#include <qapplication.h>
-#include <qsettings.h>
-#include <qfileinfo.h>
-#include <qdatetime.h>
-#include <qcleanuphandler.h>
+#include <ntqapplication.h>
+#include <ntqsettings.h>
+#include <ntqfileinfo.h>
+#include <ntqdatetime.h>
+#include <ntqcleanuphandler.h>
 #ifndef NO_ERRNO_H
 #include <errno.h>
 #endif // NO_ERROR_H
diff --git a/src/tools/qcomlibrary_p.h b/src/tools/qcomlibrary_p.h
index b2cfbe74..201ca476 100644
--- a/src/tools/qcomlibrary_p.h
+++ b/src/tools/qcomlibrary_p.h
@@ -53,7 +53,7 @@
 
 #ifndef QT_H
 #include "qcom_p.h"
-#include "qlibrary.h"
+#include "ntqlibrary.h"
 #endif // QT_H
 
 #ifndef QT_NO_COMPONENT
diff --git a/src/tools/qcomponentfactory.cpp b/src/tools/qcomponentfactory.cpp
index c02e9f06..9109cc5b 100644
--- a/src/tools/qcomponentfactory.cpp
+++ b/src/tools/qcomponentfactory.cpp
@@ -41,10 +41,10 @@
 #include "qcomponentfactory_p.h"
 
 #ifndef QT_NO_COMPONENT
-#include "qsettings.h"
+#include "ntqsettings.h"
 #include <private/qcomlibrary_p.h>
-#include "qdir.h"
-#include "qapplication.h"
+#include "ntqdir.h"
+#include "ntqapplication.h"
 
 /*!
   \class TQComponentFactory qcomponentfactory.h
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index ac7fa475..60e698f3 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -39,9 +39,9 @@
 **
 **********************************************************************/
 
-#include "qstring.h"
-#include "qregexp.h"
-#include "qdatastream.h"
+#include "ntqstring.h"
+#include "ntqregexp.h"
+#include "ntqdatastream.h"
 
 #ifdef QT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
@@ -568,7 +568,7 @@ TQDataStream &operator>>( TQDataStream &s, TQByteArray &a )
  *****************************************************************************/
 
 /*!
-    \class TQCString qcstring.h
+    \class TQCString ntqcstring.h
     \reentrant
     \brief The TQCString class provides an abstraction of the classic C
     zero-terminated char array (char *).
diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp
index 329bf8f2..3359d68b 100644
--- a/src/tools/qdatastream.cpp
+++ b/src/tools/qdatastream.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qdatastream.h"
+#include "ntqdatastream.h"
 
 #ifndef QT_NO_DATASTREAM
-#include "qbuffer.h"
+#include "ntqbuffer.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -52,7 +52,7 @@
 #endif
 
 /*!
-    \class TQDataStream qdatastream.h
+    \class TQDataStream ntqdatastream.h
     \reentrant
     \brief The TQDataStream class provides serialization of binary data
     to a TQIODevice.
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp
index c9e34ddb..d1358cc8 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -40,9 +40,9 @@
 
 #include "qplatformdefs.h"
 
-#include "qdatetime.h"
-#include "qdatastream.h"
-#include "qregexp.h"
+#include "ntqdatetime.h"
+#include "ntqdatastream.h"
+#include "ntqregexp.h"
 
 #include <stdio.h>
 #ifndef Q_OS_TEMP
@@ -202,7 +202,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa
  *****************************************************************************/
 
 /*!
-    \class TQDate qdatetime.h
+    \class TQDate ntqdatetime.h
     \reentrant
     \brief The TQDate class provides date functions.
 
@@ -1240,7 +1240,7 @@ void TQDate::julianToGregorian( uint jd, int &y, int &m, int &d )
  *****************************************************************************/
 
 /*!
-    \class TQTime qdatetime.h
+    \class TQTime ntqdatetime.h
     \reentrant
 
     \brief The TQTime class provides clock time functions.
@@ -1862,7 +1862,7 @@ int TQTime::elapsed() const
  *****************************************************************************/
 
 /*!
-    \class TQDateTime qdatetime.h
+    \class TQDateTime ntqdatetime.h
     \reentrant
     \brief The TQDateTime class provides date and time functions.
 
diff --git a/src/tools/qdeepcopy.cpp b/src/tools/qdeepcopy.cpp
index 9c57adfe..ea23fa63 100644
--- a/src/tools/qdeepcopy.cpp
+++ b/src/tools/qdeepcopy.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qdeepcopy.h"
+#include "ntqdeepcopy.h"
 
 /*!
-    \class TQDeepCopy qdeepcopy.h
+    \class TQDeepCopy ntqdeepcopy.h
     \brief The TQDeepCopy class is a template class which ensures that
     implicitly shared and explicitly shared classes reference unique
     data.
diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp
index 48f2d5b3..17b74851 100644
--- a/src/tools/qdir.cpp
+++ b/src/tools/qdir.cpp
@@ -39,14 +39,14 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "qdir.h"
+#include "ntqdir.h"
 
 #ifndef QT_NO_DIR
 #include <private/qdir_p.h>
-#include "qfileinfo.h"
-#include "qregexp.h"
-#include "qstringlist.h"
-#include "qdeepcopy.h"
+#include "ntqfileinfo.h"
+#include "ntqregexp.h"
+#include "ntqstringlist.h"
+#include "ntqdeepcopy.h"
 #include <limits.h>
 
 #if defined(Q_FS_FAT) && !defined(Q_OS_UNIX)
@@ -151,7 +151,7 @@ const bool CaseSensitiveFS = TRUE;
     (excluding symbolic links), sorted by size, smallest first:
     \code
     #include <stdio.h>
-    #include <qdir.h>
+    #include <ntqdir.h>
 
     int main( int argc, char **argv )
     {
@@ -561,7 +561,7 @@ bool TQDir::cdUp()
     nameFilter.
 
     The \a nameFilter is a wildcard (globbing) filter that understands
-    "*" and "?" wildcards. (See \link qregexp.html#wildcard-matching
+    "*" and "?" wildcards. (See \link ntqregexp.html#wildcard-matching
     TQRegExp wildcard matching\endlink.) You may specify several filter
     entries all separated by a single space " " or by a semi-colon
     ";".
@@ -1198,7 +1198,7 @@ bool qt_matchFilterList( const TQValueList<TQRegExp>& filters,
     Returns TRUE if the \a fileName matches any of the wildcard (glob)
     patterns in the list of \a filters; otherwise returns FALSE.
 
-    (See \link qregexp.html#wildcard-matching TQRegExp wildcard
+    (See \link ntqregexp.html#wildcard-matching TQRegExp wildcard
     matching.\endlink)
     \sa TQRegExp::match()
 */
@@ -1220,7 +1220,7 @@ bool TQDir::match( const TQStringList &filters, const TQString &fileName )
     pattern \a filter; otherwise returns FALSE. The \a filter may
     contain multiple patterns separated by spaces or semicolons.
 
-    (See \link qregexp.html#wildcard-matching TQRegExp wildcard
+    (See \link ntqregexp.html#wildcard-matching TQRegExp wildcard
     matching.\endlink)
     \sa TQRegExp::match()
 */
diff --git a/src/tools/qdir_p.h b/src/tools/qdir_p.h
index 03be15a8..4538e5b2 100644
--- a/src/tools/qdir_p.h
+++ b/src/tools/qdir_p.h
@@ -55,8 +55,8 @@
 //
 
 #ifndef QT_H
-#include "qregexp.h"
-#include "qvaluelist.h"
+#include "ntqregexp.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 extern TQValueList<TQRegExp> qt_makeFilterList( const TQString & );
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index 83880d29..c5d7173e 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -39,14 +39,14 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "qdir.h"
+#include "ntqdir.h"
 
 #ifndef QT_NO_DIR
 
 #include "qdir_p.h"
-#include "qfileinfo.h"
-#include "qregexp.h"
-#include "qstringlist.h"
+#include "ntqfileinfo.h"
+#include "ntqregexp.h"
+#include "ntqstringlist.h"
 
 #ifdef QT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp
index 1fabc595..ab5248fe 100644
--- a/src/tools/qfile.cpp
+++ b/src/tools/qfile.cpp
@@ -50,13 +50,13 @@
 # undef truncate
 #endif
 
-#include "qfile.h"
+#include "ntqfile.h"
 #ifndef NO_ERRNO_H
 #include <errno.h>
 #endif
 
 
-// Duplicated from qobject.h, but we cannot include qobject.h here since
+// Duplicated from ntqobject.h, but we cannot include ntqobject.h here since
 // it causes qmake to not build on irix g++
 #define QT_TRANSLATE_NOOP(scope,x) (x)
 
@@ -78,7 +78,7 @@ public:
 extern bool qt_file_access( const TQString& fn, int t );
 
 /*!
-    \class TQFile qfile.h
+    \class TQFile ntqfile.h
     \reentrant
     \brief The TQFile class is an I/O device that operates on files.
 
diff --git a/src/tools/qfile_unix.cpp b/src/tools/qfile_unix.cpp
index d9ed6d82..85d0fd4f 100644
--- a/src/tools/qfile_unix.cpp
+++ b/src/tools/qfile_unix.cpp
@@ -52,7 +52,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 # undef truncate
 #endif
 
-#include "qfile.h"
+#include "ntqfile.h"
 #include <errno.h>
 #include <limits.h>
 
diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp
index b144de1b..014e037c 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/qfileinfo.cpp
@@ -40,11 +40,11 @@
 
 #include "qplatformdefs.h"
 
-#include "qfileinfo.h"
-#include "qdatetime.h"
-#include "qdir.h"
+#include "ntqfileinfo.h"
+#include "ntqdatetime.h"
+#include "ntqdir.h"
 #include "qfiledefs_p.h"
-#include "qdeepcopy.h"
+#include "ntqdeepcopy.h"
 #if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
 #include <limits.h>
 #endif
diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp
index c1ad38bd..5f10a207 100644
--- a/src/tools/qfileinfo_unix.cpp
+++ b/src/tools/qfileinfo_unix.cpp
@@ -39,10 +39,10 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "qfileinfo.h"
+#include "ntqfileinfo.h"
 #include "qfiledefs_p.h"
-#include "qdatetime.h"
-#include "qdir.h"
+#include "ntqdatetime.h"
+#include "ntqdir.h"
 
 #include <limits.h>
 #if !defined(TQWS) && defined(Q_OS_MAC)
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index b5a74eae..4d7fd38e 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 #if defined(Q_CC_BOR)
     // needed for qsort() because of a std namespace problem on Borland
 #   include "qplatformdefs.h"
@@ -48,7 +48,7 @@
 #endif
 
 #define	 TQGARRAY_CPP
-#include "qgarray.h"
+#include "ntqgarray.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -77,7 +77,7 @@
 #endif
 
 /*!
-  \class TQShared qshared.h
+  \class TQShared ntqshared.h
   \reentrant
   \ingroup shared
   \brief The TQShared class is used internally for implementing shared classes.
@@ -94,7 +94,7 @@
 */
 
 /*!
-  \class TQGArray qgarray.h
+  \class TQGArray ntqgarray.h
   \reentrant
   \ingroup shared
   \ingroup collection
diff --git a/src/tools/qgcache.cpp b/src/tools/qgcache.cpp
index f7a4aeea..190e3c9e 100644
--- a/src/tools/qgcache.cpp
+++ b/src/tools/qgcache.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qgcache.h"
-#include "qptrlist.h"
-#include "qdict.h"
-#include "qstring.h"
+#include "ntqgcache.h"
+#include "ntqptrlist.h"
+#include "ntqdict.h"
+#include "ntqstring.h"
 
 /*!
-  \class TQGCache qgcache.h
+  \class TQGCache ntqgcache.h
   \reentrant
   \ingroup shared
   \ingroup collection
@@ -672,7 +672,7 @@ void TQGCache::statistics() const
  *****************************************************************************/
 
 /*!
-  \class TQGCacheIterator qgcache.h
+  \class TQGCacheIterator ntqgcache.h
   \reentrant
   \ingroup shared
   \ingroup collection
diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp
index 18282aa6..99c0cbc2 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/qgdict.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qgdict.h"
-#include "qptrlist.h"
-#include "qstring.h"
-#include "qdatastream.h"
+#include "ntqgdict.h"
+#include "ntqptrlist.h"
+#include "ntqstring.h"
+#include "ntqdatastream.h"
 #include <ctype.h>
 
 /*!
@@ -997,7 +997,7 @@ TQDataStream& TQGDict::write( TQDataStream &s ) const
  *****************************************************************************/
 
 /*!
-  \class TQGDictIterator qgdict.h
+  \class TQGDictIterator ntqgdict.h
   \reentrant
   \ingroup collection
   \brief The TQGDictIterator class is an internal class for implementing TQDictIterator and TQIntDictIterator.
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index a72798ce..c9f14102 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qglist.h"
-#include "qgvector.h"
-#include "qdatastream.h"
-#include "qvaluelist.h"
+#include "ntqglist.h"
+#include "ntqgvector.h"
+#include "ntqdatastream.h"
+#include "ntqvaluelist.h"
 
 /*!
-  \class TQLNode qglist.h
+  \class TQLNode ntqglist.h
   \reentrant
   \ingroup collection
   \brief The TQLNode class is an internal class for the TQPtrList template collection.
@@ -74,7 +74,7 @@
 
 
 /*!
-  \class TQGList qglist.h
+  \class TQGList ntqglist.h
   \reentrant
   \ingroup collection
   \brief The TQGList class is an internal class for implementing TQt collection classes.
@@ -88,7 +88,7 @@
   customize the subclasses, namely compareItems(), read() and
   write. Normally, you do not have to reimplement any of these
   functions.  If you still want to reimplement them, see the TQStrList
-  class (qstrlist.h) for an example.
+  class (ntqstrlist.h) for an example.
 */
 
 
@@ -1080,7 +1080,7 @@ TQLNode* TQGList::erase( TQLNode* it )
  *****************************************************************************/
 
 /*!
-  \class TQGListIterator qglist.h
+  \class TQGListIterator ntqglist.h
   \reentrant
   \ingroup collection
   \brief The TQGListIterator class is an internal class for implementing TQPtrListIterator.
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 805e7fd6..2336fb0b 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -40,7 +40,7 @@
 
 #include "qplatformdefs.h"
 
-#include "qasciidict.h"
+#include "ntqasciidict.h"
 #include <limits.h>
 #include <stdio.h>
 #include <limits.h>
@@ -699,7 +699,7 @@ void qSystemWarning( const char* msg, int code )
     Prints a warning message containing the source code file name and
     line number if \a test is FALSE.
 
-    This is really a macro defined in \c qglobal.h.
+    This is really a macro defined in \c ntqglobal.h.
 
     Q_ASSERT is useful for testing pre- and post-conditions.
 
@@ -709,7 +709,7 @@ void qSystemWarning( const char* msg, int code )
 	// File: div.cpp
 	//
 
-	#include <qglobal.h>
+	#include <ntqglobal.h>
 
 	int divide( int a, int b )
 	{
@@ -736,7 +736,7 @@ void qSystemWarning( const char* msg, int code )
     If \a p is 0, prints a warning message containing the source code file
     name and line number, saying that the program ran out of memory.
 
-    This is really a macro defined in \c qglobal.h.
+    This is really a macro defined in \c ntqglobal.h.
 
     Example:
     \code
@@ -858,7 +858,7 @@ void qObsolete(	 const char *message )
 
     Example:
     \code
-	#include <qapplication.h>
+	#include <ntqapplication.h>
 	#include <stdio.h>
 	#include <stdlib.h>
 
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp
index 6b22e3b9..5afd8bc4 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/qgpluginmanager.cpp
@@ -39,8 +39,8 @@
 #include "qgpluginmanager_p.h"
 #ifndef QT_NO_COMPONENT
 #include "qcomlibrary_p.h"
-#include "qmap.h"
-#include "qdir.h"
+#include "ntqmap.h"
+#include "ntqdir.h"
 
 /*
   The following co-occurrence code is borrowed from TQt Linguist.
@@ -287,7 +287,7 @@ static int similarity( const TQString& s1, const TQString& s2 )
 
 
 
-#include <qptrlist.h>
+#include <ntqptrlist.h>
 
 TQGPluginManager::TQGPluginManager( const TQUuid& id, const TQStringList& paths, const TQString &suffix, bool cs )
     : interfaceId( id ), plugDict( 17, cs ), casesens( cs ), autounload( TRUE )
diff --git a/src/tools/qgpluginmanager_p.h b/src/tools/qgpluginmanager_p.h
index 4e419479..82bfdf05 100644
--- a/src/tools/qgpluginmanager_p.h
+++ b/src/tools/qgpluginmanager_p.h
@@ -40,10 +40,10 @@
 #define TQGPLUGINMANAGER_P_H
 
 #ifndef QT_H
-#include "qdict.h"
-#include "qlibrary.h"
-#include "quuid.h"
-#include "qstringlist.h"
+#include "ntqdict.h"
+#include "ntqlibrary.h"
+#include "ntquuid.h"
+#include "ntqstringlist.h"
 #include "qcom_p.h"
 #endif // QT_H
 
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index d9602aef..b53e4172 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 #if defined(Q_CC_BOR)
 // needed for qsort() because of a std namespace problem on Borland
 #include "qplatformdefs.h"
 #endif
 
 #define	 TQGVECTOR_CPP
-#include "qgvector.h"
-#include "qglist.h"
-#include "qstring.h"
-#include "qdatastream.h"
+#include "ntqgvector.h"
+#include "ntqglist.h"
+#include "ntqstring.h"
+#include "ntqdatastream.h"
 #include <stdlib.h>
 
 #ifdef QT_THREAD_SUPPORT
diff --git a/src/tools/qiodevice.cpp b/src/tools/qiodevice.cpp
index 74fbb9f7..64c39915 100644
--- a/src/tools/qiodevice.cpp
+++ b/src/tools/qiodevice.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qiodevice.h"
+#include "ntqiodevice.h"
 
 /*!
-    \class TQIODevice qiodevice.h
+    \class TQIODevice ntqiodevice.h
     \reentrant
 
     \brief The TQIODevice class is the base class of I/O devices.
diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp
index 71b533a8..a96e0c06 100644
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/qlibrary.cpp
@@ -40,8 +40,8 @@
 
 #include "qplatformdefs.h"
 #include <private/qlibrary_p.h>
-#include <qstringlist.h>
-#include <qfile.h>
+#include <ntqstringlist.h>
+#include <ntqfile.h>
 
 #ifndef QT_NO_LIBRARY
 
@@ -69,7 +69,7 @@ TQLibraryPrivate::TQLibraryPrivate( TQLibrary *lib )
 
 
 /*!
-    \class TQLibrary qlibrary.h
+    \class TQLibrary ntqlibrary.h
     \reentrant
     \brief The TQLibrary class provides a wrapper for handling shared libraries.
 
diff --git a/src/tools/qlibrary_p.h b/src/tools/qlibrary_p.h
index cf603e9a..c2e4166b 100644
--- a/src/tools/qlibrary_p.h
+++ b/src/tools/qlibrary_p.h
@@ -53,12 +53,12 @@
 //
 //
 
-#include "qlibrary.h"
+#include "ntqlibrary.h"
 
 #ifndef QT_NO_LIBRARY
 
 #ifndef QT_H
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #endif // QT_H
 
 class TQLibraryPrivate
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 59d23f80..dd176921 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -43,12 +43,12 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "qlocale.h"
+#include "ntqlocale.h"
 #include "qlocale_p.h"
-#include "qnamespace.h"
+#include "ntqnamespace.h"
 
 #ifdef QT_QLOCALE_USES_FCVT
-# include <qmutex.h>
+# include <ntqmutex.h>
 # include <private/qmutexpool_p.h>
 #endif
 
diff --git a/src/tools/qlocale_p.h b/src/tools/qlocale_p.h
index a11c4ec7..1b80a4c8 100644
--- a/src/tools/qlocale_p.h
+++ b/src/tools/qlocale_p.h
@@ -51,7 +51,7 @@
 //
 //
 
-#include <qstring.h>
+#include <ntqstring.h>
 
 struct TQLocalePrivate
 {
diff --git a/src/tools/qmap.cpp b/src/tools/qmap.cpp
index e74c8ccf..4c288450 100644
--- a/src/tools/qmap.cpp
+++ b/src/tools/qmap.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qmap.h"
+#include "ntqmap.h"
 
 typedef TQMapNodeBase* NodePtr;
 typedef TQMapNodeBase Node;
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp
index 71e8530d..146edbec 100644
--- a/src/tools/qmutex_unix.cpp
+++ b/src/tools/qmutex_unix.cpp
@@ -68,7 +68,7 @@ typedef pthread_mutex_t     Q_MUTEX_T;
 #  undef  Q_RECURSIVE_MUTEX_TYPE
 #endif
 
-#include "qmutex.h"
+#include "ntqmutex.h"
 #include "qmutex_p.h"
 
 #include <errno.h>
@@ -334,7 +334,7 @@ int TQRecursiveMutexPrivate::type() const
 
 
 /*!
-    \class TQMutex qmutex.h
+    \class TQMutex ntqmutex.h
     \threadsafe
     \brief The TQMutex class provides access serialization between threads.
 
@@ -512,7 +512,7 @@ bool TQMutex::tryLock()
 }
 
 /*!
-    \class TQMutexLocker qmutex.h
+    \class TQMutexLocker ntqmutex.h
     \brief The TQMutexLocker class simplifies locking and unlocking TQMutexes.
 
     \threadsafe
diff --git a/src/tools/qmutexpool.cpp b/src/tools/qmutexpool.cpp
index f0250ef2..48f1beeb 100644
--- a/src/tools/qmutexpool.cpp
+++ b/src/tools/qmutexpool.cpp
@@ -40,7 +40,7 @@
 
 #ifdef QT_THREAD_SUPPORT
 
-#include <qthread.h>
+#include <ntqthread.h>
 
 Q_EXPORT TQMutexPool *qt_global_mutexpool = 0;
 
diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h
index 0981cf82..67bd23c0 100644
--- a/src/tools/qmutexpool_p.h
+++ b/src/tools/qmutexpool_p.h
@@ -54,8 +54,8 @@
 #ifdef QT_THREAD_SUPPORT
 
 #ifndef QT_H
-#include "qmutex.h"
-#include "qmemarray.h"
+#include "ntqmutex.h"
+#include "ntqmemarray.h"
 #endif // QT_H
 
 class Q_EXPORT TQMutexPool
diff --git a/src/tools/qptrcollection.cpp b/src/tools/qptrcollection.cpp
index bc6e9454..718a739d 100644
--- a/src/tools/qptrcollection.cpp
+++ b/src/tools/qptrcollection.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qptrcollection.h"
+#include "ntqptrcollection.h"
 
 /*!
-    \class TQPtrCollection qptrcollection.h
+    \class TQPtrCollection ntqptrcollection.h
     \reentrant
     \brief The TQPtrCollection class is the base class of most pointer-based TQt collections.
 
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index 133e04eb..81e16013 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "qregexp.h"
+#include "ntqregexp.h"
 
 #ifndef QT_NO_REGEXP
 
-#include "qmemarray.h"
-#include "qbitarray.h"
-#include "qcache.h"
-#include "qcleanuphandler.h"
-#include "qintdict.h"
-#include "qmap.h"
-#include "qptrvector.h"
-#include "qstring.h"
-#include "qtl.h"
+#include "ntqmemarray.h"
+#include "ntqbitarray.h"
+#include "ntqcache.h"
+#include "ntqcleanuphandler.h"
+#include "ntqintdict.h"
+#include "ntqmap.h"
+#include "ntqptrvector.h"
+#include "ntqstring.h"
+#include "ntqtl.h"
 
 #ifdef QT_THREAD_SUPPORT
-#include "qthreadstorage.h"
+#include "ntqthreadstorage.h"
 #include <private/qthreadinstance_p.h>
 #endif // QT_THREAD_SUPPORT
 
@@ -78,7 +78,7 @@
 */
 
 /*!
-    \class TQRegExp qregexp.h
+    \class TQRegExp ntqregexp.h
     \reentrant
     \brief The TQRegExp class provides pattern matching using regular expressions.
 
diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp
index a5eb6279..52fbd276 100644
--- a/src/tools/qsemaphore.cpp
+++ b/src/tools/qsemaphore.cpp
@@ -40,13 +40,13 @@
 
 #if defined(QT_THREAD_SUPPORT)
 
-#include "qsemaphore.h"
-#include "qmutex.h"
-#include "qwaitcondition.h"
+#include "ntqsemaphore.h"
+#include "ntqmutex.h"
+#include "ntqwaitcondition.h"
 
 
 /*!
-    \class TQSemaphore qsemaphore.h
+    \class TQSemaphore ntqsemaphore.h
     \threadsafe
     \brief The TQSemaphore class provides a robust integer semaphore.
 
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index 902c5d0c..9d582d7e 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -52,16 +52,16 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 # undef truncate
 #endif
 
-#include "qsettings.h"
+#include "ntqsettings.h"
 
 #ifndef QT_NO_SETTINGS
 
-#include "qdir.h"
-#include "qfile.h"
-#include "qfileinfo.h"
-#include "qmap.h"
-#include "qtextstream.h"
-#include "qregexp.h"
+#include "ntqdir.h"
+#include "ntqfile.h"
+#include "ntqfileinfo.h"
+#include "ntqmap.h"
+#include "ntqtextstream.h"
+#include "ntqregexp.h"
 #include <private/qsettings_p.h>
 #ifndef NO_ERRNO_H
 #include <errno.h>
@@ -447,7 +447,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
 
 #ifdef Q_WS_WIN // for homedirpath reading from registry
 #include "qt_windows.h"
-#include "qlibrary.h"
+#include "ntqlibrary.h"
 
 #ifndef CSIDL_APPDATA
 #define CSIDL_APPDATA                   0x001a        // <user name>\Application Data
diff --git a/src/tools/qsettings_p.h b/src/tools/qsettings_p.h
index 965792c9..73c92ff3 100644
--- a/src/tools/qsettings_p.h
+++ b/src/tools/qsettings_p.h
@@ -54,9 +54,9 @@
 //
 
 #ifndef QT_H
-#include "qstringlist.h"
-#include "qmap.h"
-#include "qvaluestack.h"
+#include "ntqstringlist.h"
+#include "ntqmap.h"
+#include "ntqvaluestack.h"
 #endif // QT_H
 
 #ifndef QT_NO_SETTINGS
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index ae582e34..f4946a01 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -44,13 +44,13 @@
 #undef QT_NO_CAST_ASCII
 #endif
 
-#include "qstring.h"
-#include "qregexp.h"
-#include "qdatastream.h"
+#include "ntqstring.h"
+#include "ntqregexp.h"
+#include "ntqdatastream.h"
 #ifndef QT_NO_TEXTCODEC
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif
-#include "qlocale.h"
+#include "ntqlocale.h"
 #include "qlocale_p.h"
 
 #include "qunicodetables_p.h"
@@ -66,7 +66,7 @@
 #include "qt_windows.h"
 #endif
 #if !defined( QT_NO_COMPONENT ) && !defined( QT_LITE_COMPONENT )
-#include "qcleanuphandler.h"
+#include "ntqcleanuphandler.h"
 #endif
 
 #ifndef LLONG_MAX
@@ -148,7 +148,7 @@ static char qToLower(char c)
 }
 
 /*!
-    \class TQCharRef qstring.h
+    \class TQCharRef ntqstring.h
     \reentrant
     \brief The TQCharRef class is a helper class for TQString.
 
@@ -167,7 +167,7 @@ static char qToLower(char c)
 */
 
 /*!
-    \class TQChar qstring.h
+    \class TQChar ntqstring.h
     \reentrant
     \brief The TQChar class provides a lightweight Unicode character.
 
@@ -1092,7 +1092,7 @@ void TQString::compose()
 
 // These macros are used for efficient allocation of TQChar strings.
 // IMPORTANT! If you change these, make sure you also change the
-// "delete unicode" statement in ~TQStringData() in qstring.h correspondingly!
+// "delete unicode" statement in ~TQStringData() in ntqstring.h correspondingly!
 
 #define QT_ALLOC_QCHAR_VEC( N ) (TQChar*) new char[ sizeof(TQChar)*( N ) ]
 #define QT_DELETE_QCHAR_VEC( P ) delete[] ((char*)( P ))
@@ -1229,7 +1229,7 @@ char* TQString::unicodeToLatin1(const TQChar *uc, uint l)
  *****************************************************************************/
 
 /*!
-    \class TQString qstring.h
+    \class TQString ntqstring.h
     \reentrant
 
     \brief The TQString class provides an abstraction of Unicode text
@@ -1278,7 +1278,7 @@ char* TQString::unicodeToLatin1(const TQChar *uc, uint l)
     and join a list of strings into a single string with an optional
     separator using TQStringList::join(). You can obtain a list of
     strings from a string list that contain a particular substring or
-    that match a particular \link qregexp.html regex\endlink using
+    that match a particular \link ntqregexp.html regex\endlink using
     TQStringList::grep().
 
     <b>Note for C programmers</b>
@@ -4442,7 +4442,7 @@ TQString &TQString::replace( const TQString & before, const TQString & after )
     // s == "ba"
   \endcode
 
-  For regexps containing \link qregexp.html#capturing-text capturing
+  For regexps containing \link ntqregexp.html#capturing-text capturing
   parentheses \endlink, occurrences of <b>\\1</b>, <b>\\2</b>, ...,
   in \a after are replaced with \a{rx}.cap(1), cap(2), ...
 
@@ -6914,7 +6914,7 @@ TQDataStream &operator>>( TQDataStream &s, TQString &str )
  *****************************************************************************/
 
 /*!
-  \class TQConstString qstring.h
+  \class TQConstString ntqstring.h
   \reentrant
   \ingroup text
   \brief The TQConstString class provides string objects using constant Unicode data.
diff --git a/src/tools/qstringlist.cpp b/src/tools/qstringlist.cpp
index 7234cc40..3f77cc52 100644
--- a/src/tools/qstringlist.cpp
+++ b/src/tools/qstringlist.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qstringlist.h"
+#include "ntqstringlist.h"
 
 #ifndef QT_NO_STRINGLIST
-#include "qregexp.h"
-#include "qstrlist.h"
-#include "qdatastream.h"
-#include "qtl.h"
+#include "ntqregexp.h"
+#include "ntqstrlist.h"
+#include "ntqdatastream.h"
+#include "ntqtl.h"
 
 /*!
-    \class TQStringList qstringlist.h
+    \class TQStringList ntqstringlist.h
     \reentrant
     \brief The TQStringList class provides a list of strings.
 
@@ -61,7 +61,7 @@
     objects. Unlike TQStrList, which stores pointers to characters,
     TQStringList holds real TQString objects. It is the class of choice
     whenever you work with Unicode strings. TQStringList is part of the
-    \link qtl.html TQt Template Library\endlink.
+    \link ntqtl.html TQt Template Library\endlink.
 
     Like TQString itself, TQStringList objects are implicitly shared, so
     passing them around as value-parameters is both fast and safe.
@@ -171,7 +171,7 @@
 /*!
     Sorts the list of strings in ascending case-sensitive order.
 
-    Sorting is very fast. It uses the \link qtl.html TQt Template
+    Sorting is very fast. It uses the \link ntqtl.html TQt Template
     Library's\endlink efficient HeapSort implementation that has a
     time complexity of O(n*log n).
 
@@ -388,7 +388,7 @@ TQStringList& TQStringList::gres( const TQString &before, const TQString &after,
     // list == ["olpha", "beta", "gamma", "epsilon"]
     \endcode
 
-    For regexps containing \link qregexp.html#capturing-text
+    For regexps containing \link ntqregexp.html#capturing-text
     capturing parentheses \endlink, occurrences of <b>\\1</b>,
     <b>\\2</b>, ..., in \a after are replaced with \a{rx}.cap(1),
     cap(2), ...
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 9b37b3b5..4f4ba467 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -2,72 +2,72 @@
 
 tools {
 	TOOLS_P		= tools
-	HEADERS +=  $$TOOLS_H/qmemarray.h \
-		  $$TOOLS_H/qasciicache.h \
-		  $$TOOLS_H/qasciidict.h \
-		  $$TOOLS_H/qbitarray.h \
-		  $$TOOLS_H/qbuffer.h \
-		  $$TOOLS_H/qcache.h \
-		  $$TOOLS_H/qcleanuphandler.h \
+	HEADERS +=  $$TOOLS_H/ntqmemarray.h \
+		  $$TOOLS_H/ntqasciicache.h \
+		  $$TOOLS_H/ntqasciidict.h \
+		  $$TOOLS_H/ntqbitarray.h \
+		  $$TOOLS_H/ntqbuffer.h \
+		  $$TOOLS_H/ntqcache.h \
+		  $$TOOLS_H/ntqcleanuphandler.h \
 		  $$TOOLS_P/qcomponentfactory_p.h \
 		  $$TOOLS_P/qcomlibrary_p.h \
-		  $$TOOLS_H/qcstring.h \
-		  $$TOOLS_H/qdatastream.h \
-		  $$TOOLS_H/qdatetime.h \
-		  $$TOOLS_H/qdeepcopy.h \
-		  $$TOOLS_H/qdict.h \
-		  $$TOOLS_H/qdir.h \
+		  $$TOOLS_H/ntqcstring.h \
+		  $$TOOLS_H/ntqdatastream.h \
+		  $$TOOLS_H/ntqdatetime.h \
+		  $$TOOLS_H/ntqdeepcopy.h \
+		  $$TOOLS_H/ntqdict.h \
+		  $$TOOLS_H/ntqdir.h \
 		  $$TOOLS_P/qdir_p.h \
-		  $$TOOLS_H/qfile.h \
+		  $$TOOLS_H/ntqfile.h \
 		  $$TOOLS_P/qfiledefs_p.h \
-		  $$TOOLS_H/qfileinfo.h \
-		  $$TOOLS_H/qgarray.h \
-		  $$TOOLS_H/qgcache.h \
-		  $$TOOLS_H/qgdict.h \
-		  $$TOOLS_H/qgeneric.h \
-		  $$TOOLS_H/qglist.h \
-		  $$TOOLS_H/qglobal.h \
+		  $$TOOLS_H/ntqfileinfo.h \
+		  $$TOOLS_H/ntqgarray.h \
+		  $$TOOLS_H/ntqgcache.h \
+		  $$TOOLS_H/ntqgdict.h \
+		  $$TOOLS_H/ntqgeneric.h \
+		  $$TOOLS_H/ntqglist.h \
+		  $$TOOLS_H/ntqglobal.h \
 		  $$TOOLS_P/qgpluginmanager_p.h \
-		  $$TOOLS_H/qgvector.h \
-		  $$TOOLS_H/qintcache.h \
-		  $$TOOLS_H/qintdict.h \
-		  $$TOOLS_H/qiodevice.h \
-		  $$TOOLS_H/qlibrary.h \
+		  $$TOOLS_H/ntqgvector.h \
+		  $$TOOLS_H/ntqintcache.h \
+		  $$TOOLS_H/ntqintdict.h \
+		  $$TOOLS_H/ntqiodevice.h \
+		  $$TOOLS_H/ntqlibrary.h \
 		  $$TOOLS_P/qlibrary_p.h \
-		  $$TOOLS_H/qlocale.h \
+		  $$TOOLS_H/ntqlocale.h \
 		  $$TOOLS_P/qlocale_p.h \
-		  $$TOOLS_H/qptrlist.h \
-		  $$TOOLS_H/qmap.h \
-		  $$TOOLS_H/qmutex.h \
+		  $$TOOLS_H/ntqptrlist.h \
+		  $$TOOLS_H/ntqmap.h \
+		  $$TOOLS_H/ntqmutex.h \
 		  $$TOOLS_P/qmutex_p.h \
 		  $$TOOLS_P/qmutexpool_p.h \
 		  $$TOOLS_P/qpluginmanager_p.h \
-		  $$TOOLS_H/qptrcollection.h \
-		  $$TOOLS_H/qptrdict.h \
-		  $$TOOLS_H/qptrqueue.h \
-		  $$TOOLS_H/qregexp.h \
-		  $$TOOLS_H/qsemaphore.h \
-		  $$TOOLS_H/qsettings.h \
+		  $$TOOLS_H/ntqptrcollection.h \
+		  $$TOOLS_H/ntqptrdict.h \
+		  $$TOOLS_H/ntqptrqueue.h \
+		  $$TOOLS_H/ntqregexp.h \
+		  $$TOOLS_H/ntqsemaphore.h \
+		  $$TOOLS_H/ntqsettings.h \
 		  $$TOOLS_P/qsettings_p.h \
-		  $$TOOLS_H/qshared.h \
-		  $$TOOLS_H/qsortedlist.h \
-		  $$TOOLS_H/qptrstack.h \
-		  $$TOOLS_H/qstring.h \
-		  $$TOOLS_H/qstringlist.h \
-		  $$TOOLS_H/qstrlist.h \
-		  $$TOOLS_H/qstrvec.h \
-		  $$TOOLS_H/qtextstream.h \
+		  $$TOOLS_H/ntqshared.h \
+		  $$TOOLS_H/ntqsortedlist.h \
+		  $$TOOLS_H/ntqptrstack.h \
+		  $$TOOLS_H/ntqstring.h \
+		  $$TOOLS_H/ntqstringlist.h \
+		  $$TOOLS_H/ntqstrlist.h \
+		  $$TOOLS_H/ntqstrvec.h \
+		  $$TOOLS_H/ntqtextstream.h \
 		  $$TOOLS_P/qthreadinstance_p.h \
-		  $$TOOLS_H/qthreadstorage.h\
+		  $$TOOLS_H/ntqthreadstorage.h\
 		  $$TOOLS_P/qunicodetables_p.h \
-		  $$TOOLS_H/qptrvector.h \
-	          $$TOOLS_H/qvaluelist.h \
-		  $$TOOLS_H/qvaluestack.h \
-		  $$TOOLS_H/qvaluevector.h \
-		  $$TOOLS_H/qwaitcondition.h \
+		  $$TOOLS_H/ntqptrvector.h \
+	          $$TOOLS_H/ntqvaluelist.h \
+		  $$TOOLS_H/ntqvaluestack.h \
+		  $$TOOLS_H/ntqvaluevector.h \
+		  $$TOOLS_H/ntqwaitcondition.h \
 		  $$TOOLS_P/qcom_p.h \
 		  $$TOOLS_P/qucom_p.h \
-		  $$TOOLS_H/quuid.h
+		  $$TOOLS_H/ntquuid.h
 
 	win32:SOURCES += $$TOOLS_CPP/qdir_win.cpp \
 	 	  $$TOOLS_CPP/qfile_win.cpp \
diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp
index 55c9005c..9c2d0dfb 100644
--- a/src/tools/qtextstream.cpp
+++ b/src/tools/qtextstream.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qtextstream.h"
+#include "ntqtextstream.h"
 
 #ifndef QT_NO_TEXTSTREAM
-#include "qtextcodec.h"
-#include "qregexp.h"
-#include "qbuffer.h"
-#include "qfile.h"
+#include "ntqtextcodec.h"
+#include "ntqregexp.h"
+#include "ntqbuffer.h"
+#include "ntqfile.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -57,7 +57,7 @@
 #endif
 
 /*!
-    \class TQTextStream qtextstream.h
+    \class TQTextStream ntqtextstream.h
     \reentrant
     \brief The TQTextStream class provides basic functions for reading
     and writing text using a TQIODevice.
@@ -2374,7 +2374,7 @@ TQTextStream &reset( TQTextStream &s )
 
 
 /*!
-    \class TQTextIStream qtextstream.h
+    \class TQTextIStream ntqtextstream.h
     \reentrant
     \brief The TQTextIStream class is a convenience class for input streams.
 
diff --git a/src/tools/qthreadinstance_p.h b/src/tools/qthreadinstance_p.h
index 59ce53fd..62c569c4 100644
--- a/src/tools/qthreadinstance_p.h
+++ b/src/tools/qthreadinstance_p.h
@@ -54,8 +54,8 @@
 #ifdef QT_THREAD_SUPPORT
 
 #ifndef QT_H
-#include "qmutex.h"
-#include "qwindowdefs.h"
+#include "ntqmutex.h"
+#include "ntqwindowdefs.h"
 #endif // QT_H
 
 #ifdef Q_OS_UNIX
diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp
index d2c488a2..05b86b95 100644
--- a/src/tools/qthreadstorage_unix.cpp
+++ b/src/tools/qthreadstorage_unix.cpp
@@ -40,7 +40,7 @@
 
 #include "qplatformdefs.h"
 
-#include "qthreadstorage.h"
+#include "ntqthreadstorage.h"
 #include <private/qthreadinstance_p.h>
 
 #include <string.h>
diff --git a/src/tools/qucom_p.h b/src/tools/qucom_p.h
index 678d3d5f..0814e18d 100644
--- a/src/tools/qucom_p.h
+++ b/src/tools/qucom_p.h
@@ -54,8 +54,8 @@
 //
 
 #ifndef QT_H
-#include "qstring.h"
-#include "quuid.h"
+#include "ntqstring.h"
+#include "ntquuid.h"
 #endif // QT_H
 
 #ifdef check
diff --git a/src/tools/qunicodetables.cpp b/src/tools/qunicodetables.cpp
index 5c64d231..abcfadf7 100644
--- a/src/tools/qunicodetables.cpp
+++ b/src/tools/qunicodetables.cpp
@@ -13112,8 +13112,8 @@ enum Script {
     UnknownScript = NScripts
 };
 
-// copied form qfont.h, as we can't include it in tools. Do not modify without
-// changing the script enum in qfont.h aswell.
+// copied form ntqfont.h, as we can't include it in tools. Do not modify without
+// changing the script enum in ntqfont.h aswell.
 const unsigned char TQUnicodeTables::otherScripts [128] = {
 #define SCRIPTS_02 0
     0xaf, Latin, 0xff, SpacingModifiers, 			// row 0x02, index 0
diff --git a/src/tools/qunicodetables_p.h b/src/tools/qunicodetables_p.h
index 4e079dc5..07d4a599 100644
--- a/src/tools/qunicodetables_p.h
+++ b/src/tools/qunicodetables_p.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifdef QT_NO_UNICODETABLES
diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp
index 220ff496..64ec7a3b 100644
--- a/src/tools/quuid.cpp
+++ b/src/tools/quuid.cpp
@@ -36,12 +36,12 @@
 **
 **********************************************************************/
 
-#include "quuid.h"
+#include "ntquuid.h"
 
-#include "qdatastream.h"
+#include "ntqdatastream.h"
 
 /*!
-    \class TQUuid quuid.h
+    \class TQUuid ntquuid.h
     \brief The TQUuid class defines a Universally Unique Identifier (UUID).
 
     \reentrant
@@ -389,7 +389,7 @@ TQUuid TQUuid::createUuid()
     return result;
 }
 #else // !Q_OS_WIN32
-#include "qdatetime.h"
+#include "ntqdatetime.h"
 #include "stdlib.h" // For srand/rand
 TQUuid TQUuid::createUuid()
 {
diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/qwaitcondition_unix.cpp
index 5c4e9388..2f1e5b98 100644
--- a/src/tools/qwaitcondition_unix.cpp
+++ b/src/tools/qwaitcondition_unix.cpp
@@ -44,8 +44,8 @@
 
 typedef pthread_mutex_t Q_MUTEX_T;
 
-#include "qwaitcondition.h"
-#include "qmutex.h"
+#include "ntqwaitcondition.h"
+#include "ntqmutex.h"
 #include "qmutex_p.h"
 
 #include <errno.h>
@@ -58,7 +58,7 @@ struct TQWaitConditionPrivate {
 
 
 /*!
-    \class TQWaitCondition qwaitcondition.h
+    \class TQWaitCondition ntqwaitcondition.h
     \threadsafe
     \brief The TQWaitCondition class allows waiting/waking for conditions between threads.
 
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 99126c92..38592c9b 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -1,31 +1,31 @@
 #define Q_EXPORT_TEMPLATES
 
-#include <qcanvas.h>
-#include <qaccessible.h>
-#include <qconnection.h>
-#include <qguardedptr.h>
-#include <qobject.h>
-#include <qpoint.h>
-#include <qrect.h>
-#include <qsignalslotimp.h>
-#include <qwidget.h>
-#include <qhttp.h>
+#include <ntqcanvas.h>
+#include <ntqaccessible.h>
+#include <ntqconnection.h>
+#include <ntqguardedptr.h>
+#include <ntqobject.h>
+#include <ntqpoint.h>
+#include <ntqrect.h>
+#include <ntqsignalslotimp.h>
+#include <ntqwidget.h>
+#include <ntqhttp.h>
 #include <private/qsqlextension_p.h>
-#include <qsqlindex.h>
-#include <qtable.h>
-#include <qtable.h>
-#include <qtable.h>
-#include <qasciidict.h>
-#include <qcstring.h>
-#include <qdict.h>
-#include <qintdict.h>
-#include <qlibrary.h>
-#include <qmap.h>
-#include <qmemarray.h>
-#include <qptrlist.h>
-#include <qptrvector.h>
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qvaluevector.h>
-#include <qdockarea.h>
-#include <qdockwindow.h>
+#include <ntqsqlindex.h>
+#include <ntqtable.h>
+#include <ntqtable.h>
+#include <ntqtable.h>
+#include <ntqasciidict.h>
+#include <ntqcstring.h>
+#include <ntqdict.h>
+#include <ntqintdict.h>
+#include <ntqlibrary.h>
+#include <ntqmap.h>
+#include <ntqmemarray.h>
+#include <ntqptrlist.h>
+#include <ntqptrvector.h>
+#include <ntqstring.h>
+#include <ntqvaluelist.h>
+#include <ntqvaluevector.h>
+#include <ntqdockarea.h>
+#include <ntqdockwindow.h>