685 files changed, 3820 insertions, 3820 deletions

diff --git a/src/3rdparty/sqlite/config.h b/src/3rdparty/sqlite/config.h
index ae29a5723..b17d48a88 100644
--- a/src/3rdparty/sqlite/config.h
+++ b/src/3rdparty/sqlite/config.h
@@ -1,5 +1,5 @@
-#include <qglobal.h>
-#include <qconfig.h>
+#include <ntqglobal.h>
+#include <ntqconfig.h>
 
 #ifndef QT_POINTER_SIZE
 # ifdef Q_OS_WIN32
diff --git a/src/3rdparty/sqlite/trolltech.patch b/src/3rdparty/sqlite/trolltech.patch
index cbafffbd4..81d408d1a 100644
--- a/src/3rdparty/sqlite/trolltech.patch
+++ b/src/3rdparty/sqlite/trolltech.patch
@@ -3,8 +3,8 @@ diff -du ./config.h /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h
 +++ /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h	2004-01-08 14:29:23.000000000 +0100
 @@ -1 +1,23 @@
 -#define SQLITE_PTR_SZ 4
-+#include <qglobal.h>
-+#include <qconfig.h>
++#include <ntqglobal.h>
++#include <ntqconfig.h>
 +
 +#ifndef QT_POINTER_SIZE
 +# ifdef Q_OS_WIN32
diff --git a/src/attic/qtmultilineedit.cpp b/src/attic/qtmultilineedit.cpp
index 773bbbde6..79c3700fb 100644
--- a/src/attic/qtmultilineedit.cpp
+++ b/src/attic/qtmultilineedit.cpp
@@ -13,19 +13,19 @@
 
 #include "qtmultilineedit.h"
 #ifndef QT_NO_QTMULTILINEEDIT
-#include "qpainter.h"
-#include "qscrollbar.h"
-#include "qclipboard.h"
-#include "qpixmap.h"
-#include "qregexp.h"
-#include "qapplication.h"
-#include "qdragobject.h"
-#include "qpopupmenu.h"
-#include "qtimer.h"
-#include "qdict.h"
-#include "qcursor.h"
+#include "ntqpainter.h"
+#include "ntqscrollbar.h"
+#include "ntqclipboard.h"
+#include "ntqpixmap.h"
+#include "ntqregexp.h"
+#include "ntqapplication.h"
+#include "ntqdragobject.h"
+#include "ntqpopupmenu.h"
+#include "ntqtimer.h"
+#include "ntqdict.h"
+#include "ntqcursor.h"
 #ifndef QT_NO_COMPAT
-#include "qstyle.h"
+#include "ntqstyle.h"
 #endif
 
 
diff --git a/src/attic/qtmultilineedit.h b/src/attic/qtmultilineedit.h
index b7e52b03d..3b7ccd25c 100644
--- a/src/attic/qtmultilineedit.h
+++ b/src/attic/qtmultilineedit.h
@@ -16,8 +16,8 @@
 
 #ifndef QT_H
 #include "qttableview.h"
-#include "qstring.h"
-#include "qptrlist.h"
+#include "ntqstring.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_QTMULTILINEEDIT
diff --git a/src/attic/qttableview.cpp b/src/attic/qttableview.cpp
index c93ef7c99..e608ae92f 100644
--- a/src/attic/qttableview.cpp
+++ b/src/attic/qttableview.cpp
@@ -13,9 +13,9 @@
 
 #include "qttableview.h"
 #ifndef QT_NO_QTTABLEVIEW
-#include "qscrollbar.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
+#include "ntqscrollbar.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
 #include <limits.h>
 
 enum ScrollBarDirtyFlags {
diff --git a/src/attic/qttableview.h b/src/attic/qttableview.h
index 158cb661c..4dfb38ce7 100644
--- a/src/attic/qttableview.h
+++ b/src/attic/qttableview.h
@@ -15,7 +15,7 @@
 #define TQTTABLEVIEW_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_QTTABLEVIEW
diff --git a/src/canvas/qcanvas.h b/src/canvas/ntqcanvas.h
index 37c30816d..b104fd8a6 100644
--- a/src/canvas/qcanvas.h
+++ b/src/canvas/ntqcanvas.h
@@ -42,13 +42,13 @@
 #define TQCANVAS_H
 
 #ifndef QT_H
-#include "qscrollview.h"
-#include "qpixmap.h"
-#include "qptrlist.h"
-#include "qbrush.h"
-#include "qpen.h"
-#include "qvaluelist.h"
-#include "qpointarray.h"
+#include "ntqscrollview.h"
+#include "ntqpixmap.h"
+#include "ntqptrlist.h"
+#include "ntqbrush.h"
+#include "ntqpen.h"
+#include "ntqvaluelist.h"
+#include "ntqpointarray.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
@@ -810,7 +810,7 @@ private:
 };
 
 #define Q_DEFINED_QCANVAS
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // QT_NO_CANVAS
 
 #endif // TQCANVAS_H
diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp
index 167e02094..7b337fb49 100644
--- a/src/canvas/qcanvas.cpp
+++ b/src/canvas/qcanvas.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qcanvas.h"
+#include "ntqcanvas.h"
 #ifndef QT_NO_CANVAS
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qimage.h"
-#include "qptrdict.h"
-#include "qpainter.h"
-#include "qpolygonscanner.h"
-#include "qtimer.h"
-#include "qtl.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqimage.h"
+#include "ntqptrdict.h"
+#include "ntqpainter.h"
+#include "ntqpolygonscanner.h"
+#include "ntqtimer.h"
+#include "ntqtl.h"
 
 #include <stdlib.h>
 
@@ -436,7 +436,7 @@ static int scm(int a, int b)
 
 
 /*!
-    \class TQCanvas qcanvas.h
+    \class TQCanvas ntqcanvas.h
     \brief The TQCanvas class provides a 2D area that can contain TQCanvasItem objects.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -1844,7 +1844,7 @@ class TQCanvasItemExtra {
 
 
 /*!
-    \class TQCanvasItem qcanvas.h
+    \class TQCanvasItem ntqcanvas.h
     \brief The TQCanvasItem class provides an abstract graphic object on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2484,7 +2484,7 @@ static bool collision_double_dispatch( const TQCanvasSprite* s1,
 
 
 /*!
-    \class TQCanvasSprite qcanvas.h
+    \class TQCanvasSprite ntqcanvas.h
     \brief The TQCanvasSprite class provides an animated canvas item on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2801,7 +2801,7 @@ TQRect TQCanvasItem::boundingRectAdvanced() const
 }
 
 /*!
-    \class TQCanvasPixmap qcanvas.h
+    \class TQCanvasPixmap ntqcanvas.h
     \brief The TQCanvasPixmap class provides pixmaps for TQCanvasSprites.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2931,7 +2931,7 @@ TQCanvasPixmap::~TQCanvasPixmap()
 */
 
 /*!
-    \class TQCanvasPixmapArray qcanvas.h
+    \class TQCanvasPixmapArray ntqcanvas.h
     \brief The TQCanvasPixmapArray class provides an array of TQCanvasPixmaps.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -3457,7 +3457,7 @@ void TQCanvasSprite::draw(TQPainter& painter)
 }
 
 /*!
-    \class TQCanvasView qcanvas.h
+    \class TQCanvasView ntqcanvas.h
     \brief The TQCanvasView class provides an on-screen view of a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -3726,7 +3726,7 @@ TQSize TQCanvasView::sizeHint() const
 // ### TQt 4.0 customer request: operate on doubles rather than int.
 // ### I know, almost impossible due to the use of TQRegion etc.
 /*!
-    \class TQCanvasPolygonalItem qcanvas.h
+    \class TQCanvasPolygonalItem ntqcanvas.h
     \brief The TQCanvasPolygonalItem class provides a polygonal canvas item
     on a TQCanvas.
 \if defined(commercial)
@@ -4135,7 +4135,7 @@ void TQCanvasPolygonalItem::setBrush(TQBrush b)
 
 
 /*!
-    \class TQCanvasPolygon qcanvas.h
+    \class TQCanvasPolygon ntqcanvas.h
     \brief The TQCanvasPolygon class provides a polygon on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4228,7 +4228,7 @@ void TQCanvasPolygon::moveBy(double dx, double dy)
 }
 
 /*!
-    \class TQCanvasSpline qcanvas.h
+    \class TQCanvasSpline ntqcanvas.h
     \brief The TQCanvasSpline class provides multi-bezier splines on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4390,7 +4390,7 @@ TQPointArray TQCanvasPolygon::areaPoints() const
 // points -- that way for some uses just the constructor call would be
 // required?
 /*!
-    \class TQCanvasLine qcanvas.h
+    \class TQCanvasLine ntqcanvas.h
     \brief The TQCanvasLine class provides a line on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4534,7 +4534,7 @@ void TQCanvasLine::moveBy(double dx, double dy)
 }
 
 /*!
-    \class TQCanvasRectangle qcanvas.h
+    \class TQCanvasRectangle ntqcanvas.h
     \brief The TQCanvasRectangle class provides a rectangle on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4672,7 +4672,7 @@ void TQCanvasRectangle::drawShape(TQPainter & p)
 
 
 /*!
-    \class TQCanvasEllipse qcanvas.h
+    \class TQCanvasEllipse ntqcanvas.h
     \brief The TQCanvasEllipse class provides an ellipse or ellipse segment on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4859,7 +4859,7 @@ void TQCanvasEllipse::drawShape(TQPainter & p)
 
 
 /*!
-    \class TQCanvasText qcanvas.h
+    \class TQCanvasText ntqcanvas.h
     \brief The TQCanvasText class provides a text object on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/canvas/qt_canvas.pri b/src/canvas/qt_canvas.pri
index 779a52153..ad3ee30bb 100644
--- a/src/canvas/qt_canvas.pri
+++ b/src/canvas/qt_canvas.pri
@@ -1,6 +1,6 @@
 # Qt canvas module
 
 canvas {
-	HEADERS += $$CANVAS_H/qcanvas.h
+	HEADERS += $$CANVAS_H/ntqcanvas.h
 	SOURCES += $$CANVAS_CPP/qcanvas.cpp
 }
diff --git a/src/codecs/qbig5codec.h b/src/codecs/ntqbig5codec.h
index c32f3a63b..24b8747ec 100644
--- a/src/codecs/qbig5codec.h
+++ b/src/codecs/ntqbig5codec.h
@@ -46,7 +46,7 @@
 #define TQBIG5CODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qeucjpcodec.h b/src/codecs/ntqeucjpcodec.h
index 31154b619..b5d6e7d88 100644
--- a/src/codecs/qeucjpcodec.h
+++ b/src/codecs/ntqeucjpcodec.h
@@ -71,8 +71,8 @@
 #define TQEUCJPCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
-#include "qjpunicode.h"
+#include "ntqtextcodec.h"
+#include "ntqjpunicode.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qeuckrcodec.h b/src/codecs/ntqeuckrcodec.h
index 0c8371d0d..7235ca31a 100644
--- a/src/codecs/qeuckrcodec.h
+++ b/src/codecs/ntqeuckrcodec.h
@@ -67,7 +67,7 @@
 #define TQEUCKRCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qgb18030codec.h b/src/codecs/ntqgb18030codec.h
index a0f88dd84..fa7f897c9 100644
--- a/src/codecs/qgb18030codec.h
+++ b/src/codecs/ntqgb18030codec.h
@@ -42,7 +42,7 @@
 #define TQGB18030CODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 
diff --git a/src/codecs/qgbkcodec.h b/src/codecs/ntqgbkcodec.h
index df13073d7..6701ac935 100644
--- a/src/codecs/qgbkcodec.h
+++ b/src/codecs/ntqgbkcodec.h
@@ -42,6 +42,6 @@
 #ifndef TQGBKCODEC_H
 #define TQGBKCODEC_H
 #ifndef QT_H
-#include "qgb18030codec.h"
+#include "ntqgb18030codec.h"
 #endif // QT_H
 #endif
diff --git a/src/codecs/qjiscodec.h b/src/codecs/ntqjiscodec.h
index 02dc2acf0..00cbf7cde 100644
--- a/src/codecs/qjiscodec.h
+++ b/src/codecs/ntqjiscodec.h
@@ -71,8 +71,8 @@
 #define TQJISCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
-#include "qjpunicode.h"
+#include "ntqtextcodec.h"
+#include "ntqjpunicode.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qjpunicode.h b/src/codecs/ntqjpunicode.h
index 15107d7c2..eb0c8f712 100644
--- a/src/codecs/qjpunicode.h
+++ b/src/codecs/ntqjpunicode.h
@@ -71,7 +71,7 @@
 #define TQJPUNICODE_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qrtlcodec.h b/src/codecs/ntqrtlcodec.h
index 1ddbbde7a..bb031da45 100644
--- a/src/codecs/qrtlcodec.h
+++ b/src/codecs/ntqrtlcodec.h
@@ -42,7 +42,7 @@
 #define TQRTLCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_CODEC_HEBREW
diff --git a/src/codecs/qsjiscodec.h b/src/codecs/ntqsjiscodec.h
index 4e85505ef..9bac66caf 100644
--- a/src/codecs/qsjiscodec.h
+++ b/src/codecs/ntqsjiscodec.h
@@ -71,8 +71,8 @@
 #define TQSJISCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
-#include "qjpunicode.h"
+#include "ntqtextcodec.h"
+#include "ntqjpunicode.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qtextcodec.h b/src/codecs/ntqtextcodec.h
index 5fb16c1dc..d6ea1a3bd 100644
--- a/src/codecs/qtextcodec.h
+++ b/src/codecs/ntqtextcodec.h
@@ -42,7 +42,7 @@
 #define TQTEXTCODEC_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTCODEC
diff --git a/src/codecs/qtextcodecfactory.h b/src/codecs/ntqtextcodecfactory.h
index 8e1bf38ad..94b4dddad 100644
--- a/src/codecs/qtextcodecfactory.h
+++ b/src/codecs/ntqtextcodecfactory.h
@@ -40,7 +40,7 @@
 #define TQTEXTCODECFACTORY_H
 
 #ifndef QT_H
-#include "qstringlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTCODEC
diff --git a/src/codecs/qtextcodecplugin.h b/src/codecs/ntqtextcodecplugin.h
index b9393a023..787941f51 100644
--- a/src/codecs/qtextcodecplugin.h
+++ b/src/codecs/ntqtextcodecplugin.h
@@ -42,8 +42,8 @@
 #define TQTEXTCODECPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTCODECPLUGIN
diff --git a/src/codecs/qtsciicodec.h b/src/codecs/ntqtsciicodec.h
index abe0b3a99..4b881b135 100644
--- a/src/codecs/qtsciicodec.h
+++ b/src/codecs/ntqtsciicodec.h
@@ -69,7 +69,7 @@
 #define TQTSCIICODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_CODECS
diff --git a/src/codecs/qutfcodec.h b/src/codecs/ntqutfcodec.h
index d34c27925..8955b6c2c 100644
--- a/src/codecs/qutfcodec.h
+++ b/src/codecs/ntqutfcodec.h
@@ -42,7 +42,7 @@
 #define TQUTFCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTCODEC
diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp
index 9fdc45fac..efb90ff39 100644
--- a/src/codecs/qbig5codec.cpp
+++ b/src/codecs/qbig5codec.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 /*!
-    \class TQBig5Codec qbig5codec.h
+    \class TQBig5Codec ntqbig5codec.h
     \ingroup i18n
 
     \brief The TQBig5Codec class provides conversion to and from the Big5 encoding.
@@ -98,7 +98,7 @@
   SUCH DAMAGE.
 */
 
-#include "qbig5codec.h"
+#include "ntqbig5codec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp
index a869b9144..1b5a3c897 100644
--- a/src/codecs/qeucjpcodec.cpp
+++ b/src/codecs/qeucjpcodec.cpp
@@ -42,7 +42,7 @@
 // a.k.a. Junji Takagi, and is included in TQt with the author's permission,
 // and the grateful thanks of the Trolltech team.
 
-/*! \class TQEucJpCodec qeucjpcodec.h
+/*! \class TQEucJpCodec ntqeucjpcodec.h
     \reentrant
     \ingroup i18n
 
@@ -114,7 +114,7 @@
  * SUCH DAMAGE.
  */
 
-#include "qeucjpcodec.h"
+#include "ntqeucjpcodec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp
index fc799bd84..547c00e80 100644
--- a/src/codecs/qeuckrcodec.cpp
+++ b/src/codecs/qeuckrcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-/*! \class TQEucKrCodec qeuckrcodec.h
+/*! \class TQEucKrCodec ntqeuckrcodec.h
     \reentrant
     \ingroup i18n
 
@@ -92,7 +92,7 @@
     int heuristicNameMatch(const char* hint) const;
 */
 
-#include "qeuckrcodec.h"
+#include "ntqeuckrcodec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qfontcodecs_p.h b/src/codecs/qfontcodecs_p.h
index b78738fd8..d323fbb92 100644
--- a/src/codecs/qfontcodecs_p.h
+++ b/src/codecs/qfontcodecs_p.h
@@ -54,8 +54,8 @@
 //
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qtextcodec.h"
+#include "ntqglobal.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 
diff --git a/src/codecs/qfontjpcodec.cpp b/src/codecs/qfontjpcodec.cpp
index 8cdac2dee..365f21e0e 100644
--- a/src/codecs/qfontjpcodec.cpp
+++ b/src/codecs/qfontjpcodec.cpp
@@ -42,7 +42,7 @@
 
 #ifndef QT_NO_CODECS
 #ifndef QT_NO_BIG_CODECS
-#include "qjpunicode.h"
+#include "ntqjpunicode.h"
 
 
 // JIS X 0201
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index 257cbb587..938967071 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -35,7 +35,7 @@
 **
 **********************************************************************/
 
-/*! \class TQGb18030Codec qgb18030codec.h
+/*! \class TQGb18030Codec ntqgb18030codec.h
   \reentrant
   \ingroup i18n
 
@@ -115,10 +115,10 @@
   SUCH DAMAGE.
 */
 
-#include "qgb18030codec.h"
+#include "ntqgb18030codec.h"
 
 #if (QT_VERSION-0 >= 0x040000)
-#error "move obsolete header <qgbkcodec.h> into the src/compat directory"
+#error "move obsolete header <ntqgbkcodec.h> into the src/compat directory"
 #endif
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qisciicodec_p.h b/src/codecs/qisciicodec_p.h
index 6f2f43edb..ebf9fe14b 100644
--- a/src/codecs/qisciicodec_p.h
+++ b/src/codecs/qisciicodec_p.h
@@ -2,7 +2,7 @@
 #define TQISCIICODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_CODECS
diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp
index f0ecfdb65..5f5afbb9b 100644
--- a/src/codecs/qjiscodec.cpp
+++ b/src/codecs/qjiscodec.cpp
@@ -132,7 +132,7 @@
   SUCH DAMAGE.
 */
 
-#include "qjiscodec.h"
+#include "ntqjiscodec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp
index bc2d19328..1a6c34aea 100644
--- a/src/codecs/qjpunicode.cpp
+++ b/src/codecs/qjpunicode.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-/*! \class TQJpUnicodeConv qjpunicode.h
+/*! \class TQJpUnicodeConv ntqjpunicode.h
     \reentrant
     \ingroup i18n
 
@@ -82,9 +82,9 @@
   SUCH DAMAGE.
 */
 
-#include "qjpunicode.h"
+#include "ntqjpunicode.h"
 #ifndef QT_NO_BIG_CODECS
-#include "qcstring.h"
+#include "ntqcstring.h"
 #ifdef Q_OS_TEMP
 #include "qwinfunctions_wce.h"
 #endif
diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp
index 75a049c7e..fa1585ec8 100644
--- a/src/codecs/qrtlcodec.cpp
+++ b/src/codecs/qrtlcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qrtlcodec.h"
+#include "ntqrtlcodec.h"
 #include <private/qtextengine_p.h>
 
 #ifndef QT_NO_CODEC_HEBREW
@@ -359,7 +359,7 @@ static TQChar::Direction findBasicDirection(TQString str)
 
 
 /*!
-    \class TQHebrewCodec qrtlcodec.h
+    \class TQHebrewCodec ntqrtlcodec.h
     \reentrant
     \ingroup i18n
 
diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp
index e6666a02b..9d2df5109 100644
--- a/src/codecs/qsjiscodec.cpp
+++ b/src/codecs/qsjiscodec.cpp
@@ -42,7 +42,7 @@
 // a.k.a. Junji Takagi, and is included in TQt with the author's permission,
 // and the grateful thanks of the Trolltech team.
 
-/*! \class TQSjisCodec qsjiscodec.h
+/*! \class TQSjisCodec ntqsjiscodec.h
     \reentrant
     \ingroup i18n
   \brief The TQSjisCodec class provides conversion to and from Shift-JIS.
@@ -90,7 +90,7 @@
   SUCH DAMAGE.
 */
 
-#include "qsjiscodec.h"
+#include "ntqsjiscodec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qt_codecs.pri b/src/codecs/qt_codecs.pri
index 344557299..3753a5dae 100644
--- a/src/codecs/qt_codecs.pri
+++ b/src/codecs/qt_codecs.pri
@@ -5,21 +5,21 @@ tools {
 	CODECS_P		= codecs
 	HEADERS += \
 #$$CODECS_H/qasmocodec.h \
-		$$CODECS_H/qbig5codec.h \
-		  $$CODECS_H/qeucjpcodec.h \
-		  $$CODECS_H/qeuckrcodec.h \
+		$$CODECS_H/ntqbig5codec.h \
+		  $$CODECS_H/ntqeucjpcodec.h \
+		  $$CODECS_H/ntqeuckrcodec.h \
 		  $$CODECS_P/qisciicodec_p.h \
-		  $$CODECS_H/qgb18030codec.h \
-		  $$CODECS_H/qjiscodec.h \
-		  $$CODECS_H/qjpunicode.h \
-		  $$CODECS_H/qrtlcodec.h \
-		  $$CODECS_H/qsjiscodec.h \
-		  $$CODECS_H/qtextcodec.h \
-		  $$CODECS_H/qtsciicodec.h \
-		  $$CODECS_H/qutfcodec.h \
+		  $$CODECS_H/ntqgb18030codec.h \
+		  $$CODECS_H/ntqjiscodec.h \
+		  $$CODECS_H/ntqjpunicode.h \
+		  $$CODECS_H/ntqrtlcodec.h \
+		  $$CODECS_H/ntqsjiscodec.h \
+		  $$CODECS_H/ntqtextcodec.h \
+		  $$CODECS_H/ntqtsciicodec.h \
+		  $$CODECS_H/ntqutfcodec.h \
 		  $$CODECS_P/qtextcodecinterface_p.h \
-		  $$CODECS_H/qtextcodecfactory.h \
-		  $$CODECS_H/qtextcodecplugin.h
+		  $$CODECS_H/ntqtextcodecfactory.h \
+		  $$CODECS_H/ntqtextcodecplugin.h
 
 	SOURCES += \
 #$$CODECS_CPP/qasmocodec.cpp \
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index c08d465fa..23b6ff51a 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -45,30 +45,30 @@
 # undef open
 #endif
 
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #ifndef QT_NO_TEXTCODEC
 
-#include "qvaluelist.h"
-#include "qtextcodecfactory.h"
-#include "qutfcodec.h"
-#include "qnamespace.h"
+#include "ntqvaluelist.h"
+#include "ntqtextcodecfactory.h"
+#include "ntqutfcodec.h"
+#include "ntqnamespace.h"
 #ifndef QT_NO_CODECS
-#include "qrtlcodec.h"
-#include "qtsciicodec.h"
+#include "ntqrtlcodec.h"
+#include "ntqtsciicodec.h"
 #include "qisciicodec_p.h"
 #endif // QT_NO_CODECS
 #ifndef QT_NO_BIG_CODECS
-#include "qbig5codec.h"
-#include "qeucjpcodec.h"
-#include "qeuckrcodec.h"
-#include "qgb18030codec.h"
-#include "qjiscodec.h"
-#include "qjpunicode.h"
-#include "qsjiscodec.h"
+#include "ntqbig5codec.h"
+#include "ntqeucjpcodec.h"
+#include "ntqeuckrcodec.h"
+#include "ntqgb18030codec.h"
+#include "ntqjiscodec.h"
+#include "ntqjpunicode.h"
+#include "ntqsjiscodec.h"
 #endif // QT_NO_BIG_CODECS
-#include "qfile.h"
-#include "qstrlist.h"
-#include "qstring.h"
+#include "ntqfile.h"
+#include "ntqstrlist.h"
+#include "ntqstring.h"
 #include "../tools/qlocale_p.h"
 
 #if !defined(QT_NO_CODECS) && !defined(QT_NO_BIG_CODECS) && defined(Q_WS_X11)
@@ -202,7 +202,7 @@ TQString TQTextStatelessDecoder::toUnicode(const char* chars, int len)
 
 
 /*!
-    \class TQTextCodec qtextcodec.h
+    \class TQTextCodec ntqtextcodec.h
     \brief The TQTextCodec class provides conversion between text encodings.
     \reentrant
     \ingroup i18n
@@ -1160,7 +1160,7 @@ bool TQTextCodec::canEncode( const TQString& s ) const
 
 
 /*!
-    \class TQTextEncoder qtextcodec.h
+    \class TQTextEncoder ntqtextcodec.h
     \brief The TQTextEncoder class provides a state-based encoder.
     \reentrant
     \ingroup i18n
@@ -1192,7 +1192,7 @@ TQTextEncoder::~TQTextEncoder()
 */
 
 /*!
-    \class TQTextDecoder qtextcodec.h
+    \class TQTextDecoder ntqtextcodec.h
     \brief The TQTextDecoder class provides a state-based decoder.
     \reentrant
     \ingroup i18n
diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp
index a0ccedbcd..71e5ed125 100644
--- a/src/codecs/qtextcodecfactory.cpp
+++ b/src/codecs/qtextcodecfactory.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qtextcodecfactory.h"
+#include "ntqtextcodecfactory.h"
 
 #ifndef QT_NO_TEXTCODEC
 
 #ifndef QT_NO_COMPONENT
-#include "qapplication.h"
-#include "qcleanuphandler.h"
+#include "ntqapplication.h"
+#include "ntqcleanuphandler.h"
 #include <private/qpluginmanager_p.h>
 #include "qtextcodecinterface_p.h"
 
diff --git a/src/codecs/qtextcodecplugin.cpp b/src/codecs/qtextcodecplugin.cpp
index 29264c9dd..6f084584d 100644
--- a/src/codecs/qtextcodecplugin.cpp
+++ b/src/codecs/qtextcodecplugin.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qtextcodecplugin.h"
+#include "ntqtextcodecplugin.h"
 #ifndef QT_NO_TEXTCODECPLUGIN
 #include "qtextcodecinterface_p.h"
 
 /*!
-    \class TQTextCodecPlugin qtextcodecplugin.h
+    \class TQTextCodecPlugin ntqtextcodecplugin.h
     \brief The TQTextCodecPlugin class provides an abstract base for custom TQTextCodec plugins.
     \reentrant
     \ingroup plugins
diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp
index 5d6825272..87fc18b3f 100644
--- a/src/codecs/qtsciicodec.cpp
+++ b/src/codecs/qtsciicodec.cpp
@@ -40,7 +40,7 @@
 // and is included in TQt with the author's permission, and the grateful
 // thanks of the Trolltech team.
 
-/*! \class TQTsciiCodec qtsciicodec.h
+/*! \class TQTsciiCodec ntqtsciicodec.h
     \reentrant
     \ingroup i18n
 
@@ -92,7 +92,7 @@
   SUCH DAMAGE.
 */
 
-#include "qtsciicodec.h"
+#include "ntqtsciicodec.h"
 
 #ifndef QT_NO_CODECS
 
diff --git a/src/codecs/qutfcodec.cpp b/src/codecs/qutfcodec.cpp
index a95663614..4943ac8c2 100644
--- a/src/codecs/qutfcodec.cpp
+++ b/src/codecs/qutfcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qutfcodec.h"
+#include "ntqutfcodec.h"
 
 #ifndef QT_NO_TEXTCODEC
 
diff --git a/src/compat/qapp.h b/src/compat/ntqapp.h
index e71c7c87b..05e743317 100644
--- a/src/compat/qapp.h
+++ b/src/compat/ntqapp.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQAPP_H
 #define TQAPP_H
-#include "qapplication.h"
+#include "ntqapplication.h"
 #endif
diff --git a/src/compat/qarray.h b/src/compat/ntqarray.h
index a0ded7f5b..dc29acdaa 100644
--- a/src/compat/qarray.h
+++ b/src/compat/ntqarray.h
@@ -22,6 +22,6 @@
 #ifndef TQARRAY_H
 #define TQARRAY_H
 #ifndef QT_NO_COMPAT
-#include "qmemarray.h"
+#include "ntqmemarray.h"
 #endif
 #endif
diff --git a/src/compat/qbitarry.h b/src/compat/ntqbitarry.h
index 7928b2f88..9ed0f5629 100644
--- a/src/compat/qbitarry.h
+++ b/src/compat/ntqbitarry.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQBITARRY_H
 #define TQBITARRY_H
-#include "qbitarray.h"
+#include "ntqbitarray.h"
 #endif
diff --git a/src/compat/qbttngrp.h b/src/compat/ntqbttngrp.h
index a91d1bcef..410c3b440 100644
--- a/src/compat/qbttngrp.h
+++ b/src/compat/ntqbttngrp.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQBTTNGRP_H
 #define TQBTTNGRP_H
-#include "qbuttongroup.h"
+#include "ntqbuttongroup.h"
 #endif
diff --git a/src/compat/qchkbox.h b/src/compat/ntqchkbox.h
index fd5a2d51a..a7e8005e0 100644
--- a/src/compat/qchkbox.h
+++ b/src/compat/ntqchkbox.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQCHKBOX_H
 #define TQCHKBOX_H
-#include "qcheckbox.h"
+#include "ntqcheckbox.h"
 #endif
diff --git a/src/compat/qclipbrd.h b/src/compat/ntqclipbrd.h
index d20dd332e..abc51a374 100644
--- a/src/compat/qclipbrd.h
+++ b/src/compat/ntqclipbrd.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQCLIPBRD_H
 #define TQCLIPBRD_H
-#include "qclipboard.h"
+#include "ntqclipboard.h"
 #endif
diff --git a/src/compat/qcollect.h b/src/compat/ntqcollect.h
index 58e00e6cb..3fd294de9 100644
--- a/src/compat/qcollect.h
+++ b/src/compat/ntqcollect.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQCOLLECT_H
 #define TQCOLLECT_H
-#include "qptrcollection.h"
+#include "ntqptrcollection.h"
 #endif
diff --git a/src/compat/qcollection.h b/src/compat/ntqcollection.h
index c78d60581..e7ddd71d8 100644
--- a/src/compat/qcollection.h
+++ b/src/compat/ntqcollection.h
@@ -22,6 +22,6 @@
 #ifndef TQCOLLECTION_H
 #define TQCOLLECTION_H
 #ifndef QT_NO_COMPAT
-#include "qptrcollection.h"
+#include "ntqptrcollection.h"
 #endif
 #endif
diff --git a/src/compat/qcombo.h b/src/compat/ntqcombo.h
index 52bccf577..024a6df05 100644
--- a/src/compat/qcombo.h
+++ b/src/compat/ntqcombo.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQCOMBO_H
 #define TQCOMBO_H
-#include "qcombobox.h"
+#include "ntqcombobox.h"
 #endif
diff --git a/src/compat/qconnect.h b/src/compat/ntqconnect.h
index c42868bef..ef922de1b 100644
--- a/src/compat/qconnect.h
+++ b/src/compat/ntqconnect.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQCONNECT_H
 #define TQCONNECT_H
-#include "qconnection.h"
+#include "ntqconnection.h"
 #endif
diff --git a/src/compat/qdatetm.h b/src/compat/ntqdatetm.h
index 611c48f28..26acdb8b3 100644
--- a/src/compat/qdatetm.h
+++ b/src/compat/ntqdatetm.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQDATETM_H
 #define TQDATETM_H
-#include "qdatetime.h"
+#include "ntqdatetime.h"
 #endif
diff --git a/src/compat/qdrawutl.h b/src/compat/ntqdrawutl.h
index bf51159b5..145dae668 100644
--- a/src/compat/qdrawutl.h
+++ b/src/compat/ntqdrawutl.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQDRAWUTL_H
 #define TQDRAWUTL_H
-#include "qdrawutil.h"
+#include "ntqdrawutil.h"
 #endif
diff --git a/src/compat/qdstream.h b/src/compat/ntqdstream.h
index f92557be4..081ff0f8b 100644
--- a/src/compat/qdstream.h
+++ b/src/compat/ntqdstream.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQDSTREAM_H
 #define TQDSTREAM_H
-#include "qdatastream.h"
+#include "ntqdatastream.h"
 #endif
diff --git a/src/compat/qfiledef.h b/src/compat/ntqfiledef.h
index 03537ac91..03537ac91 100644
--- a/src/compat/qfiledef.h
+++ b/src/compat/ntqfiledef.h
diff --git a/src/compat/qfiledlg.h b/src/compat/ntqfiledlg.h
index 309ae12b5..c00fd631d 100644
--- a/src/compat/qfiledlg.h
+++ b/src/compat/ntqfiledlg.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQFILEDLG_H
 #define TQFILEDLG_H
-#include "qfiledialog.h"
+#include "ntqfiledialog.h"
 #endif
diff --git a/src/compat/qfileinf.h b/src/compat/ntqfileinf.h
index e4cba44a5..8d976b4bc 100644
--- a/src/compat/qfileinf.h
+++ b/src/compat/ntqfileinf.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQFILEINF_H
 #define TQFILEINF_H
-#include "qfileinfo.h"
+#include "ntqfileinfo.h"
 #endif
diff --git a/src/compat/qfontinf.h b/src/compat/ntqfontinf.h
index 2da955847..c0c6d8cc1 100644
--- a/src/compat/qfontinf.h
+++ b/src/compat/ntqfontinf.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQFONTINF_H
 #define TQFONTINF_H
-#include "qfontinfo.h"
+#include "ntqfontinfo.h"
 #endif
diff --git a/src/compat/qfontmet.h b/src/compat/ntqfontmet.h
index f2da52713..ad7c115c4 100644
--- a/src/compat/qfontmet.h
+++ b/src/compat/ntqfontmet.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQFONTMET_H
 #define TQFONTMET_H
-#include "qfontmetrics.h"
+#include "ntqfontmetrics.h"
 #endif
diff --git a/src/compat/qgrpbox.h b/src/compat/ntqgrpbox.h
index 31bc81d64..d8ad712b0 100644
--- a/src/compat/qgrpbox.h
+++ b/src/compat/ntqgrpbox.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQGRPBOX_H
 #define TQGRPBOX_H
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #endif
diff --git a/src/compat/qintcach.h b/src/compat/ntqintcach.h
index 09b3e0856..a9ee0bafc 100644
--- a/src/compat/qintcach.h
+++ b/src/compat/ntqintcach.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQINTCACH_H
 #define TQINTCACH_H
-#include "qintcache.h"
+#include "ntqintcache.h"
 #endif
diff --git a/src/compat/qiodev.h b/src/compat/ntqiodev.h
index 65afe35d4..83dd74901 100644
--- a/src/compat/qiodev.h
+++ b/src/compat/ntqiodev.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQIODEV_H
 #define TQIODEV_H
-#include "qiodevice.h"
+#include "ntqiodevice.h"
 #endif
diff --git a/src/compat/qlcdnum.h b/src/compat/ntqlcdnum.h
index 11b2b3d27..b6e5c4e59 100644
--- a/src/compat/qlcdnum.h
+++ b/src/compat/ntqlcdnum.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQLCDNUM_H
 #define TQLCDNUM_H
-#include "qlcdnumber.h"
+#include "ntqlcdnumber.h"
 #endif
diff --git a/src/compat/qlined.h b/src/compat/ntqlined.h
index 460f0cbfe..c573061da 100644
--- a/src/compat/qlined.h
+++ b/src/compat/ntqlined.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQLINED_H
 #define TQLINED_H
-#include "qlineedit.h"
+#include "ntqlineedit.h"
 #endif
diff --git a/src/compat/qlist.h b/src/compat/ntqlist.h
index b1c3a585d..444cb3be3 100644
--- a/src/compat/qlist.h
+++ b/src/compat/ntqlist.h
@@ -22,6 +22,6 @@
 #ifndef TQLIST_H
 #define TQLIST_H
 #ifndef QT_NO_COMPAT
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 #endif
 #endif
diff --git a/src/compat/qmenudta.h b/src/compat/ntqmenudta.h
index 7d8836817..86f3e75d5 100644
--- a/src/compat/qmenudta.h
+++ b/src/compat/ntqmenudta.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQMENUDTA_H
 #define TQMENUDTA_H
-#include "qmenudata.h"
+#include "ntqmenudata.h"
 #endif
diff --git a/src/compat/qmetaobj.h b/src/compat/ntqmetaobj.h
index b6fa96e51..a8f237c0f 100644
--- a/src/compat/qmetaobj.h
+++ b/src/compat/ntqmetaobj.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQMETAOBJ_H
 #define TQMETAOBJ_H
-#include "qmetaobject.h"
+#include "ntqmetaobject.h"
 #endif
diff --git a/src/compat/qmlined.h b/src/compat/ntqmlined.h
index 98101e581..28e1ab908 100644
--- a/src/compat/qmlined.h
+++ b/src/compat/ntqmlined.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQMLINED_H
 #define TQMLINED_H
-#include "qmultilineedit.h"
+#include "ntqmultilineedit.h"
 #endif
diff --git a/src/compat/qmsgbox.h b/src/compat/ntqmsgbox.h
index e0c2ff04c..55d34c51f 100644
--- a/src/compat/qmsgbox.h
+++ b/src/compat/ntqmsgbox.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQMSGBOX_H
 #define TQMSGBOX_H
-#include "qmessagebox.h"
+#include "ntqmessagebox.h"
 #endif
diff --git a/src/compat/qmultilinedit.h b/src/compat/ntqmultilinedit.h
index 43274d641..e530f469c 100644
--- a/src/compat/qmultilinedit.h
+++ b/src/compat/ntqmultilinedit.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQMULTILINEDIT_H
 #define TQMULTILINEDIT_H
-#include "qmultilineedit.h"
+#include "ntqmultilineedit.h"
 #endif
diff --git a/src/compat/qobjcoll.h b/src/compat/ntqobjcoll.h
index 9432ee4a0..643c363b8 100644
--- a/src/compat/qobjcoll.h
+++ b/src/compat/ntqobjcoll.h
@@ -21,6 +21,6 @@
 *****************************************************************************/
 #ifndef TQOBJCOLL_H
 #define TQOBJCOLL_H
-#include "qobjectlist.h"
-#include "qobjectdict.h"
+#include "ntqobjectlist.h"
+#include "ntqobjectdict.h"
 #endif
diff --git a/src/compat/qobjdefs.h b/src/compat/ntqobjdefs.h
index f8280891b..63bf8ce18 100644
--- a/src/compat/qobjdefs.h
+++ b/src/compat/ntqobjdefs.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQOBJDEFS_H
 #define TQOBJDEFS_H
-#include "qobjectdefs.h"
+#include "ntqobjectdefs.h"
 #endif
diff --git a/src/compat/qpaintd.h b/src/compat/ntqpaintd.h
index aa0c46de7..9fee2c004 100644
--- a/src/compat/qpaintd.h
+++ b/src/compat/ntqpaintd.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPAINTD_H
 #define TQPAINTD_H
-#include "qpaintdevice.h"
+#include "ntqpaintdevice.h"
 #endif
diff --git a/src/compat/qpaintdc.h b/src/compat/ntqpaintdc.h
index cfb7bbd88..d598bedf7 100644
--- a/src/compat/qpaintdc.h
+++ b/src/compat/ntqpaintdc.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPAINTDC_H
 #define TQPAINTDC_H
-#include "qpaintdevicedefs.h"
+#include "ntqpaintdevicedefs.h"
 #endif
diff --git a/src/compat/qpdevmet.h b/src/compat/ntqpdevmet.h
index a2978de3e..eb54dd3b7 100644
--- a/src/compat/qpdevmet.h
+++ b/src/compat/ntqpdevmet.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPDEVMET_H
 #define TQPDEVMET_H
-#include "qpaintdevicemetrics.h"
+#include "ntqpaintdevicemetrics.h"
 #endif
diff --git a/src/compat/qpmcache.h b/src/compat/ntqpmcache.h
index e2917720e..cf3b4915e 100644
--- a/src/compat/qpmcache.h
+++ b/src/compat/ntqpmcache.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPMCACHE_H
 #define TQPMCACHE_H
-#include "qpixmapcache.h"
+#include "ntqpixmapcache.h"
 #endif
diff --git a/src/compat/qpntarry.h b/src/compat/ntqpntarry.h
index f8289def4..4de05006f 100644
--- a/src/compat/qpntarry.h
+++ b/src/compat/ntqpntarry.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPNTARRY_H
 #define TQPNTARRY_H
-#include "qpointarray.h"
+#include "ntqpointarray.h"
 #endif
diff --git a/src/compat/qpopmenu.h b/src/compat/ntqpopmenu.h
index e900339a2..4fb4ea582 100644
--- a/src/compat/qpopmenu.h
+++ b/src/compat/ntqpopmenu.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPOPMENU_H
 #define TQPOPMENU_H
-#include "qpopupmenu.h"
+#include "ntqpopupmenu.h"
 #endif
diff --git a/src/compat/qprndlg.h b/src/compat/ntqprndlg.h
index 945a75b7c..7913d4491 100644
--- a/src/compat/qprndlg.h
+++ b/src/compat/ntqprndlg.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPRNDLG_H
 #define TQPRNDLG_H
-#include "qprintdialog.h"
+#include "ntqprintdialog.h"
 #endif
diff --git a/src/compat/qprogbar.h b/src/compat/ntqprogbar.h
index b4ba1ae57..be0f41ff6 100644
--- a/src/compat/qprogbar.h
+++ b/src/compat/ntqprogbar.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPROGBAR_H
 #define TQPROGBAR_H
-#include "qprogressbar.h"
+#include "ntqprogressbar.h"
 #endif
diff --git a/src/compat/qprogdlg.h b/src/compat/ntqprogdlg.h
index 2a341546d..00dd30038 100644
--- a/src/compat/qprogdlg.h
+++ b/src/compat/ntqprogdlg.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPROGDLG_H
 #define TQPROGDLG_H
-#include "qprogressdialog.h"
+#include "ntqprogressdialog.h"
 #endif
diff --git a/src/compat/qpsprn.h b/src/compat/ntqpsprn.h
index f8f0f6d27..f8f0f6d27 100644
--- a/src/compat/qpsprn.h
+++ b/src/compat/ntqpsprn.h
diff --git a/src/compat/qpushbt.h b/src/compat/ntqpushbt.h
index 337fa989d..3c77ad073 100644
--- a/src/compat/qpushbt.h
+++ b/src/compat/ntqpushbt.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQPUSHBT_H
 #define TQPUSHBT_H
-#include "qpushbutton.h"
+#include "ntqpushbutton.h"
 #endif
diff --git a/src/compat/qqueue.h b/src/compat/ntqqueue.h
index c8356a546..0af0f1c99 100644
--- a/src/compat/qqueue.h
+++ b/src/compat/ntqqueue.h
@@ -22,6 +22,6 @@
 #ifndef TQQUEUE_H
 #define TQQUEUE_H
 #ifndef QT_NO_COMPAT
-#include "qptrqueue.h"
+#include "ntqptrqueue.h"
 #endif
 #endif
diff --git a/src/compat/qradiobt.h b/src/compat/ntqradiobt.h
index bef69abe4..bcb48d68f 100644
--- a/src/compat/qradiobt.h
+++ b/src/compat/ntqradiobt.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQRADIOBT_H
 #define TQRADIOBT_H
-#include "qradiobutton.h"
+#include "ntqradiobutton.h"
 #endif
diff --git a/src/compat/qrangect.h b/src/compat/ntqrangect.h
index 7247a795f..87fc5c6e4 100644
--- a/src/compat/qrangect.h
+++ b/src/compat/ntqrangect.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQRANGECT_H
 #define TQRANGECT_H
-#include "qrangecontrol.h"
+#include "ntqrangecontrol.h"
 #endif
diff --git a/src/compat/qscrbar.h b/src/compat/ntqscrbar.h
index 870b0139c..ad435e83f 100644
--- a/src/compat/qscrbar.h
+++ b/src/compat/ntqscrbar.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQSCRBAR_H
 #define TQSCRBAR_H
-#include "qscrollbar.h"
+#include "ntqscrollbar.h"
 #endif
diff --git a/src/compat/qsocknot.h b/src/compat/ntqsocknot.h
index 55ef3a2ff..da6fc4825 100644
--- a/src/compat/qsocknot.h
+++ b/src/compat/ntqsocknot.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQSOCKNOT_H
 #define TQSOCKNOT_H
-#include "qsocketnotifier.h"
+#include "ntqsocketnotifier.h"
 #endif
diff --git a/src/compat/qstack.h b/src/compat/ntqstack.h
index db69e37a4..43d3ad9ac 100644
--- a/src/compat/qstack.h
+++ b/src/compat/ntqstack.h
@@ -22,6 +22,6 @@
 #ifndef TQSTACK_H
 #define TQSTACK_H
 #ifndef QT_NO_COMPAT
-#include "qptrstack.h"
+#include "ntqptrstack.h"
 #endif
 #endif
diff --git a/src/compat/qtabdlg.h b/src/compat/ntqtabdlg.h
index 98aef91df..1469373c9 100644
--- a/src/compat/qtabdlg.h
+++ b/src/compat/ntqtabdlg.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQTABDLG_H
 #define TQTABDLG_H
-#include "qtabdialog.h"
+#include "ntqtabdialog.h"
 #endif
diff --git a/src/compat/qtstream.h b/src/compat/ntqtstream.h
index cc0f1233a..fcdd3aa7c 100644
--- a/src/compat/qtstream.h
+++ b/src/compat/ntqtstream.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQTSTREAM_H
 #define TQTSTREAM_H
-#include "qtextstream.h"
+#include "ntqtextstream.h"
 #endif
diff --git a/src/compat/qvector.h b/src/compat/ntqvector.h
index 27d9b0901..116edaf38 100644
--- a/src/compat/qvector.h
+++ b/src/compat/ntqvector.h
@@ -22,6 +22,6 @@
 #ifndef TQVECTOR_H
 #define TQVECTOR_H
 #ifndef QT_NO_COMPAT
-#include "qptrvector.h"
+#include "ntqptrvector.h"
 #endif
 #endif
diff --git a/src/compat/qwidcoll.h b/src/compat/ntqwidcoll.h
index 34b27d72d..7a0a8162b 100644
--- a/src/compat/qwidcoll.h
+++ b/src/compat/ntqwidcoll.h
@@ -21,6 +21,6 @@
 *****************************************************************************/
 #ifndef TQWIDCOLL_H
 #define TQWIDCOLL_H
-#include "qwidgetlist.h"
-#include "qwidgetintdict.h"
+#include "ntqwidgetlist.h"
+#include "ntqwidgetintdict.h"
 #endif
diff --git a/src/compat/qwindefs.h b/src/compat/ntqwindefs.h
index 62c5c4a2d..a818f2a82 100644
--- a/src/compat/qwindefs.h
+++ b/src/compat/ntqwindefs.h
@@ -21,5 +21,5 @@
 *****************************************************************************/
 #ifndef TQWINDEFS_H
 #define TQWINDEFS_H
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #endif
diff --git a/src/dialogs/qcolordialog.h b/src/dialogs/ntqcolordialog.h
index 28c8ee1c0..c3490ef53 100644
--- a/src/dialogs/qcolordialog.h
+++ b/src/dialogs/ntqcolordialog.h
@@ -42,7 +42,7 @@
 #define TQCOLORDIALOG_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_COLORDIALOG
diff --git a/src/dialogs/qdialog.h b/src/dialogs/ntqdialog.h
index 068b4d360..bc9670af6 100644
--- a/src/dialogs/qdialog.h
+++ b/src/dialogs/ntqdialog.h
@@ -42,7 +42,7 @@
 #define TQDIALOG_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 #ifndef QT_NO_DIALOG
 #if 0
diff --git a/src/dialogs/qerrormessage.h b/src/dialogs/ntqerrormessage.h
index fffb7c73b..91634fbf7 100644
--- a/src/dialogs/qerrormessage.h
+++ b/src/dialogs/ntqerrormessage.h
@@ -42,7 +42,7 @@
 #define TQERRORMESSAGE_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_ERRORMESSAGE
diff --git a/src/dialogs/qfiledialog.h b/src/dialogs/ntqfiledialog.h
index ee13267e5..cc811b636 100644
--- a/src/dialogs/qfiledialog.h
+++ b/src/dialogs/ntqfiledialog.h
@@ -55,10 +55,10 @@ class TQFileDialogPrivate;
 class TQFileDialogTQFileListView;
 
 #ifndef QT_H
-#include "qdir.h"
-#include "qdialog.h"
-#include "qurloperator.h"
-#include "qurlinfo.h"
+#include "ntqdir.h"
+#include "ntqdialog.h"
+#include "ntqurloperator.h"
+#include "ntqurlinfo.h"
 #endif // QT_H
 
 #if __GNUC__ - 0 > 3
diff --git a/src/dialogs/qfontdialog.h b/src/dialogs/ntqfontdialog.h
index 53e625f23..bcb5e06dc 100644
--- a/src/dialogs/qfontdialog.h
+++ b/src/dialogs/ntqfontdialog.h
@@ -41,7 +41,7 @@
 #ifndef TQFONTDIALOG_H
 #define TQFONTDIALOG_H
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 
 #ifndef QT_NO_FONTDIALOG
 
@@ -56,8 +56,8 @@
 //
 
 #ifndef QT_H
-#include "qdialog.h"
-#include "qfont.h"
+#include "ntqdialog.h"
+#include "ntqfont.h"
 #endif // QT_H
 
 class TQFontDialogPrivate;
diff --git a/src/dialogs/qinputdialog.h b/src/dialogs/ntqinputdialog.h
index 96db6e557..7b21503bb 100644
--- a/src/dialogs/qinputdialog.h
+++ b/src/dialogs/ntqinputdialog.h
@@ -42,9 +42,9 @@
 #define TQINPUTDIALOG_H
 
 #ifndef QT_H
-#include "qdialog.h"
-#include "qstring.h"
-#include "qlineedit.h"
+#include "ntqdialog.h"
+#include "ntqstring.h"
+#include "ntqlineedit.h"
 #endif // QT_H
 
 #ifndef QT_NO_INPUTDIALOG
diff --git a/src/dialogs/qmessagebox.h b/src/dialogs/ntqmessagebox.h
index 65a7b6244..5ab38f78c 100644
--- a/src/dialogs/qmessagebox.h
+++ b/src/dialogs/ntqmessagebox.h
@@ -42,7 +42,7 @@
 #define TQMESSAGEBOX_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_MESSAGEBOX
@@ -200,8 +200,8 @@ private:	// Disabled copy constructor and operator=
 /*
 *  Macro to be used at the beginning of main(), e.g.
 *
-*   #include <qapplication.h>
-*   #include <qmessagebox.h>
+*   #include <ntqapplication.h>
+*   #include <ntqmessagebox.h>
 *   int main( int argc, char**argv )
 *   {
 *     QT_REQUIRE_VERSION( argc, argv, "3.0.5" )
diff --git a/src/dialogs/qprintdialog.h b/src/dialogs/ntqprintdialog.h
index 4d411850a..ea46c6fed 100644
--- a/src/dialogs/qprintdialog.h
+++ b/src/dialogs/ntqprintdialog.h
@@ -42,7 +42,7 @@
 #define TQPRINTDIALOG_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_PRINTDIALOG
diff --git a/src/dialogs/qprogressdialog.h b/src/dialogs/ntqprogressdialog.h
index 13b3129a8..e480f2862 100644
--- a/src/dialogs/qprogressdialog.h
+++ b/src/dialogs/ntqprogressdialog.h
@@ -42,9 +42,9 @@
 #define TQPROGRESSDIALOG_H
 
 #ifndef QT_H
-#include "qsemimodal.h"
-#include "qlabel.h"       // ### remove or keep for users' convenience?
-#include "qprogressbar.h" // ### remove or keep for users' convenience?
+#include "ntqsemimodal.h"
+#include "ntqlabel.h"       // ### remove or keep for users' convenience?
+#include "ntqprogressbar.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
 #ifndef QT_NO_PROGRESSDIALOG
diff --git a/src/dialogs/qsemimodal.h b/src/dialogs/ntqsemimodal.h
index 580b97bd9..ff015b7f6 100644
--- a/src/dialogs/qsemimodal.h
+++ b/src/dialogs/ntqsemimodal.h
@@ -42,7 +42,7 @@
 #define TQSEMIMODAL_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_COMPAT
diff --git a/src/dialogs/qtabdialog.h b/src/dialogs/ntqtabdialog.h
index 6391f6630..216225289 100644
--- a/src/dialogs/qtabdialog.h
+++ b/src/dialogs/ntqtabdialog.h
@@ -42,8 +42,8 @@
 #define TQTABDIALOG_H
 
 #ifndef QT_H
-#include "qdialog.h"
-#include "qiconset.h"
+#include "ntqdialog.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_TABDIALOG
diff --git a/src/dialogs/qwizard.h b/src/dialogs/ntqwizard.h
index 04754fb7b..b366f29ca 100644
--- a/src/dialogs/qwizard.h
+++ b/src/dialogs/ntqwizard.h
@@ -43,7 +43,7 @@
 
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_WIZARD
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index 0a3be03fb..e275f02b9 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-#include "qcolordialog.h"
+#include "ntqcolordialog.h"
 
 #ifndef QT_NO_COLORDIALOG
 
-#include "qpainter.h"
-#include "qlayout.h"
-#include "qlabel.h"
-#include "qpushbutton.h"
-#include "qlineedit.h"
-#include "qimage.h"
-#include "qpixmap.h"
-#include "qdrawutil.h"
-#include "qvalidator.h"
-#include "qdragobject.h"
-#include "qgridview.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qsettings.h"
-#include "qpopupmenu.h"
+#include "ntqpainter.h"
+#include "ntqlayout.h"
+#include "ntqlabel.h"
+#include "ntqpushbutton.h"
+#include "ntqlineedit.h"
+#include "ntqimage.h"
+#include "ntqpixmap.h"
+#include "ntqdrawutil.h"
+#include "ntqvalidator.h"
+#include "ntqdragobject.h"
+#include "ntqgridview.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqsettings.h"
+#include "ntqpopupmenu.h"
 
 #ifdef Q_WS_MAC
 TQRgb macGetRgba( TQRgb initial, bool *ok, TQWidget *parent, const char* name );
@@ -1416,7 +1416,7 @@ void TQColorDialogPrivate::addCustom()
 
 
 /*!
-    \class TQColorDialog qcolordialog.h
+    \class TQColorDialog ntqcolordialog.h
     \brief The TQColorDialog class provides a dialog widget for specifying colors.
     \mainclass
     \ingroup dialogs
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index 4f99ae9e6..1ef49e0c0 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "qdialog.h"
+#include "ntqdialog.h"
 
 #ifndef QT_NO_DIALOG
 
-#include "qpushbutton.h"
-#include "qfocusdata.h"
-#include "qapplication.h"
-#include "qobjectlist.h"
-#include "qwidgetlist.h"
-#include "qlayout.h"
-#include "qsizegrip.h"
-#include "qwhatsthis.h"
-#include "qpopupmenu.h"
-#include "qcursor.h"
+#include "ntqpushbutton.h"
+#include "ntqfocusdata.h"
+#include "ntqapplication.h"
+#include "ntqobjectlist.h"
+#include "ntqwidgetlist.h"
+#include "ntqlayout.h"
+#include "ntqsizegrip.h"
+#include "ntqwhatsthis.h"
+#include "ntqpopupmenu.h"
+#include "ntqcursor.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #if defined( Q_OS_TEMP )
 #include "qt_windows.h"
@@ -344,7 +344,7 @@ void TQDialog::hideDefault()
   Hides special buttons which are rather shown in the titlebar
   on WinCE, to conserve screen space.
 */
-# include "qmessagebox.h"
+# include "ntqmessagebox.h"
 extern const char * mb_texts[]; // Defined in qmessagebox.cpp
 void TQDialog::hideSpecial()
 {
diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp
index 7352ee641..a33872bb8 100644
--- a/src/dialogs/qerrormessage.cpp
+++ b/src/dialogs/qerrormessage.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qerrormessage.h"
+#include "ntqerrormessage.h"
 
 #ifndef QT_NO_ERRORMESSAGE
 
-#include "qapplication.h"
-#include "qcheckbox.h"
-#include "qdict.h"
-#include "qlabel.h"
-#include "qlayout.h"
-#include "qmessagebox.h"
-#include "qpushbutton.h"
-#include "qstringlist.h"
-#include "qstylesheet.h"
-#include "qtextview.h"
+#include "ntqapplication.h"
+#include "ntqcheckbox.h"
+#include "ntqdict.h"
+#include "ntqlabel.h"
+#include "ntqlayout.h"
+#include "ntqmessagebox.h"
+#include "ntqpushbutton.h"
+#include "ntqstringlist.h"
+#include "ntqstylesheet.h"
+#include "ntqtextview.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index c9032f853..cfa6dd39d 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -50,50 +50,50 @@
 # undef truncate
 #endif
 
-#include "qfiledialog.h"
+#include "ntqfiledialog.h"
 
 #ifndef QT_NO_FILEDIALOG
 
 #include "private/qapplication_p.h"
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qbuttongroup.h"
-#include "qcheckbox.h"
-#include "qcleanuphandler.h"
-#include "qcombobox.h"
-#include "qcstring.h"
-#include "qcursor.h"
-#include "qdragobject.h"
-#include "qfile.h"
-#include "qguardedptr.h"
-#include "qhbox.h"
-#include "qheader.h"
-#include "qlabel.h"
-#include "qlayout.h"
-#include "qlibrary.h"
-#include "qlineedit.h"
-#include "qlistbox.h"
-#include "qlistview.h"
-#include "qmap.h"
-#include "qmessagebox.h"
-#include "qmime.h"
-#include "qnetworkprotocol.h"
-#include "qobjectlist.h"
-#include "qpainter.h"
-#include "qpopupmenu.h"
-#include "qprogressbar.h"
-#include "qptrvector.h"
-#include "qpushbutton.h"
-#include "qregexp.h"
-#include "qsemimodal.h"
-#include "qsplitter.h"
-#include "qstrlist.h"
-#include "qstyle.h"
-#include "qtimer.h"
-#include "qtoolbutton.h"
-#include "qtooltip.h"
-#include "qvbox.h"
-#include "qwidgetstack.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqbuttongroup.h"
+#include "ntqcheckbox.h"
+#include "ntqcleanuphandler.h"
+#include "ntqcombobox.h"
+#include "ntqcstring.h"
+#include "ntqcursor.h"
+#include "ntqdragobject.h"
+#include "ntqfile.h"
+#include "ntqguardedptr.h"
+#include "ntqhbox.h"
+#include "ntqheader.h"
+#include "ntqlabel.h"
+#include "ntqlayout.h"
+#include "ntqlibrary.h"
+#include "ntqlineedit.h"
+#include "ntqlistbox.h"
+#include "ntqlistview.h"
+#include "ntqmap.h"
+#include "ntqmessagebox.h"
+#include "ntqmime.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqobjectlist.h"
+#include "ntqpainter.h"
+#include "ntqpopupmenu.h"
+#include "ntqprogressbar.h"
+#include "ntqptrvector.h"
+#include "ntqpushbutton.h"
+#include "ntqregexp.h"
+#include "ntqsemimodal.h"
+#include "ntqsplitter.h"
+#include "ntqstrlist.h"
+#include "ntqstyle.h"
+#include "ntqtimer.h"
+#include "ntqtoolbutton.h"
+#include "ntqtooltip.h"
+#include "ntqvbox.h"
+#include "ntqwidgetstack.h"
 
 #ifdef Q_WS_X11
 #include "private/qtkdeintegration_x11_p.h"
@@ -2164,7 +2164,7 @@ static TQStringList makeFiltersList( const TQString &filter )
 }
 
 /*!
-  \class TQFileDialog qfiledialog.h
+  \class TQFileDialog ntqfiledialog.h
   \brief The TQFileDialog class provides dialogs that allow users to select files or directories.
   \ingroup dialogs
   \mainclass
@@ -4968,7 +4968,7 @@ void TQFileDialog::keyPressEvent( TQKeyEvent * ke )
 }
 
 
-/*! \class TQFileIconProvider qfiledialog.h
+/*! \class TQFileIconProvider ntqfiledialog.h
 
   \brief The TQFileIconProvider class provides icons for TQFileDialog to
   use.
@@ -6445,7 +6445,7 @@ void TQFileDialog::goBack()
 // preview widget from TQWidget and from this class' indeed.
 
 /*!
-  \class TQFilePreview qfiledialog.h
+  \class TQFilePreview ntqfiledialog.h
   \ingroup misc
   \brief The TQFilePreview class provides file previewing in TQFileDialog.
 
diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp
index 317a2ec1e..48ecb3d61 100644
--- a/src/dialogs/qfontdialog.cpp
+++ b/src/dialogs/qfontdialog.cpp
@@ -38,33 +38,33 @@
 **
 **********************************************************************/
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 
 #ifndef QT_NO_FONTDIALOG
 
-#include "qfontdialog.h"
-
-#include "qlineedit.h"
-#include "qlistbox.h"
-#include "qpushbutton.h"
-#include "qcheckbox.h"
-#include "qcombobox.h"
-#include "qlayout.h"
-#include "qvgroupbox.h"
-#include "qhgroupbox.h"
-#include "qlabel.h"
-#include "qapplication.h"
-#include "qfontdatabase.h"
-#include "qstyle.h"
+#include "ntqfontdialog.h"
+
+#include "ntqlineedit.h"
+#include "ntqlistbox.h"
+#include "ntqpushbutton.h"
+#include "ntqcheckbox.h"
+#include "ntqcombobox.h"
+#include "ntqlayout.h"
+#include "ntqvgroupbox.h"
+#include "ntqhgroupbox.h"
+#include "ntqlabel.h"
+#include "ntqapplication.h"
+#include "ntqfontdatabase.h"
+#include "ntqstyle.h"
 #include <private/qfontdata_p.h>
-#include <qvalidator.h>
+#include <ntqvalidator.h>
 
 #ifdef Q_WS_X11
 #include "private/qtkdeintegration_x11_p.h"
 #endif
 
 /*!
-  \class TQFontDialog qfontdialog.h
+  \class TQFontDialog ntqfontdialog.h
   \ingroup dialogs
   \mainclass
   \brief The TQFontDialog class provides a dialog widget for selecting a font.
@@ -470,7 +470,7 @@ bool TQFontDialog::eventFilter( TQObject * o , TQEvent * e )
 #endif
 
 #ifdef SHOW_FONTS_IN_FAMILIES
-#include "qpainter.h"
+#include "ntqpainter.h"
 #include <sizeedit.h>
 
 class TQListBoxFontText : public TQListBoxText
diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp
index a75d24b5c..7b285da97 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/qinputdialog.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qinputdialog.h"
+#include "ntqinputdialog.h"
 
 #ifndef QT_NO_INPUTDIALOG
 
-#include "qlayout.h"
-#include "qlabel.h"
-#include "qlineedit.h"
-#include "qpushbutton.h"
-#include "qspinbox.h"
-#include "qcombobox.h"
-#include "qwidgetstack.h"
-#include "qvalidator.h"
-#include "qapplication.h"
+#include "ntqlayout.h"
+#include "ntqlabel.h"
+#include "ntqlineedit.h"
+#include "ntqpushbutton.h"
+#include "ntqspinbox.h"
+#include "ntqcombobox.h"
+#include "ntqwidgetstack.h"
+#include "ntqvalidator.h"
+#include "ntqapplication.h"
 
 class TQInputDialogPrivate
 {
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index e0545de32..fc902b5a0 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qmessagebox.h"
+#include "ntqmessagebox.h"
 
 #ifndef QT_NO_MESSAGEBOX
 
-#include "qaccel.h"
-#include "qlabel.h"
-#include "qpushbutton.h"
-#include "qimage.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qobjectlist.h"
+#include "ntqaccel.h"
+#include "ntqlabel.h"
+#include "ntqpushbutton.h"
+#include "ntqimage.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqobjectlist.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #if defined QT_NON_COMMERCIAL
 #include "qnc_win.h"
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index 0e00609e4..f46d1a5e6 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -38,31 +38,31 @@
 **
 **********************************************************************/
 
-#include "qprintdialog.h"
+#include "ntqprintdialog.h"
 
 #ifndef QT_NO_PRINTDIALOG
 
-#include "qfiledialog.h"
-#include "qfile.h"
-#include "qtextstream.h"
-#include "qcombobox.h"
-#include "qframe.h"
-#include "qlabel.h"
-#include "qlineedit.h"
-#include "qpushbutton.h"
-#include "qprinter.h"
-#include "qlistview.h"
-#include "qlayout.h"
-#include "qbuttongroup.h"
-#include "qradiobutton.h"
-#include "qspinbox.h"
-#include "qapplication.h"
-#include "qheader.h"
-#include "qstyle.h"
-#include "qstring.h"
-#include "qregexp.h"
+#include "ntqfiledialog.h"
+#include "ntqfile.h"
+#include "ntqtextstream.h"
+#include "ntqcombobox.h"
+#include "ntqframe.h"
+#include "ntqlabel.h"
+#include "ntqlineedit.h"
+#include "ntqpushbutton.h"
+#include "ntqprinter.h"
+#include "ntqlistview.h"
+#include "ntqlayout.h"
+#include "ntqbuttongroup.h"
+#include "ntqradiobutton.h"
+#include "ntqspinbox.h"
+#include "ntqapplication.h"
+#include "ntqheader.h"
+#include "ntqstyle.h"
+#include "ntqstring.h"
+#include "ntqregexp.h"
 #if !defined(QT_NO_CUPS) || !defined(QT_NO_NIS)
-#include "qlibrary.h"
+#include "ntqlibrary.h"
 #endif
 
 #ifndef QT_NO_NIS
@@ -825,7 +825,7 @@ static void qpd_cleanup_globaldialog()
 }
 
 /*!
-  \class TQPrintDialog qprintdialog.h
+  \class TQPrintDialog ntqprintdialog.h
 
   \brief The TQPrintDialog class provides a dialog for specifying
   the printer's configuration.
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index a0f63467e..d29b4c581 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qprogressdialog.h"
+#include "ntqprogressdialog.h"
 
 #ifndef QT_NO_PROGRESSDIALOG
 
-#include "qaccel.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qdatetime.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qpushbutton.h"
-#include "qcursor.h"
-#include "qtimer.h"
+#include "ntqaccel.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqdatetime.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqpushbutton.h"
+#include "ntqcursor.h"
+#include "ntqtimer.h"
 #include <limits.h>
 
 // If the operation is expected to take this long (as predicted by
@@ -100,7 +100,7 @@ public:
 
 
 /*!
-  \class TQProgressDialog qprogressdialog.h
+  \class TQProgressDialog ntqprogressdialog.h
   \brief The TQProgressDialog class provides feedback on the progress of a slow operation.
   \ingroup dialogs
   \mainclass
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index 9bd899205..deada26e9 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -3,22 +3,22 @@
 dialogs {
 	DIALOGS_P	= dialogs
 
-	HEADERS	+= $$DIALOGS_H/qcolordialog.h \
-		  $$DIALOGS_H/qdialog.h \
-		  $$DIALOGS_H/qerrormessage.h \
-		  $$DIALOGS_H/qfiledialog.h \
-		  $$DIALOGS_H/qfontdialog.h \
-		  $$DIALOGS_H/qmessagebox.h \
-		  $$DIALOGS_H/qprogressdialog.h \
-		  $$DIALOGS_H/qsemimodal.h \
-		  $$DIALOGS_H/qtabdialog.h \
-		  $$DIALOGS_H/qwizard.h \
-		  $$DIALOGS_H/qinputdialog.h
+	HEADERS	+= $$DIALOGS_H/ntqcolordialog.h \
+		  $$DIALOGS_H/ntqdialog.h \
+		  $$DIALOGS_H/ntqerrormessage.h \
+		  $$DIALOGS_H/ntqfiledialog.h \
+		  $$DIALOGS_H/ntqfontdialog.h \
+		  $$DIALOGS_H/ntqmessagebox.h \
+		  $$DIALOGS_H/ntqprogressdialog.h \
+		  $$DIALOGS_H/ntqsemimodal.h \
+		  $$DIALOGS_H/ntqtabdialog.h \
+		  $$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
 	unix:SOURCES += $$DIALOGS_CPP/qprintdialog.cpp
-	unix:HEADERS   += $$DIALOGS_H/qprintdialog.h 
+	unix:HEADERS   += $$DIALOGS_H/ntqprintdialog.h 
 
 	SOURCES += $$DIALOGS_CPP/qcolordialog.cpp \
 		  $$DIALOGS_CPP/qdialog.cpp \
diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp
index 8360158b0..2315e4ac1 100644
--- a/src/dialogs/qtabdialog.cpp
+++ b/src/dialogs/qtabdialog.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qtabdialog.h"
+#include "ntqtabdialog.h"
 
 #ifndef QT_NO_TABDIALOG
 
-#include "qobjectlist.h"
-#include "qtabbar.h"
-#include "qtabwidget.h"
-#include "qpushbutton.h"
-#include "qpainter.h"
-#include "qpixmap.h"
-#include "qapplication.h"
-#include "qtabwidget.h"
-#include "qwidgetstack.h"
-#include "qlayout.h"
+#include "ntqobjectlist.h"
+#include "ntqtabbar.h"
+#include "ntqtabwidget.h"
+#include "ntqpushbutton.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
+#include "ntqtabwidget.h"
+#include "ntqwidgetstack.h"
+#include "ntqlayout.h"
 
 /*!
-  \class TQTabDialog qtabdialog.h
+  \class TQTabDialog ntqtabdialog.h
 
   \brief The TQTabDialog class provides a stack of tabbed widgets.
 
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp
index 3b79098fc..8ab1d13c2 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/qwizard.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-#include "qwizard.h"
+#include "ntqwizard.h"
 
 #ifndef QT_NO_WIZARD
 
-#include "qlayout.h"
-#include "qpushbutton.h"
-#include "qcursor.h"
-#include "qlabel.h"
-#include "qwidgetstack.h"
-#include "qapplication.h"
-#include "qptrlist.h"
-#include "qpainter.h"
-#include "qaccel.h"
+#include "ntqlayout.h"
+#include "ntqpushbutton.h"
+#include "ntqcursor.h"
+#include "ntqlabel.h"
+#include "ntqwidgetstack.h"
+#include "ntqapplication.h"
+#include "ntqptrlist.h"
+#include "ntqpainter.h"
+#include "ntqaccel.h"
 
 /*! \file wizard/wizard.cpp */
 /*! \file wizard/wizard.h */
 
 /*!
-    \class TQWizard qwizard.h
+    \class TQWizard ntqwizard.h
     \brief The TQWizard class provides a framework for wizard dialogs.
 
     \ingroup abstractwidgets
diff --git a/src/iconview/qiconview.h b/src/iconview/ntqiconview.h
index ee8bbd267..ea905fa56 100644
--- a/src/iconview/qiconview.h
+++ b/src/iconview/ntqiconview.h
@@ -42,15 +42,15 @@
 #define TQICONVIEW_H
 
 #ifndef QT_H
-#include "qscrollview.h"
-#include "qstring.h"
-#include "qrect.h"
-#include "qpoint.h"
-#include "qsize.h"
-#include "qfont.h" // TQString->TQFont conversion
-#include "qdragobject.h"
-#include "qbitmap.h"
-#include "qpicture.h"
+#include "ntqscrollview.h"
+#include "ntqstring.h"
+#include "ntqrect.h"
+#include "ntqpoint.h"
+#include "ntqsize.h"
+#include "ntqfont.h" // TQString->TQFont conversion
+#include "ntqdragobject.h"
+#include "ntqbitmap.h"
+#include "ntqpicture.h"
 #endif // QT_H
 
 #ifndef QT_NO_ICONVIEW
diff --git a/src/iconview/qiconview.cpp b/src/iconview/qiconview.cpp
index 4efbb0717..fbcf3316b 100644
--- a/src/iconview/qiconview.cpp
+++ b/src/iconview/qiconview.cpp
@@ -38,39 +38,39 @@
 **
 **********************************************************************/
 
-#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
 
-#include "qiconview.h"
+#include "ntqiconview.h"
 
 #ifndef QT_NO_ICONVIEW
 
-#include "qfontmetrics.h"
-#include "qpainter.h"
-#include "qevent.h"
-#include "qpalette.h"
-#include "qmime.h"
-#include "qimage.h"
-#include "qpen.h"
-#include "qbrush.h"
-#include "qtimer.h"
-#include "qcursor.h"
-#include "qapplication.h"
-#include "qtextedit.h"
-#include "qmemarray.h"
-#include "qptrlist.h"
-#include "qvbox.h"
-#include "qtooltip.h"
-#include "qbitmap.h"
-#include "qpixmapcache.h"
-#include "qptrdict.h"
-#include "qstringlist.h"
-#include "qcleanuphandler.h"
+#include "ntqfontmetrics.h"
+#include "ntqpainter.h"
+#include "ntqevent.h"
+#include "ntqpalette.h"
+#include "ntqmime.h"
+#include "ntqimage.h"
+#include "ntqpen.h"
+#include "ntqbrush.h"
+#include "ntqtimer.h"
+#include "ntqcursor.h"
+#include "ntqapplication.h"
+#include "ntqtextedit.h"
+#include "ntqmemarray.h"
+#include "ntqptrlist.h"
+#include "ntqvbox.h"
+#include "ntqtooltip.h"
+#include "ntqbitmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqptrdict.h"
+#include "ntqstringlist.h"
+#include "ntqcleanuphandler.h"
 #include "private/qrichtext_p.h"
-#include "qstyle.h"
+#include "ntqstyle.h"
 
 #include <limits.h>
 #include <stdlib.h>
@@ -499,7 +499,7 @@ void TQIconViewItemLineEdit::focusOutEvent( TQFocusEvent *e )
 
 
 /*!
-    \class TQIconDragItem qiconview.h
+    \class TQIconDragItem ntqiconview.h
     \ingroup draganddrop
 
     \brief The TQIconDragItem class encapsulates a drag item.
@@ -587,7 +587,7 @@ bool TQIconDragData::operator==( const TQIconDragData &i ) const
 
 
 /*!
-    \class TQIconDrag qiconview.h
+    \class TQIconDrag ntqiconview.h
 
     \brief The TQIconDrag class supports drag and drop operations
     within a TQIconView.
@@ -802,7 +802,7 @@ void TQIconDragData::setTextRect( const TQRect &r )
 
 
 /*!
-    \class TQIconViewItem qiconview.h
+    \class TQIconViewItem ntqiconview.h
     \brief The TQIconViewItem class provides a single item in a TQIconView.
 
     \ingroup advanced
@@ -2294,7 +2294,7 @@ void TQIconViewItem::checkRect()
 
 
 /*!
-    \class TQIconView qiconview.h
+    \class TQIconView ntqiconview.h
     \brief The TQIconView class provides an area with movable labelled icons.
 
     \module iconview
diff --git a/src/iconview/qt_iconview.pri b/src/iconview/qt_iconview.pri
index 198885ed7..df1613b5d 100644
--- a/src/iconview/qt_iconview.pri
+++ b/src/iconview/qt_iconview.pri
@@ -1,6 +1,6 @@
 # Qt iconview module
 
 iconview {
-	HEADERS += $$ICONVIEW_H/qiconview.h
+	HEADERS += $$ICONVIEW_H/ntqiconview.h
 	SOURCES += $$ICONVIEW_CPP/qiconview.cpp
 }
diff --git a/src/inputmethod/qinputcontextfactory.h b/src/inputmethod/ntqinputcontextfactory.h
index 515593fe8..29ecda7f3 100644
--- a/src/inputmethod/qinputcontextfactory.h
+++ b/src/inputmethod/ntqinputcontextfactory.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: qinputcontextfactory.h,v 1.1.1.1 2004/05/11 11:16:49 daisuke Exp $
+** $Id: ntqinputcontextfactory.h,v 1.1.1.1 2004/05/11 11:16:49 daisuke Exp $
 **
 ** Definition of TQInputContextFactory class
 **
@@ -37,7 +37,7 @@
 #define TQINPUTCONTEXTFACTORY_H
 
 #ifndef QT_H
-#include "qstringlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_IM
diff --git a/src/inputmethod/qinputcontextplugin.h b/src/inputmethod/ntqinputcontextplugin.h
index e54f54cc3..92875c52e 100644
--- a/src/inputmethod/qinputcontextplugin.h
+++ b/src/inputmethod/ntqinputcontextplugin.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: qinputcontextplugin.h,v 1.2 2004/06/20 18:43:11 daisuke Exp $
+** $Id: ntqinputcontextplugin.h,v 1.2 2004/06/20 18:43:11 daisuke Exp $
 **
 ** Definition of TQInputContextPlugin class
 **
@@ -39,8 +39,8 @@
 #define TQINPUTCONTEXTPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_IM
diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp
index a1ac4f35d..ae4391525 100644
--- a/src/inputmethod/qinputcontextfactory.cpp
+++ b/src/inputmethod/qinputcontextfactory.cpp
@@ -36,12 +36,12 @@
 **********************************************************************/
 
 #include "qinputcontextinterface_p.h" // up here for GCC 2.7.* compatibility
-#include "qinputcontextfactory.h"
-#include "qinputcontext.h"
+#include "ntqinputcontextfactory.h"
+#include "ntqinputcontext.h"
 
 #ifndef QT_NO_IM
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 #ifdef QT_THREAD_SUPPORT
 #include <private/qmutexpool_p.h>
@@ -49,7 +49,7 @@
 
 #include <stdlib.h>
 
-#include "qcleanuphandler.h"
+#include "ntqcleanuphandler.h"
 #include <private/qpluginmanager_p.h>
 #ifndef QT_NO_COMPONENT
 
diff --git a/src/inputmethod/qinputcontextplugin.cpp b/src/inputmethod/qinputcontextplugin.cpp
index fa34e07e9..3b474d2ff 100644
--- a/src/inputmethod/qinputcontextplugin.cpp
+++ b/src/inputmethod/qinputcontextplugin.cpp
@@ -35,7 +35,7 @@
 **
 **********************************************************************/
 
-#include "qinputcontextplugin.h"
+#include "ntqinputcontextplugin.h"
 
 #ifndef QT_NO_IM
 #ifndef QT_NO_COMPONENT
@@ -43,7 +43,7 @@
 #include "qinputcontextinterface_p.h"
 
 /*!
-    \class TQInputContextPlugin qinputcontextplugin.h
+    \class TQInputContextPlugin ntqinputcontextplugin.h
     \brief The TQInputContextPlugin class provides an abstract base for custom TQInputContext plugins.
     \reentrant
     \ingroup plugins
diff --git a/src/inputmethod/qt_inputmethod.pri b/src/inputmethod/qt_inputmethod.pri
index d9ac32aec..202bba267 100644
--- a/src/inputmethod/qt_inputmethod.pri
+++ b/src/inputmethod/qt_inputmethod.pri
@@ -2,9 +2,9 @@
 
 inputmethod {
 	INPUTMETHOD_P = inputmethod
-	HEADERS +=$$INPUTMETHOD_H/qinputcontextfactory.h \
+	HEADERS +=$$INPUTMETHOD_H/ntqinputcontextfactory.h \
 		  $$INPUTMETHOD_P/qinputcontextinterface_p.h \
-		  $$INPUTMETHOD_H/qinputcontextplugin.h
+		  $$INPUTMETHOD_H/ntqinputcontextplugin.h
 	SOURCES +=$$INPUTMETHOD_CPP/qinputcontextfactory.cpp \
 		  $$INPUTMETHOD_CPP/qinputcontextplugin.cpp
 }
diff --git a/src/kernel/q1xcompatibility.h b/src/kernel/ntq1xcompatibility.h
index 8ace504b5..8ace504b5 100644
--- a/src/kernel/q1xcompatibility.h
+++ b/src/kernel/ntq1xcompatibility.h
diff --git a/src/kernel/qabstractlayout.h b/src/kernel/ntqabstractlayout.h
index b42133628..88a0eeff9 100644
--- a/src/kernel/qabstractlayout.h
+++ b/src/kernel/ntqabstractlayout.h
@@ -47,7 +47,7 @@
 
 #ifndef QT_H
 #ifndef QT_NO_COMPAT
-#include "qlayout.h"
+#include "ntqlayout.h"
 #endif
 #endif // QT_H
 
diff --git a/src/kernel/qaccel.h b/src/kernel/ntqaccel.h
index 79bafe636..717d2acef 100644
--- a/src/kernel/qaccel.h
+++ b/src/kernel/ntqaccel.h
@@ -42,8 +42,8 @@
 #define TQACCEL_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qkeysequence.h"
+#include "ntqobject.h"
+#include "ntqkeysequence.h"
 #endif // QT_H
 
 #ifndef QT_NO_ACCEL
diff --git a/src/kernel/qaccessible.h b/src/kernel/ntqaccessible.h
index 7109367f9..4dccd594d 100644
--- a/src/kernel/qaccessible.h
+++ b/src/kernel/ntqaccessible.h
@@ -40,11 +40,11 @@
 #define TQACCESSIBLE_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #include <private/qcom_p.h>
-#include "qrect.h"
-#include "qguardedptr.h"
-#include "qmemarray.h"
+#include "ntqrect.h"
+#include "ntqguardedptr.h"
+#include "ntqmemarray.h"
 #endif // QT_H
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
@@ -289,7 +289,7 @@ private:
 };
 
 #define Q_DEFINED_QACCESSIBLE_OBJECT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif //QT_ACCESSIBILITY_SUPPORT
 
 #endif //TQACCESSIBLE_H
diff --git a/src/kernel/qapplication.h b/src/kernel/ntqapplication.h
index 6e62b4576..2ab779760 100644
--- a/src/kernel/qapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -42,12 +42,12 @@
 #define TQAPPLICATION_H
 
 #ifndef QT_H
-#include "qdesktopwidget.h"
-#include "qasciidict.h"
-#include "qpalette.h"
-#include "qtranslator.h"
-#include "qstrlist.h"
-#include "qstringlist.h"
+#include "ntqdesktopwidget.h"
+#include "ntqasciidict.h"
+#include "ntqpalette.h"
+#include "ntqtranslator.h"
+#include "ntqstrlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 class TQSessionManager;
diff --git a/src/kernel/qasyncimageio.h b/src/kernel/ntqasyncimageio.h
index 9767b3d94..25401c06e 100644
--- a/src/kernel/qasyncimageio.h
+++ b/src/kernel/ntqasyncimageio.h
@@ -42,7 +42,7 @@
 #define TQASYNCIMAGEIO_H
 
 #ifndef QT_H
-#include "qimage.h"
+#include "ntqimage.h"
 #endif // QT_H
 
 #ifndef QT_NO_ASYNC_IMAGE_IO
diff --git a/src/kernel/qasyncio.h b/src/kernel/ntqasyncio.h
index 8f1319d96..878b2f75a 100644
--- a/src/kernel/qasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -42,9 +42,9 @@
 #define TQASYNCIO_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qsignal.h"
-#include "qtimer.h"
+#include "ntqobject.h"
+#include "ntqsignal.h"
+#include "ntqtimer.h"
 #endif // QT_H
 
 #ifndef QT_NO_ASYNC_IO
diff --git a/src/kernel/qbitmap.h b/src/kernel/ntqbitmap.h
index 3612989fe..90fe694e4 100644
--- a/src/kernel/qbitmap.h
+++ b/src/kernel/ntqbitmap.h
@@ -42,7 +42,7 @@
 #define TQBITMAP_H
 
 #ifndef QT_H
-#include "qpixmap.h"
+#include "ntqpixmap.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qbrush.h b/src/kernel/ntqbrush.h
index c401a212c..72c61d4e6 100644
--- a/src/kernel/qbrush.h
+++ b/src/kernel/ntqbrush.h
@@ -42,8 +42,8 @@
 #define TQBRUSH_H
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qshared.h"
+#include "ntqcolor.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qclipboard.h b/src/kernel/ntqclipboard.h
index e84aa37c4..f61005d9c 100644
--- a/src/kernel/qclipboard.h
+++ b/src/kernel/ntqclipboard.h
@@ -42,8 +42,8 @@
 #define TQCLIPBOARD_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qobject.h"
+#include "ntqwindowdefs.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_CLIPBOARD
diff --git a/src/kernel/qcolor.h b/src/kernel/ntqcolor.h
index 125a257d7..fd9e7630b 100644
--- a/src/kernel/qcolor.h
+++ b/src/kernel/ntqcolor.h
@@ -42,8 +42,8 @@
 #define TQCOLOR_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qstringlist.h"
+#include "ntqwindowdefs.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 const TQRgb  RGB_MASK    = 0x00ffffff;		// masks RGB values
diff --git a/src/kernel/qconnection.h b/src/kernel/ntqconnection.h
index 7ad0cb6b0..db562210e 100644
--- a/src/kernel/qconnection.h
+++ b/src/kernel/ntqconnection.h
@@ -42,7 +42,7 @@
 #define TQCONNECTION_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 class Q_EXPORT TQConnection
@@ -74,5 +74,5 @@ private:	// Disabled copy constructor and operator=
 };
 
 #define Q_DEFINED_QCONNECTION
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQCONNECTION_H
diff --git a/src/kernel/qcursor.h b/src/kernel/ntqcursor.h
index 4bd4f8904..70c91e95b 100644
--- a/src/kernel/qcursor.h
+++ b/src/kernel/ntqcursor.h
@@ -42,8 +42,8 @@
 #define TQCURSOR_H
 
 #ifndef QT_H
-#include "qpoint.h"
-#include "qshared.h"
+#include "ntqpoint.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 /*
diff --git a/src/kernel/qdesktopwidget.h b/src/kernel/ntqdesktopwidget.h
index 71fc28834..cf24fe6ca 100644
--- a/src/kernel/qdesktopwidget.h
+++ b/src/kernel/ntqdesktopwidget.h
@@ -40,7 +40,7 @@
 #define TQDESKTOPWIDGET_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 class TQApplication;
diff --git a/src/kernel/qdragobject.h b/src/kernel/ntqdragobject.h
index a392245b8..303ceb99f 100644
--- a/src/kernel/qdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -46,10 +46,10 @@ class TQStoredDragData;
 class TQImageDragData;
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qimage.h"
-#include "qstrlist.h"
-#include "qcolor.h"
+#include "ntqobject.h"
+#include "ntqimage.h"
+#include "ntqstrlist.h"
+#include "ntqcolor.h"
 #endif // QT_H
 
 #ifndef QT_NO_MIME
diff --git a/src/kernel/qdrawutil.h b/src/kernel/ntqdrawutil.h
index f75cab52c..2d3e1fefd 100644
--- a/src/kernel/qdrawutil.h
+++ b/src/kernel/ntqdrawutil.h
@@ -42,8 +42,8 @@
 #define TQDRAWUTIL_H
 
 #ifndef QT_H
-#include "qnamespace.h"
-#include "qstring.h" // char*->TQString conversion
+#include "ntqnamespace.h"
+#include "ntqstring.h" // char*->TQString conversion
 #endif // QT_H
 
 class TQPainter;
diff --git a/src/kernel/qdropsite.h b/src/kernel/ntqdropsite.h
index 0099bb2a2..952be802c 100644
--- a/src/kernel/qdropsite.h
+++ b/src/kernel/ntqdropsite.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 #endif
 
diff --git a/src/kernel/qevent.h b/src/kernel/ntqevent.h
index 8f444f8f0..08dc69b6c 100644
--- a/src/kernel/qevent.h
+++ b/src/kernel/ntqevent.h
@@ -42,11 +42,11 @@
 #define TQEVENT_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qregion.h"
-#include "qnamespace.h"
-#include "qmime.h"
-#include "qpair.h"
+#include "ntqwindowdefs.h"
+#include "ntqregion.h"
+#include "ntqnamespace.h"
+#include "ntqmime.h"
+#include "ntqpair.h"
 #endif // QT_H
 
 class Q_EXPORT TQEvent: public TQt		// event base class
diff --git a/src/kernel/qeventloop.h b/src/kernel/ntqeventloop.h
index eae247846..2a98a33e2 100644
--- a/src/kernel/qeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -40,8 +40,8 @@
 #define TQEVENTLOOP_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qsocketnotifier.h"
+#include "ntqobject.h"
+#include "ntqsocketnotifier.h"
 #endif // QT_H
 
 class TQEventLoopPrivate;
diff --git a/src/kernel/qfocusdata.h b/src/kernel/ntqfocusdata.h
index f3e69a3de..8a44a5031 100644
--- a/src/kernel/qfocusdata.h
+++ b/src/kernel/ntqfocusdata.h
@@ -42,7 +42,7 @@
 #define TQFOCUSDATA_H
 
 #ifndef QT_H
-#include "qwidgetlist.h"
+#include "ntqwidgetlist.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qfont.h b/src/kernel/ntqfont.h
index ddb763da6..0d205410e 100644
--- a/src/kernel/qfont.h
+++ b/src/kernel/ntqfont.h
@@ -42,8 +42,8 @@
 #define TQFONT_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qstring.h"
+#include "ntqwindowdefs.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 
@@ -201,7 +201,7 @@ public:
 
 
     // a copy of this lives in qunicodetables.cpp, as we can't include
-    // qfont.h it in tools/. Do not modify without changing the script
+    // ntqfont.h it in tools/. Do not modify without changing the script
     // enum in qunicodetable_p.h aswell.
     enum Script {
 	// European Alphabetic Scripts
diff --git a/src/kernel/qfontdatabase.h b/src/kernel/ntqfontdatabase.h
index 04d44f92a..482e36634 100644
--- a/src/kernel/qfontdatabase.h
+++ b/src/kernel/ntqfontdatabase.h
@@ -42,11 +42,11 @@
 #define TQFONTDATABASE_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qfont.h"
-#include "qvaluelist.h"
+#include "ntqwindowdefs.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqfont.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qfontinfo.h b/src/kernel/ntqfontinfo.h
index bc29d280b..175aaa320 100644
--- a/src/kernel/qfontinfo.h
+++ b/src/kernel/ntqfontinfo.h
@@ -42,7 +42,7 @@
 #define TQFONTINFO_H
 
 #ifndef QT_H
-#include "qfont.h"
+#include "ntqfont.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qfontmetrics.h b/src/kernel/ntqfontmetrics.h
index 7e1f46f10..7c8c7b610 100644
--- a/src/kernel/qfontmetrics.h
+++ b/src/kernel/ntqfontmetrics.h
@@ -42,8 +42,8 @@
 #define TQFONTMETRICS_H
 
 #ifndef QT_H
-#include "qfont.h"
-#include "qrect.h"
+#include "ntqfont.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 #ifdef Q_WS_QWS
diff --git a/src/kernel/qgif.h b/src/kernel/ntqgif.h
index be5a3de72..f5fee77be 100644
--- a/src/kernel/qgif.h
+++ b/src/kernel/ntqgif.h
@@ -49,7 +49,7 @@
 #define TQGIF_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #ifndef QT_BUILTIN_GIF_READER
diff --git a/src/kernel/qgplugin.h b/src/kernel/ntqgplugin.h
index 354122bca..d7bbcbee0 100644
--- a/src/kernel/qgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_COMPONENT
diff --git a/src/kernel/qguardedptr.h b/src/kernel/ntqguardedptr.h
index f08c086f3..21a4d154f 100644
--- a/src/kernel/qguardedptr.h
+++ b/src/kernel/ntqguardedptr.h
@@ -42,7 +42,7 @@
 #define TQGUARDEDPTR_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 // ### 4.0: rename to something without Private in it. Not really internal.
@@ -140,5 +140,5 @@ inline TQObject* TQGuardedPtrPrivate::object() const
 }
 
 #define Q_DEFINED_QGUARDEDPTR
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif
diff --git a/src/kernel/qiconset.h b/src/kernel/ntqiconset.h
index 0aa01e95d..7ecbfa52a 100644
--- a/src/kernel/qiconset.h
+++ b/src/kernel/ntqiconset.h
@@ -42,8 +42,8 @@
 #define TQICONSET_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qpixmap.h"
+#include "ntqobject.h"
+#include "ntqpixmap.h"
 #endif // QT_H
 
 #ifndef QT_NO_ICONSET
diff --git a/src/kernel/qimage.h b/src/kernel/ntqimage.h
index 057bfb8ca..34b585b7e 100644
--- a/src/kernel/qimage.h
+++ b/src/kernel/ntqimage.h
@@ -42,9 +42,9 @@
 #define TQIMAGE_H
 
 #ifndef QT_H
-#include "qpixmap.h"
-#include "qstrlist.h"
-#include "qstringlist.h"
+#include "ntqpixmap.h"
+#include "ntqstrlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 class TQImageDataMisc; // internal
diff --git a/src/kernel/qimageformatplugin.h b/src/kernel/ntqimageformatplugin.h
index ac973210e..db9fb3806 100644
--- a/src/kernel/qimageformatplugin.h
+++ b/src/kernel/ntqimageformatplugin.h
@@ -40,8 +40,8 @@
 #define TQIMAGEFORMATPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
diff --git a/src/kernel/qinputcontext.h b/src/kernel/ntqinputcontext.h
index e06624e17..cc3eafae9 100644
--- a/src/kernel/qinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: qinputcontext.h,v 1.8 2004/06/22 06:47:30 daisuke Exp $
+** $Id: ntqinputcontext.h,v 1.8 2004/06/22 06:47:30 daisuke Exp $
 **
 ** Definition of TQInputContext
 **
@@ -39,15 +39,15 @@
 #ifndef QT_NO_IM
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qglobal.h"
-#include "qevent.h"
-#include "qstring.h"
+#include "ntqobject.h"
+#include "ntqglobal.h"
+#include "ntqevent.h"
+#include "ntqstring.h"
 #if (QT_VERSION-0 >= 0x040000)
-#include "qlist.h"
-#include "qaction.h"
+#include "ntqlist.h"
+#include "ntqaction.h"
 #else
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 #endif
 #endif
 
diff --git a/src/kernel/qjpegio.h b/src/kernel/ntqjpegio.h
index 9610bafe8..43e240296 100644
--- a/src/kernel/qjpegio.h
+++ b/src/kernel/ntqjpegio.h
@@ -41,7 +41,7 @@
 #ifndef TQJPEGIO_H
 #define TQJPEGIO_H
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 
 #ifndef QT_NO_IMAGEIO_JPEG
 
diff --git a/src/kernel/qkeycode.h b/src/kernel/ntqkeycode.h
index dff86f893..bca9305ba 100644
--- a/src/kernel/qkeycode.h
+++ b/src/kernel/ntqkeycode.h
@@ -42,7 +42,7 @@
 #define TQKEYCODE_H
 
 #ifndef QT_H
-#include "qnamespace.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 // all key codes are now in the TQt namespace class
diff --git a/src/kernel/qkeysequence.h b/src/kernel/ntqkeysequence.h
index 3a845efff..f77bebc59 100644
--- a/src/kernel/qkeysequence.h
+++ b/src/kernel/ntqkeysequence.h
@@ -43,8 +43,8 @@
 
 #ifndef QT_H
 #ifndef QT_H
-#include "qnamespace.h"
-#include "qstring.h"
+#include "ntqnamespace.h"
+#include "ntqstring.h"
 #endif // QT_H
 #endif
 
diff --git a/src/kernel/qlayout.h b/src/kernel/ntqlayout.h
index 798c9c867..c461724a1 100644
--- a/src/kernel/qlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -42,9 +42,9 @@
 #define TQLAYOUT_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qsizepolicy.h"
-#include "qwidget.h"
+#include "ntqobject.h"
+#include "ntqsizepolicy.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #include <limits.h>
diff --git a/src/kernel/qlocalfs.h b/src/kernel/ntqlocalfs.h
index 56c0ece3e..ac1d6c189 100644
--- a/src/kernel/qlocalfs.h
+++ b/src/kernel/ntqlocalfs.h
@@ -42,8 +42,8 @@
 #define TQLOCALFS_H
 
 #ifndef QT_H
-#include "qnetworkprotocol.h"
-#include "qdir.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqdir.h"
 #endif // QT_H
 
 #ifndef QT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qmetaobject.h b/src/kernel/ntqmetaobject.h
index d2ce0ccc7..e269024b6 100644
--- a/src/kernel/qmetaobject.h
+++ b/src/kernel/ntqmetaobject.h
@@ -42,8 +42,8 @@
 #define TQMETAOBJECT_H
 
 #ifndef QT_H
-#include "qconnection.h"
-#include "qstrlist.h"
+#include "ntqconnection.h"
+#include "ntqstrlist.h"
 #endif // QT_H
 
 #ifndef Q_MOC_OUTPUT_REVISION
diff --git a/src/kernel/qmime.h b/src/kernel/ntqmime.h
index 0ea9b8d1b..60fdbc247 100644
--- a/src/kernel/qmime.h
+++ b/src/kernel/ntqmime.h
@@ -42,8 +42,8 @@
 #define TQMIME_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qmap.h"
+#include "ntqwindowdefs.h"
+#include "ntqmap.h"
 #endif // QT_H
 
 #ifndef QT_NO_MIME
@@ -125,7 +125,7 @@ private:
 #if defined(Q_WS_WIN)
 
 #ifndef QT_H
-#include "qptrlist.h" // down here for GCC 2.7.* compatibility
+#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
 #endif // QT_H
 
 /*
@@ -161,7 +161,7 @@ public:
 #if defined(Q_WS_MAC)
 
 #ifndef QT_H
-#include "qptrlist.h" // down here for GCC 2.7.* compatibility
+#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
 #endif // QT_H
 
 /*
diff --git a/src/kernel/qmngio.h b/src/kernel/ntqmngio.h
index 76f5abf69..76f5abf69 100644
--- a/src/kernel/qmngio.h
+++ b/src/kernel/ntqmngio.h
diff --git a/src/kernel/qmovie.h b/src/kernel/ntqmovie.h
index db75ac331..9f5238fc7 100644
--- a/src/kernel/qmovie.h
+++ b/src/kernel/ntqmovie.h
@@ -42,7 +42,7 @@
 #define TQMOVIE_H
 
 #ifndef QT_H
-#include "qpixmap.h" // ### remove or keep for users' convenience?
+#include "ntqpixmap.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
 #ifndef QT_NO_MOVIE
diff --git a/src/kernel/qnamespace.h b/src/kernel/ntqnamespace.h
index 85a327f3e..8e49c580c 100644
--- a/src/kernel/qnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -42,7 +42,7 @@
 #define TQNAMESPACE_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h
index 1d5635545..28e431eb5 100644
--- a/src/kernel/qnetworkprotocol.h
+++ b/src/kernel/ntqnetworkprotocol.h
@@ -42,10 +42,10 @@
 #define TQNETWORKPROTOCOL_H
 
 #ifndef QT_H
-#include "qurlinfo.h"
-#include "qstring.h"
-#include "qdict.h"
-#include "qobject.h"
+#include "ntqurlinfo.h"
+#include "ntqstring.h"
+#include "ntqdict.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qobject.h b/src/kernel/ntqobject.h
index 4d19f91ad..804e6f1af 100644
--- a/src/kernel/qobject.h
+++ b/src/kernel/ntqobject.h
@@ -42,11 +42,11 @@
 #define TQOBJECT_H
 
 #ifndef QT_H
-#include "qobjectdefs.h"
-#include "qwindowdefs.h"
-#include "qstring.h"
-#include "qevent.h"
-#include "qnamespace.h"
+#include "ntqobjectdefs.h"
+#include "ntqwindowdefs.h"
+#include "ntqstring.h"
+#include "ntqevent.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 #define QT_TR_NOOP(x) (x)
@@ -261,5 +261,5 @@ inline TQString TQObject::trUtf8( const char *sourceText, const char * ) {
 
 
 #define Q_DEFINED_QOBJECT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQOBJECT_H
diff --git a/src/kernel/qobjectcleanuphandler.h b/src/kernel/ntqobjectcleanuphandler.h
index 24ffc139c..464fd7bf7 100644
--- a/src/kernel/qobjectcleanuphandler.h
+++ b/src/kernel/ntqobjectcleanuphandler.h
@@ -40,7 +40,7 @@
 #define TQOBJECTCLEANUPHANDLER_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 class TQObjectList;
diff --git a/src/kernel/qobjectdefs.h b/src/kernel/ntqobjectdefs.h
index 8402afe50..3b4b71e1d 100644
--- a/src/kernel/qobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -42,7 +42,7 @@
 #define TQOBJECTDEFS_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qobjectdict.h b/src/kernel/ntqobjectdict.h
index f8642d8d4..b3fcd282e 100644
--- a/src/kernel/qobjectdict.h
+++ b/src/kernel/ntqobjectdict.h
@@ -42,8 +42,8 @@
 #define TQOBJECTDICT_H
 
 #ifndef QT_H
-#include "qmetaobject.h"
-#include "qasciidict.h"
+#include "ntqmetaobject.h"
+#include "ntqasciidict.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qobjectlist.h b/src/kernel/ntqobjectlist.h
index 0bc59711d..c1d8f7982 100644
--- a/src/kernel/qobjectlist.h
+++ b/src/kernel/ntqobjectlist.h
@@ -42,8 +42,8 @@
 #define TQOBJECTLIST_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qptrlist.h"
+#include "ntqobject.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpaintdevice.h b/src/kernel/ntqpaintdevice.h
index 84384f19c..771aff492 100644
--- a/src/kernel/qpaintdevice.h
+++ b/src/kernel/ntqpaintdevice.h
@@ -42,8 +42,8 @@
 #define TQPAINTDEVICE_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qrect.h"
+#include "ntqwindowdefs.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 #if defined(Q_WS_QWS)
diff --git a/src/kernel/qpaintdevicedefs.h b/src/kernel/ntqpaintdevicedefs.h
index 165439f8c..beb0c09db 100644
--- a/src/kernel/qpaintdevicedefs.h
+++ b/src/kernel/ntqpaintdevicedefs.h
@@ -42,7 +42,7 @@
 #define TQPAINTDEVICEDEFS_H
 
 #error "this file is gone.  the #defines it contained are in"
-#error "q1xcompatibility.h; the functionality is in TQPaintDevice"
+#error "ntq1xcompatibility.h; the functionality is in TQPaintDevice"
 #error "and TQPaintDeviceMetrics."
 
 #endif // TQPAINTDEVICEDEFS_H
diff --git a/src/kernel/qpaintdevicemetrics.h b/src/kernel/ntqpaintdevicemetrics.h
index 50856f244..e618a1d26 100644
--- a/src/kernel/qpaintdevicemetrics.h
+++ b/src/kernel/ntqpaintdevicemetrics.h
@@ -42,7 +42,7 @@
 #define TQPAINTDEVICEMETRICS_H
 
 #ifndef QT_H
-#include "qpaintdevice.h"
+#include "ntqpaintdevice.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpainter.h b/src/kernel/ntqpainter.h
index e81cc1731..bcccdb59e 100644
--- a/src/kernel/qpainter.h
+++ b/src/kernel/ntqpainter.h
@@ -43,14 +43,14 @@
 
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qfontmetrics.h"
-#include "qfontinfo.h"
-#include "qregion.h"
-#include "qpen.h"
-#include "qbrush.h"
-#include "qpointarray.h"
-#include "qwmatrix.h"
+#include "ntqcolor.h"
+#include "ntqfontmetrics.h"
+#include "ntqfontinfo.h"
+#include "ntqregion.h"
+#include "ntqpen.h"
+#include "ntqbrush.h"
+#include "ntqpointarray.h"
+#include "ntqwmatrix.h"
 #endif // QT_H
 
 class TQGfx;
diff --git a/src/kernel/qpalette.h b/src/kernel/ntqpalette.h
index 2d3360546..b3b155f25 100644
--- a/src/kernel/qpalette.h
+++ b/src/kernel/ntqpalette.h
@@ -42,10 +42,10 @@
 #define TQPALETTE_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qcolor.h"
-#include "qshared.h"
-#include "qbrush.h" // TQColor->TQBrush conversion
+#include "ntqwindowdefs.h"
+#include "ntqcolor.h"
+#include "ntqshared.h"
+#include "ntqbrush.h" // TQColor->TQBrush conversion
 #endif // QT_H
 
 #ifndef QT_NO_PALETTE
diff --git a/src/kernel/qpen.h b/src/kernel/ntqpen.h
index 93d98d200..e92a7cc06 100644
--- a/src/kernel/qpen.h
+++ b/src/kernel/ntqpen.h
@@ -42,8 +42,8 @@
 #define TQPEN_H
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qshared.h"
+#include "ntqcolor.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpicture.h b/src/kernel/ntqpicture.h
index 7322bb936..9a76a7b5d 100644
--- a/src/kernel/qpicture.h
+++ b/src/kernel/ntqpicture.h
@@ -42,8 +42,8 @@
 #define TQPICTURE_H
 
 #ifndef QT_H
-#include "qpaintdevice.h"
-#include "qbuffer.h"
+#include "ntqpaintdevice.h"
+#include "ntqbuffer.h"
 #endif // QT_H
 
 #ifndef QT_NO_PICTURE
diff --git a/src/kernel/qpixmap.h b/src/kernel/ntqpixmap.h
index 89496e7a3..abf203690 100644
--- a/src/kernel/qpixmap.h
+++ b/src/kernel/ntqpixmap.h
@@ -42,10 +42,10 @@
 #define TQPIXMAP_H
 
 #ifndef QT_H
-#include "qpaintdevice.h"
-#include "qcolor.h" // char*->TQColor conversion
-#include "qstring.h" // char*->TQString conversion
-#include "qnamespace.h"
+#include "ntqpaintdevice.h"
+#include "ntqcolor.h" // char*->TQColor conversion
+#include "ntqstring.h" // char*->TQString conversion
+#include "ntqnamespace.h"
 #endif // QT_H
 
 class TQGfx;
diff --git a/src/kernel/qpixmapcache.h b/src/kernel/ntqpixmapcache.h
index 47e729cf4..29bcb82e0 100644
--- a/src/kernel/qpixmapcache.h
+++ b/src/kernel/ntqpixmapcache.h
@@ -42,7 +42,7 @@
 #define TQPIXMAPCACHE_H
 
 #ifndef QT_H
-#include "qpixmap.h"
+#include "ntqpixmap.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpngio.h b/src/kernel/ntqpngio.h
index 1a9d5c291..ce41e7d55 100644
--- a/src/kernel/qpngio.h
+++ b/src/kernel/ntqpngio.h
@@ -42,7 +42,7 @@
 #define TQPNGIO_H
 
 #ifndef QT_H
-#include "qimage.h"
+#include "ntqimage.h"
 #endif // QT_H
 
 #ifndef QT_NO_IMAGEIO_PNG
diff --git a/src/kernel/qpoint.h b/src/kernel/ntqpoint.h
index cab2ee797..731683a4c 100644
--- a/src/kernel/qpoint.h
+++ b/src/kernel/ntqpoint.h
@@ -42,7 +42,7 @@
 #define TQPOINT_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #endif // QT_H
 
 
@@ -215,5 +215,5 @@ inline const TQPoint operator/( const TQPoint &p, double c )
 }
 
 #define Q_DEFINED_QPOINT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQPOINT_H
diff --git a/src/kernel/qpointarray.h b/src/kernel/ntqpointarray.h
index a78023b80..a0aa8ea74 100644
--- a/src/kernel/qpointarray.h
+++ b/src/kernel/ntqpointarray.h
@@ -42,8 +42,8 @@
 #define TQPOINTARRAY_H
 
 #ifndef QT_H
-#include "qmemarray.h"
-#include "qpoint.h"
+#include "ntqmemarray.h"
+#include "ntqpoint.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpolygonscanner.h b/src/kernel/ntqpolygonscanner.h
index be6369891..276f9afcb 100644
--- a/src/kernel/qpolygonscanner.h
+++ b/src/kernel/ntqpolygonscanner.h
@@ -42,7 +42,7 @@
 #define TQPOLYGONSCANNER_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 class TQPointArray;
diff --git a/src/kernel/qprinter.h b/src/kernel/ntqprinter.h
index b08b97cb5..fa7b9caa8 100644
--- a/src/kernel/qprinter.h
+++ b/src/kernel/ntqprinter.h
@@ -42,9 +42,9 @@
 #define TQPRINTER_H
 
 #ifndef QT_H
-#include "qpaintdevice.h"
-#include "qstring.h"
-#include "qstringlist.h"
+#include "ntqpaintdevice.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_PRINTER
diff --git a/src/kernel/qprocess.h b/src/kernel/ntqprocess.h
index 9a710df76..e9a77e3ed 100644
--- a/src/kernel/qprocess.h
+++ b/src/kernel/ntqprocess.h
@@ -42,9 +42,9 @@
 #define TQPROCESS_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qstringlist.h"
-#include "qdir.h"
+#include "ntqobject.h"
+#include "ntqstringlist.h"
+#include "ntqdir.h"
 #endif // QT_H
 
 #ifndef QT_NO_PROCESS
diff --git a/src/kernel/qrect.h b/src/kernel/ntqrect.h
index b1ab9090e..426c17560 100644
--- a/src/kernel/qrect.h
+++ b/src/kernel/ntqrect.h
@@ -42,7 +42,7 @@
 #define TQRECT_H
 
 #ifndef QT_H
-#include "qsize.h"
+#include "ntqsize.h"
 #endif // QT_H
 
 #if defined(topLeft)
@@ -272,5 +272,5 @@ inline bool TQRect::contains( int x, int y ) const
 	   y >= y1 && y <= y2;
 }
 #define Q_DEFINED_QRECT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQRECT_H
diff --git a/src/kernel/qregion.h b/src/kernel/ntqregion.h
index 9b6557cbe..798b33cde 100644
--- a/src/kernel/qregion.h
+++ b/src/kernel/ntqregion.h
@@ -42,8 +42,8 @@
 #define TQREGION_H
 
 #ifndef QT_H
-#include "qshared.h"
-#include "qrect.h"
+#include "ntqshared.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 #ifdef Q_WS_X11
diff --git a/src/kernel/qsession.h b/src/kernel/ntqsession.h
index 36fd657b8..36fd657b8 100644
--- a/src/kernel/qsession.h
+++ b/src/kernel/ntqsession.h
diff --git a/src/kernel/qsessionmanager.h b/src/kernel/ntqsessionmanager.h
index 865a13262..6a435c3a1 100644
--- a/src/kernel/qsessionmanager.h
+++ b/src/kernel/ntqsessionmanager.h
@@ -42,10 +42,10 @@
 #define TQSESSIONMANAGER_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qwindowdefs.h"
-#include "qstring.h"
-#include "qstringlist.h"
+#include "ntqobject.h"
+#include "ntqwindowdefs.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 #ifndef QT_NO_SESSIONMANAGER
 
diff --git a/src/kernel/qsignal.h b/src/kernel/ntqsignal.h
index d5b4cd7e7..0664fe5d2 100644
--- a/src/kernel/qsignal.h
+++ b/src/kernel/ntqsignal.h
@@ -42,8 +42,8 @@
 #define TQSIGNAL_H
 
 #ifndef QT_H
-#include "qvariant.h"
-#include "qobject.h"
+#include "ntqvariant.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qsignalmapper.h b/src/kernel/ntqsignalmapper.h
index 1ad42890b..2b560a7cd 100644
--- a/src/kernel/qsignalmapper.h
+++ b/src/kernel/ntqsignalmapper.h
@@ -42,7 +42,7 @@
 #define TQSIGNALMAPPER_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 #ifndef QT_NO_SIGNALMAPPER
 class  TQSignalMapperData;
diff --git a/src/kernel/qsignalslotimp.h b/src/kernel/ntqsignalslotimp.h
index 7e8cf1d44..e1c3bf0f5 100644
--- a/src/kernel/qsignalslotimp.h
+++ b/src/kernel/ntqsignalslotimp.h
@@ -42,9 +42,9 @@
 #define TQSIGNALSLOTIMP_H
 
 #ifndef QT_H
-#include "qconnection.h"
-#include "qptrlist.h"
-#include "qptrvector.h"
+#include "ntqconnection.h"
+#include "ntqptrlist.h"
+#include "ntqptrvector.h"
 #endif // QT_H
 
 class Q_EXPORT TQConnectionList : public TQPtrList<TQConnection>
@@ -93,5 +93,5 @@ public:
 };
 
 #define Q_DEFINED_QCONNECTION_LIST
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQSIGNALSLOTIMP_H
diff --git a/src/kernel/qsimplerichtext.h b/src/kernel/ntqsimplerichtext.h
index 8860f114b..e8b479a8d 100644
--- a/src/kernel/qsimplerichtext.h
+++ b/src/kernel/ntqsimplerichtext.h
@@ -42,9 +42,9 @@
 #define TQSIMPLERICHTEXT_H
 
 #ifndef QT_H
-#include "qnamespace.h"
-#include "qstring.h"
-#include "qregion.h"
+#include "ntqnamespace.h"
+#include "ntqstring.h"
+#include "ntqregion.h"
 #endif // QT_H
 
 #ifndef QT_NO_RICHTEXT
diff --git a/src/kernel/qsize.h b/src/kernel/ntqsize.h
index a8b6fabe5..01905dfd3 100644
--- a/src/kernel/qsize.h
+++ b/src/kernel/ntqsize.h
@@ -42,14 +42,14 @@
 #define TQSIZE_H
 
 #ifndef QT_H
-#include "qpoint.h" // ### change to qwindowdefs.h?
+#include "ntqpoint.h" // ### change to ntqwindowdefs.h?
 #endif // QT_H
 
 class Q_EXPORT TQSize
 // ### Make TQSize inherit TQt in TQt 4.0
 {
 public:
-    // ### Move this enum to qnamespace.h in TQt 4.0
+    // ### Move this enum to ntqnamespace.h in TQt 4.0
     enum ScaleMode {
 	ScaleFree,
 	ScaleMin,
diff --git a/src/kernel/qsizegrip.h b/src/kernel/ntqsizegrip.h
index 2b8b6eca2..20fab72e0 100644
--- a/src/kernel/qsizegrip.h
+++ b/src/kernel/ntqsizegrip.h
@@ -42,7 +42,7 @@
 #define TQSIZEGRIP_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_SIZEGRIP
diff --git a/src/kernel/qsizepolicy.h b/src/kernel/ntqsizepolicy.h
index 87099c32d..85b087a53 100644
--- a/src/kernel/qsizepolicy.h
+++ b/src/kernel/ntqsizepolicy.h
@@ -42,7 +42,7 @@
 #define TQSIZEPOLICY_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 // Documentation is in qabstractlayout.cpp.
diff --git a/src/kernel/qsocketnotifier.h b/src/kernel/ntqsocketnotifier.h
index ce3396f39..df92ce8ea 100644
--- a/src/kernel/qsocketnotifier.h
+++ b/src/kernel/ntqsocketnotifier.h
@@ -42,7 +42,7 @@
 #define TQSOCKETNOTIFIER_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qsound.h b/src/kernel/ntqsound.h
index 52bf794a9..3e4efda58 100644
--- a/src/kernel/qsound.h
+++ b/src/kernel/ntqsound.h
@@ -41,7 +41,7 @@
 #define TQSOUND_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_SOUND
diff --git a/src/kernel/qstyle.h b/src/kernel/ntqstyle.h
index fec9522a9..f36ad8a2b 100644
--- a/src/kernel/qstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -41,7 +41,7 @@
 #define TQSTYLE_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qstylesheet.h b/src/kernel/ntqstylesheet.h
index 4b7e31043..b73d6f0ae 100644
--- a/src/kernel/qstylesheet.h
+++ b/src/kernel/ntqstylesheet.h
@@ -42,11 +42,11 @@
 #define TQSTYLESHEET_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qvaluelist.h"
-#include "qptrvector.h"
-#include "qdict.h"
-#include "qobject.h"
+#include "ntqstring.h"
+#include "ntqvaluelist.h"
+#include "ntqptrvector.h"
+#include "ntqdict.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_RICHTEXT
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
new file mode 100644
index 000000000..6a2a54289
--- /dev/null
+++ b/src/kernel/ntqt.h
@@ -0,0 +1,375 @@
+/****************************************************************************
+**
+** TQt GUI Toolkit
+**
+** This header file efficiently includes all TQt GUI Toolkit functionality.
+**
+** Generated : Mon Oct 13 13:07:29 CEST 2003
+
+**
+** Copyright (C) 1995-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of the TQt GUI Toolkit.
+**
+*****************************************************************************/
+
+#ifndef QT_H
+#define QT_H
+#include "ntqglobal.h"
+#include "ntqfeatures.h"
+#include "ntqshared.h"
+#include "ntqptrcollection.h"
+#include "ntqglist.h"
+#include "ntqobjectdefs.h"
+#include "ntqnamespace.h"
+#include "ntqgarray.h"
+#include "ntqmemarray.h"
+#include "ntqcstring.h"
+#include "ntqstring.h"
+#include "ntqptrlist.h"
+#include "ntqiodevice.h"
+#include "ntqkeysequence.h"
+#include "ntqwindowdefs.h"
+#include "ntqgdict.h"
+#include "ntqfont.h"
+#include "ntqdatastream.h"
+#include "ntqpair.h"
+#include "ntqpoint.h"
+#include <stdio.h>
+#include "ntqtextstream.h"
+#include "ntqfontinfo.h"
+#include "ntqsizepolicy.h"
+#include "ntqtl.h"
+#include "ntqsize.h"
+#include "ntqrect.h"
+#include "ntqbitarray.h"
+#include "ntqregion.h"
+#include "ntqsql.h"
+#include "ntqstrlist.h"
+#include "ntqvaluelist.h"
+#include "ntqmap.h"
+#include "ntqdatetime.h"
+#include "ntqmime.h"
+#include "ntqasciidict.h"
+#include "ntqpaintdevice.h"
+#include "ntqfontmetrics.h"
+#include "ntqdict.h"
+#include "ntqevent.h"
+#include "ntqhostaddress.h"
+#include "ntqstringlist.h"
+#include "ntqcolor.h"
+#include <ntqdom.h>
+#include "ntqobject.h"
+#include <ntqdrawutil.h>
+#include "ntqbrush.h"
+#include "ntqpalette.h"
+#include "ntqwidget.h"
+#include "ntqjpunicode.h"
+#include "ntqtextcodec.h"
+#include "ntqstyle.h"
+#include "ntqframe.h"
+#include "ntqfile.h"
+#include "ntqfileinfo.h"
+#include "ntqurlinfo.h"
+#include "ntqwidgetlist.h"
+#include <ntqcombobox.h>
+#include "ntqgroupbox.h"
+#include "ntqdialog.h"
+#include <ntqdataview.h>
+#include "ntqdockwindow.h"
+#include "ntqcommonstyle.h"
+#include "ntqnetworkprotocol.h"
+#include <ntqeuckrcodec.h>
+#include <ntqgb18030codec.h>
+#include "ntqgcache.h"
+#include "ntqpixmap.h"
+#include <ntqgif.h>
+#include <ntqglcolormap.h>
+#include <ntqcache.h>
+#include <ntqdropsite.h>
+#include "ntqgplugin.h"
+#include <ntqgrid.h>
+#include "ntqrangecontrol.h"
+#include "ntqbuttongroup.h"
+#include <ntqdatetimeedit.h>
+#include "ntqgvector.h"
+#include "ntqhbox.h"
+#include <ntqhbuttongroup.h>
+#include "ntqiconset.h"
+#include <ntqhgroupbox.h>
+#include "ntqsocketnotifier.h"
+#include <ntqeventloop.h>
+#include <ntqhttp.h>
+#include <ntqaction.h>
+#include "ntqbuffer.h"
+#include "ntqimage.h"
+#include <ntqimageformatplugin.h>
+#include "ntqlineedit.h"
+#include <ntqintcache.h>
+#include "ntqintdict.h"
+#include "ntqmotifstyle.h"
+#include "ntqpicture.h"
+#include <ntqjiscodec.h>
+#include <ntqeucjpcodec.h>
+#include <ntqkeycode.h>
+#include <ntqaccel.h>
+#include "ntqlabel.h"
+#include "ntqlayout.h"
+#include <ntqlcdnumber.h>
+#include <ntqlibrary.h>
+#include <ntqinputdialog.h>
+#include "ntqscrollbar.h"
+#include "ntqscrollview.h"
+#include "ntqdir.h"
+#include "ntqwindowsstyle.h"
+#include "ntqconnection.h"
+#include "ntqbitmap.h"
+#include "ntqvariant.h"
+#include "ntqsignal.h"
+#include <ntqmessagebox.h>
+#include "ntqmetaobject.h"
+#include "ntqheader.h"
+#include <ntqmotifplusstyle.h>
+#include <ntqcdestyle.h>
+#include <ntqmovie.h>
+#include "ntqptrvector.h"
+#include "ntqmutex.h"
+#include "ntqbutton.h"
+#include <ntqnetwork.h>
+#include <ntqftp.h>
+#include "ntqguardedptr.h"
+#include <ntqobjectcleanuphandler.h>
+#include "ntqsqlfield.h"
+#include <ntqobjectdict.h>
+#include <ntqobjectlist.h>
+#include <ntqcolordialog.h>
+#include <ntqpaintdevicemetrics.h>
+#include "ntqpointarray.h"
+#include "ntqmenudata.h"
+#include <ntqlistview.h>
+#include "ntqpen.h"
+#include "ntqdragobject.h"
+#include <ntqiconview.h>
+#include <ntqpixmapcache.h>
+#include <ntqplatinumstyle.h>
+#include <ntqpngio.h>
+#include <ntqcursor.h>
+#include <ntqerrormessage.h>
+#include <ntqpolygonscanner.h>
+#include "ntqpopupmenu.h"
+#include <ntqprintdialog.h>
+#include <ntqprinter.h>
+#include <ntqprocess.h>
+#include "ntqprogressbar.h"
+#include "ntqsemimodal.h"
+#include <ntqasciicache.h>
+#include "ntqptrdict.h"
+#include <ntqcleanuphandler.h>
+#include <ntqptrqueue.h>
+#include <ntqptrstack.h>
+#include "ntqstylesheet.h"
+#include <ntqpushbutton.h>
+#include <ntqradiobutton.h>
+#include <ntqdial.h>
+#include <ntqdockarea.h>
+#include "ntqregexp.h"
+#include <ntqclipboard.h>
+#include <ntqrtlcodec.h>
+#include <ntqlistbox.h>
+#include <ntqgridview.h>
+#include "ntqsemaphore.h"
+#include <ntqprogressdialog.h>
+#include "ntqsocketdevice.h"
+#include <ntqsessionmanager.h>
+#include <ntqsettings.h>
+#include <ntqsgistyle.h>
+#include <ntqfontdialog.h>
+#include "ntqtimer.h"
+#include <ntqsignalmapper.h>
+#include <ntqsignalslotimp.h>
+#include <ntqsimplerichtext.h>
+#include "ntqwmatrix.h"
+#include <ntqsizegrip.h>
+#include <ntqabstractlayout.h>
+#include <ntqsjiscodec.h>
+#include <ntqslider.h>
+#include <ntqsocket.h>
+#include <ntqserversocket.h>
+#include <ntqdns.h>
+#include <ntqsortedlist.h>
+#include <ntqsound.h>
+#include <ntqspinbox.h>
+#include <ntqsplashscreen.h>
+#include <ntqsplitter.h>
+#include "ntqsqlerror.h"
+#include "ntqeditorfactory.h"
+#include "ntqsqlquery.h"
+#include "ntqsqlrecord.h"
+#include <ntqsqldriverplugin.h>
+#include "ntqsqlindex.h"
+#include "ntqsqlcursor.h"
+#include <ntqsqldriver.h>
+#include <ntqsqlform.h>
+#include "ntqtable.h"
+#include <ntqsqlpropertymap.h>
+#include <ntqsqldatabase.h>
+#include <ntqdatabrowser.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlselectcursor.h>
+#include <ntqstatusbar.h>
+#include <ntqmenubar.h>
+#include <ntqcanvas.h>
+#include "ntqtranslator.h"
+#include <ntqstrvec.h>
+#include <ntqinterlacestyle.h>
+#include <ntqstylefactory.h>
+#include <ntqstyleplugin.h>
+#include "ntqtextedit.h"
+#include <ntqsyntaxhighlighter.h>
+#include <ntqtabbar.h>
+#include <ntqtabdialog.h>
+#include "ntqsqleditorfactory.h"
+#include <ntqtabwidget.h>
+#include <ntqtextbrowser.h>
+#include <ntqbig5codec.h>
+#include <ntqtextcodecfactory.h>
+#include <ntqtextcodecplugin.h>
+#include <ntqmultilineedit.h>
+#include "ntqtoolbar.h"
+#include <ntqtextview.h>
+#include "ntqwaitcondition.h"
+#include <ntqasyncio.h>
+#include <ntqfontdatabase.h>
+#include <ntqmainwindow.h>
+#include <ntqtoolbox.h>
+#include <ntqtoolbutton.h>
+#include <ntqtooltip.h>
+#include "ntqdesktopwidget.h"
+#include <ntqtsciicodec.h>
+#include "ntqurl.h"
+#include "ntqurloperator.h"
+#include <ntqfiledialog.h>
+#include <ntqutfcodec.h>
+#include <ntquuid.h>
+#include <ntqvalidator.h>
+#include <ntqasyncimageio.h>
+#include <ntqvaluestack.h>
+#include <ntqvaluevector.h>
+#include <ntqdatatable.h>
+#include <ntqvbox.h>
+#include <ntqvbuttongroup.h>
+#include <ntqvfbhdr.h>
+#include <ntqvgroupbox.h>
+#include <ntqthread.h>
+#include <ntqwhatsthis.h>
+#include <ntqapplication.h>
+#include <ntqwidgetintdict.h>
+#include <ntqfocusdata.h>
+#include <ntqwidgetplugin.h>
+#include <ntqwidgetstack.h>
+#include <ntqcheckbox.h>
+#include <ntqcompactstyle.h>
+#include <ntqwizard.h>
+#include <ntqpainter.h>
+#include <ntqworkspace.h>
+#include <ntqlocalfs.h>
+#include <ntqxml.h>
+
+#if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX )
+#include <private/qcom_p.h>
+#include <private/qucom_p.h>
+#include "private/qgfxdriverinterface_p.h"
+#include "private/qcom_p.h"
+#include "private/qimageformatinterface_p.h"
+#include "private/qisciicodec_p.h"
+#include "private/qkbddriverinterface_p.h"
+#include "private/qlayoutengine_p.h"
+#include "private/qcomlibrary_p.h"
+#include "private/qmousedriverinterface_p.h"
+#include "private/qeffects_p.h"
+#include "private/qgpluginmanager_p.h"
+#include "private/qinternal_p.h"
+#include "private/qsqldriverinterface_p.h"
+#include "private/qsqlmanager_p.h"
+#include "private/qlock_p.h"
+#include "private/qcomponentfactory_p.h"
+#include "private/qstyleinterface_p.h"
+#include "private/qrichtext_p.h"
+#include "private/qsvgdevice_p.h"
+#include "private/qfontcodecs_p.h"
+#include "private/qtextcodecinterface_p.h"
+#include "private/qpsprinter_p.h"
+#include "private/qtitlebar_p.h"
+#include "private/qucom_p.h"
+#include "private/qucomextra_p.h"
+#include "private/qpluginmanager_p.h"
+#include "private/qdir_p.h"
+#include "private/qsettings_p.h"
+#include "private/qsqlextension_p.h"
+#include "private/qdialogbuttons_p.h"
+#include "private/qwidgetinterface_p.h"
+#include "private/qwidgetresizehandler_p.h"
+#include "private/qlibrary_p.h"
+#endif // Private headers
+
+
+#ifdef Q_WS_X11
+#include "private/qtkdeintegration_x11_p.h"
+#endif
+
+#ifdef Q_WS_MAC
+#include <qaquastyle.h>
+#include <qmacstyle_mac.h>
+#endif // Q_WS_MAC
+
+#ifdef Q_WS_WIN
+#include <qwindowsxpstyle.h>
+#endif
+
+#ifdef Q_WS_QWS
+#include <private/qtextengine_p.h>
+#include "qfontmanager_qws.h"
+#include <qfontfactorybdf_qws.h>
+#include <qgfxvoodoodefs_qws.h>
+#include <qgfxmatroxdefs_qws.h>
+#include <qgfxdriverplugin_qws.h>
+#include <qkbddriverfactory_qws.h>
+#include <qkbddriverplugin_qws.h>
+#include <qmousedriverfactory_qws.h>
+#include <qmousedriverplugin_qws.h>
+#include <qcopchannel_qws.h>
+#include <qdirectpainter_qws.h>
+#include "qmemorymanager_qws.h"
+#include <qmouse_qws.h>
+#include <qfontfactoryttf_qws.h>
+#ifndef Q_OS_MAC
+# include <qsoundqss_qws.h>
+#endif
+#include "qgfx_qws.h"
+#include <qgfxdriverfactory_qws.h>
+#include "qwsdisplay_qws.h"
+#include "qwssocket_qws.h"
+#include "qwsdecoration_qws.h"
+#include "qwsutils_qws.h"
+#include <qwscursor_qws.h>
+#include "qwsmanager_qws.h"
+#include "qwsdefaultdecoration_qws.h"
+#include <qgfxraster_qws.h>
+#include "qwscommand_qws.h"
+#include <qwshydrodecoration_qws.h>
+#include <qwskde2decoration_qws.h>
+#include <qwskdedecoration_qws.h>
+#include <qwsbeosdecoration_qws.h>
+#include "qwsproperty_qws.h"
+#include <qwsregionmanager_qws.h>
+#include "qwsevent_qws.h"
+#include <qwindowsystem_qws.h>
+#include <qwswindowsdecoration_qws.h>
+#endif // Q_WS_QWS
+
+
+#ifdef Q_WS_WCE
+#include <qpocketpcstyle_wce.h>
+#endif // Q_WS_WCE
+
+#endif // QT_H
diff --git a/src/kernel/qthread.h b/src/kernel/ntqthread.h
index 192772855..56480a3fb 100644
--- a/src/kernel/qthread.h
+++ b/src/kernel/ntqthread.h
@@ -44,11 +44,11 @@
 #if defined(QT_THREAD_SUPPORT)
 
 #ifndef QT_H
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #ifndef QT_NO_COMPAT
-#include "qmutex.h"
-#include "qsemaphore.h"
-#include "qwaitcondition.h"
+#include "ntqmutex.h"
+#include "ntqsemaphore.h"
+#include "ntqwaitcondition.h"
 #endif // QT_NO_COMPAT
 #endif // QT_H
 
diff --git a/src/kernel/qtimer.h b/src/kernel/ntqtimer.h
index 3767e1d35..103c65ab9 100644
--- a/src/kernel/qtimer.h
+++ b/src/kernel/ntqtimer.h
@@ -42,7 +42,7 @@
 #define TQTIMER_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qtranslator.h b/src/kernel/ntqtranslator.h
index 1d7273c2b..eccc8e4c1 100644
--- a/src/kernel/qtranslator.h
+++ b/src/kernel/ntqtranslator.h
@@ -43,8 +43,8 @@
 #define TQTRANSLATOR_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qvaluelist.h"
+#include "ntqobject.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TRANSLATION
diff --git a/src/kernel/qurl.h b/src/kernel/ntqurl.h
index a7430c9dd..5069849fe 100644
--- a/src/kernel/qurl.h
+++ b/src/kernel/ntqurl.h
@@ -42,7 +42,7 @@
 #define TQURL_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_URL
diff --git a/src/kernel/qurlinfo.h b/src/kernel/ntqurlinfo.h
index bf6f751a2..18ef71c57 100644
--- a/src/kernel/qurlinfo.h
+++ b/src/kernel/ntqurlinfo.h
@@ -42,10 +42,10 @@
 #define TQURLINFO_H
 
 #ifndef QT_H
-#include "qdatetime.h"
-#include "qstring.h"
+#include "ntqdatetime.h"
+#include "ntqstring.h"
 #if defined(QT_ABI_QT4)
-#include "qiodevice.h"
+#include "ntqiodevice.h"
 #endif
 #endif // QT_H
 
diff --git a/src/kernel/qurloperator.h b/src/kernel/ntqurloperator.h
index 7b258161a..654cc313f 100644
--- a/src/kernel/qurloperator.h
+++ b/src/kernel/ntqurloperator.h
@@ -42,11 +42,11 @@
 #define TQURLOPERATOR_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qurl.h"
-#include "qptrlist.h"
-#include "qnetworkprotocol.h"
-#include "qstringlist.h" // TQString->TQStringList conversion
+#include "ntqobject.h"
+#include "ntqurl.h"
+#include "ntqptrlist.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqstringlist.h" // TQString->TQStringList conversion
 #endif // QT_H
 
 #ifndef QT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qvariant.h b/src/kernel/ntqvariant.h
index 04cb4c24e..e7a09f5c1 100644
--- a/src/kernel/qvariant.h
+++ b/src/kernel/ntqvariant.h
@@ -42,7 +42,7 @@
 #define TQVARIANT_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_VARIANT
@@ -319,9 +319,9 @@ public:
 
 // down here for GCC 2.7.* compatibility
 #ifndef QT_H
-#include "qvaluelist.h"
-#include "qstringlist.h"
-#include "qmap.h"
+#include "ntqvaluelist.h"
+#include "ntqstringlist.h"
+#include "ntqmap.h"
 #endif // QT_H
 
 inline TQVariant::Type TQVariant::type() const
diff --git a/src/kernel/qvfbhdr.h b/src/kernel/ntqvfbhdr.h
index 3f6cbe34c..300ace8bb 100644
--- a/src/kernel/qvfbhdr.h
+++ b/src/kernel/ntqvfbhdr.h
@@ -40,8 +40,8 @@
 #define TQVFBHDR_H
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qrect.h"
+#include "ntqcolor.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 #define QT_VFB_MOUSE_PIPE	"/tmp/.qtvfb_mouse-%1"
diff --git a/src/kernel/qwidget.h b/src/kernel/ntqwidget.h
index 94c4a3af9..383ffc8e0 100644
--- a/src/kernel/qwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -42,14 +42,14 @@
 #define TQWIDGET_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qobject.h"
-#include "qpaintdevice.h"
-#include "qpalette.h"
-#include "qfont.h"
-#include "qfontmetrics.h"
-#include "qfontinfo.h"
-#include "qsizepolicy.h"
+#include "ntqwindowdefs.h"
+#include "ntqobject.h"
+#include "ntqpaintdevice.h"
+#include "ntqpalette.h"
+#include "ntqfont.h"
+#include "ntqfontmetrics.h"
+#include "ntqfontinfo.h"
+#include "ntqsizepolicy.h"
 #endif // QT_H
 
 #if defined(Q_WS_X11) && !defined(QT_NO_IM)
@@ -1089,6 +1089,6 @@ struct Q_EXPORT TQWExtra {
 };
 
 #define Q_DEFINED_QWIDGET
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 
 #endif // TQWIDGET_H
diff --git a/src/kernel/qwidgetintdict.h b/src/kernel/ntqwidgetintdict.h
index 7fcc592f6..512f7830e 100644
--- a/src/kernel/qwidgetintdict.h
+++ b/src/kernel/ntqwidgetintdict.h
@@ -42,8 +42,8 @@
 #define TQWIDGETINTDICT_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qintdict.h"
+#include "ntqwidget.h"
+#include "ntqintdict.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qwidgetlist.h b/src/kernel/ntqwidgetlist.h
index 14a1bfd8a..03e40b7cf 100644
--- a/src/kernel/qwidgetlist.h
+++ b/src/kernel/ntqwidgetlist.h
@@ -42,8 +42,8 @@
 #define TQWIDGETLIST_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qptrlist.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 class Q_EXPORT TQWidgetList : public TQPtrList<TQWidget>
diff --git a/src/kernel/qwindowdefs.h b/src/kernel/ntqwindowdefs.h
index 426ca1d37..bbc317570 100644
--- a/src/kernel/qwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -43,9 +43,9 @@
 #define TQWINDOWDEFS_H
 
 #ifndef QT_H
-#include "qobjectdefs.h"
-#include "qstring.h"
-#include "qnamespace.h"
+#include "ntqobjectdefs.h"
+#include "ntqstring.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 // Class forward definitions
@@ -84,7 +84,7 @@ class TQTime;
 class TQClipboard;
 
 
-// Widget list (defined in qwidgetlist.h)
+// Widget list (defined in ntqwidgetlist.h)
 
 class TQWidgetList;
 class TQWidgetListIt;
diff --git a/src/kernel/qwmatrix.h b/src/kernel/ntqwmatrix.h
index 0cf1a4a8b..bb3042f3d 100644
--- a/src/kernel/qwmatrix.h
+++ b/src/kernel/ntqwmatrix.h
@@ -42,10 +42,10 @@
 #define TQWMATRIX_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qpointarray.h"
-#include "qrect.h"
-#include "qregion.h"
+#include "ntqwindowdefs.h"
+#include "ntqpointarray.h"
+#include "ntqrect.h"
+#include "ntqregion.h"
 #endif // QT_H
 
 #ifndef QT_NO_WMATRIX
diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp
index 2292a4e7c..bf1851991 100644
--- a/src/kernel/qabstractlayout.cpp
+++ b/src/kernel/qabstractlayout.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qlayout.h"
+#include "ntqlayout.h"
 
 #ifndef QT_NO_LAYOUT
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "qlayoutengine_p.h"
-#include "qmenubar.h"
-#include "qtoolbar.h"
+#include "ntqmenubar.h"
+#include "ntqtoolbar.h"
 
 static int menuBarHeightForWidth( TQMenuBar *menubar, int w )
 {
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 8bedd90cf..019dd8369 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -38,21 +38,21 @@
 **
 **********************************************************************/
 
-#include "qaccel.h"
+#include "ntqaccel.h"
 
 #ifndef QT_NO_ACCEL
 
-#include "qsignal.h"
-#include "qapplication.h"
-#include "qwidget.h"
-#include "qptrlist.h"
-#include "qwhatsthis.h"
-#include "qguardedptr.h"
-#include "qstatusbar.h"
-#include "qdockwindow.h"
-#include "qsignalslotimp.h"
+#include "ntqsignal.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
+#include "ntqwhatsthis.h"
+#include "ntqguardedptr.h"
+#include "ntqstatusbar.h"
+#include "ntqdockwindow.h"
+#include "ntqsignalslotimp.h"
 /*!
-    \class TQAccel qaccel.h
+    \class TQAccel ntqaccel.h
     \brief The TQAccel class handles keyboard accelerator and shortcut keys.
 
     \ingroup misc
@@ -85,7 +85,7 @@
     combined with modifiers (\c SHIFT, \c CTRL, \c ALT or \c
     UNICODE_ACCEL). For example, \c{CTRL + Key_P} could be a shortcut
     for printing a document. The key codes are listed in \c
-    qnamespace.h. As an alternative, use \c UNICODE_ACCEL with the
+    ntqnamespace.h. As an alternative, use \c UNICODE_ACCEL with the
     unicode code point of the character. For example, \c{UNICODE_ACCEL
     + 'A'} gives the same accelerator as \c Key_A.
 
diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp
index 346838785..e89cf2c04 100644
--- a/src/kernel/qaccessible.cpp
+++ b/src/kernel/qaccessible.cpp
@@ -36,18 +36,18 @@
 **
 **********************************************************************/
 
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 
-#include "qptrdict.h"
-#include "qmetaobject.h"
+#include "ntqptrdict.h"
+#include "ntqmetaobject.h"
 #include <private/qpluginmanager_p.h>
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include <stdlib.h>
 
 /*!
-    \class TQAccessible qaccessible.h
+    \class TQAccessible ntqaccessible.h
     \brief The TQAccessible class provides enums and static functions
     relating to accessibility.
 
@@ -422,7 +422,7 @@ bool TQAccessible::isActive()
 }
 
 /*!
-    \class TQAccessibleInterface qaccessible.h
+    \class TQAccessibleInterface ntqaccessible.h
     \brief The TQAccessibleInterface class defines an interface that exposes information about accessible objects.
 
     \ingroup misc
@@ -633,7 +633,7 @@ bool TQAccessible::isActive()
 
 
 /*!
-    \class TQAccessibleObject qaccessible.h
+    \class TQAccessibleObject ntqaccessible.h
     \brief The TQAccessibleObject class implements parts of the
     TQAccessibleInterface for TQObjects.
 
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index ffb147ab5..6eb69ff45 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -38,36 +38,36 @@
 **
 **********************************************************************/
 
-#include "qobjectlist.h"
-#include "qapplication.h"
-#include "qeventloop.h"
+#include "ntqobjectlist.h"
+#include "ntqapplication.h"
+#include "ntqeventloop.h"
 #include "qeventloop_p.h"
-#include "qwidget.h"
-#include "qwidgetlist.h"
-#include "qwidgetintdict.h"
-#include "qptrdict.h"
-#include "qcleanuphandler.h"
-
-#include "qtranslator.h"
-#include "qtextcodec.h"
-#include "qsessionmanager.h"
-#include "qdragobject.h"
-#include "qclipboard.h"
-#include "qcursor.h"
-#include "qstyle.h"
-#include "qstylefactory.h"
-#include "qfile.h"
-#include "qmessagebox.h"
-#include "qdir.h"
-#include "qfileinfo.h"
+#include "ntqwidget.h"
+#include "ntqwidgetlist.h"
+#include "ntqwidgetintdict.h"
+#include "ntqptrdict.h"
+#include "ntqcleanuphandler.h"
+
+#include "ntqtranslator.h"
+#include "ntqtextcodec.h"
+#include "ntqsessionmanager.h"
+#include "ntqdragobject.h"
+#include "ntqclipboard.h"
+#include "ntqcursor.h"
+#include "ntqstyle.h"
+#include "ntqstylefactory.h"
+#include "ntqfile.h"
+#include "ntqmessagebox.h"
+#include "ntqdir.h"
+#include "ntqfileinfo.h"
 #ifdef Q_WS_WIN
 #include "qinputcontext_p.h"
 #endif
 #include "qfontdata_p.h"
 
 #if defined(QT_THREAD_SUPPORT)
-#  include "qmutex.h"
-#  include "qthread.h"
+#  include "ntqmutex.h"
+#  include "ntqthread.h"
 #endif // QT_THREAD_SUPPORT
 
 #include <stdlib.h>
@@ -77,7 +77,7 @@
 #endif
 
 /*!
-  \class TQApplication qapplication.h
+  \class TQApplication ntqapplication.h
   \brief The TQApplication class manages the GUI application's control
   flow and main settings.
 
@@ -282,9 +282,9 @@
   TQApplication. This can be useful if you wish to share code between
   a non-GUI server and a GUI client.
 
-  \headerfile qnamespace.h
-  \headerfile qwindowdefs.h
-  \headerfile qglobal.h
+  \headerfile ntqnamespace.h
+  \headerfile ntqwindowdefs.h
+  \headerfile ntqglobal.h
 */
 
 /*! \enum TQt::HANDLE
@@ -1167,8 +1167,8 @@ TQApplication::~TQApplication()
     \code
 	// showargs.cpp - displays program arguments in a list box
 
-	#include <qapplication.h>
-	#include <qlistbox.h>
+	#include <ntqapplication.h>
+	#include <ntqlistbox.h>
 
 	int main( int argc, char **argv )
 	{
@@ -2079,7 +2079,7 @@ TQWidgetList *TQApplication::topLevelWidgets()
     delete list;                      // delete the list, not the widgets
   \endcode
 
-  The TQWidgetList class is defined in the \c qwidgetlist.h header
+  The TQWidgetList class is defined in the \c ntqwidgetlist.h header
   file.
 
   \warning Delete the list as soon as you have finished using it.
@@ -4122,7 +4122,7 @@ bool TQApplication::reverseLayout()
 
 
 /*!
-  \class TQSessionManager qsessionmanager.h
+  \class TQSessionManager ntqsessionmanager.h
   \brief The TQSessionManager class provides access to the session manager.
 
   \ingroup application
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 7f0d4d3d4..1c285c44c 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -64,45 +64,45 @@
 # undef truncate
 #endif
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
 #include "qcolor_p.h"
-#include "qcursor.h"
-#include "qwidget.h"
+#include "ntqcursor.h"
+#include "ntqwidget.h"
 #include "qwidget_p.h"
-#include "qobjectlist.h"
-#include "qwidgetlist.h"
-#include "qwidgetintdict.h"
-#include "qbitarray.h"
-#include "qpainter.h"
-#include "qpixmapcache.h"
-#include "qdatetime.h"
-#include "qtextcodec.h"
-#include "qdatastream.h"
-#include "qbuffer.h"
-#include "qsocketnotifier.h"
-#include "qsessionmanager.h"
-#include "qvaluelist.h"
-#include "qdict.h"
-#include "qguardedptr.h"
-#include "qclipboard.h"
-#include "qwhatsthis.h" // ######## dependency
-#include "qsettings.h"
-#include "qstylefactory.h"
-#include "qfileinfo.h"
+#include "ntqobjectlist.h"
+#include "ntqwidgetlist.h"
+#include "ntqwidgetintdict.h"
+#include "ntqbitarray.h"
+#include "ntqpainter.h"
+#include "ntqpixmapcache.h"
+#include "ntqdatetime.h"
+#include "ntqtextcodec.h"
+#include "ntqdatastream.h"
+#include "ntqbuffer.h"
+#include "ntqsocketnotifier.h"
+#include "ntqsessionmanager.h"
+#include "ntqvaluelist.h"
+#include "ntqdict.h"
+#include "ntqguardedptr.h"
+#include "ntqclipboard.h"
+#include "ntqwhatsthis.h" // ######## dependency
+#include "ntqsettings.h"
+#include "ntqstylefactory.h"
+#include "ntqfileinfo.h"
 
 // Input method stuff - UNFINISHED
 #ifndef QT_NO_IM
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 #endif // QT_NO_IM
 #include "qinternal_p.h" // shared double buffer cleanup
 
 #if defined(QT_THREAD_SUPPORT)
-# include "qthread.h"
+# include "ntqthread.h"
 #endif
 
 #if defined(QT_DEBUG) && defined(Q_OS_LINUX)
-# include "qfile.h"
+# include "ntqfile.h"
 #endif
 
 #include "qt_x11_p.h"
@@ -1636,7 +1636,7 @@ static Visual *find_truecolor_visual( Display *dpy, int scr, int *depth, int *nc
 #include <X11/keysymdef.h>
 
 // ### This should be static but it isn't because of the friend declaration
-// ### in qpaintdevice.h which then should have a static too but can't have
+// ### in ntqpaintdevice.h which then should have a static too but can't have
 // ### it because "storage class specifiers invalid in friend function
 // ### declarations" :-) Ideas anyone?
 void qt_init_internal( int *argcptr, char **argv,
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index c8e8d6ef5..41164a4c6 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qasyncimageio.h"
+#include "ntqasyncimageio.h"
 
 #ifndef QT_NO_ASYNC_IMAGE_IO
 
-#include "qptrlist.h"
-#include "qgif.h"
+#include "ntqptrlist.h"
+#include "ntqgif.h"
 #include <stdlib.h>
 
 extern void qt_init_image_handlers();
@@ -52,7 +52,7 @@ extern void qt_init_image_plugins();
 #define Q_TRANSPARENT 0x00ffffff
 
 /*!
-    \class TQImageConsumer qasyncimageio.h
+    \class TQImageConsumer ntqasyncimageio.h
     \brief The TQImageConsumer class is an abstraction used by TQImageDecoder.
 
     \ingroup images
@@ -154,7 +154,7 @@ extern void qt_init_image_plugins();
 
 
 /*!
-    \class TQImageDecoder qasyncimageio.h
+    \class TQImageDecoder ntqasyncimageio.h
     \brief The TQImageDecoder class is an incremental image decoder for all supported image formats.
 
     \ingroup images
@@ -178,7 +178,7 @@ extern void qt_init_image_plugins();
     \legalese
 
     TQt supports GIF reading if it is configured that way during
-    installation (see qgif.h). If it is, we are required to state that
+    installation (see ntqgif.h). If it is, we are required to state that
     "The Graphics Interchange Format(c) is the Copyright property of
     CompuServe Incorporated. GIF(sm) is a Service Mark property of
     CompuServe Incorporated."
@@ -199,7 +199,7 @@ static const int max_header = 32;
 
 
 
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 class TQGIFFormat : public TQImageFormat {
 public:
@@ -299,7 +299,7 @@ public:
     {
 	if ( !factories ) {
 	    factories = new TQPtrList<TQImageFormatType>;
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 	    gif_decoder_factory = new TQGIFFormatType;
 #endif
@@ -310,7 +310,7 @@ public:
 
     static TQPtrList<TQImageFormatType> * factories;
 
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
     static TQGIFFormatType * gif_decoder_factory;
 #endif
@@ -320,7 +320,7 @@ public:
 };
 
 TQPtrList<TQImageFormatType> * TQImageDecoderPrivate::factories = 0;
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 TQGIFFormatType * TQImageDecoderPrivate::gif_decoder_factory = 0;
 #endif
@@ -330,7 +330,7 @@ void TQImageDecoderPrivate::cleanup()
 {
     delete factories;
     factories = 0;
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
     delete gif_decoder_factory;
     gif_decoder_factory = 0;
@@ -531,7 +531,7 @@ void TQImageDecoder::unregisterDecoderFactory(TQImageFormatType* f)
 }
 
 /*!
-    \class TQImageFormat qasyncimageio.h
+    \class TQImageFormat ntqasyncimageio.h
     \brief The TQImageFormat class is an incremental image decoder for a specific image format.
 
     \ingroup images
@@ -583,7 +583,7 @@ TQImageFormat::~TQImageFormat()
 */
 
 /*!
-    \class TQImageFormatType qasyncimageio.h
+    \class TQImageFormatType ntqasyncimageio.h
     \brief The TQImageFormatType class is a factory that makes TQImageFormat objects.
 
     \ingroup images
@@ -659,11 +659,11 @@ bool qt_builtin_gif_reader()
 #endif
 }
 
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 
 /* -- NOTDOC
-  \class TQGIFFormat qasyncimageio.h
+  \class TQGIFFormat ntqasyncimageio.h
   \brief Incremental image decoder for GIF image format.
 
   \ingroup images
@@ -702,7 +702,7 @@ TQGIFFormat::~TQGIFFormat()
 
 
 /* -- NOTDOC
-  \class TQGIFFormatType qasyncimageio.h
+  \class TQGIFFormatType ntqasyncimageio.h
   \brief Incremental image decoder for GIF image format.
 
   \ingroup images
diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp
index 643e35656..84912e1ff 100644
--- a/src/kernel/qasyncio.cpp
+++ b/src/kernel/qasyncio.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qasyncio.h"
-#include "qiodevice.h"
+#include "ntqasyncio.h"
+#include "ntqiodevice.h"
 #include <stdlib.h>
 
 #ifndef QT_NO_ASYNC_IO
 
 /*!
-  \class TQAsyncIO qasyncio.h
+  \class TQAsyncIO ntqasyncio.h
   \obsolete
   \brief The TQAsyncIO class encapsulates I/O asynchronicity.
 
@@ -86,7 +86,7 @@ void TQAsyncIO::ready()
 
 
 /*!
-  \class TQDataSink qasyncio.h
+  \class TQDataSink ntqasyncio.h
   \obsolete
   \brief The TQDataSink class is an asynchronous consumer of data.
 
@@ -132,7 +132,7 @@ void TQDataSink::maybeReady()
 
 
 /*!
-  \class TQDataSource qasyncio.h
+  \class TQDataSource ntqasyncio.h
   \obsolete
   \brief The TQDataSource class is an asynchronous producer of data.
 
@@ -209,7 +209,7 @@ void TQDataSource::rewind()
 }
 
 /*!
-  \class TQIODeviceSource qasyncio.h
+  \class TQIODeviceSource ntqasyncio.h
   \obsolete
   \brief The TQIODeviceSource class is a TQDataSource that draws data from a TQIODevice.
 
@@ -297,7 +297,7 @@ void TQIODeviceSource::rewind()
 
 
 /*!
-  \class TQDataPump qasyncio.h
+  \class TQDataPump ntqasyncio.h
   \obsolete
   \brief The TQDataPump class moves data from a TQDataSource to a TQDataSink during event processing.
 
diff --git a/src/kernel/qbitmap.cpp b/src/kernel/qbitmap.cpp
index 9e1ea6fbe..1e341e545 100644
--- a/src/kernel/qbitmap.cpp
+++ b/src/kernel/qbitmap.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qbitmap.h"
-#include "qimage.h"
+#include "ntqbitmap.h"
+#include "ntqimage.h"
 
 
 /*!
-    \class TQBitmap qbitmap.h
+    \class TQBitmap ntqbitmap.h
     \brief The TQBitmap class provides monochrome (1-bit depth) pixmaps.
 
     \ingroup graphics
diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp
index 2fdffc826..32da6a764 100644
--- a/src/kernel/qclipboard.cpp
+++ b/src/kernel/qclipboard.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qclipboard.h"
+#include "ntqclipboard.h"
 
 #ifndef QT_NO_CLIPBOARD
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
-#include "qdragobject.h"
-#include "qpixmap.h"
+#include "ntqdragobject.h"
+#include "ntqpixmap.h"
 
 /*!
-    \class TQClipboard qclipboard.h
+    \class TQClipboard ntqclipboard.h
     \brief The TQClipboard class provides access to the window system clipboard.
 
     \ingroup io
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index 0c780a89d..379e8249a 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -60,19 +60,19 @@
 # undef open
 #endif
 
-#include "qclipboard.h"
+#include "ntqclipboard.h"
 
 #ifndef QT_NO_CLIPBOARD
 
-#include "qapplication.h"
-#include "qeventloop.h"
-#include "qbitmap.h"
-#include "qdatetime.h"
-#include "qdragobject.h"
-#include "qbuffer.h"
-#include "qtextcodec.h"
-#include "qvaluelist.h"
-#include "qmap.h"
+#include "ntqapplication.h"
+#include "ntqeventloop.h"
+#include "ntqbitmap.h"
+#include "ntqdatetime.h"
+#include "ntqdragobject.h"
+#include "ntqbuffer.h"
+#include "ntqtextcodec.h"
+#include "ntqvaluelist.h"
+#include "ntqmap.h"
 #include "qt_x11_p.h"
 #include "qapplication_p.h"
 
diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp
index 4806191e3..832e5b7f7 100644
--- a/src/kernel/qcolor.cpp
+++ b/src/kernel/qcolor.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qcolor.h"
-#include "qnamespace.h"
-#include "qdatastream.h"
+#include "ntqcolor.h"
+#include "ntqnamespace.h"
+#include "ntqdatastream.h"
 
 #include <stdio.h>
 
 
 /*!
-    \class TQColor qcolor.h
+    \class TQColor ntqcolor.h
     \brief The TQColor class provides colors based on RGB or HSV values.
 
     \ingroup images
diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp
index 273909741..680737ffc 100644
--- a/src/kernel/qcolor_p.cpp
+++ b/src/kernel/qcolor_p.cpp
@@ -39,13 +39,13 @@
 **
 **********************************************************************/
 
-#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
 
-#include "qcolor.h"
+#include "ntqcolor.h"
 
 #ifndef QT_NO_COLORNAMES
 
diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
index 8bd1eb48e..38080b42a 100644
--- a/src/kernel/qcolor_x11.cpp
+++ b/src/kernel/qcolor_x11.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qcolor.h"
+#include "ntqcolor.h"
 #include "qcolor_p.h"
 #include "string.h"
-#include "qpaintdevice.h"
-#include "qapplication.h"
+#include "ntqpaintdevice.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
 #include "qt_x11_p.h"
 
@@ -58,7 +58,7 @@
   this TQt application.
  *****************************************************************************/
 
-#include "qintdict.h"
+#include "ntqintdict.h"
 
 struct TQColorData {
     uint pix;					// allocated pixel value
diff --git a/src/kernel/qconnection.cpp b/src/kernel/qconnection.cpp
index ac8e93efa..b30a76413 100644
--- a/src/kernel/qconnection.cpp
+++ b/src/kernel/qconnection.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "qconnection.h"
+#include "ntqconnection.h"
 
-/*! \class TQConnection qconnection.h
+/*! \class TQConnection ntqconnection.h
   \brief The TQConnection class is an internal class, used in the signal/slot mechanism.
 
   \internal
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index 112e70c72..12e7cc780 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qcursor.h"
+#include "ntqcursor.h"
 
 #ifndef QT_NO_CURSOR
 
-#include "qbitmap.h"
-#include "qimage.h"
-#include "qdatastream.h"
+#include "ntqbitmap.h"
+#include "ntqimage.h"
+#include "ntqdatastream.h"
 
 
 /*!
-    \class TQCursor qcursor.h
+    \class TQCursor ntqcursor.h
 
     \brief The TQCursor class provides a mouse cursor with an arbitrary
     shape.
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index 2eccebbc4..b880988fb 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qcursor.h"
-#include "qbitmap.h"
-#include "qimage.h"
-#include "qapplication.h"
-#include "qdatastream.h"
-#include "qnamespace.h"
+#include "ntqcursor.h"
+#include "ntqbitmap.h"
+#include "ntqimage.h"
+#include "ntqapplication.h"
+#include "ntqdatastream.h"
+#include "ntqnamespace.h"
 #include "qt_x11_p.h"
 #include <X11/cursorfont.h>
 
diff --git a/src/kernel/qdesktopwidget_x11.cpp b/src/kernel/qdesktopwidget_x11.cpp
index c4a9fc477..d8c10605b 100644
--- a/src/kernel/qdesktopwidget_x11.cpp
+++ b/src/kernel/qdesktopwidget_x11.cpp
@@ -36,9 +36,9 @@
 **
 **********************************************************************/
 
-#include "qdesktopwidget.h"
-#include "qapplication.h"
-#include "qobjectlist.h"
+#include "ntqdesktopwidget.h"
+#include "ntqapplication.h"
+#include "ntqobjectlist.h"
 #include "qt_x11_p.h"
 #include <cstdlib>
 
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index 759d960d4..8c64ce107 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -40,20 +40,20 @@
 
 #include "qplatformdefs.h"
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 #ifndef QT_NO_DRAGANDDROP
 
-#include "qwidget.h"
-#include "qintdict.h"
-#include "qdatetime.h"
-#include "qdict.h"
-#include "qguardedptr.h"
-#include "qdragobject.h"
-#include "qobjectlist.h"
-#include "qcursor.h"
-#include "qbitmap.h"
-#include "qpainter.h"
+#include "ntqwidget.h"
+#include "ntqintdict.h"
+#include "ntqdatetime.h"
+#include "ntqdict.h"
+#include "ntqguardedptr.h"
+#include "ntqdragobject.h"
+#include "ntqobjectlist.h"
+#include "ntqcursor.h"
+#include "ntqbitmap.h"
+#include "ntqpainter.h"
 
 #include "qt_x11_p.h"
 
@@ -1484,7 +1484,7 @@ bool qt_xdnd_handle_badwindow()
 
 
 /*!
-    \class TQDragMoveEvent qevent.h
+    \class TQDragMoveEvent ntqevent.h
     \ingroup events
     \ingroup draganddrop
     \brief The TQDragMoveEvent class provides an event which is sent while a drag and drop is in progress.
@@ -1658,7 +1658,7 @@ bool qt_dnd_enable( TQWidget* w, bool on )
 
 
 /*!
-    \class TQDropEvent qevent.h
+    \class TQDropEvent ntqevent.h
     \ingroup events
     \ingroup draganddrop
 
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index bf838cc85..96653b1c2 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -45,15 +45,15 @@
 
 #ifndef QT_NO_MIME
 
-#include "qdragobject.h"
-#include "qtextcodec.h"
-#include "qapplication.h"
-#include "qpoint.h"
-#include "qwidget.h"
-#include "qbuffer.h"
-#include "qgif.h"
-#include "qregexp.h"
-#include "qdir.h"
+#include "ntqdragobject.h"
+#include "ntqtextcodec.h"
+#include "ntqapplication.h"
+#include "ntqpoint.h"
+#include "ntqwidget.h"
+#include "ntqbuffer.h"
+#include "ntqgif.h"
+#include "ntqregexp.h"
+#include "ntqdir.h"
 #include <ctype.h>
 
 // both a struct for storing stuff in and a wrapper to avoid polluting
@@ -569,7 +569,7 @@ TQWidget * TQDragObject::source()
 
 
 /*!
-    \class TQDragObject qdragobject.h
+    \class TQDragObject ntqdragobject.h
 
     \brief The TQDragObject class encapsulates MIME-based data
     transfer.
@@ -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 qclipboard.html clipboard\endlink.
+    drop and for the \link ntqclipboard.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.
@@ -674,7 +674,7 @@ void TQTextDrag::setSubtype( const TQCString & st)
 }
 
 /*!
-    \class TQTextDrag qdragobject.h
+    \class TQTextDrag ntqdragobject.h
 
     \brief The TQTextDrag class is a drag and drop object for
     transferring plain and Unicode text.
@@ -989,7 +989,7 @@ public:
 
 
 /*!
-    \class TQImageDrag qdragobject.h
+    \class TQImageDrag ntqdragobject.h
 
     \brief The TQImageDrag class provides a drag and drop object for
     transferring images.
@@ -1210,7 +1210,7 @@ bool TQImageDrag::decode( const TQMimeSource* e, TQPixmap& pm )
 
 
 /*!
-    \class TQStoredDrag qdragobject.h
+    \class TQStoredDrag ntqdragobject.h
     \brief The TQStoredDrag class provides a simple stored-value drag object for arbitrary MIME data.
 
     \ingroup draganddrop
@@ -1286,7 +1286,7 @@ TQByteArray TQStoredDrag::encodedData(const char* m) const
 
 
 /*!
-    \class TQUriDrag qdragobject.h
+    \class TQUriDrag ntqdragobject.h
     \brief The TQUriDrag class provides a drag object for a list of URI references.
 
     \ingroup draganddrop
@@ -1703,7 +1703,7 @@ TQWidget* TQDropEvent::source() const
 #endif
 
 /*!
-    \class TQColorDrag qdragobject.h
+    \class TQColorDrag ntqdragobject.h
 
     \brief The TQColorDrag class provides a drag and drop object for
     transferring colors.
diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp
index fa271c978..d9505797b 100644
--- a/src/kernel/qdrawutil.cpp
+++ b/src/kernel/qdrawutil.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qdrawutil.h"
+#include "ntqdrawutil.h"
 #ifndef QT_NO_DRAWUTIL
-#include "qbitmap.h"
-#include "qpixmapcache.h"
-#include "qapplication.h"
-#include "qpainter.h"
+#include "ntqbitmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
 
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws a horizontal (\a y1 == \a y2) or vertical (\a x1 == \a x2)
     shaded line using the painter \a p.
@@ -166,7 +166,7 @@ void qDrawShadeLine( TQPainter *p, int x1, int y1, int x2, int y2,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the shaded rectangle specified by (\a x, \a y, \a w, \a h)
     using the painter \a p.
@@ -272,7 +272,7 @@ void qDrawShadeRect( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the shaded panel specified by (\a x, \a y, \a w, \a h) using
     the painter \a p.
@@ -427,7 +427,7 @@ static void qDrawWinShades( TQPainter *p,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the Windows-style button specified by (\a x, \a y, \a w, \a
     h) using the painter \a p.
@@ -466,7 +466,7 @@ void qDrawWinButton( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the Windows-style panel specified by (\a x, \a y, \a w, \a
     h) using the painter \a p.
@@ -508,7 +508,7 @@ void qDrawWinPanel( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the plain rectangle specified by (\a x, \a y, \a w, \a h)
     using the painter \a p.
diff --git a/src/kernel/qdropsite.cpp b/src/kernel/qdropsite.cpp
index 412720416..07dd965dc 100644
--- a/src/kernel/qdropsite.cpp
+++ b/src/kernel/qdropsite.cpp
@@ -36,16 +36,16 @@
 **
 **********************************************************************/
 
-#include "qdropsite.h"
+#include "ntqdropsite.h"
 
 #ifndef QT_NO_DRAGANDDROP
 
-#include "qwidget.h"
+#include "ntqwidget.h"
 
 
 // NOT REVISED
 /*!
-  \class TQDropSite qdropsite.h
+  \class TQDropSite ntqdropsite.h
   \brief The TQDropSite class provides nothing and does nothing.
 
   \obsolete
diff --git a/src/kernel/qevent.cpp b/src/kernel/qevent.cpp
index 75bcb2244..9c9aace01 100644
--- a/src/kernel/qevent.cpp
+++ b/src/kernel/qevent.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qevent.h"
-#include "qcursor.h"
-#include "qapplication.h"
+#include "ntqevent.h"
+#include "ntqcursor.h"
+#include "ntqapplication.h"
 
 
 /*!
-    \class TQEvent qevent.h
+    \class TQEvent ntqevent.h
     \brief The TQEvent class is the base class of all
     event classes. Event objects contain event parameters.
 
@@ -210,7 +210,7 @@
 
 
 /*!
-    \class TQTimerEvent qevent.h
+    \class TQTimerEvent ntqevent.h
     \brief The TQTimerEvent class contains parameters that describe a
     timer event.
 
@@ -245,7 +245,7 @@
 
 
 /*!
-    \class TQMouseEvent qevent.h
+    \class TQMouseEvent ntqevent.h
     \ingroup events
 
     \brief The TQMouseEvent class contains parameters that describe a mouse event.
@@ -480,7 +480,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const
 
 
 /*!
-    \class TQWheelEvent qevent.h
+    \class TQWheelEvent ntqevent.h
     \brief The TQWheelEvent class contains parameters that describe a wheel event.
 
     \ingroup events
@@ -680,7 +680,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio
 */
 
 /*!
-    \class TQKeyEvent qevent.h
+    \class TQKeyEvent ntqevent.h
     \brief The TQKeyEvent class contains describes a key event.
 
     \ingroup events
@@ -1152,7 +1152,7 @@ TQt::ButtonState TQKeyEvent::stateAfter() const
 
 
 /*!
-    \class TQFocusEvent qevent.h
+    \class TQFocusEvent ntqevent.h
     \brief The TQFocusEvent class contains event parameters for widget focus
     events.
 
@@ -1256,7 +1256,7 @@ void TQFocusEvent::resetReason()
 
 
 /*!
-    \class TQPaintEvent qevent.h
+    \class TQPaintEvent ntqevent.h
     \brief The TQPaintEvent class contains event parameters for paint events.
 
     \ingroup events
@@ -1328,7 +1328,7 @@ void TQFocusEvent::resetReason()
 */
 
 /*!
-    \class TQMoveEvent qevent.h
+    \class TQMoveEvent ntqevent.h
     \brief The TQMoveEvent class contains event parameters for move events.
 
     \ingroup events
@@ -1363,7 +1363,7 @@ void TQFocusEvent::resetReason()
 
 
 /*!
-    \class TQResizeEvent qevent.h
+    \class TQResizeEvent ntqevent.h
     \brief The TQResizeEvent class contains event parameters for resize events.
 
     \ingroup events
@@ -1397,7 +1397,7 @@ void TQFocusEvent::resetReason()
 
 
 /*!
-    \class TQCloseEvent qevent.h
+    \class TQCloseEvent ntqevent.h
     \brief The TQCloseEvent class contains parameters that describe a close event.
 
     \ingroup events
@@ -1499,7 +1499,7 @@ void TQFocusEvent::resetReason()
 */
 
 /*!
-   \class TQIconDragEvent qevent.h
+   \class TQIconDragEvent ntqevent.h
    \brief The TQIconDragEvent class signals that a main icon drag has begun.
 
     \ingroup events
@@ -1554,7 +1554,7 @@ void TQFocusEvent::resetReason()
 */
 
 /*!
-    \class TQContextMenuEvent qevent.h
+    \class TQContextMenuEvent ntqevent.h
     \brief The TQContextMenuEvent class contains parameters that describe a context menu event.
 
     \ingroup events
@@ -1766,7 +1766,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
 
 
 /*!
-    \class TQIMEvent qevent.h
+    \class TQIMEvent ntqevent.h
     \brief The TQIMEvent class provides parameters for input method events.
 
     \ingroup events
@@ -1905,7 +1905,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
 */
 
 /*!
-    \class TQTabletEvent qevent.h
+    \class TQTabletEvent ntqevent.h
     \brief The TQTabletEvent class contains parameters that describe a Tablet
     event.
 
@@ -2148,7 +2148,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
 */
 
 /*!
-    \class TQChildEvent qevent.h
+    \class TQChildEvent ntqevent.h
     \brief The TQChildEvent class contains event parameters for child object
     events.
 
@@ -2202,7 +2202,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
 
 
 /*!
-    \class TQCustomEvent qevent.h
+    \class TQCustomEvent ntqevent.h
     \brief The TQCustomEvent class provides support for custom events.
 
     \ingroup events
@@ -2455,7 +2455,7 @@ TQCustomEvent::TQCustomEvent( int type )
 
 
 /*!
-    \class TQDragEnterEvent qevent.h
+    \class TQDragEnterEvent ntqevent.h
     \brief The TQDragEnterEvent class provides an event which is sent to the widget when a drag and drop first drags onto the widget.
 
     \ingroup events
@@ -2479,7 +2479,7 @@ TQCustomEvent::TQCustomEvent( int type )
 */
 
 /*!
-    \class TQDragLeaveEvent qevent.h
+    \class TQDragLeaveEvent ntqevent.h
     \brief The TQDragLeaveEvent class provides an event which is sent to the widget when a drag and drop leaves the widget.
 
     \ingroup events
@@ -2502,7 +2502,7 @@ TQCustomEvent::TQCustomEvent( int type )
 */
 
 /*!
-    \class TQHideEvent qevent.h
+    \class TQHideEvent ntqevent.h
     \brief The TQHideEvent class provides an event which is sent after a widget is hidden.
 
     \ingroup events
@@ -2527,7 +2527,7 @@ TQCustomEvent::TQCustomEvent( int type )
 */
 
 /*!
-    \class TQShowEvent qevent.h
+    \class TQShowEvent ntqevent.h
     \brief The TQShowEvent class provides an event which is sent when a widget is shown.
 
     \ingroup events
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp
index 3ad30a41e..f09d3e9a8 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/qeventloop.cpp
@@ -37,9 +37,9 @@
 **********************************************************************/
 
 #include "qeventloop_p.h" // includes qplatformdefs.h
-#include "qeventloop.h"
-#include "qapplication.h"
-#include "qdatetime.h"
+#include "ntqeventloop.h"
+#include "ntqapplication.h"
+#include "ntqdatetime.h"
 
 /*!
     \class TQEventLoop
diff --git a/src/kernel/qeventloop_p.h b/src/kernel/qeventloop_p.h
index 3894517b9..7eb32a5d8 100644
--- a/src/kernel/qeventloop_p.h
+++ b/src/kernel/qeventloop_p.h
@@ -58,7 +58,7 @@
 # undef raise
 #endif
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 
 class TQSocketNotifier;
 #ifdef Q_OS_MAC
@@ -66,7 +66,7 @@ class TQMacSockNotPrivate;
 #endif
 
 #if defined(Q_OS_UNIX) || defined (Q_WS_WIN)
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 #endif // Q_OS_UNIX || Q_WS_WIN
 
 #if defined(Q_OS_UNIX)
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp
index d1aee1f62..b131a701f 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/qeventloop_unix.cpp
@@ -37,9 +37,9 @@
 **********************************************************************/
 
 #include "qeventloop_p.h" // includes qplatformdefs.h
-#include "qeventloop.h"
-#include "qapplication.h"
-#include "qbitarray.h"
+#include "ntqeventloop.h"
+#include "ntqapplication.h"
+#include "ntqbitarray.h"
 #include <stdlib.h>
 #include <sys/types.h>
 
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index 26716b179..ae2183a0e 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -37,14 +37,14 @@
 **********************************************************************/
 
 #include "qeventloop_p.h" // includes qplatformdefs.h
-#include "qeventloop.h"
-#include "qapplication.h"
-#include "qbitarray.h"
+#include "ntqeventloop.h"
+#include "ntqapplication.h"
+#include "ntqbitarray.h"
 #include "qcolor_p.h"
 #include "qt_x11_p.h"
 
 #if defined(QT_THREAD_SUPPORT)
-#  include "qmutex.h"
+#  include "ntqmutex.h"
 #endif // QT_THREAD_SUPPORT
 
 #include <errno.h>
diff --git a/src/kernel/qfocusdata.cpp b/src/kernel/qfocusdata.cpp
index 838a2ab15..0f06da4e3 100644
--- a/src/kernel/qfocusdata.cpp
+++ b/src/kernel/qfocusdata.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qfocusdata.h"
+#include "ntqfocusdata.h"
 
 /*!
-    \class TQFocusData qfocusdata.h
+    \class TQFocusData ntqfocusdata.h
     \brief The TQFocusData class maintains the list of widgets in the focus
     chain.
 
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 5fd1a8755..6e78fa43a 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -40,19 +40,19 @@
 
 #define QT_FATAL_ASSERT
 
-#include "qfont.h"
-#include "qfontdatabase.h"
-#include "qfontmetrics.h"
-#include "qfontinfo.h"
-#include "qpainter.h"
-#include "qdict.h"
-#include "qcache.h"
-#include "qdatastream.h"
-#include "qapplication.h"
-#include "qcleanuphandler.h"
-#include "qstringlist.h"
+#include "ntqfont.h"
+#include "ntqfontdatabase.h"
+#include "ntqfontmetrics.h"
+#include "ntqfontinfo.h"
+#include "ntqpainter.h"
+#include "ntqdict.h"
+#include "ntqcache.h"
+#include "ntqdatastream.h"
+#include "ntqapplication.h"
+#include "ntqcleanuphandler.h"
+#include "ntqstringlist.h"
 #ifdef Q_WS_MAC
-#include "qpaintdevicemetrics.h"
+#include "ntqpaintdevicemetrics.h"
 #endif
 
 #include <private/qunicodetables_p.h>
@@ -237,7 +237,7 @@ TQFontEngineData::~TQFontEngineData()
 
 
 /*!
-    \class TQFont qfont.h
+    \class TQFont ntqfont.h
     \brief The TQFont class specifies a font used for drawing text.
 
     \ingroup graphics
@@ -1808,7 +1808,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font )
  *****************************************************************************/
 
 /*!
-    \class TQFontMetrics qfontmetrics.h
+    \class TQFontMetrics ntqfontmetrics.h
     \brief The TQFontMetrics class provides font metrics information.
 
     \ingroup graphics
@@ -2443,7 +2443,7 @@ TQRect TQFontMetrics::boundingRect( TQChar ch ) const
     If several of the horizontal or several of the vertical alignment
     flags are set, the resulting alignment is undefined.
 
-    These flags are defined in \c qnamespace.h.
+    These flags are defined in \c ntqnamespace.h.
 
     If \c ExpandTabs is set in \a flgs, then: if \a tabarray is
     non-null, it specifies a 0-terminated sequence of pixel-positions
@@ -2505,7 +2505,7 @@ TQRect TQFontMetrics::boundingRect( int x, int y, int w, int h, int flgs,
     \i \c WordBreak breaks the text to fit the rectangle.
     \endlist
 
-    These flags are defined in \c qnamespace.h.
+    These flags are defined in \c ntqnamespace.h.
 
     If \c ExpandTabs is set in \a flgs, then: if \a tabarray is
     non-null, it specifies a 0-terminated sequence of pixel-positions
@@ -2591,7 +2591,7 @@ int TQFontMetrics::lineWidth() const
  *****************************************************************************/
 
 /*!
-    \class TQFontInfo qfontinfo.h
+    \class TQFontInfo ntqfontinfo.h
 
     \brief The TQFontInfo class provides general information about fonts.
 
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 5d9debaf1..82120732e 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -44,15 +44,15 @@
 
 #include "qplatformdefs.h"
 
-#include "qfont.h"
-#include "qapplication.h"
-#include "qcleanuphandler.h"
-#include "qfontinfo.h"
-#include "qfontdatabase.h"
-#include "qfontmetrics.h"
-#include "qpaintdevice.h"
-#include "qpaintdevicemetrics.h"
-#include "qtextcodec.h"
+#include "ntqfont.h"
+#include "ntqapplication.h"
+#include "ntqcleanuphandler.h"
+#include "ntqfontinfo.h"
+#include "ntqfontdatabase.h"
+#include "ntqfontmetrics.h"
+#include "ntqpaintdevice.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqtextcodec.h"
 
 #include <private/qfontcodecs_p.h>
 #include <private/qunicodetables_p.h>
diff --git a/src/kernel/qfontdata_p.h b/src/kernel/qfontdata_p.h
index eb83ffb3c..fc0734489 100644
--- a/src/kernel/qfontdata_p.h
+++ b/src/kernel/qfontdata_p.h
@@ -53,9 +53,9 @@
 //
 //
 
-#include "qobject.h"
-#include "qfont.h"
-#include "qpaintdevicemetrics.h"
+#include "ntqobject.h"
+#include "ntqfont.h"
+#include "ntqpaintdevicemetrics.h"
 
 // forwards
 class TQFontEngine;
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp
index 6e2d3ebfd..96cc1118b 100644
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qfontdatabase.h"
+#include "ntqfontdatabase.h"
 
 #ifndef QT_NO_FONTDATABASE
 
-#include <qtl.h>
-#include <qapplication.h>
+#include <ntqtl.h>
+#include <ntqapplication.h>
 
 #include <private/qunicodetables_p.h>
 #include "qfontengine_p.h"
 
-#include <qcleanuphandler.h>
+#include <ntqcleanuphandler.h>
 
 #ifdef Q_WS_X11
 #include <locale.h>
@@ -1293,7 +1293,7 @@ TQString TQFontDatabase::styleString( const TQFont &f )
 
 
 /*!
-    \class TQFontDatabase qfontdatabase.h
+    \class TQFontDatabase ntqfontdatabase.h
     \brief The TQFontDatabase class provides information about the fonts available in the underlying window system.
 
     \ingroup environment
@@ -1332,8 +1332,8 @@ TQString TQFontDatabase::styleString( const TQFont &f )
 
     Example:
 \code
-#include <qapplication.h>
-#include <qfontdatabase.h>
+#include <ntqapplication.h>
+#include <ntqfontdatabase.h>
 #include <else.h>
 
 int main( int argc, char **argv )
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index 77a7ad17f..9231bf50d 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -40,8 +40,8 @@
 
 #include <qplatformdefs.h>
 
-#include <qdatetime.h>
-#include <qpaintdevicemetrics.h>
+#include <ntqdatetime.h>
+#include <ntqpaintdevicemetrics.h>
 
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index 7c0fc0219..bd3d33a3f 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -38,12 +38,12 @@
 #define TQFONTENGINE_P_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #ifdef Q_WS_WIN
 #include "qt_windows.h"
-#include "qptrdict.h"
+#include "ntqptrdict.h"
 #endif
 
 #include "qtextengine_p.h"
@@ -529,8 +529,8 @@ private:
 
 #elif defined( Q_WS_MAC )
 #include "qt_mac.h"
-#include <qmap.h>
-#include <qcache.h>
+#include <ntqmap.h>
+#include <ntqcache.h>
 
 class TQFontEngineMac : public TQFontEngine
 {
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 5693e238d..290e3519d 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -40,20 +40,20 @@
 
 // #define FONTENGINE_DEBUG
 
-#include <qwidget.h>
-#include <qcstring.h>
-#include <qtextcodec.h>
+#include <ntqwidget.h>
+#include <ntqcstring.h>
+#include <ntqtextcodec.h>
 
-#include "qbitmap.h"
-#include "qfontdatabase.h"
-#include "qpaintdevice.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qimage.h"
+#include "ntqbitmap.h"
+#include "ntqfontdatabase.h"
+#include "ntqpaintdevice.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqimage.h"
 
 #include "qt_x11_p.h"
 
-#include "qfont.h"
+#include "ntqfont.h"
 #include "qtextengine_p.h"
 
 #include <private/qunicodetables_p.h>
diff --git a/src/kernel/qgplugin.cpp b/src/kernel/qgplugin.cpp
index e95257634..a8733b07b 100644
--- a/src/kernel/qgplugin.cpp
+++ b/src/kernel/qgplugin.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "qgplugin.h"
+#include "ntqgplugin.h"
 
 #ifndef QT_NO_COMPONENT
 
diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp
index 079904197..e631b1988 100644
--- a/src/kernel/qguardedptr.cpp
+++ b/src/kernel/qguardedptr.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qguardedptr.h"
+#include "ntqguardedptr.h"
 
 /*!
-    \class TQGuardedPtr qguardedptr.h
+    \class TQGuardedPtr ntqguardedptr.h
     \brief The TQGuardedPtr class is a template class that provides guarded pointers to TQObjects.
 
     \ingroup objectmodel
diff --git a/src/kernel/qiconset.cpp b/src/kernel/qiconset.cpp
index da672b037..2ba52a7b8 100644
--- a/src/kernel/qiconset.cpp
+++ b/src/kernel/qiconset.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qiconset.h"
+#include "ntqiconset.h"
 
 #ifndef QT_NO_ICONSET
 
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qcleanuphandler.h"
-#include "qimage.h"
-#include "qpainter.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqcleanuphandler.h"
+#include "ntqimage.h"
+#include "ntqpainter.h"
 
 enum { NumSizes = 2, NumModes = 3, NumStates = 2 };
 
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index edc77a851..56bd482e0 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -38,24 +38,24 @@
 **
 **********************************************************************/
 
-#include "qimage.h"
-#include "qregexp.h"
-#include "qfile.h"
-#include "qdatastream.h"
-#include "qtextstream.h"
-#include "qbuffer.h"
-#include "qptrlist.h"
-#include "qasyncimageio.h"
-#include "qpngio.h"
-#include "qmngio.h"
-#include "qjpegio.h"
-#include "qmap.h"
+#include "ntqimage.h"
+#include "ntqregexp.h"
+#include "ntqfile.h"
+#include "ntqdatastream.h"
+#include "ntqtextstream.h"
+#include "ntqbuffer.h"
+#include "ntqptrlist.h"
+#include "ntqasyncimageio.h"
+#include "ntqpngio.h"
+#include "ntqmngio.h"
+#include "ntqjpegio.h"
+#include "ntqmap.h"
 #include <private/qpluginmanager_p.h>
 #include "qimageformatinterface_p.h"
-#include "qwmatrix.h"
-#include "qapplication.h"
-#include "qmime.h"
-#include "qdragobject.h"
+#include "ntqwmatrix.h"
+#include "ntqapplication.h"
+#include "ntqmime.h"
+#include "ntqdragobject.h"
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -100,7 +100,7 @@
     An entry in the color table is an RGB triplet encoded as a \c
     uint. Use the \link ::qRed() qRed()\endlink, \link ::qGreen()
     qGreen()\endlink and \link ::qBlue() qBlue()\endlink functions (\c
-    qcolor.h) to access the components, and \link ::qRgb()
+    ntqcolor.h) to access the components, and \link ::qRgb()
     qRgb\endlink to make an RGB triplet (see the TQColor class
     documentation).
 
@@ -890,7 +890,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const
 
     A color value is an RGB triplet. Use the \link ::qRed()
     qRed()\endlink, \link ::qGreen() qGreen()\endlink and \link
-    ::qBlue() qBlue()\endlink functions (defined in \c qcolor.h) to
+    ::qBlue() qBlue()\endlink functions (defined in \c ntqcolor.h) to
     get the color value components.
 
     \sa setColor() numColors() TQColor
@@ -902,7 +902,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const
     Sets a color in the color table at index \a i to \a c.
 
     A color value is an RGB triplet. Use the \link ::qRgb()
-    qRgb()\endlink function (defined in \c qcolor.h) to make RGB
+    qRgb()\endlink function (defined in \c ntqcolor.h) to make RGB
     triplets.
 
     \sa color() setNumColors() numColors()
@@ -922,7 +922,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const
     directly, because the pixel format depends on the byte order on
     the underlying platform. Hint: use \link ::qRed() qRed()\endlink,
     \link ::qGreen() qGreen()\endlink and \link ::qBlue()
-    qBlue()\endlink, etc. (qcolor.h) to access the pixels.
+    qBlue()\endlink, etc. (ntqcolor.h) to access the pixels.
 
     \warning If you are accessing 16-bpp image data, you must handle
     endianness yourself. (TQt/Embedded only)
@@ -2373,7 +2373,7 @@ TQImage TQImage::convertBitOrder( Endian bitOrder ) const
     return image;
 }
 
-// ### Candidate (renamed) for qcolor.h
+// ### Candidate (renamed) for ntqcolor.h
 static
 bool isGray(TQRgb c)
 {
@@ -3716,7 +3716,7 @@ static void swapPixel01( TQImage *image )	// 1-bpp: swap 0 and 1 pixels
  *****************************************************************************/
 
 /*!
-    \class TQImageIO qimage.h
+    \class TQImageIO ntqimage.h
 
     \brief The TQImageIO class contains parameters for loading and
     saving images.
@@ -3954,7 +3954,7 @@ static TQImageHandler *get_image_handler( const char *format )
 
 /*!
     Defines an image I/O handler for the image format called \a
-    format, which is recognized using the \link qregexp.html#details
+    format, which is recognized using the \link ntqregexp.html#details
     regular expression\endlink \a header, read using \a readImage and
     written using \a writeImage.
 
diff --git a/src/kernel/qimageformatplugin.cpp b/src/kernel/qimageformatplugin.cpp
index 78ca5cdac..101f09bc0 100644
--- a/src/kernel/qimageformatplugin.cpp
+++ b/src/kernel/qimageformatplugin.cpp
@@ -36,13 +36,13 @@
 **
 **********************************************************************/
 
-#include "qimageformatplugin.h"
+#include "ntqimageformatplugin.h"
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 #include "qimageformatinterface_p.h"
-#include "qimage.h"
+#include "ntqimage.h"
 
 /*!
-    \class TQImageFormatPlugin qimageformatplugin.h
+    \class TQImageFormatPlugin ntqimageformatplugin.h
     \brief The TQImageFormatPlugin class provides an abstract base for custom image format plugins.
 
     \ingroup plugins
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 557ef38e4..a5884db93 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -35,15 +35,15 @@
 
 //#define QT_NO_IM_PREEDIT_RELOCATION
 
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 
 #ifndef QT_NO_IM
 
 #include "qplatformdefs.h"
 
-#include "qapplication.h"
-#include "qwidget.h"
-#include "qpopupmenu.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
+#include "ntqpopupmenu.h"
 
 #include <stdlib.h>
 #include <limits.h>
@@ -93,7 +93,7 @@ public:
 
 // UPDATED COMMENT REQUIRED -- 2004-07-08 YamaKen
 /*!
-    \class TQInputContext qinputcontext.h
+    \class TQInputContext ntqinputcontext.h
     \brief The TQInputContext class abstracts the input method dependent data and composing state.
 
     \ingroup i18n
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h
index 85ce98162..0a7d193d3 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/qinputcontext_p.h
@@ -52,7 +52,7 @@
 //
 //
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 
 class TQKeyEvent;
 class TQWidget;
@@ -61,8 +61,8 @@ class TQString;
 
 
 #ifdef Q_WS_X11
-#include "qarray.h"
-#include "qwindowdefs.h"
+#include "ntqarray.h"
+#include "ntqwindowdefs.h"
 #include "qt_x11_p.h"
 #endif
 
diff --git a/src/kernel/qinputcontext_x11.cpp b/src/kernel/qinputcontext_x11.cpp
index b7865ece3..44ebf0f7f 100644
--- a/src/kernel/qinputcontext_x11.cpp
+++ b/src/kernel/qinputcontext_x11.cpp
@@ -36,14 +36,14 @@
 **
 **********************************************************************/
 
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 
 #ifndef QT_NO_IM
 
 #include "qplatformdefs.h"
 
-#include "qapplication.h"
-#include "qwidget.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
 
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
index 1f779a04e..2a58f01d3 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/qinternal.cpp
@@ -39,10 +39,10 @@
 **********************************************************************/
 
 #include "private/qinternal_p.h"
-#include "qwidget.h"
-#include "qpixmap.h"
-#include "qpainter.h"
-#include "qcleanuphandler.h"
+#include "ntqwidget.h"
+#include "ntqpixmap.h"
+#include "ntqpainter.h"
+#include "ntqcleanuphandler.h"
 
 // Modern systems (year 2011) have very large screens in excess of 1000 pixels wide
 // Some may even have screens in excess of 4000 pixels wide(!)
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 7e3c8774b..875263dd9 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -53,11 +53,11 @@
 //
 //
 #ifndef QT_H
-#include "qnamespace.h"
-#include "qrect.h"
-#include "qptrlist.h"
-#include "qcstring.h"
-#include "qiodevice.h"
+#include "ntqnamespace.h"
+#include "ntqrect.h"
+#include "ntqptrlist.h"
+#include "ntqcstring.h"
+#include "ntqiodevice.h"
 #endif // QT_H
 
 class TQWidget;
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index 43a747924..de1832b26 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -42,12 +42,12 @@
 #define QT_CLEAN_NAMESPACE
 #endif
 
-#include "qimage.h"
+#include "ntqimage.h"
 
 #ifndef QT_NO_IMAGEIO_JPEG
 
-#include "qiodevice.h"
-#include "qjpegio.h"
+#include "ntqiodevice.h"
+#include "ntqjpegio.h"
 
 #include <stdio.h>      // jpeglib needs this to be pre-included
 #include <setjmp.h>
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index 68f6faeb1..727b443bf 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qkeysequence.h"
+#include "ntqkeysequence.h"
 
 #ifndef QT_NO_ACCEL
 
-#include "qaccel.h"
-#include "qshared.h"
-#include "qvaluelist.h"
+#include "ntqaccel.h"
+#include "ntqshared.h"
+#include "ntqvaluelist.h"
 #ifndef QT_NO_REGEXP
-# include "qregexp.h"
+# include "ntqregexp.h"
 #endif
 
 #ifdef Q_WS_MAC
@@ -57,7 +57,7 @@
 #endif
 
 /*!
-    \class TQKeySequence qkeysequence.h
+    \class TQKeySequence ntqkeysequence.h
     \brief The TQKeySequence class encapsulates a key sequence as used
     by accelerators.
 
@@ -67,7 +67,7 @@
     optionally combined with modifiers, e.g. \c SHIFT, \c CTRL, \c
     ALT, \c META, or \c UNICODE_ACCEL. For example, \c{CTRL + Key_P}
     might be a sequence used as a shortcut for printing a document.
-    The key codes are listed in \c{qnamespace.h}. As an alternative,
+    The key codes are listed in \c{ntqnamespace.h}. As an alternative,
     use \c UNICODE_ACCEL with the unicode code point of the character.
     For example, \c{UNICODE_ACCEL + 'A'} gives the same key sequence
     as \c Key_A.
@@ -241,7 +241,7 @@ TQKeySequence::TQKeySequence( const TQString& key )
 /*!
     Constructs a key sequence that has a single \a key.
 
-    The key codes are listed in \c{qnamespace.h} and can be
+    The key codes are listed in \c{ntqnamespace.h} and can be
     combined with modifiers, e.g. with \c SHIFT, \c CTRL, \c
     ALT, \c META or \c UNICODE_ACCEL.
 */
@@ -256,7 +256,7 @@ TQKeySequence::TQKeySequence( int key )
     Constructs a key sequence with up to 4 keys \a k1, \a k2,
     \a k3 and \a k4.
 
-    The key codes are listed in \c{qnamespace.h} and can be
+    The key codes are listed in \c{ntqnamespace.h} and can be
     combined with modifiers, e.g. with \c SHIFT, \c CTRL, \c
     ALT, \c META or \c UNICODE_ACCEL.
 */
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index 9f0792908..df9229ed8 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qlayout.h"
+#include "ntqlayout.h"
 
 #ifndef QT_NO_LAYOUT
 
-#include "qapplication.h"
-#include "qwidget.h"
-#include "qptrlist.h"
-#include "qsizepolicy.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
+#include "ntqsizepolicy.h"
 
 #include "qlayoutengine_p.h"
 
diff --git a/src/kernel/qlayoutengine.cpp b/src/kernel/qlayoutengine.cpp
index f4c45846d..558d42671 100644
--- a/src/kernel/qlayoutengine.cpp
+++ b/src/kernel/qlayoutengine.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qlayout.h"
+#include "ntqlayout.h"
 #include "private/qlayoutengine_p.h"
 
 #ifndef QT_NO_LAYOUT
diff --git a/src/kernel/qlayoutengine_p.h b/src/kernel/qlayoutengine_p.h
index 4231a9c85..2e49891aa 100644
--- a/src/kernel/qlayoutengine_p.h
+++ b/src/kernel/qlayoutengine_p.h
@@ -42,7 +42,7 @@
 #define TQLAYOUTENGINE_P_H
 
 #ifndef TQLAYOUT_H
-    #error "Need to include qlayout.h before including qlayoutengine_p.h"
+    #error "Need to include ntqlayout.h before including qlayoutengine_p.h"
 #endif
 
 //
@@ -60,7 +60,7 @@
 
 
 #ifndef QT_H
-#include "qabstractlayout.h"
+#include "ntqabstractlayout.h"
 #endif // QT_H
 
 #ifndef QT_NO_LAYOUT
diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/qlocalfs.cpp
index 6c4949369..a3e141ba3 100644
--- a/src/kernel/qlocalfs.cpp
+++ b/src/kernel/qlocalfs.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "qlocalfs.h"
+#include "ntqlocalfs.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL
 
-#include "qfileinfo.h"
-#include "qfile.h"
-#include "qurlinfo.h"
-#include "qapplication.h"
-#include "qurloperator.h"
-#include "qguardedptr.h"
+#include "ntqfileinfo.h"
+#include "ntqfile.h"
+#include "ntqurlinfo.h"
+#include "ntqapplication.h"
+#include "ntqurloperator.h"
+#include "ntqguardedptr.h"
 
 //#define TQLOCALFS_DEBUG
 
 
 /*!
-    \class TQLocalFs qlocalfs.h
+    \class TQLocalFs ntqlocalfs.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/qlock_p.h b/src/kernel/qlock_p.h
index 5550b94c0..5fb1526ca 100644
--- a/src/kernel/qlock_p.h
+++ b/src/kernel/qlock_p.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 class TQLockData;
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index a2fc39b27..d9e6a152c 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qmetaobject.h"
-#include "qasciidict.h"
+#include "ntqmetaobject.h"
+#include "ntqasciidict.h"
 
 #ifdef QT_THREAD_SUPPORT
 #include <private/qmutexpool_p.h>
 #endif // QT_THREAD_SUPPORT
 
 /*!
-  \class TQMetaData qmetaobject.h
+  \class TQMetaData ntqmetaobject.h
   \reentrant
 
   \brief The TQMetaData class provides information about a member function that is known to the meta object system.
@@ -64,7 +64,7 @@
  */
 
 /*!
-  \class TQClassInfo qmetaobject.h
+  \class TQClassInfo ntqmetaobject.h
 
   \brief The TQClassInfo class provides a struct that stores some basic information about a single class.
 
@@ -81,7 +81,7 @@
 
 
 /*!
-    \class TQMetaObject qmetaobject.h
+    \class TQMetaObject ntqmetaobject.h
     \brief The TQMetaObject class contains meta information about TQt objects.
 
     \ingroup objectmodel
@@ -845,7 +845,7 @@ bool TQMetaObject::qt_static_property( TQObject* o, int id, int f, TQVariant* v)
 
 
 /*!
-    \class TQMetaProperty qmetaobject.h
+    \class TQMetaProperty ntqmetaobject.h
 
     \brief The TQMetaProperty class stores meta data about a property.
 
diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp
index b783bac98..34d4b2152 100644
--- a/src/kernel/qmime.cpp
+++ b/src/kernel/qmime.cpp
@@ -36,21 +36,21 @@
 **
 **********************************************************************/
 
-#include "qmime.h"
+#include "ntqmime.h"
 
 #ifndef QT_NO_MIME
 
-#include "qmap.h"
-#include "qstringlist.h"
-#include "qfileinfo.h"
-#include "qdir.h"
-#include "qdragobject.h"
-#include "qcleanuphandler.h"
-#include "qapplication.h" // ### for now
-#include "qclipboard.h" // ### for now
+#include "ntqmap.h"
+#include "ntqstringlist.h"
+#include "ntqfileinfo.h"
+#include "ntqdir.h"
+#include "ntqdragobject.h"
+#include "ntqcleanuphandler.h"
+#include "ntqapplication.h" // ### for now
+#include "ntqclipboard.h" // ### for now
 
 /*!
-    \class TQMimeSource qmime.h
+    \class TQMimeSource ntqmime.h
     \brief The TQMimeSource class is an abstraction of objects which provide formatted data of a certain MIME type.
 
     \ingroup io
@@ -180,7 +180,7 @@ public:
 
 
 /*!
-    \class TQMimeSourceFactory qmime.h
+    \class TQMimeSourceFactory ntqmime.h
     \brief The TQMimeSourceFactory class is an extensible provider of mime-typed data.
 
     \ingroup io
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index 809291842..0bd83131a 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -42,14 +42,14 @@
 #define QT_CLEAN_NAMESPACE
 #endif
 
-#include "qdatetime.h"
+#include "ntqdatetime.h"
 
 #ifndef QT_NO_IMAGEIO_MNG
 
-#include "qimage.h"
-#include "qasyncimageio.h"
-#include "qiodevice.h"
-#include "qmngio.h"
+#include "ntqimage.h"
+#include "ntqasyncimageio.h"
+#include "ntqiodevice.h"
+#include "ntqmngio.h"
 
 // Define XMD_H prohibits the included headers of libmng.h to typedef INT32.
 // This is needed for Borland with STL support, since in that case, INT32 is
@@ -209,7 +209,7 @@ class TQMNGFormatType : public TQImageFormatType
 
 
 /*
-  \class TQMNGFormat qmngio.h
+  \class TQMNGFormat ntqmngio.h
   \brief Incremental image decoder for MNG image format.
 
   \ingroup images
@@ -241,7 +241,7 @@ TODO: decide on this point.  gIFg gives disposal types, so it can be done.
 */
 
 /*
-  \class TQMNGFormatType qasyncimageio.h
+  \class TQMNGFormatType ntqasyncimageio.h
   \brief Incremental image decoder for MNG image format.
 
   \ingroup images
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp
index ddb7bb17b..0085b8956 100644
--- a/src/kernel/qmotifdnd_x11.cpp
+++ b/src/kernel/qmotifdnd_x11.cpp
@@ -68,11 +68,11 @@ in doc/dnd.doc, where the documentation system can see it. */
 
 #include "qplatformdefs.h"
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 #ifndef QT_NO_DRAGANDDROP
 
-#include "qwidget.h"
+#include "ntqwidget.h"
 #include "qt_x11_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 2f2d9148a..431660674 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -40,15 +40,15 @@
 
 // #define QT_SAVE_MOVIE_HACK
 
-#include "qtimer.h"
-#include "qpainter.h"
-#include "qptrlist.h"
-#include "qbitmap.h"
-#include "qmovie.h"
-#include "qfile.h"
-#include "qbuffer.h"
-#include "qobject.h"
-#include "qpixmapcache.h"
+#include "ntqtimer.h"
+#include "ntqpainter.h"
+#include "ntqptrlist.h"
+#include "ntqbitmap.h"
+#include "ntqmovie.h"
+#include "ntqfile.h"
+#include "ntqbuffer.h"
+#include "ntqobject.h"
+#include "ntqpixmapcache.h"
 
 #ifndef QT_NO_MOVIE
 
@@ -56,13 +56,13 @@
 #include "qgfx_qws.h"
 #endif
 
-#include "qasyncio.h"
-#include "qasyncimageio.h"
+#include "ntqasyncio.h"
+#include "ntqasyncimageio.h"
 
 #include <stdlib.h>
 
 /*!
-    \class TQMovie qmovie.h
+    \class TQMovie ntqmovie.h
     \brief The TQMovie class provides incremental loading of animations or images, signalling as it progresses.
 
     \ingroup images
@@ -94,7 +94,7 @@
 
     The supported formats are MNG (if TQt is configured with MNG
     support enabled) and GIF (if TQt is configured with GIF support
-    enabled, see qgif.h).
+    enabled, see ntqgif.h).
 
     If TQt is configured to support GIF reading, we are required to
     state that "The Graphics Interchange Format(c) is the Copyright
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp
index 6861a26d0..c53649119 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/qnetworkprotocol.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qnetworkprotocol.h"
+#include "ntqnetworkprotocol.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL
 
-#include "qlocalfs.h"
-#include "qurloperator.h"
-#include "qtimer.h"
-#include "qmap.h"
-#include "qptrqueue.h"
+#include "ntqlocalfs.h"
+#include "ntqurloperator.h"
+#include "ntqtimer.h"
+#include "ntqmap.h"
+#include "ntqptrqueue.h"
 
 //#define TQNETWORKPROTOCOL_DEBUG
 #define NETWORK_OP_DELAY 1000
@@ -99,7 +99,7 @@ public:
 };
 
 /*!
-    \class TQNetworkProtocol qnetworkprotocol.h
+    \class TQNetworkProtocol ntqnetworkprotocol.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/qobject.cpp b/src/kernel/qobject.cpp
index 7cc01174e..619308be3 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qvariant.h"
-#include "qapplication.h"
-#include "qobject.h"
-#include "qobjectlist.h"
-#include "qsignalslotimp.h"
-#include "qregexp.h"
-#include "qmetaobject.h"
+#include "ntqvariant.h"
+#include "ntqapplication.h"
+#include "ntqobject.h"
+#include "ntqobjectlist.h"
+#include "ntqsignalslotimp.h"
+#include "ntqregexp.h"
+#include "ntqmetaobject.h"
 #include <private/qucom_p.h>
 #include "qucomextra_p.h"
-#include "qptrvector.h"
+#include "ntqptrvector.h"
 
 #ifdef QT_THREAD_SUPPORT
-#include <qmutex.h>
+#include <ntqmutex.h>
 #include <private/qmutexpool_p.h>
 #endif
 
@@ -76,7 +76,7 @@ public:
 };
 
 /*!
-    \class TQt qnamespace.h
+    \class TQt ntqnamespace.h
 
     \brief The TQt class is a namespace for miscellaneous identifiers
     that need to be global-like.
@@ -106,7 +106,7 @@ public:
 
 
 /*!
-    \class TQObject qobject.h
+    \class TQObject ntqobject.h
     \brief The TQObject class is the base class of all TQt objects.
 
     \ingroup objectmodel
@@ -1105,7 +1105,7 @@ static void objSearch( TQObjectList *result,
     Returns a list of child objects, or 0 if this object has no
     children.
 
-    The TQObjectList class is defined in the \c qobjectlist.h header
+    The TQObjectList class is defined in the \c ntqobjectlist.h header
     file.
 
     The first child added is the \link TQPtrList::first() first\endlink
@@ -1127,7 +1127,7 @@ static void objSearch( TQObjectList *result,
     Returns a pointer to the list of all object trees (their root
     objects), or 0 if there are no objects.
 
-    The TQObjectList class is defined in the \c qobjectlist.h header
+    The TQObjectList class is defined in the \c ntqobjectlist.h header
     file.
 
     The most recent root object created is the \link TQPtrList::first()
@@ -1181,7 +1181,7 @@ const TQObjectList *TQObject::objectTrees()
     delete l; // delete the list, not the objects
     \endcode
 
-    The TQObjectList class is defined in the \c qobjectlist.h header
+    The TQObjectList class is defined in the \c ntqobjectlist.h header
     file.
 
     \warning Delete the list as soon you have finished using it. The
diff --git a/src/kernel/qobjectcleanuphandler.cpp b/src/kernel/qobjectcleanuphandler.cpp
index 7e12e7cb4..f9f5d3e2f 100644
--- a/src/kernel/qobjectcleanuphandler.cpp
+++ b/src/kernel/qobjectcleanuphandler.cpp
@@ -36,11 +36,11 @@
 **
 **********************************************************************/
 
-#include "qobjectcleanuphandler.h"
-#include "qobjectlist.h"
+#include "ntqobjectcleanuphandler.h"
+#include "ntqobjectlist.h"
 
 /*!
-    \class TQObjectCleanupHandler qobjectcleanuphandler.h
+    \class TQObjectCleanupHandler ntqobjectcleanuphandler.h
     \brief The TQObjectCleanupHandler class watches the lifetime of multiple TQObjects.
 
     \ingroup objectmodel
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index 2bc747c32..aefd8971a 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qpaintdevice.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qwidget.h"
-#include "qbitmap.h"
-#include "qapplication.h"
+#include "ntqpaintdevice.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqwidget.h"
+#include "ntqbitmap.h"
+#include "ntqapplication.h"
 #include "qt_x11_p.h"
 
 
 /*!
-    \class TQPaintDevice qpaintdevice.h
+    \class TQPaintDevice ntqpaintdevice.h
     \brief The TQPaintDevice class is the base class of objects that
     can be painted.
 
@@ -270,8 +270,8 @@ TQPaintDeviceX11Data* TQPaintDevice::getX11Data( bool def ) const
     Returns the window system handle of the paint device, for
     low-level access. Using this function is not portable.
 
-    The HANDLE type varies with platform; see \c qpaintdevice.h and
-    \c qwindowdefs.h for details.
+    The HANDLE type varies with platform; see \c ntqpaintdevice.h and
+    \c ntqwindowdefs.h for details.
 
     \sa x11Display()
 */
diff --git a/src/kernel/qpaintdevicemetrics.cpp b/src/kernel/qpaintdevicemetrics.cpp
index c6f0e4d53..046533fbe 100644
--- a/src/kernel/qpaintdevicemetrics.cpp
+++ b/src/kernel/qpaintdevicemetrics.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qpaintdevicemetrics.h"
+#include "ntqpaintdevicemetrics.h"
 
 /*!
-    \class TQPaintDeviceMetrics qpaintdevicemetrics.h
+    \class TQPaintDeviceMetrics ntqpaintdevicemetrics.h
     \brief The TQPaintDeviceMetrics class provides information about a
     paint device.
 
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 2d99ef754..d0d069702 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qpainter.h"
+#include "ntqpainter.h"
 #include "qpainter_p.h"
-#include "qbitmap.h"
-#include "qptrstack.h"
-#include "qptrdict.h"
-#include "qdatastream.h"
-#include "qwidget.h"
-#include "qimage.h"
-#include "qpaintdevicemetrics.h"
-#include "qapplication.h"
+#include "ntqbitmap.h"
+#include "ntqptrstack.h"
+#include "ntqptrdict.h"
+#include "ntqdatastream.h"
+#include "ntqwidget.h"
+#include "ntqimage.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqapplication.h"
 #include "qrichtext_p.h"
-#include "qregexp.h"
-#include "qcleanuphandler.h"
+#include "ntqregexp.h"
+#include "ntqcleanuphandler.h"
 #ifdef Q_WS_QWS
 #include "qgfx_qws.h"
 #endif
@@ -69,7 +69,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
 #endif
 
 /*!
-    \class TQPainter qpainter.h
+    \class TQPainter ntqpainter.h
     \brief The TQPainter class does low-level painting e.g. on widgets.
 
     \ingroup graphics
@@ -235,7 +235,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
     platforms may behave incorrectly with coordinates as small as
     +/-4000.
 
-    \headerfile qdrawutil.h
+    \headerfile ntqdrawutil.h
 
     \sa TQPaintDevice TQWidget TQPixmap TQPrinter TQPicture
 	\link simple-application.html Application Walkthrough \endlink
@@ -3139,7 +3139,7 @@ TQRect TQPainter::boundingRect( const TQRect &r, int flags,
  *****************************************************************************/
 
 /*!
-    \class TQPen qpen.h
+    \class TQPen ntqpen.h
     \brief The TQPen class defines how a TQPainter should draw lines and outlines
     of shapes.
 
@@ -3568,7 +3568,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPen &p )
  *****************************************************************************/
 
 /*!
-    \class TQBrush qbrush.h
+    \class TQBrush ntqbrush.h
 
     \brief The TQBrush class defines the fill pattern of shapes drawn by a TQPainter.
 
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index d2127be2f..6214dc3b4 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -40,13 +40,13 @@
 
 #include "qplatformdefs.h"
 
-#include "qfont.h"
-#include "qpainter.h"
-#include "qwidget.h"
-#include "qbitmap.h"
-#include "qpixmapcache.h"
-#include "qtextcodec.h"
-#include "qpaintdevicemetrics.h"
+#include "ntqfont.h"
+#include "ntqpainter.h"
+#include "ntqwidget.h"
+#include "ntqbitmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqtextcodec.h"
+#include "ntqpaintdevicemetrics.h"
 
 #include "qt_x11_p.h"
 
@@ -137,7 +137,7 @@ static const TQt::HANDLE rendhd = 0;
 #endif
 
 // hack, so we don't have to make TQRegion::clipRectangles() public or include
-// X11 headers in qregion.h
+// X11 headers in ntqregion.h
 inline void *qt_getClipRects( const TQRegion &r, int &num )
 {
     return r.clipRectangles( num );
@@ -435,8 +435,8 @@ static void init_gc_cache()
 
 // #define GC_CACHE_STAT
 #if defined(GC_CACHE_STAT)
-#include "qtextstream.h"
-#include "qbuffer.h"
+#include "ntqtextstream.h"
+#include "ntqbuffer.h"
 
 static int g_numhits    = 0;
 static int g_numcreates = 0;
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index 9d23df6cd..3821306c0 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "qpalette.h"
+#include "ntqpalette.h"
 
 #ifndef QT_NO_PALETTE
-#include "qdatastream.h"
-#include "qcleanuphandler.h"
+#include "ntqdatastream.h"
+#include "ntqcleanuphandler.h"
 
 /*****************************************************************************
   TQColorGroup member functions
  *****************************************************************************/
 
 /*!
-    \class TQColorGroup qpalette.h
+    \class TQColorGroup ntqpalette.h
     \brief The TQColorGroup class contains a group of widget colors.
 
     \ingroup appearance
@@ -513,7 +513,7 @@ bool TQColorGroup::operator==( const TQColorGroup &g ) const
  *****************************************************************************/
 
 /*!
-    \class TQPalette qpalette.h
+    \class TQPalette ntqpalette.h
 
     \brief The TQPalette class contains color groups for each widget state.
 
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index 8d02588bc..aeb0f56e0 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qpicture.h"
+#include "ntqpicture.h"
 
 #ifndef QT_NO_PICTURE
 
-#include "qpainter.h"
-#include "qpixmap.h"
-#include "qimage.h"
-#include "qfile.h"
-#include "qdatastream.h"
-#include "qpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
+#include "ntqimage.h"
+#include "ntqfile.h"
+#include "ntqdatastream.h"
+#include "ntqpaintdevicemetrics.h"
 
 #ifndef QT_NO_SVG
 #include "private/qsvgdevice_p.h"
 #endif
 
 /*!
-    \class TQPicture qpicture.h
+    \class TQPicture ntqpicture.h
     \brief The TQPicture class is a paint device that records and
     replays TQPainter commands.
 
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 7d2580081..ca1490a5a 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qpixmap.h"
-
-#include "qbitmap.h"
-#include "qimage.h"
-#include "qwidget.h"
-#include "qpainter.h"
-#include "qdatastream.h"
-#include "qbuffer.h"
-#include "qobjectlist.h"
-#include "qapplication.h"
+#include "ntqpixmap.h"
+
+#include "ntqbitmap.h"
+#include "ntqimage.h"
+#include "ntqwidget.h"
+#include "ntqpainter.h"
+#include "ntqdatastream.h"
+#include "ntqbuffer.h"
+#include "ntqobjectlist.h"
+#include "ntqapplication.h"
 #include <private/qinternal_p.h>
-#include "qmime.h"
-#include "qdragobject.h"
-#include "qfile.h"
+#include "ntqmime.h"
+#include "ntqdragobject.h"
+#include "ntqfile.h"
 
 /*!
-    \class TQPixmap qpixmap.h
+    \class TQPixmap ntqpixmap.h
     \brief The TQPixmap class is an off-screen, pixel-based paint device.
 
     \ingroup graphics
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index 8bbc20e8a..4040b055a 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -67,11 +67,11 @@
 #undef QT_MITSHM_XFORM
 #endif
 
-#include "qbitmap.h"
-#include "qpaintdevicemetrics.h"
-#include "qimage.h"
-#include "qwmatrix.h"
-#include "qapplication.h"
+#include "ntqbitmap.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqimage.h"
+#include "ntqwmatrix.h"
+#include "ntqapplication.h"
 #include "qt_x11_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index 14616e045..f29e0402c 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qpixmapcache.h"
-#include "qcache.h"
-#include "qobject.h"
-#include "qcleanuphandler.h"
+#include "ntqpixmapcache.h"
+#include "ntqcache.h"
+#include "ntqobject.h"
+#include "ntqcleanuphandler.h"
 
 
 // REVISED: paul
 /*!
-    \class TQPixmapCache qpixmapcache.h
+    \class TQPixmapCache ntqpixmapcache.h
 
     \brief The TQPixmapCache class provides an application-global cache for
     pixmaps.
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index bbb4037bd..eee32c438 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qpngio.h"
+#include "ntqpngio.h"
 
 #ifndef QT_NO_IMAGEIO_PNG
 
-#include "qasyncimageio.h"
-#include "qiodevice.h"
+#include "ntqasyncimageio.h"
+#include "ntqiodevice.h"
 
 #include <png.h>
 #if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
@@ -764,7 +764,7 @@ void write_png_image(TQImageIO* iio)
 }
 
 /*!
-    \class TQPNGImagePacker qpngio.h
+    \class TQPNGImagePacker ntqpngio.h
     \brief The TQPNGImagePacker class creates well-compressed PNG animations.
 
     \ingroup images
@@ -979,7 +979,7 @@ class TQPNGFormatType : public TQImageFormatType
 
 
 /*
-  \class TQPNGFormat qpngio.h
+  \class TQPNGFormat ntqpngio.h
   \brief The TQPNGFormat class provides an incremental image decoder for PNG
   image format.
 
@@ -1012,7 +1012,7 @@ class TQPNGFormatType : public TQImageFormatType
 */
 
 /*
-  \class TQPNGFormatType qasyncimageio.h
+  \class TQPNGFormatType ntqasyncimageio.h
   \brief The TQPNGFormatType class provides an incremental image decoder
   for PNG image format.
 
diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp
index 6e8359cf8..35fd3bc34 100644
--- a/src/kernel/qpoint.cpp
+++ b/src/kernel/qpoint.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qpoint.h"
-#include "qdatastream.h"
+#include "ntqpoint.h"
+#include "ntqdatastream.h"
 
 
 /*!
-    \class TQPoint qpoint.h
+    \class TQPoint ntqpoint.h
     \brief The TQPoint class defines a point in the plane.
 
     \ingroup images
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp
index 9df82efa0..3258a4415 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/qpointarray.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qpointarray.h"
-#include "qrect.h"
-#include "qdatastream.h"
-#include "qwmatrix.h"
+#include "ntqpointarray.h"
+#include "ntqrect.h"
+#include "ntqdatastream.h"
+#include "ntqwmatrix.h"
 #include <stdarg.h>
 
 const double Q_PI = 3.14159265358979323846;   // pi // one more useful comment
 
 
 /*!
-    \class TQPointArray qpointarray.h
+    \class TQPointArray ntqpointarray.h
     \brief The TQPointArray class provides an array of points.
 
     \ingroup images
diff --git a/src/kernel/qpolygonscanner.cpp b/src/kernel/qpolygonscanner.cpp
index ace53d29d..92f36f3e6 100644
--- a/src/kernel/qpolygonscanner.cpp
+++ b/src/kernel/qpolygonscanner.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "qpolygonscanner.h"
-#include "qpointarray.h"
+#include "ntqpolygonscanner.h"
+#include "ntqpointarray.h"
 #include <stdlib.h>
 
 
diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp
index a4d64a0d6..3dd79b99c 100644
--- a/src/kernel/qprinter.cpp
+++ b/src/kernel/qprinter.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qprinter.h"
+#include "ntqprinter.h"
 #include "qprinter_p.h"
 
 #ifndef QT_NO_PRINTER
 
 /*!
-    \class TQPrinter qprinter.h
+    \class TQPrinter ntqprinter.h
     \brief The TQPrinter class is a paint device that paints on a printer.
 
     \ingroup images
diff --git a/src/kernel/qprinter_p.h b/src/kernel/qprinter_p.h
index 42caeade0..17d528985 100644
--- a/src/kernel/qprinter_p.h
+++ b/src/kernel/qprinter_p.h
@@ -43,9 +43,9 @@
 #ifndef QT_NO_PRINTER
 
 #ifndef QT_H
-#include <qshared.h>
-#include <qstring.h>
-#include <qsize.h>
+#include <ntqshared.h>
+#include <ntqstring.h>
+#include <ntqsize.h>
 #endif // QT_H
 
 class TQPrinterPrivate
diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp
index 9c24c8fce..bbe30a850 100644
--- a/src/kernel/qprinter_unix.cpp
+++ b/src/kernel/qprinter_unix.cpp
@@ -47,14 +47,14 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 # undef open
 #endif
 
-#include "qprinter.h"
+#include "ntqprinter.h"
 
 #ifndef QT_NO_PRINTER
 
-#include "qpaintdevicemetrics.h"
+#include "ntqpaintdevicemetrics.h"
 #include "qpsprinter_p.h"
-#include "qprintdialog.h"
-#include "qapplication.h"
+#include "ntqprintdialog.h"
+#include "ntqapplication.h"
 #include "qprinter_p.h"
 
 #include <unistd.h> // For ::sleep()
diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp
index 59dc27abe..64262960a 100644
--- a/src/kernel/qprocess.cpp
+++ b/src/kernel/qprocess.cpp
@@ -41,11 +41,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "qprocess.h"
+#include "ntqprocess.h"
 
 #ifndef QT_NO_PROCESS
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "private/qinternal_p.h"
 
 
@@ -53,7 +53,7 @@
 
 
 /*!
-    \class TQProcess qprocess.h
+    \class TQProcess ntqprocess.h
 
     \brief The TQProcess class is used to start external programs and
     to communicate with them.
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 57bb56f5d..1c2e0b9f5 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -45,17 +45,17 @@
 #undef connect
 #endif
 
-#include "qprocess.h"
+#include "ntqprocess.h"
 
 #ifndef QT_NO_PROCESS
 
-#include "qapplication.h"
-#include "qptrqueue.h"
-#include "qptrlist.h"
-#include "qsocketnotifier.h"
-#include "qtimer.h"
-#include "qcleanuphandler.h"
-#include "qregexp.h"
+#include "ntqapplication.h"
+#include "ntqptrqueue.h"
+#include "ntqptrlist.h"
+#include "ntqsocketnotifier.h"
+#include "ntqtimer.h"
+#include "ntqcleanuphandler.h"
+#include "ntqregexp.h"
 #include "private/qinternal_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 0fc94ad24..f52b43710 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -56,23 +56,23 @@
 
 #undef Q_PRINTER_USE_TYPE42
 
-#include "qpainter.h"
-#include "qapplication.h"
-#include "qpaintdevicemetrics.h"
-#include "qimage.h"
-#include "qdatetime.h"
-#include "qstring.h"
-#include "qdict.h"
-#include "qmemarray.h"
-#include "qfile.h"
-#include "qbuffer.h"
-#include "qintdict.h"
-#include "qtextcodec.h"
-#include "qsettings.h"
-#include "qmap.h"
-#include "qfontdatabase.h"
-#include "qregexp.h"
-#include "qbitmap.h"
+#include "ntqpainter.h"
+#include "ntqapplication.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqimage.h"
+#include "ntqdatetime.h"
+#include "ntqstring.h"
+#include "ntqdict.h"
+#include "ntqmemarray.h"
+#include "ntqfile.h"
+#include "ntqbuffer.h"
+#include "ntqintdict.h"
+#include "ntqtextcodec.h"
+#include "ntqsettings.h"
+#include "ntqmap.h"
+#include "ntqfontdatabase.h"
+#include "ntqregexp.h"
+#include "ntqbitmap.h"
 #include <private/qunicodetables_p.h>
 
 #if defined(Q_OS_WIN32)
@@ -5355,7 +5355,7 @@ static void emitBits( char *out, int & byte, int & bit,
 
 //#define DEBUG_COMPRESS
 #ifdef DEBUG_COMPRESS
-#include <qdatetime.h>
+#include <ntqdatetime.h>
 #endif
 
 static TQByteArray compress( const TQImage & image, bool gray ) {
diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/qpsprinter_p.h
index e560b95fa..070f43207 100644
--- a/src/kernel/qpsprinter_p.h
+++ b/src/kernel/qpsprinter_p.h
@@ -58,8 +58,8 @@
 
 
 #ifndef QT_H
-#include "qprinter.h"
-#include "qtextstream.h"
+#include "ntqprinter.h"
+#include "ntqtextstream.h"
 #endif // QT_H
 
 #ifndef QT_NO_PRINTER
diff --git a/src/kernel/qrect.cpp b/src/kernel/qrect.cpp
index 17197aa33..3a8bd2fb6 100644
--- a/src/kernel/qrect.cpp
+++ b/src/kernel/qrect.cpp
@@ -39,8 +39,8 @@
 **********************************************************************/
 
 #define	 TQRECT_C
-#include "qrect.h"
-#include "qdatastream.h"
+#include "ntqrect.h"
+#include "ntqdatastream.h"
 
 /*!
     \class TQRect
@@ -54,7 +54,7 @@
     a bottom-right corner, but it is normally expressed as an
     upper-left corner and a size.
 
-    The coordinate type is TQCOORD (defined in \c qwindowdefs.h as \c
+    The coordinate type is TQCOORD (defined in \c ntqwindowdefs.h as \c
     int). The minimum value of TQCOORD is TQCOORD_MIN (-2147483648) and
     the maximum value is  TQCOORD_MAX (2147483647).
 
diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp
index af15d565f..6537b74ce 100644
--- a/src/kernel/qregion.cpp
+++ b/src/kernel/qregion.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qregion.h"
-#include "qpointarray.h"
-#include "qbuffer.h"
-#include "qdatastream.h"
+#include "ntqregion.h"
+#include "ntqpointarray.h"
+#include "ntqbuffer.h"
+#include "ntqdatastream.h"
 
 // BEING REVISED: paul
 /*!
-    \class TQRegion qregion.h
+    \class TQRegion ntqregion.h
     \brief The TQRegion class specifies a clip region for a painter.
 
     \ingroup images
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 78155fecc..2094a00c7 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qregion.h"
-#include "qpointarray.h"
-#include "qbuffer.h"
-#include "qimage.h"
-#include "qbitmap.h"
+#include "ntqregion.h"
+#include "ntqpointarray.h"
+#include "ntqbuffer.h"
+#include "ntqimage.h"
+#include "ntqbitmap.h"
 #include "qt_x11_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index e572fb8f8..783b89188 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -43,25 +43,25 @@
 #ifndef QT_NO_RICHTEXT
 
 
-#include "qstringlist.h"
-#include "qfont.h"
-#include "qtextstream.h"
-#include "qfile.h"
-#include "qapplication.h"
-#include "qmap.h"
-#include "qfileinfo.h"
-#include "qstylesheet.h"
-#include "qmime.h"
-#include "qimage.h"
-#include "qdragobject.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qcursor.h"
-#include "qptrstack.h"
-#include "qptrdict.h"
-#include "qstyle.h"
-#include "qcleanuphandler.h"
+#include "ntqstringlist.h"
+#include "ntqfont.h"
+#include "ntqtextstream.h"
+#include "ntqfile.h"
+#include "ntqapplication.h"
+#include "ntqmap.h"
+#include "ntqfileinfo.h"
+#include "ntqstylesheet.h"
+#include "ntqmime.h"
+#include "ntqimage.h"
+#include "ntqdragobject.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqcursor.h"
+#include "ntqptrstack.h"
+#include "ntqptrdict.h"
+#include "ntqstyle.h"
+#include "ntqcleanuphandler.h"
 #include "qtextengine_p.h"
 #include <private/qunicodetables_p.h>
 
@@ -6694,8 +6694,8 @@ void TQTextImage::adjustToPainter( TQPainter* p )
 }
 
 #if !defined(Q_WS_X11)
-#include <qbitmap.h>
-#include <qcleanuphandler.h>
+#include <ntqbitmap.h>
+#include <ntqcleanuphandler.h>
 static TQPixmap *qrt_selection = 0;
 static TQSingleCleanupHandler<TQPixmap> qrt_cleanup_pixmap;
 static void qrt_createSelectionPixmap( const TQColorGroup &cg )
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 2d7844382..7c5453b55 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -54,27 +54,27 @@
 //
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qptrlist.h"
-#include "qrect.h"
-#include "qfontmetrics.h"
-#include "qintdict.h"
-#include "qmap.h"
-#include "qstringlist.h"
-#include "qfont.h"
-#include "qcolor.h"
-#include "qsize.h"
-#include "qvaluelist.h"
-#include "qvaluestack.h"
-#include "qobject.h"
-#include "qdict.h"
-#include "qpixmap.h"
-#include "qstylesheet.h"
-#include "qptrvector.h"
-#include "qpainter.h"
-#include "qlayout.h"
-#include "qobject.h"
-#include "qapplication.h"
+#include "ntqstring.h"
+#include "ntqptrlist.h"
+#include "ntqrect.h"
+#include "ntqfontmetrics.h"
+#include "ntqintdict.h"
+#include "ntqmap.h"
+#include "ntqstringlist.h"
+#include "ntqfont.h"
+#include "ntqcolor.h"
+#include "ntqsize.h"
+#include "ntqvaluelist.h"
+#include "ntqvaluestack.h"
+#include "ntqobject.h"
+#include "ntqdict.h"
+#include "ntqpixmap.h"
+#include "ntqstylesheet.h"
+#include "ntqptrvector.h"
+#include "ntqpainter.h"
+#include "ntqlayout.h"
+#include "ntqobject.h"
+#include "ntqapplication.h"
 #endif // QT_H
 
 #ifndef QT_NO_RICHTEXT
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 6967f4847..ab6bd2f36 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -36,9 +36,9 @@
 
 #include "qscriptengine_p.h"
 
-#include "qstring.h"
-#include "qrect.h"
-#include "qfont.h"
+#include "ntqstring.h"
+#include "ntqrect.h"
+#include "ntqfont.h"
 #include <private/qunicodetables_p.h>
 #include "qtextengine_p.h"
 #include "qfontengine_p.h"
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index 5bbbfdc3b..06523b700 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -1899,8 +1899,8 @@ static void indic_attributes(int script, const TQString &text, int from, int len
 //
 // --------------------------------------------------------------------------------------------------------------------------------------------
 
-#include <qtextcodec.h>
-#include <qlibrary.h>
+#include <ntqtextcodec.h>
+#include <ntqlibrary.h>
 
 
 static void thaiWordBreaks(const TQChar *string, const int len, TQCharAttributes *attributes)
diff --git a/src/kernel/qsharedmemory_p.h b/src/kernel/qsharedmemory_p.h
index 00f190a2b..30cd171ee 100644
--- a/src/kernel/qsharedmemory_p.h
+++ b/src/kernel/qsharedmemory_p.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #if !defined (QT_QWS_NO_SHM)
diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp
index 5e6f2a48d..acc74829f 100644
--- a/src/kernel/qsignal.cpp
+++ b/src/kernel/qsignal.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qsignal.h"
-#include "qmetaobject.h"
-#include "qguardedptr.h"
+#include "ntqsignal.h"
+#include "ntqmetaobject.h"
+#include "ntqguardedptr.h"
 
 /*!
-    \class TQSignal qsignal.h
+    \class TQSignal ntqsignal.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 <qsignal.h>
+	#include <ntqsignal.h>
 
 	class MyClass
 	{
diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/qsignalmapper.cpp
index fda65b054..0e23de826 100644
--- a/src/kernel/qsignalmapper.cpp
+++ b/src/kernel/qsignalmapper.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "qsignalmapper.h"
+#include "ntqsignalmapper.h"
 #ifndef QT_NO_SIGNALMAPPER
-#include "qptrdict.h"
+#include "ntqptrdict.h"
 
 struct TQSignalMapperRec {
     TQSignalMapperRec()
@@ -67,7 +67,7 @@ public:
 };
 
 /*!
-    \class TQSignalMapper qsignalmapper.h
+    \class TQSignalMapper ntqsignalmapper.h
     \brief The TQSignalMapper class bundles signals from identifiable senders.
 
     \ingroup io
diff --git a/src/kernel/qsimplerichtext.cpp b/src/kernel/qsimplerichtext.cpp
index b21efba04..20bea6af4 100644
--- a/src/kernel/qsimplerichtext.cpp
+++ b/src/kernel/qsimplerichtext.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qsimplerichtext.h"
+#include "ntqsimplerichtext.h"
 
 #ifndef QT_NO_RICHTEXT
 #include "qrichtext_p.h"
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 class TQSimpleRichTextData
 {
@@ -76,7 +76,7 @@ void TQSimpleRichTextData::adjustSize(TQPainter *p) {
 }
 
 /*!
-    \class TQSimpleRichText qsimplerichtext.h
+    \class TQSimpleRichText ntqsimplerichtext.h
     \brief The TQSimpleRichText class provides a small displayable piece of rich text.
 
     \ingroup text
diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp
index c2b8d9b94..4cd0735c3 100644
--- a/src/kernel/qsize.cpp
+++ b/src/kernel/qsize.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "qsize.h"
-#include "qdatastream.h"
+#include "ntqsize.h"
+#include "ntqdatastream.h"
 
 
 /*!
@@ -51,7 +51,7 @@
 
   A size is specified by a width and a height.
 
-  The coordinate type is TQCOORD (defined in \c <qwindowdefs.h> as \c int).
+  The coordinate type is TQCOORD (defined in \c <ntqwindowdefs.h> as \c int).
   The minimum value of TQCOORD is TQCOORD_MIN (-2147483648) and the maximum
   value is TQCOORD_MAX (2147483647).
 
diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp
index c0de2643c..decff43a7 100644
--- a/src/kernel/qsizegrip.cpp
+++ b/src/kernel/qsizegrip.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qsizegrip.h"
+#include "ntqsizegrip.h"
 
 #ifndef QT_NO_SIZEGRIP
 
-#include "qpainter.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 
 #if defined(Q_WS_X11)
 #include "qt_x11_p.h"
 extern Atom qt_sizegrip;			// defined in qapplication_x11.cpp
 #elif defined (Q_WS_WIN )
-#include "qobjectlist.h"
+#include "ntqobjectlist.h"
 #include "qt_windows.h"
 #elif defined(Q_WS_MAC)
 bool qt_mac_update_sizer(TQWidget *, int); //qwidget_mac.cpp
@@ -79,7 +79,7 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w )
 
 
 /*!
-    \class TQSizeGrip qsizegrip.h
+    \class TQSizeGrip ntqsizegrip.h
 
     \brief The TQSizeGrip class provides a corner-grip for resizing a top-level window.
 
diff --git a/src/kernel/qsocketnotifier.cpp b/src/kernel/qsocketnotifier.cpp
index 1e8e0f239..b7bceb15e 100644
--- a/src/kernel/qsocketnotifier.cpp
+++ b/src/kernel/qsocketnotifier.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qsocketnotifier.h"
-#include "qapplication.h"
-#include "qevent.h"
-#include "qeventloop.h"
+#include "ntqsocketnotifier.h"
+#include "ntqapplication.h"
+#include "ntqevent.h"
+#include "ntqeventloop.h"
 #include "qplatformdefs.h"
 
 #if defined(Q_OS_UNIX)
@@ -50,7 +50,7 @@
 
 
 /*!
-    \class TQSocketNotifier qsocketnotifier.h
+    \class TQSocketNotifier ntqsocketnotifier.h
     \brief The TQSocketNotifier class provides support for socket callbacks.
 
     \ingroup io
diff --git a/src/kernel/qsound.cpp b/src/kernel/qsound.cpp
index 845b6a754..604bf130d 100644
--- a/src/kernel/qsound.cpp
+++ b/src/kernel/qsound.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qsound.h"
+#include "ntqsound.h"
 
 #ifndef QT_NO_SOUND
 
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 
 static TQPtrList<TQAuServer> *servers=0;
 
@@ -98,7 +98,7 @@ public:
 };
 
 /*!
-    \class TQSound qsound.h
+    \class TQSound ntqsound.h
     \brief The TQSound class provides access to the platform audio facilities.
 
     \ingroup multimedia
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 26c5afb73..59f6d0a0e 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -40,13 +40,13 @@
 
 #define QT_CLEAN_NAMESPACE
 
-#include "qsound.h"
+#include "ntqsound.h"
 
 #ifndef QT_NO_SOUND
 
-#include "qptrdict.h"
-#include "qsocketnotifier.h"
-#include "qapplication.h"
+#include "ntqptrdict.h"
+#include "ntqsocketnotifier.h"
+#include "ntqapplication.h"
 
 
 #ifdef QT_NAS_SUPPORT
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 9222e3735..25c9b1801 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qstyle.h"
+#include "ntqstyle.h"
 #ifndef QT_NO_STYLE
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qpixmapcache.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqpixmapcache.h"
 
 #include <limits.h>
 
@@ -57,7 +57,7 @@ public:
 };
 
 /*!
-    \class TQStyleOption qstyle.h
+    \class TQStyleOption ntqstyle.h
     \brief The TQStyleOption class specifies optional parameters for TQStyle functions.
     \ingroup appearance
 
@@ -307,7 +307,7 @@ public:
 */
 
 /*!
-    \class TQStyle qstyle.h
+    \class TQStyle ntqstyle.h
     \brief The TQStyle class specifies the look and feel of a GUI.
     \ingroup appearance
 
diff --git a/src/kernel/qstylesheet.cpp b/src/kernel/qstylesheet.cpp
index 333f1059c..e74a9be16 100644
--- a/src/kernel/qstylesheet.cpp
+++ b/src/kernel/qstylesheet.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qstylesheet.h"
+#include "ntqstylesheet.h"
 
 #ifndef QT_NO_RICHTEXT
 
 #include "private/qrichtext_p.h"
-#include "qlayout.h"
-#include "qpainter.h"
-#include "qcleanuphandler.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
+#include "ntqcleanuphandler.h"
 
 #include <stdio.h>
 
@@ -78,7 +78,7 @@ public:
 };
 
 /*!
-    \class TQStyleSheetItem qstylesheet.h
+    \class TQStyleSheetItem ntqstylesheet.h
     \brief The TQStyleSheetItem class provides an encapsulation of a set of text styles.
 
     \ingroup text
@@ -855,7 +855,7 @@ int TQStyleSheetItem::lineSpacing() const
 
 
 /*!
-    \class TQStyleSheet qstylesheet.h
+    \class TQStyleSheet ntqstylesheet.h
     \ingroup text
     \brief The TQStyleSheet class is a collection of styles for rich text
     rendering and a generator of tags.
diff --git a/src/kernel/qt.h b/src/kernel/qt.h
deleted file mode 100644
index 01d43d298..000000000
--- a/src/kernel/qt.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/****************************************************************************
-**
-** TQt GUI Toolkit
-**
-** This header file efficiently includes all TQt GUI Toolkit functionality.
-**
-** Generated : Mon Oct 13 13:07:29 CEST 2003
-
-**
-** Copyright (C) 1995-2008 Trolltech ASA.  All rights reserved.
-**
-** This file is part of the TQt GUI Toolkit.
-**
-*****************************************************************************/
-
-#ifndef QT_H
-#define QT_H
-#include "qglobal.h"
-#include "qfeatures.h"
-#include "qshared.h"
-#include "qptrcollection.h"
-#include "qglist.h"
-#include "qobjectdefs.h"
-#include "qnamespace.h"
-#include "qgarray.h"
-#include "qmemarray.h"
-#include "qcstring.h"
-#include "qstring.h"
-#include "qptrlist.h"
-#include "qiodevice.h"
-#include "qkeysequence.h"
-#include "qwindowdefs.h"
-#include "qgdict.h"
-#include "qfont.h"
-#include "qdatastream.h"
-#include "qpair.h"
-#include "qpoint.h"
-#include <stdio.h>
-#include "qtextstream.h"
-#include "qfontinfo.h"
-#include "qsizepolicy.h"
-#include "qtl.h"
-#include "qsize.h"
-#include "qrect.h"
-#include "qbitarray.h"
-#include "qregion.h"
-#include "qsql.h"
-#include "qstrlist.h"
-#include "qvaluelist.h"
-#include "qmap.h"
-#include "qdatetime.h"
-#include "qmime.h"
-#include "qasciidict.h"
-#include "qpaintdevice.h"
-#include "qfontmetrics.h"
-#include "qdict.h"
-#include "qevent.h"
-#include "qhostaddress.h"
-#include "qstringlist.h"
-#include "qcolor.h"
-#include <qdom.h>
-#include "qobject.h"
-#include <qdrawutil.h>
-#include "qbrush.h"
-#include "qpalette.h"
-#include "qwidget.h"
-#include "qjpunicode.h"
-#include "qtextcodec.h"
-#include "qstyle.h"
-#include "qframe.h"
-#include "qfile.h"
-#include "qfileinfo.h"
-#include "qurlinfo.h"
-#include "qwidgetlist.h"
-#include <qcombobox.h>
-#include "qgroupbox.h"
-#include "qdialog.h"
-#include <qdataview.h>
-#include "qdockwindow.h"
-#include "qcommonstyle.h"
-#include "qnetworkprotocol.h"
-#include <qeuckrcodec.h>
-#include <qgb18030codec.h>
-#include "qgcache.h"
-#include "qpixmap.h"
-#include <qgif.h>
-#include <qglcolormap.h>
-#include <qcache.h>
-#include <qdropsite.h>
-#include "qgplugin.h"
-#include <qgrid.h>
-#include "qrangecontrol.h"
-#include "qbuttongroup.h"
-#include <qdatetimeedit.h>
-#include "qgvector.h"
-#include "qhbox.h"
-#include <qhbuttongroup.h>
-#include "qiconset.h"
-#include <qhgroupbox.h>
-#include "qsocketnotifier.h"
-#include <qeventloop.h>
-#include <qhttp.h>
-#include <qaction.h>
-#include "qbuffer.h"
-#include "qimage.h"
-#include <qimageformatplugin.h>
-#include "qlineedit.h"
-#include <qintcache.h>
-#include "qintdict.h"
-#include "qmotifstyle.h"
-#include "qpicture.h"
-#include <qjiscodec.h>
-#include <qeucjpcodec.h>
-#include <qkeycode.h>
-#include <qaccel.h>
-#include "qlabel.h"
-#include "qlayout.h"
-#include <qlcdnumber.h>
-#include <qlibrary.h>
-#include <qinputdialog.h>
-#include "qscrollbar.h"
-#include "qscrollview.h"
-#include "qdir.h"
-#include "qwindowsstyle.h"
-#include "qconnection.h"
-#include "qbitmap.h"
-#include "qvariant.h"
-#include "qsignal.h"
-#include <qmessagebox.h>
-#include "qmetaobject.h"
-#include "qheader.h"
-#include <qmotifplusstyle.h>
-#include <qcdestyle.h>
-#include <qmovie.h>
-#include "qptrvector.h"
-#include "qmutex.h"
-#include "qbutton.h"
-#include <qnetwork.h>
-#include <qftp.h>
-#include "qguardedptr.h"
-#include <qobjectcleanuphandler.h>
-#include "qsqlfield.h"
-#include <qobjectdict.h>
-#include <qobjectlist.h>
-#include <qcolordialog.h>
-#include <qpaintdevicemetrics.h>
-#include "qpointarray.h"
-#include "qmenudata.h"
-#include <qlistview.h>
-#include "qpen.h"
-#include "qdragobject.h"
-#include <qiconview.h>
-#include <qpixmapcache.h>
-#include <qplatinumstyle.h>
-#include <qpngio.h>
-#include <qcursor.h>
-#include <qerrormessage.h>
-#include <qpolygonscanner.h>
-#include "qpopupmenu.h"
-#include <qprintdialog.h>
-#include <qprinter.h>
-#include <qprocess.h>
-#include "qprogressbar.h"
-#include "qsemimodal.h"
-#include <qasciicache.h>
-#include "qptrdict.h"
-#include <qcleanuphandler.h>
-#include <qptrqueue.h>
-#include <qptrstack.h>
-#include "qstylesheet.h"
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qdial.h>
-#include <qdockarea.h>
-#include "qregexp.h"
-#include <qclipboard.h>
-#include <qrtlcodec.h>
-#include <qlistbox.h>
-#include <qgridview.h>
-#include "qsemaphore.h"
-#include <qprogressdialog.h>
-#include "qsocketdevice.h"
-#include <qsessionmanager.h>
-#include <qsettings.h>
-#include <qsgistyle.h>
-#include <qfontdialog.h>
-#include "qtimer.h"
-#include <qsignalmapper.h>
-#include <qsignalslotimp.h>
-#include <qsimplerichtext.h>
-#include "qwmatrix.h"
-#include <qsizegrip.h>
-#include <qabstractlayout.h>
-#include <qsjiscodec.h>
-#include <qslider.h>
-#include <qsocket.h>
-#include <qserversocket.h>
-#include <qdns.h>
-#include <qsortedlist.h>
-#include <qsound.h>
-#include <qspinbox.h>
-#include <qsplashscreen.h>
-#include <qsplitter.h>
-#include "qsqlerror.h"
-#include "qeditorfactory.h"
-#include "qsqlquery.h"
-#include "qsqlrecord.h"
-#include <qsqldriverplugin.h>
-#include "qsqlindex.h"
-#include "qsqlcursor.h"
-#include <qsqldriver.h>
-#include <qsqlform.h>
-#include "qtable.h"
-#include <qsqlpropertymap.h>
-#include <qsqldatabase.h>
-#include <qdatabrowser.h>
-#include <qsqlresult.h>
-#include <qsqlselectcursor.h>
-#include <qstatusbar.h>
-#include <qmenubar.h>
-#include <qcanvas.h>
-#include "qtranslator.h"
-#include <qstrvec.h>
-#include <qinterlacestyle.h>
-#include <qstylefactory.h>
-#include <qstyleplugin.h>
-#include "qtextedit.h"
-#include <qsyntaxhighlighter.h>
-#include <qtabbar.h>
-#include <qtabdialog.h>
-#include "qsqleditorfactory.h"
-#include <qtabwidget.h>
-#include <qtextbrowser.h>
-#include <qbig5codec.h>
-#include <qtextcodecfactory.h>
-#include <qtextcodecplugin.h>
-#include <qmultilineedit.h>
-#include "qtoolbar.h"
-#include <qtextview.h>
-#include "qwaitcondition.h"
-#include <qasyncio.h>
-#include <qfontdatabase.h>
-#include <qmainwindow.h>
-#include <qtoolbox.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
-#include "qdesktopwidget.h"
-#include <qtsciicodec.h>
-#include "qurl.h"
-#include "qurloperator.h"
-#include <qfiledialog.h>
-#include <qutfcodec.h>
-#include <quuid.h>
-#include <qvalidator.h>
-#include <qasyncimageio.h>
-#include <qvaluestack.h>
-#include <qvaluevector.h>
-#include <qdatatable.h>
-#include <qvbox.h>
-#include <qvbuttongroup.h>
-#include <qvfbhdr.h>
-#include <qvgroupbox.h>
-#include <qthread.h>
-#include <qwhatsthis.h>
-#include <qapplication.h>
-#include <qwidgetintdict.h>
-#include <qfocusdata.h>
-#include <qwidgetplugin.h>
-#include <qwidgetstack.h>
-#include <qcheckbox.h>
-#include <qcompactstyle.h>
-#include <qwizard.h>
-#include <qpainter.h>
-#include <qworkspace.h>
-#include <qlocalfs.h>
-#include <qxml.h>
-
-#if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX )
-#include <private/qcom_p.h>
-#include <private/qucom_p.h>
-#include "private/qgfxdriverinterface_p.h"
-#include "private/qcom_p.h"
-#include "private/qimageformatinterface_p.h"
-#include "private/qisciicodec_p.h"
-#include "private/qkbddriverinterface_p.h"
-#include "private/qlayoutengine_p.h"
-#include "private/qcomlibrary_p.h"
-#include "private/qmousedriverinterface_p.h"
-#include "private/qeffects_p.h"
-#include "private/qgpluginmanager_p.h"
-#include "private/qinternal_p.h"
-#include "private/qsqldriverinterface_p.h"
-#include "private/qsqlmanager_p.h"
-#include "private/qlock_p.h"
-#include "private/qcomponentfactory_p.h"
-#include "private/qstyleinterface_p.h"
-#include "private/qrichtext_p.h"
-#include "private/qsvgdevice_p.h"
-#include "private/qfontcodecs_p.h"
-#include "private/qtextcodecinterface_p.h"
-#include "private/qpsprinter_p.h"
-#include "private/qtitlebar_p.h"
-#include "private/qucom_p.h"
-#include "private/qucomextra_p.h"
-#include "private/qpluginmanager_p.h"
-#include "private/qdir_p.h"
-#include "private/qsettings_p.h"
-#include "private/qsqlextension_p.h"
-#include "private/qdialogbuttons_p.h"
-#include "private/qwidgetinterface_p.h"
-#include "private/qwidgetresizehandler_p.h"
-#include "private/qlibrary_p.h"
-#endif // Private headers
-
-
-#ifdef Q_WS_X11
-#include "private/qtkdeintegration_x11_p.h"
-#endif
-
-#ifdef Q_WS_MAC
-#include <qaquastyle.h>
-#include <qmacstyle_mac.h>
-#endif // Q_WS_MAC
-
-#ifdef Q_WS_WIN
-#include <qwindowsxpstyle.h>
-#endif
-
-#ifdef Q_WS_QWS
-#include <private/qtextengine_p.h>
-#include "qfontmanager_qws.h"
-#include <qfontfactorybdf_qws.h>
-#include <qgfxvoodoodefs_qws.h>
-#include <qgfxmatroxdefs_qws.h>
-#include <qgfxdriverplugin_qws.h>
-#include <qkbddriverfactory_qws.h>
-#include <qkbddriverplugin_qws.h>
-#include <qmousedriverfactory_qws.h>
-#include <qmousedriverplugin_qws.h>
-#include <qcopchannel_qws.h>
-#include <qdirectpainter_qws.h>
-#include "qmemorymanager_qws.h"
-#include <qmouse_qws.h>
-#include <qfontfactoryttf_qws.h>
-#ifndef Q_OS_MAC
-# include <qsoundqss_qws.h>
-#endif
-#include "qgfx_qws.h"
-#include <qgfxdriverfactory_qws.h>
-#include "qwsdisplay_qws.h"
-#include "qwssocket_qws.h"
-#include "qwsdecoration_qws.h"
-#include "qwsutils_qws.h"
-#include <qwscursor_qws.h>
-#include "qwsmanager_qws.h"
-#include "qwsdefaultdecoration_qws.h"
-#include <qgfxraster_qws.h>
-#include "qwscommand_qws.h"
-#include <qwshydrodecoration_qws.h>
-#include <qwskde2decoration_qws.h>
-#include <qwskdedecoration_qws.h>
-#include <qwsbeosdecoration_qws.h>
-#include "qwsproperty_qws.h"
-#include <qwsregionmanager_qws.h>
-#include "qwsevent_qws.h"
-#include <qwindowsystem_qws.h>
-#include <qwswindowsdecoration_qws.h>
-#endif // Q_WS_QWS
-
-
-#ifdef Q_WS_WCE
-#include <qpocketpcstyle_wce.h>
-#endif // Q_WS_WCE
-
-#endif // QT_H
diff --git a/src/kernel/qt_gfx.pri b/src/kernel/qt_gfx.pri
index e27523c12..9c5b4c234 100644
--- a/src/kernel/qt_gfx.pri
+++ b/src/kernel/qt_gfx.pri
@@ -1,7 +1,7 @@
 # Qt graphics 
 
 #mng support
-HEADERS += $$KERNEL_H/qmngio.h
+HEADERS += $$KERNEL_H/ntqmngio.h
 SOURCES += $$KERNEL_CPP/qmngio.cpp
 mng {
         system-mng {
@@ -39,7 +39,7 @@ mng {
 else:DEFINES += QT_NO_IMAGEIO_MNG
 
 #jpeg support..
-HEADERS += $$KERNEL_H/qjpegio.h 
+HEADERS += $$KERNEL_H/ntqjpegio.h 
 SOURCES += $$KERNEL_CPP/qjpegio.cpp
 jpeg {
         system-jpeg {
@@ -98,7 +98,7 @@ jpeg {
 else:DEFINES += QT_NO_IMAGEIO_JPEG
 
 #png support
-HEADERS+=$$KERNEL_H/qpngio.h
+HEADERS+=$$KERNEL_H/ntqpngio.h
 SOURCES+=$$KERNEL_CPP/qpngio.cpp
 png {
         system-png {
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 5a89e08fb..0c3b867c7 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -2,104 +2,104 @@
 
 kernel {
 	KERNEL_P	= kernel
-	HEADERS += $$KERNEL_H/qabstractlayout.h \
-		  $$KERNEL_H/qaccel.h \
+	HEADERS += $$KERNEL_H/ntqabstractlayout.h \
+		  $$KERNEL_H/ntqaccel.h \
 		  $$KERNEL_P/qucomextra_p.h \
-		  $$KERNEL_H/qapplication.h \
+		  $$KERNEL_H/ntqapplication.h \
 		  $$KERNEL_P/qapplication_p.h \
-		  $$KERNEL_H/qasyncimageio.h \
-		  $$KERNEL_H/qasyncio.h \
-		  $$KERNEL_H/qbitmap.h \
-		  $$KERNEL_H/qbrush.h \
-		  $$KERNEL_H/qclipboard.h \
-		  $$KERNEL_H/qcolor.h \
+		  $$KERNEL_H/ntqasyncimageio.h \
+		  $$KERNEL_H/ntqasyncio.h \
+		  $$KERNEL_H/ntqbitmap.h \
+		  $$KERNEL_H/ntqbrush.h \
+		  $$KERNEL_H/ntqclipboard.h \
+		  $$KERNEL_H/ntqcolor.h \
 		  $$KERNEL_P/qcolor_p.h \
-		  $$KERNEL_H/qconnection.h \
-		  $$KERNEL_H/qcursor.h \
-		  $$KERNEL_H/qdesktopwidget.h \
-		  $$KERNEL_H/qdragobject.h \
-		  $$KERNEL_H/qdrawutil.h \
-		  $$KERNEL_H/qdropsite.h \
-		  $$KERNEL_H/qevent.h \
-		  $$KERNEL_H/qeventloop.h\
+		  $$KERNEL_H/ntqconnection.h \
+		  $$KERNEL_H/ntqcursor.h \
+		  $$KERNEL_H/ntqdesktopwidget.h \
+		  $$KERNEL_H/ntqdragobject.h \
+		  $$KERNEL_H/ntqdrawutil.h \
+		  $$KERNEL_H/ntqdropsite.h \
+		  $$KERNEL_H/ntqevent.h \
+		  $$KERNEL_H/ntqeventloop.h\
 		  $$KERNEL_P/qeventloop_p.h \
-		  $$KERNEL_H/qfocusdata.h \
-		  $$KERNEL_H/qfont.h \
+		  $$KERNEL_H/ntqfocusdata.h \
+		  $$KERNEL_H/ntqfont.h \
 		  $$KERNEL_P/qfontdata_p.h \
-		  $$KERNEL_H/qfontinfo.h \
-		  $$KERNEL_H/qfontmetrics.h \
-		  $$KERNEL_H/qguardedptr.h \
-		  $$KERNEL_H/qgif.h \
-		  $$KERNEL_H/qiconset.h \
-		  $$KERNEL_H/qimage.h \
+		  $$KERNEL_H/ntqfontinfo.h \
+		  $$KERNEL_H/ntqfontmetrics.h \
+		  $$KERNEL_H/ntqguardedptr.h \
+		  $$KERNEL_H/ntqgif.h \
+		  $$KERNEL_H/ntqiconset.h \
+		  $$KERNEL_H/ntqimage.h \
 		  $$KERNEL_P/qimageformatinterface_p.h \
-		  $$KERNEL_H/qimageformatplugin.h \
-		  $$KERNEL_H/qkeycode.h \
-		  $$KERNEL_H/qkeysequence.h \
-		  $$KERNEL_H/qlayout.h \
+		  $$KERNEL_H/ntqimageformatplugin.h \
+		  $$KERNEL_H/ntqkeycode.h \
+		  $$KERNEL_H/ntqkeysequence.h \
+		  $$KERNEL_H/ntqlayout.h \
 		  $$KERNEL_P/qlayoutengine_p.h \
-		  $$KERNEL_H/qtranslator.h \
-		  $$KERNEL_H/qmetaobject.h \
-		  $$KERNEL_H/qmime.h \
-		  $$KERNEL_H/qmovie.h \
-		  $$KERNEL_H/qnamespace.h \
-		  $$KERNEL_H/qnetworkprotocol.h \
-		  $$KERNEL_H/qobject.h \
- 		  $$KERNEL_H/qobjectcleanuphandler.h \
-		  $$KERNEL_H/qobjectdefs.h \
-		  $$KERNEL_H/qobjectdict.h \
-		  $$KERNEL_H/qobjectlist.h \
-		  $$KERNEL_H/qpaintdevice.h \
-		  $$KERNEL_H/qpaintdevicedefs.h \
-		  $$KERNEL_H/qpainter.h \
+		  $$KERNEL_H/ntqtranslator.h \
+		  $$KERNEL_H/ntqmetaobject.h \
+		  $$KERNEL_H/ntqmime.h \
+		  $$KERNEL_H/ntqmovie.h \
+		  $$KERNEL_H/ntqnamespace.h \
+		  $$KERNEL_H/ntqnetworkprotocol.h \
+		  $$KERNEL_H/ntqobject.h \
+ 		  $$KERNEL_H/ntqobjectcleanuphandler.h \
+		  $$KERNEL_H/ntqobjectdefs.h \
+		  $$KERNEL_H/ntqobjectdict.h \
+		  $$KERNEL_H/ntqobjectlist.h \
+		  $$KERNEL_H/ntqpaintdevice.h \
+		  $$KERNEL_H/ntqpaintdevicedefs.h \
+		  $$KERNEL_H/ntqpainter.h \
 		  $$KERNEL_P/qpainter_p.h \
-		  $$KERNEL_H/qpalette.h \
-		  $$KERNEL_H/qpaintdevicemetrics.h \
-		  $$KERNEL_H/qpen.h \
-		  $$KERNEL_H/qpicture.h \
-		  $$KERNEL_H/qpixmap.h \
-		  $$KERNEL_H/qpixmapcache.h \
-		  $$KERNEL_H/qpointarray.h \
-		  $$KERNEL_H/qpoint.h \
-		  $$KERNEL_H/qpolygonscanner.h \
-		  $$KERNEL_H/qprinter.h \
-		  $$KERNEL_H/qprocess.h \
-		  $$KERNEL_H/qrect.h \
-		  $$KERNEL_H/qregion.h \
-		  $$KERNEL_H/qsessionmanager.h \
-		  $$KERNEL_H/qsignal.h \
-		  $$KERNEL_H/qsignalmapper.h \
-		  $$KERNEL_H/qsignalslotimp.h \
-		  $$KERNEL_H/qsize.h \
-		  $$KERNEL_H/qsizegrip.h \
-		  $$KERNEL_H/qsizepolicy.h \
-		  $$KERNEL_H/qsocketnotifier.h \
-		  $$KERNEL_H/qsound.h \
-		  $$KERNEL_H/qstyle.h \
-		  $$KERNEL_H/qstylesheet.h \
-		  $$KERNEL_H/qthread.h \
-		  $$KERNEL_H/qtimer.h \
-		  $$KERNEL_H/qurl.h \
-		  $$KERNEL_H/qlocalfs.h \
-		  $$KERNEL_H/qurloperator.h \
-		  $$KERNEL_H/qurlinfo.h \
-		  $$KERNEL_H/qwidget.h \
-		  $$KERNEL_H/qwidgetintdict.h \
-		  $$KERNEL_H/qwidgetlist.h \
-		  $$KERNEL_H/qwindowdefs.h \
-		  $$KERNEL_H/qwmatrix.h \
-		  $$KERNEL_H/qvariant.h \
+		  $$KERNEL_H/ntqpalette.h \
+		  $$KERNEL_H/ntqpaintdevicemetrics.h \
+		  $$KERNEL_H/ntqpen.h \
+		  $$KERNEL_H/ntqpicture.h \
+		  $$KERNEL_H/ntqpixmap.h \
+		  $$KERNEL_H/ntqpixmapcache.h \
+		  $$KERNEL_H/ntqpointarray.h \
+		  $$KERNEL_H/ntqpoint.h \
+		  $$KERNEL_H/ntqpolygonscanner.h \
+		  $$KERNEL_H/ntqprinter.h \
+		  $$KERNEL_H/ntqprocess.h \
+		  $$KERNEL_H/ntqrect.h \
+		  $$KERNEL_H/ntqregion.h \
+		  $$KERNEL_H/ntqsessionmanager.h \
+		  $$KERNEL_H/ntqsignal.h \
+		  $$KERNEL_H/ntqsignalmapper.h \
+		  $$KERNEL_H/ntqsignalslotimp.h \
+		  $$KERNEL_H/ntqsize.h \
+		  $$KERNEL_H/ntqsizegrip.h \
+		  $$KERNEL_H/ntqsizepolicy.h \
+		  $$KERNEL_H/ntqsocketnotifier.h \
+		  $$KERNEL_H/ntqsound.h \
+		  $$KERNEL_H/ntqstyle.h \
+		  $$KERNEL_H/ntqstylesheet.h \
+		  $$KERNEL_H/ntqthread.h \
+		  $$KERNEL_H/ntqtimer.h \
+		  $$KERNEL_H/ntqurl.h \
+		  $$KERNEL_H/ntqlocalfs.h \
+		  $$KERNEL_H/ntqurloperator.h \
+		  $$KERNEL_H/ntqurlinfo.h \
+		  $$KERNEL_H/ntqwidget.h \
+		  $$KERNEL_H/ntqwidgetintdict.h \
+		  $$KERNEL_H/ntqwidgetlist.h \
+		  $$KERNEL_H/ntqwindowdefs.h \
+		  $$KERNEL_H/ntqwmatrix.h \
+		  $$KERNEL_H/ntqvariant.h \
 		  $$KERNEL_P/qrichtext_p.h \
 		  $$KERNEL_P/qinternal_p.h \
-		  $$KERNEL_H/qgplugin.h \
-		  $$KERNEL_H/qsimplerichtext.h \
+		  $$KERNEL_H/ntqgplugin.h \
+		  $$KERNEL_H/ntqsimplerichtext.h \
 		  $$KERNEL_CPP/qscriptengine_p.h \
 		  $$KERNEL_CPP/qtextengine_p.h \
 		  $$KERNEL_CPP/qfontengine_p.h \
 		  $$KERNEL_CPP/qtextlayout_p.h
 
 	unix:x11 {
-		HEADERS += $$KERNEL_H/qinputcontext.h
+		HEADERS += $$KERNEL_H/ntqinputcontext.h
 	} else {
 		HEADERS += $$KERNEL_P/qinputcontext_p.h
 	}
@@ -252,13 +252,13 @@ kernel {
 		  $$KERNEL_CPP/qtextengine.cpp
 
 	unix:HEADERS   += $$KERNEL_P/qpsprinter_p.h \
-			  $$KERNEL_H/qfontdatabase.h
+			  $$KERNEL_H/ntqfontdatabase.h
 
 	embedded:SOURCES += $$KERNEL_CPP/qsharedmemory_p.cpp \
 		  	    $$KERNEL_CPP/qfontengine_qws.cpp
 
 	accessibility {
-	      HEADERS += $$KERNEL_H/qaccessible.h
+	      HEADERS += $$KERNEL_H/ntqaccessible.h
 	      SOURCES += $$KERNEL_CPP/qaccessible.cpp
 
 	      !embedded:!x11:mac:SOURCES += $$KERNEL_CPP/qaccessible_mac.cpp
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 566a49087..e80d7bd6f 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -21,25 +21,25 @@
 #      undef _GLIBCPP_FULLY_COMPLIANT_HEADERS  // Makes qlocale.cpp compile
 #    endif
 #  endif
-#include <qmap.h>		    // I must be first!
+#include <ntqmap.h>		    // I must be first!
 #include <private/qucomextra_p.h>  // All moc genereated code has this include
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qglobal.h>
-#include <qimage.h>
-#include <qmetaobject.h>  // All moc genereated code has this include
-#include <qobject.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <ntqapplication.h>
+#include <ntqbitmap.h>
+#include <ntqcursor.h>
+#include <ntqdatetime.h>
+#include <ntqglobal.h>
+#include <ntqimage.h>
+#include <ntqmetaobject.h>  // All moc genereated code has this include
+#include <ntqobject.h>
+#include <ntqpainter.h>
+#include <ntqpixmap.h>
 #include <qplatformdefs.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qstyle.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <ntqptrlist.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqstyle.h>
+#include <ntqtimer.h>
+#include <ntqwidget.h>
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/src/kernel/qt_x11_p.h b/src/kernel/qt_x11_p.h
index 4eb8b9a64..af13262f2 100644
--- a/src/kernel/qt_x11_p.h
+++ b/src/kernel/qt_x11_p.h
@@ -54,7 +54,7 @@
 
 
 #ifndef QT_H
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #endif // QT_H
 
 // the following is necessary to work around breakage in many versions
diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp
index 0d7c57560..c299e61a0 100644
--- a/src/kernel/qtextengine.cpp
+++ b/src/kernel/qtextengine.cpp
@@ -39,10 +39,10 @@
 #include "qtextengine_p.h"
 
 #include "qscriptengine_p.h"
-#include <qfont.h>
+#include <ntqfont.h>
 #include "qfontdata_p.h"
 #include "qfontengine_p.h"
-#include <qstring.h>
+#include <ntqstring.h>
 #include <private/qunicodetables_p.h>
 #include <stdlib.h>
 
diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h
index 4858672c5..d9619e290 100644
--- a/src/kernel/qtextengine_p.h
+++ b/src/kernel/qtextengine_p.h
@@ -38,9 +38,9 @@
 #define TQTEXTENGINE_P_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qstring.h"
-#include "qnamespace.h"
+#include "ntqglobal.h"
+#include "ntqstring.h"
+#include "ntqnamespace.h"
 #include <private/qfontdata_p.h>
 #endif // QT_H
 
diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/qtextlayout.cpp
index 76f2420f5..edbd910ed 100644
--- a/src/kernel/qtextlayout.cpp
+++ b/src/kernel/qtextlayout.cpp
@@ -39,9 +39,9 @@
 #include "qtextlayout_p.h"
 #include "qtextengine_p.h"
 
-#include <qfont.h>
-#include <qapplication.h>
-#include <qpainter.h>
+#include <ntqfont.h>
+#include <ntqapplication.h>
+#include <ntqpainter.h>
 
 
 TQRect TQTextItem::rect() const
diff --git a/src/kernel/qtextlayout_p.h b/src/kernel/qtextlayout_p.h
index 275288580..b4763c8e5 100644
--- a/src/kernel/qtextlayout_p.h
+++ b/src/kernel/qtextlayout_p.h
@@ -38,9 +38,9 @@
 #define TQTEXTLAYOUT_P_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qnamespace.h"
-#include "qrect.h"
+#include "ntqstring.h"
+#include "ntqnamespace.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 class TQTextEngine;
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index 75291ff41..24239dbd9 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -40,11 +40,11 @@
 
 #include "qplatformdefs.h"
 
-#include "qthread.h"
+#include "ntqthread.h"
 #include <private/qthreadinstance_p.h>
 
 #ifndef QT_H
-#  include "qapplication.h"
+#  include "ntqapplication.h"
 #endif // QT_H
 
 #if QT_VERSION >= 0x040000
@@ -53,7 +53,7 @@
 
 
 /*!
-    \class TQThread qthread.h
+    \class TQThread ntqthread.h
     \threadsafe
     \brief The TQThread class provides platform-independent threads.
 
diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp
index 9776beccd..35de76021 100644
--- a/src/kernel/qthread_unix.cpp
+++ b/src/kernel/qthread_unix.cpp
@@ -42,11 +42,11 @@
 
 typedef pthread_mutex_t Q_MUTEX_T;
 
-#include "qthread.h"
+#include "ntqthread.h"
 #include <private/qthreadinstance_p.h>
 #include <private/qmutex_p.h>
 #include <private/qmutexpool_p.h>
-#include <qthreadstorage.h>
+#include <ntqthreadstorage.h>
 
 #include <errno.h>
 #include <sched.h>
diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp
index 33bb662cc..13bd9bba7 100644
--- a/src/kernel/qtimer.cpp
+++ b/src/kernel/qtimer.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qtimer.h"
-#include "qsignal.h"
-#include "qobjectlist.h"
+#include "ntqtimer.h"
+#include "ntqsignal.h"
+#include "ntqobjectlist.h"
 
 /*!
-    \class TQTimer qtimer.h
+    \class TQTimer ntqtimer.h
     \brief The TQTimer class provides timer signals and single-shot timers.
 
     \ingroup time
@@ -302,8 +302,8 @@ bool TQSingleShotTimer::event( TQEvent * )
 
     Example:
     \code
-	#include <qapplication.h>
-	#include <qtimer.h>
+	#include <ntqapplication.h>
+	#include <ntqtimer.h>
 
 	int main( int argc, char **argv )
 	{
diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/qtkdeintegration_x11.cpp
index 14d45a564..b61920fcf 100644
--- a/src/kernel/qtkdeintegration_x11.cpp
+++ b/src/kernel/qtkdeintegration_x11.cpp
@@ -4,12 +4,12 @@
 #define QT_CLEAN_NAMESPACE
 #include "qtkdeintegration_x11_p.h"
 
-#include <qcolordialog.h>
-#include <qfiledialog.h>
-#include <qfontdialog.h>
-#include <qlibrary.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
+#include <ntqcolordialog.h>
+#include <ntqfiledialog.h>
+#include <ntqfontdialog.h>
+#include <ntqlibrary.h>
+#include <ntqregexp.h>
+#include <ntqmessagebox.h>
 #include <stdlib.h>
 
 bool TQKDEIntegration::inited = false;
diff --git a/src/kernel/qtkdeintegration_x11_p.h b/src/kernel/qtkdeintegration_x11_p.h
index bf247b3e7..10ee4443b 100644
--- a/src/kernel/qtkdeintegration_x11_p.h
+++ b/src/kernel/qtkdeintegration_x11_p.h
@@ -4,7 +4,7 @@
 #ifndef TQKDEINTEGRATION_H
 #define TQKDEINTEGRATION_H
 
-#include <qstringlist.h>
+#include <ntqstringlist.h>
 
 class TQLibrary;
 class TQWidget;
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index a862de079..015b6cdb8 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -52,20 +52,20 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 # undef truncate
 #endif
 
-#include "qtranslator.h"
+#include "ntqtranslator.h"
 
 #ifndef QT_NO_TRANSLATION
 
-#include "qfileinfo.h"
-#include "qwidgetlist.h"
-#include "qintdict.h"
-#include "qstring.h"
-#include "qapplication.h"
-#include "qfile.h"
-#include "qbuffer.h"
-#include "qdatastream.h"
-#include "qmap.h"
-#include "qtl.h"
+#include "ntqfileinfo.h"
+#include "ntqwidgetlist.h"
+#include "ntqintdict.h"
+#include "ntqstring.h"
+#include "ntqapplication.h"
+#include "ntqfile.h"
+#include "ntqbuffer.h"
+#include "ntqdatastream.h"
+#include "ntqmap.h"
+#include "ntqtl.h"
 
 #if defined(Q_OS_UNIX)
 #define QT_USE_MMAP
diff --git a/src/kernel/qucomextra.cpp b/src/kernel/qucomextra.cpp
index df1508140..a705784ba 100644
--- a/src/kernel/qucomextra.cpp
+++ b/src/kernel/qucomextra.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "qucomextra_p.h"
-#include <qvariant.h>
+#include <ntqvariant.h>
 
 
 #ifndef QT_NO_VARIANT
diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp
index 6e2c10b5c..0a680e0d9 100644
--- a/src/kernel/qurl.cpp
+++ b/src/kernel/qurl.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qurl.h"
+#include "ntqurl.h"
 
 #ifndef QT_NO_URL
 
-#include "qdir.h"
+#include "ntqdir.h"
 
 #include <stdlib.h>
 
@@ -92,7 +92,7 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
 
 
 /*!
-    \class TQUrl qurl.h
+    \class TQUrl ntqurl.h
 
     \brief The TQUrl class provides a URL parser and simplifies working with URLs.
 \if defined(commercial)
@@ -126,13 +126,13 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
 
     Example:
 
-    <tt>http://doc.trolltech.com/qdockarea.html#lines</tt>
+    <tt>http://doc.trolltech.com/ntqdockarea.html#lines</tt>
 
     \table
     \header \i Function	    \i Returns
     \row \i \l protocol()   \i "http"
     \row \i \l host()	    \i "doc.trolltech.com"
-    \row \i \l fileName()   \i "qdockarea.html"
+    \row \i \l fileName()   \i "ntqdockarea.html"
     \row \i \l ref()	    \i "lines"
     \endtable
 
diff --git a/src/kernel/qurlinfo.cpp b/src/kernel/qurlinfo.cpp
index 95b224cf7..aafea2a3e 100644
--- a/src/kernel/qurlinfo.cpp
+++ b/src/kernel/qurlinfo.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qurlinfo.h"
+#include "ntqurlinfo.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL
 
-#include "qurloperator.h"
-#include "qdir.h"
+#include "ntqurloperator.h"
+#include "ntqdir.h"
 #include <limits.h>
 
 class TQUrlInfoPrivate
@@ -81,7 +81,7 @@ public:
 
 
 /*!
-    \class TQUrlInfo qurlinfo.h
+    \class TQUrlInfo ntqurlinfo.h
     \brief The TQUrlInfo class stores information about URLs.
 
     \ingroup io
@@ -257,7 +257,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/qurlinfo.html".
+    for example, "http://doc.trolltech.com/ntqurlinfo.html".
 
     If you call this function for an invalid URL info, this function
     turns it into a valid one.
diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp
index ecec21620..e4cb185f4 100644
--- a/src/kernel/qurloperator.cpp
+++ b/src/kernel/qurloperator.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qurloperator.h"
+#include "ntqurloperator.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL
 
-#include "qurlinfo.h"
-#include "qnetworkprotocol.h"
-#include "qmap.h"
-#include "qdir.h"
-#include "qptrdict.h"
-#include "qguardedptr.h"
+#include "ntqurlinfo.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqmap.h"
+#include "ntqdir.h"
+#include "ntqptrdict.h"
+#include "ntqguardedptr.h"
 
 //#define TQURLOPERATOR_DEBUG
 
@@ -89,7 +89,7 @@ public:
 };
 
 /*!
-    \class TQUrlOperator qurloperator.h
+    \class TQUrlOperator ntqurloperator.h
 
     \brief The TQUrlOperator class provides common operations on URLs.
 \if defined(commercial)
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 417c74dd6..6d4b5d1d1 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -40,31 +40,31 @@
 
 #include <float.h>
 
-#include "qvariant.h"
+#include "ntqvariant.h"
 #ifndef QT_NO_VARIANT
-#include "qstring.h"
-#include "qcstring.h"
-#include "qfont.h"
-#include "qpixmap.h"
-#include "qimage.h"
-#include "qbrush.h"
-#include "qpoint.h"
-#include "qrect.h"
-#include "qsize.h"
-#include "qcolor.h"
-#include "qpalette.h"
-#include "qiconset.h"
-#include "qdatastream.h"
-#include "qregion.h"
-#include "qpointarray.h"
-#include "qbitmap.h"
-#include "qcursor.h"
-#include "qdatetime.h"
-#include "qsizepolicy.h"
-#include "qshared.h"
-#include "qbitarray.h"
-#include "qkeysequence.h"
-#include "qpen.h"
+#include "ntqstring.h"
+#include "ntqcstring.h"
+#include "ntqfont.h"
+#include "ntqpixmap.h"
+#include "ntqimage.h"
+#include "ntqbrush.h"
+#include "ntqpoint.h"
+#include "ntqrect.h"
+#include "ntqsize.h"
+#include "ntqcolor.h"
+#include "ntqpalette.h"
+#include "ntqiconset.h"
+#include "ntqdatastream.h"
+#include "ntqregion.h"
+#include "ntqpointarray.h"
+#include "ntqbitmap.h"
+#include "ntqcursor.h"
+#include "ntqdatetime.h"
+#include "ntqsizepolicy.h"
+#include "ntqshared.h"
+#include "ntqbitarray.h"
+#include "ntqkeysequence.h"
+#include "ntqpen.h"
 
 #ifndef DBL_DIG
 #define DBL_DIG 10
@@ -354,7 +354,7 @@ void TQVariant::Private::clear()
 }
 
 /*!
-    \class TQVariant qvariant.h
+    \class TQVariant ntqvariant.h
     \brief The TQVariant class acts like a union for the most common TQt data types.
 
     \ingroup objectmodel
@@ -475,7 +475,7 @@ void TQVariant::Private::clear()
     \value UInt  an unsigned int
 
     Note that TQt's definition of bool depends on the compiler.
-    \c qglobal.h has the system-dependent definition of bool.
+    \c ntqglobal.h has the system-dependent definition of bool.
 */
 
 /*!
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index a4daa5c09..7833f14f6 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -39,25 +39,25 @@
 **********************************************************************/
 
 
-#include "qobjectlist.h"
-#include "qwidget.h"
-#include "qwidgetlist.h"
-#include "qwidgetintdict.h"
-#include "qptrdict.h"
-#include "qfocusdata.h"
-#include "qcursor.h"
-#include "qpixmap.h"
-#include "qapplication.h"
+#include "ntqobjectlist.h"
+#include "ntqwidget.h"
+#include "ntqwidgetlist.h"
+#include "ntqwidgetintdict.h"
+#include "ntqptrdict.h"
+#include "ntqfocusdata.h"
+#include "ntqcursor.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
-#include "qbrush.h"
-#include "qlayout.h"
-#include "qstylefactory.h"
-#include "qcleanuphandler.h"
-#include "qstyle.h"
-#include "qmetaobject.h"
-#include "qguardedptr.h"
+#include "ntqbrush.h"
+#include "ntqlayout.h"
+#include "ntqstylefactory.h"
+#include "ntqcleanuphandler.h"
+#include "ntqstyle.h"
+#include "ntqmetaobject.h"
+#include "ntqguardedptr.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -70,7 +70,7 @@
 
 
 /*!
-    \class TQWidget qwidget.h
+    \class TQWidget ntqwidget.h
     \brief The TQWidget class is the base class of all user interface objects.
 
     \ingroup abstractwidgets
@@ -410,7 +410,7 @@
     \endlist
 
     There are also some rather obscure events. They are listed in
-    \c qevent.h and you need to reimplement event() to handle them.
+    \c ntqevent.h and you need to reimplement event() to handle them.
     The default implementation of event() handles Tab and Shift+Tab
     (to move the keyboard focus), and passes on most other events to
     one of the more specialized handlers above.
@@ -1248,7 +1248,7 @@ void TQWidget::deactivateWidgetCleanup()
     id.
 
     The window identifier type depends on the underlying window
-    system, see \c qwindowdefs.h for the actual definition. If there
+    system, see \c ntqwindowdefs.h for the actual definition. If there
     is no widget with this identifier, 0 is returned.
 */
 
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 2d77cf658..9fc3e7d05 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
-#include "qnamespace.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qobjectlist.h"
-#include "qlayout.h"
-#include "qtextcodec.h"
-#include "qdatetime.h"
-#include "qcursor.h"
+#include "ntqnamespace.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqobjectlist.h"
+#include "ntqlayout.h"
+#include "ntqtextcodec.h"
+#include "ntqdatetime.h"
+#include "ntqcursor.h"
 #include "qt_x11_p.h"
 #include <stdlib.h>
 
@@ -65,8 +65,8 @@ bool qt_wstate_iconified( WId );
 void qt_updated_rootinfo();
 
 #ifndef QT_NO_IM
-#include "qinputcontext.h"
-#include "qinputcontextfactory.h"
+#include "ntqinputcontext.h"
+#include "ntqinputcontextfactory.h"
 #endif
 
 // Paint event clipping magic
diff --git a/src/kernel/qwidgetcreate_x11.cpp b/src/kernel/qwidgetcreate_x11.cpp
index 05144cd99..25a17ccb1 100644
--- a/src/kernel/qwidgetcreate_x11.cpp
+++ b/src/kernel/qwidgetcreate_x11.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qwidget.h"
+#include "ntqwidget.h"
 #include "qt_x11_p.h"
 
 
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index 9b49dbae0..e85cb00cf 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "qwmatrix.h"
-#include "qdatastream.h"
-#include "qregion.h"
+#include "ntqwmatrix.h"
+#include "ntqdatastream.h"
+#include "ntqregion.h"
 #if defined(Q_WS_X11)
 double qsincos( double, bool calcCos );		// defined in qpainter_x11.cpp
 #else
@@ -52,7 +52,7 @@ double qsincos( double, bool calcCos );		// defined in qpainter_x11.cpp
 #ifndef QT_NO_WMATRIX
 
 /*!
-    \class TQWMatrix qwmatrix.h
+    \class TQWMatrix ntqwmatrix.h
     \brief The TQWMatrix class specifies 2D transformations of a
     coordinate system.
 
diff --git a/src/moc/moc.l b/src/moc/moc.l
index 91c170c37..ea5669661 100644
--- a/src/moc/moc.l
+++ b/src/moc/moc.l
@@ -65,7 +65,7 @@ long buf_size_total = 0, buf_index = 0;
      }
 #endif
 
-#include "qstring.h"
+#include "ntqstring.h"
 
 
 #define input yyinput				// yyinput in C++
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 5744269a7..ce1867373 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -59,14 +59,14 @@
 void yyerror( const char *msg );
 
 #include "qplatformdefs.h"
-#include "qasciidict.h"
-#include "qdatetime.h"
-#include "qdict.h"
-#include "qfile.h"
-#include "qdir.h"
-#include "qptrlist.h"
-#include "qregexp.h"
-#include "qstrlist.h"
+#include "ntqasciidict.h"
+#include "ntqdatetime.h"
+#include "ntqdict.h"
+#include "ntqfile.h"
+#include "ntqdir.h"
+#include "ntqptrlist.h"
+#include "ntqregexp.h"
+#include "ntqstrlist.h"
 #ifdef MOC_MWERKS_PLUGIN
 # ifdef Q_OS_MACX
 #  undef OLD_DEBUG
@@ -569,7 +569,7 @@ class parser_reg {
     bool	  noInclude;		// no #include <filename>
     bool	  generatedCode;		// no code generated
     bool	  mocError;			// moc parsing error occurred
-    bool       hasVariantIncluded;	//whether or not qvariant.h was included yet
+    bool       hasVariantIncluded;	//whether or not ntqvariant.h was included yet
     TQCString  className;				// name of parsed class
     TQCString  superClassName;			// name of first super class
     TQStrList  multipleSuperClasses;			// other superclasses
@@ -646,10 +646,10 @@ int	   tmpYYStart;			// Used to store the lexers current mode
 int	   tmpYYStart2;			// Used to store the lexers current mode
 					//  (if tmpYYStart is already used)
 
-// if the format revision changes, you MUST change it in qmetaobject.h too
+// if the format revision changes, you MUST change it in ntqmetaobject.h too
 const int formatRevision = 26;		// moc output format revision
 
-// if the flags change, you HAVE to change it in qmetaobject.h too
+// if the flags change, you HAVE to change it in ntqmetaobject.h too
 enum Flags  {
     Invalid		= 0x00000000,
     Readable		= 0x00000001,
@@ -2906,8 +2906,8 @@ void generateClass()		      // generate C++ source code for a class
 		g->includeFiles.next();
 	    }
 	}
-	fprintf( out, "#include <%sqmetaobject.h>\n", (const char*)g->qtPath );
-	fprintf( out, "#include <%sqapplication.h>\n\n", (const char*)g->qtPath );
+	fprintf( out, "#include <%sntqmetaobject.h>\n", (const char*)g->qtPath );
+	fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath );
 	fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath );
 	fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision );
 	fprintf( out, "#error \"This file was generated using the moc from %s."
@@ -2925,7 +2925,7 @@ void generateClass()		      // generate C++ source code for a class
 	    needToIncludeVariant = ( f->type != "void" && !validUType( f->type ) && isVariantType( f->type) );
 
 	if ( needToIncludeVariant ) {
-	    fprintf( out, "#include <%sqvariant.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "#include <%sntqvariant.h>\n", (const char*)g->qtPath );
 	    g->hasVariantIncluded = TRUE;
 	}
     }
@@ -3115,8 +3115,8 @@ void generateClass()		      // generate C++ source code for a class
 
 	if ( !predef_call_func && !included_list_headers ) {
 	    // yes we need it, because otherwise QT_VERSION may not be defined
-	    fprintf( out, "\n#include <%sqobjectdefs.h>\n", (const char*)g->qtPath );
-	    fprintf( out, "#include <%sqsignalslotimp.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "\n#include <%sntqobjectdefs.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath );
 	    included_list_headers = TRUE;
 	}
 
diff --git a/src/moc/moc_lex.cpp b/src/moc/moc_lex.cpp
index 6edb1e8ab..0bcb929cb 100644
--- a/src/moc/moc_lex.cpp
+++ b/src/moc/moc_lex.cpp
@@ -993,7 +993,7 @@ long buf_size_total = 0, buf_index = 0;
      }
 #endif
 
-#include "qstring.h"
+#include "ntqstring.h"
 
 
 #define input yyinput				// yyinput in C++
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index 81c7c5eaa..575f1f6b4 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -13,14 +13,14 @@ static char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
 void yyerror( const char *msg );
 
 #include "qplatformdefs.h"
-#include "qasciidict.h"
-#include "qdatetime.h"
-#include "qdict.h"
-#include "qfile.h"
-#include "qdir.h"
-#include "qptrlist.h"
-#include "qregexp.h"
-#include "qstrlist.h"
+#include "ntqasciidict.h"
+#include "ntqdatetime.h"
+#include "ntqdict.h"
+#include "ntqfile.h"
+#include "ntqdir.h"
+#include "ntqptrlist.h"
+#include "ntqregexp.h"
+#include "ntqstrlist.h"
 #ifdef MOC_MWERKS_PLUGIN
 # ifdef Q_OS_MACX
 #  undef OLD_DEBUG
@@ -523,7 +523,7 @@ class parser_reg {
     bool	  noInclude;		/* no #include <filename>*/
     bool	  generatedCode;		/* no code generated*/
     bool	  mocError;			/* moc parsing error occurred*/
-    bool       hasVariantIncluded;	/*whether or not qvariant.h was included yet*/
+    bool       hasVariantIncluded;	/*whether or not ntqvariant.h was included yet*/
     TQCString  className;				/* name of parsed class*/
     TQCString  superClassName;			/* name of first super class*/
     TQStrList  multipleSuperClasses;			/* other superclasses*/
@@ -600,10 +600,10 @@ int	   tmpYYStart;			/* Used to store the lexers current mode*/
 int	   tmpYYStart2;			/* Used to store the lexers current mode*/
 					/*  (if tmpYYStart is already used)*/
 
-/* if the format revision changes, you MUST change it in qmetaobject.h too*/
+/* if the format revision changes, you MUST change it in ntqmetaobject.h too*/
 const int formatRevision = 26;		/* moc output format revision*/
 
-/* if the flags change, you HAVE to change it in qmetaobject.h too*/
+/* if the flags change, you HAVE to change it in ntqmetaobject.h too*/
 enum Flags  {
     Invalid		= 0x00000000,
     Readable		= 0x00000001,
@@ -2946,8 +2946,8 @@ void generateClass()		      // generate C++ source code for a class
 		g->includeFiles.next();
 	    }
 	}
-	fprintf( out, "#include <%sqmetaobject.h>\n", (const char*)g->qtPath );
-	fprintf( out, "#include <%sqapplication.h>\n\n", (const char*)g->qtPath );
+	fprintf( out, "#include <%sntqmetaobject.h>\n", (const char*)g->qtPath );
+	fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath );
 	fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath );
 	fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision );
 	fprintf( out, "#error \"This file was generated using the moc from %s."
@@ -2965,7 +2965,7 @@ void generateClass()		      // generate C++ source code for a class
 	    needToIncludeVariant = ( f->type != "void" && !validUType( f->type ) && isVariantType( f->type) );
 
 	if ( needToIncludeVariant ) {
-	    fprintf( out, "#include <%sqvariant.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "#include <%sntqvariant.h>\n", (const char*)g->qtPath );
 	    g->hasVariantIncluded = TRUE;
 	}
     }
@@ -3155,8 +3155,8 @@ void generateClass()		      // generate C++ source code for a class
 
 	if ( !predef_call_func && !included_list_headers ) {
 	    // yes we need it, because otherwise QT_VERSION may not be defined
-	    fprintf( out, "\n#include <%sqobjectdefs.h>\n", (const char*)g->qtPath );
-	    fprintf( out, "#include <%sqsignalslotimp.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "\n#include <%sntqobjectdefs.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath );
 	    included_list_headers = TRUE;
 	}
 
diff --git a/src/network/qdns.h b/src/network/ntqdns.h
index a14d2024f..96f09d265 100644
--- a/src/network/qdns.h
+++ b/src/network/ntqdns.h
@@ -42,10 +42,10 @@
 #define TQDNS_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qhostaddress.h"
-#include "qsocketnotifier.h"
-#include "qstringlist.h"
+#include "ntqobject.h"
+#include "ntqhostaddress.h"
+#include "ntqsocketnotifier.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qftp.h b/src/network/ntqftp.h
index 475eed1f0..86ba65822 100644
--- a/src/network/qftp.h
+++ b/src/network/ntqftp.h
@@ -42,9 +42,9 @@
 #define TQFTP_H
 
 #ifndef QT_H
-#include "qstring.h" // char*->TQString conversion
-#include "qurlinfo.h"
-#include "qnetworkprotocol.h"
+#include "ntqstring.h" // char*->TQString conversion
+#include "ntqurlinfo.h"
+#include "ntqnetworkprotocol.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qhostaddress.h b/src/network/ntqhostaddress.h
index 09986861a..17de16289 100644
--- a/src/network/qhostaddress.h
+++ b/src/network/ntqhostaddress.h
@@ -42,7 +42,7 @@
 #define TQHOSTADDRESS_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qhttp.h b/src/network/ntqhttp.h
index b71ef105e..f0f9d2ea9 100644
--- a/src/network/qhttp.h
+++ b/src/network/ntqhttp.h
@@ -42,9 +42,9 @@
 #define TQHTTP_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qnetworkprotocol.h"
-#include "qstringlist.h"
+#include "ntqobject.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
@@ -272,6 +272,6 @@ private:
 };
 
 #define Q_DEFINED_QHTTP
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif
 #endif
diff --git a/src/network/qnetwork.h b/src/network/ntqnetwork.h
index 48a1841db..0565ea514 100644
--- a/src/network/qnetwork.h
+++ b/src/network/ntqnetwork.h
@@ -42,7 +42,7 @@
 #define TQNETWORK_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qserversocket.h b/src/network/ntqserversocket.h
index a54b04a7b..b5c2a4b88 100644
--- a/src/network/qserversocket.h
+++ b/src/network/ntqserversocket.h
@@ -42,9 +42,9 @@
 #define TQSERVERSOCKET_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qhostaddress.h"
-#include "qsocketdevice.h" // ### remove or keep for users' convenience?
+#include "ntqobject.h"
+#include "ntqhostaddress.h"
+#include "ntqsocketdevice.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 #ifndef QT_NO_NETWORK
 
diff --git a/src/network/qsocket.h b/src/network/ntqsocket.h
index ee5b38422..2a727dd30 100644
--- a/src/network/qsocket.h
+++ b/src/network/ntqsocket.h
@@ -42,9 +42,9 @@
 #define TQSOCKET_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qiodevice.h"
-#include "qhostaddress.h" // int->TQHostAddress conversion
+#include "ntqobject.h"
+#include "ntqiodevice.h"
+#include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qsocketdevice.h b/src/network/ntqsocketdevice.h
index cfb847ce6..bd3d62225 100644
--- a/src/network/qsocketdevice.h
+++ b/src/network/ntqsocketdevice.h
@@ -42,8 +42,8 @@
 #define TQSOCKETDEVICE_H
 
 #ifndef QT_H
-#include "qiodevice.h"
-#include "qhostaddress.h" // int->TQHostAddress conversion
+#include "ntqiodevice.h"
+#include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index 1b896e552..e6dafa6c6 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -60,23 +60,23 @@
 # undef socket
 #endif
 
-#include "qdns.h"
+#include "ntqdns.h"
 
 #ifndef QT_NO_DNS
 
-#include "qdatetime.h"
-#include "qdict.h"
-#include "qptrlist.h"
-#include "qstring.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qptrvector.h"
-#include "qstrlist.h"
-#include "qptrdict.h"
-#include "qfile.h"
-#include "qtextstream.h"
-#include "qsocketdevice.h"
-#include "qcleanuphandler.h"
+#include "ntqdatetime.h"
+#include "ntqdict.h"
+#include "ntqptrlist.h"
+#include "ntqstring.h"
+#include "ntqtimer.h"
+#include "ntqapplication.h"
+#include "ntqptrvector.h"
+#include "ntqstrlist.h"
+#include "ntqptrdict.h"
+#include "ntqfile.h"
+#include "ntqtextstream.h"
+#include "ntqsocketdevice.h"
+#include "ntqcleanuphandler.h"
 #include <limits.h>
 #ifdef Q_OS_MAC
 #include "../3rdparty/dlcompat/dlfcn.h"
@@ -1598,7 +1598,7 @@ void TQDnsSocket::answer()
 
 
 /*!
-    \class TQDns qdns.h
+    \class TQDns ntqdns.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>.
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 78f29e8cd..441cdda5c 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "qftp.h"
+#include "ntqftp.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL_FTP
 
-#include "qsocket.h"
-#include "qsocketdevice.h"
-#include "qurlinfo.h"
-#include "qurloperator.h"
-#include "qstringlist.h"
-#include "qregexp.h"
-#include "qtimer.h"
-#include "qfileinfo.h"
-#include "qptrdict.h" // binary compatibility
+#include "ntqsocket.h"
+#include "ntqsocketdevice.h"
+#include "ntqurlinfo.h"
+#include "ntqurloperator.h"
+#include "ntqstringlist.h"
+#include "ntqregexp.h"
+#include "ntqtimer.h"
+#include "ntqfileinfo.h"
+#include "ntqptrdict.h" // binary compatibility
 
 #ifndef QT_NO_TEXTCODEC
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif
 
 //#define TQFTPPI_DEBUG
@@ -1064,7 +1064,7 @@ static void delete_d( const TQFtp* foo )
  *
  *********************************************************************/
 /*!
-    \class TQFtp qftp.h
+    \class TQFtp ntqftp.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>.
diff --git a/src/network/qhostaddress.cpp b/src/network/qhostaddress.cpp
index 360045282..43d614cc9 100644
--- a/src/network/qhostaddress.cpp
+++ b/src/network/qhostaddress.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "qhostaddress.h"
-#include "qstringlist.h"
+#include "ntqhostaddress.h"
+#include "ntqstringlist.h"
 
 #ifndef QT_NO_NETWORK
 class TQHostAddressPrivate
@@ -83,7 +83,7 @@ TQHostAddressPrivate::TQHostAddressPrivate(const Q_IPV6ADDR &a_) : a(0), isIp4(F
 }
 
 /*!
-    \class TQHostAddress qhostaddress.h
+    \class TQHostAddress ntqhostaddress.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/qhttp.cpp b/src/network/qhttp.cpp
index 4d8cc3e53..b8a110e58 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qhttp.h"
+#include "ntqhttp.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL_HTTP
 
-#include "qsocket.h"
-#include "qtextstream.h"
-#include "qmap.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qcstring.h"
-#include "qbuffer.h"
-#include "qurloperator.h"
-#include "qtimer.h"
+#include "ntqsocket.h"
+#include "ntqtextstream.h"
+#include "ntqmap.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqcstring.h"
+#include "ntqbuffer.h"
+#include "ntqurloperator.h"
+#include "ntqtimer.h"
 #include "private/qinternal_p.h"
 
 //#define TQHTTP_DEBUG
@@ -332,7 +332,7 @@ void TQHttpCloseRequest::start( TQHttp *http )
  ****************************************************/
 
 /*!
-    \class TQHttpHeader qhttp.h
+    \class TQHttpHeader ntqhttp.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 qhttp.h
+    \class TQHttpResponseHeader ntqhttp.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 qhttp.h
+    \class TQHttpRequestHeader ntqhttp.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 qhttp.h
+    \class TQHttp ntqhttp.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/qnetwork.cpp b/src/network/qnetwork.cpp
index 5f5d3cdb8..a3e8a7443 100644
--- a/src/network/qnetwork.cpp
+++ b/src/network/qnetwork.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qnetwork.h"
+#include "ntqnetwork.h"
 
 #ifndef QT_NO_NETWORK
 
-#include "qnetworkprotocol.h"
+#include "ntqnetworkprotocol.h"
 
 // protocols
-#include "qftp.h"
-#include "qhttp.h"
+#include "ntqftp.h"
+#include "ntqhttp.h"
 
-/*! \file qnetwork.h */
+/*! \file ntqnetwork.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 qnetwork.h.
+    This function is declared in \l ntqnetwork.h.
 */
 void qInitNetworkProtocols()
 {
diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp
index 706be57ee..04dc965ef 100644
--- a/src/network/qserversocket.cpp
+++ b/src/network/qserversocket.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qserversocket.h"
+#include "ntqserversocket.h"
 
 #ifndef QT_NO_NETWORK
 
-#include "qsocketnotifier.h"
+#include "ntqsocketnotifier.h"
 
 class TQServerSocketPrivate {
 public:
@@ -54,7 +54,7 @@ public:
 
 
 /*!
-    \class TQServerSocket qserversocket.h
+    \class TQServerSocket ntqserversocket.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/qsocket.cpp b/src/network/qsocket.cpp
index 14e45b7dc..8e69aa7cc 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/qsocket.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qsocket.h"
+#include "ntqsocket.h"
 #ifndef QT_NO_NETWORK
-#include "qptrlist.h"
-#include "qtimer.h"
-#include "qsocketdevice.h"
-#include "qdns.h"
+#include "ntqptrlist.h"
+#include "ntqtimer.h"
+#include "ntqsocketdevice.h"
+#include "ntqdns.h"
 #include "private/qinternal_p.h"
 
 #include <string.h>
@@ -224,7 +224,7 @@ void TQSocketPrivate::setSocketDevice( TQSocket *q, TQSocketDevice *device )
 }
 
 /*!
-    \class TQSocket qsocket.h
+    \class TQSocket ntqsocket.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/qsocketdevice.cpp b/src/network/qsocketdevice.cpp
index 270d74571..c09cbb59a 100644
--- a/src/network/qsocketdevice.cpp
+++ b/src/network/qsocketdevice.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qsocketdevice.h"
+#include "ntqsocketdevice.h"
 #ifndef QT_NO_NETWORK
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #include <string.h>
 
 
@@ -60,7 +60,7 @@ public:
 
 
 /*!
-    \class TQSocketDevice qsocketdevice.h
+    \class TQSocketDevice ntqsocketdevice.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/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp
index fe7c619cc..a5adfef06 100644
--- a/src/network/qsocketdevice_unix.cpp
+++ b/src/network/qsocketdevice_unix.cpp
@@ -80,11 +80,11 @@ static inline int qt_socket_socket(int domain, int type, int protocol)
 # undef socket
 #endif
 
-#include "qsocketdevice.h"
+#include "ntqsocketdevice.h"
 
 #ifndef QT_NO_NETWORK
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/src/network/qt_network.pri b/src/network/qt_network.pri
index 86fcf24d4..537f2b99d 100644
--- a/src/network/qt_network.pri
+++ b/src/network/qt_network.pri
@@ -1,14 +1,14 @@
 # Qt network module
 
 network {
-	HEADERS += $$NETWORK_H/qdns.h \
-		    $$NETWORK_H/qftp.h \
-		    $$NETWORK_H/qhttp.h \
-		    $$NETWORK_H/qhostaddress.h \
-		    $$NETWORK_H/qnetwork.h \
-		    $$NETWORK_H/qserversocket.h \
-		    $$NETWORK_H/qsocket.h \
-		    $$NETWORK_H/qsocketdevice.h
+	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 \
diff --git a/src/opengl/qgl.h b/src/opengl/ntqgl.h
index e58b18d4d..0476dfeff 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/ntqgl.h
@@ -42,8 +42,8 @@
 #define TQGL_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qglcolormap.h"
+#include "ntqwidget.h"
+#include "ntqglcolormap.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/opengl/qglcolormap.h b/src/opengl/ntqglcolormap.h
index 9aaaf22d1..23e334109 100644
--- a/src/opengl/qglcolormap.h
+++ b/src/opengl/ntqglcolormap.h
@@ -42,9 +42,9 @@
 #define TQGLCOLORMAP_H
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qmemarray.h"
-#include "qshared.h"
+#include "ntqcolor.h"
+#include "ntqmemarray.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index eed5d37b5..612448d59 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qgl.h"
-#include "qpixmap.h"
-#include "qpaintdevicemetrics.h"
-#include "qimage.h"
-#include "qcleanuphandler.h"
-#include "qptrdict.h"
+#include "ntqgl.h"
+#include "ntqpixmap.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqimage.h"
+#include "ntqcleanuphandler.h"
+#include "ntqptrdict.h"
 
 static TQGLFormat* qgl_default_format = 0;
 static TQGLFormat* qgl_default_overlay_format = 0;
@@ -62,7 +62,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format;
 
 
 /*!
-    \class TQGL qgl.h
+    \class TQGL ntqgl.h
     \brief The TQGL class is a namespace for miscellaneous identifiers
     in the TQt OpenGL module.
 \if defined(commercial)
@@ -96,7 +96,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format;
 
 
 /*!
-    \class TQGLFormat qgl.h
+    \class TQGLFormat ntqgl.h
     \brief The TQGLFormat class specifies the display format of an OpenGL
     rendering context.
 \if defined(commercial)
@@ -734,7 +734,7 @@ bool operator!=( const TQGLFormat& a, const TQGLFormat& b )
 TQGLContext* TQGLContext::currentCtx = 0;
 
 /*!
-    \class TQGLContext qgl.h
+    \class TQGLContext ntqgl.h
     \brief The TQGLContext class encapsulates an OpenGL rendering context.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -1127,7 +1127,7 @@ bool TQGLContext::create( const TQGLContext* shareContext )
 
 
 /*!
-    \class TQGLWidget qgl.h
+    \class TQGLWidget ntqgl.h
     \brief The TQGLWidget class is a widget for rendering OpenGL graphics.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 939653661..a8f317a4f 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qgl.h"
+#include "ntqgl.h"
 
 #if defined(Q_WS_X11)
 
-#include "qmap.h"
-#include "qpixmap.h"
-#include "qapplication.h"
+#include "ntqmap.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
 
-#include "qintdict.h"
+#include "ntqintdict.h"
 #include "private/qfontengine_p.h"
 
 #define INT8  dummy_INT8
@@ -74,7 +74,7 @@ extern "C" {
 
 #include "qgl_x11_p.h"
 #ifdef QT_DLOPEN_OPENGL
-#include "qlibrary.h"
+#include "ntqlibrary.h"
 
 extern "C" {
 _glCallLists qt_glCallLists;
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 22b819f39..048b7dc29 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 /*!
-    \class TQGLColormap qglcolormap.h
+    \class TQGLColormap ntqglcolormap.h
     \brief The TQGLColormap class is used for installing custom colormaps into
     TQGLWidgets.
 \if defined(commercial)
@@ -73,8 +73,8 @@
 
     Example of use:
     \code
-    #include <qapplication.h>
-    #include <qglcolormap.h>
+    #include <ntqapplication.h>
+    #include <ntqglcolormap.h>
 
     int main()
     {
@@ -97,8 +97,8 @@
     \sa TQGLWidget::setColormap(), TQGLWidget::colormap()
 */
 
-#include "qglcolormap.h"
-#include "qmemarray.h"
+#include "ntqglcolormap.h"
+#include "ntqmemarray.h"
 
 
 /*!
diff --git a/src/opengl/qt_opengl.pri b/src/opengl/qt_opengl.pri
index bb0a5d869..b89ea8c27 100644
--- a/src/opengl/qt_opengl.pri
+++ b/src/opengl/qt_opengl.pri
@@ -1,8 +1,8 @@
 # Qt opengl module
 
 opengl {
-	HEADERS += $$OPENGL_H/qgl.h \
-		   $$OPENGL_H/qglcolormap.h
+	HEADERS += $$OPENGL_H/ntqgl.h \
+		   $$OPENGL_H/ntqglcolormap.h
 	SOURCES	+= $$OPENGL_CPP/qgl.cpp \
 		   $$OPENGL_CPP/qglcolormap.cpp
 	x11 {
diff --git a/src/qt.pro b/src/qt.pro
index 5e00def09..d0315c61c 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -183,11 +183,11 @@ wince-* {
 	CONFIG -= incremental
 	message( ...removing plugin stuff... (not permanent) )
 	HEADERS -= $$TOOLS_CPP/qcomlibrary.h \
-		   $$KERNEL_CPP/qgplugin.h \
-		   $$KERNEL_CPP/qimageformatplugin.h \
-		   $$STYLES_CPP/qstyleplugin.h \
-		   $$CODECS_CPP/qtextcodecplugin.h \
-		   $$WIDGETS_CPP/qwidgetplugin.h
+		   $$KERNEL_CPP/ntqgplugin.h \
+		   $$KERNEL_CPP/ntqimageformatplugin.h \
+		   $$STYLES_CPP/ntqstyleplugin.h \
+		   $$CODECS_CPP/ntqtextcodecplugin.h \
+		   $$WIDGETS_CPP/ntqwidgetplugin.h
 
 	SOURCES -= $$TOOLS_CPP/qcomlibrary.cpp \
 		   $$KERNEL_CPP/qgplugin.cpp \
diff --git a/src/qt_install.pri b/src/qt_install.pri
index 619814dbd..6ef9ec193 100644
--- a/src/qt_install.pri
+++ b/src/qt_install.pri
@@ -4,8 +4,8 @@ INSTALLS += target
 
 #headers
 headers.files  = ../include/*.h
-headers.files += $$QT_BUILD_TREE/include/qconfig.h \
-                 $$QT_BUILD_TREE/include/qmodules.h 
+headers.files += $$QT_BUILD_TREE/include/ntqconfig.h \
+                 $$QT_BUILD_TREE/include/ntqmodules.h 
 isEmpty(headers_p.path):headers_p.path=$$headers.path/private
 headers_p.files = ../include/private/*.h
 INSTALLS += headers headers_p
diff --git a/src/sql/drivers/cache/qsqlcachedresult.cpp b/src/sql/drivers/cache/qsqlcachedresult.cpp
index 4c841e5f1..4f60fa252 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.cpp
+++ b/src/sql/drivers/cache/qsqlcachedresult.cpp
@@ -38,7 +38,7 @@
 **********************************************************************/
 
 #include "qsqlcachedresult.h"
-#include <qdatetime.h>
+#include <ntqdatetime.h>
 
 #ifndef QT_NO_SQL
 static const uint initial_cache_size = 128;
diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h
index 6d78f39de..bde3457d1 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.h
+++ b/src/sql/drivers/cache/qsqlcachedresult.h
@@ -51,11 +51,11 @@
 //
 //
 
-#include <qglobal.h>
-#include <qvariant.h>
-#include <qptrvector.h>
-#include <qvaluevector.h>
-#include <qsqlresult.h>
+#include <ntqglobal.h>
+#include <ntqvariant.h>
+#include <ntqptrvector.h>
+#include <ntqvaluevector.h>
+#include <ntqsqlresult.h>
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp
index 22c41064d..f6aff5dbb 100644
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
@@ -14,7 +14,7 @@
 
 #include "qsql_ibase.h"
 
-#include <qdatetime.h>
+#include <ntqdatetime.h>
 #include <private/qsqlextension_p.h>
 
 #include <ibase.h>
diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/qsql_ibase.h
index fcb738513..45cb4b86b 100644
--- a/src/sql/drivers/ibase/qsql_ibase.h
+++ b/src/sql/drivers/ibase/qsql_ibase.h
@@ -41,8 +41,8 @@
 #ifndef TQSQL_IBASE_H
 #define TQSQL_IBASE_H
 
-#include "qsqlresult.h"
-#include "qsqldriver.h"
+#include "ntqsqlresult.h"
+#include "ntqsqldriver.h"
 #include "../cache/qsqlcachedresult.h"
 
 
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 10448414e..433e8de26 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -41,9 +41,9 @@
 #include "qsql_mysql.h"
 #include <private/qsqlextension_p.h>
 
-#include <qdatetime.h>
-#include <qvaluevector.h>
-#include <qsqlrecord.h>
+#include <ntqdatetime.h>
+#include <ntqvaluevector.h>
+#include <ntqsqlrecord.h>
 
 #define TQMYSQL_DRIVER_NAME "TQMYSQL3"
 
diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h
index 4d4c7b1e5..6b1daef3a 100644
--- a/src/sql/drivers/mysql/qsql_mysql.h
+++ b/src/sql/drivers/mysql/qsql_mysql.h
@@ -41,10 +41,10 @@
 #ifndef TQSQL_MYSQL_H
 #define TQSQL_MYSQL_H
 
-#include <qsqldriver.h>
-#include <qsqlresult.h>
-#include <qsqlfield.h>
-#include <qsqlindex.h>
+#include <ntqsqldriver.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlfield.h>
+#include <ntqsqlindex.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 9851e1cb1..b91bea329 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -39,13 +39,13 @@
 **********************************************************************/
 
 #include "qsql_odbc.h"
-#include <qsqlrecord.h>
+#include <ntqsqlrecord.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 #endif
-#include <qdatetime.h>
+#include <ntqdatetime.h>
 #include <private/qsqlextension_p.h>
 #include <private/qinternal_p.h>
 #include <stdlib.h>
diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h
index 8583dced4..0ce01703a 100644
--- a/src/sql/drivers/odbc/qsql_odbc.h
+++ b/src/sql/drivers/odbc/qsql_odbc.h
@@ -41,12 +41,12 @@
 #ifndef TQSQL_ODBC_H
 #define TQSQL_ODBC_H
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qsqldriver.h>
-#include <qsqlfield.h>
-#include <qsqlresult.h>
-#include <qsqlindex.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqsqldriver.h>
+#include <ntqsqlfield.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlindex.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 788a69358..b039a2474 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -43,10 +43,10 @@
 
 #include <math.h>
 
-#include <qpointarray.h>
-#include <qsqlrecord.h>
-#include <qregexp.h>
-#include <qdatetime.h>
+#include <ntqpointarray.h>
+#include <ntqsqlrecord.h>
+#include <ntqregexp.h>
+#include <ntqdatetime.h>
 // PostgreSQL header <utils/elog.h> included by <postgres.h> redefines DEBUG.
 #if defined(DEBUG)
 # undef DEBUG
diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h
index bed3ebbc9..dd1ddc71c 100644
--- a/src/sql/drivers/psql/qsql_psql.h
+++ b/src/sql/drivers/psql/qsql_psql.h
@@ -41,9 +41,9 @@
 #ifndef TQSQL_PSQL_H
 #define TQSQL_PSQL_H
 
-#include <qsqlresult.h>
-#include <qsqlfield.h>
-#include <qsqldriver.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlfield.h>
+#include <ntqsqldriver.h>
 #include <libpq-fe.h>
 
 #ifdef QT_PLUGIN
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index ecdda1c0c..1662a6e8c 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -14,18 +14,18 @@
 
 #include "qsql_sqlite.h"
 
-#include <qdatetime.h>
-#include <qregexp.h>
-#include <qfile.h>
+#include <ntqdatetime.h>
+#include <ntqregexp.h>
+#include <ntqfile.h>
 
 #if (QT_VERSION-0 < 0x030000)
-#  include <qvector.h>
+#  include <ntqvector.h>
 #  if !defined Q_WS_WIN32
 #    include <unistd.h>
 #  endif
 #  include "../../../3rdparty/libraries/sqlite/sqlite.h"
 #else
-#  include <qptrvector.h>
+#  include <ntqptrvector.h>
 #  if !defined Q_WS_WIN32
 #    include <unistd.h>
 #  endif
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h
index ccde9b865..300642ce1 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.h
+++ b/src/sql/drivers/sqlite/qsql_sqlite.h
@@ -15,10 +15,10 @@
 #ifndef TQSQL_SQLITE_H
 #define TQSQL_SQLITE_H
 
-#include <qsqldriver.h>
-#include <qsqlresult.h>
-#include <qsqlrecord.h>
-#include <qsqlindex.h>
+#include <ntqsqldriver.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlrecord.h>
+#include <ntqsqlindex.h>
 #include "../cache/qsqlcachedresult.h"
 
 #if (QT_VERSION-0 >= 0x030000)
diff --git a/src/sql/qdatabrowser.h b/src/sql/ntqdatabrowser.h
index 3c991bfcf..9fa57a894 100644
--- a/src/sql/qdatabrowser.h
+++ b/src/sql/ntqdatabrowser.h
@@ -42,13 +42,13 @@
 #define TQDATABROWSER_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qsql.h"
-#include "qsqlindex.h"
-#include "qsqlcursor.h"
-#include "qsqlerror.h"
+#include "ntqwidget.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqsql.h"
+#include "ntqsqlindex.h"
+#include "ntqsqlcursor.h"
+#include "ntqsqlerror.h"
 #endif // QT_H
 
 #ifndef QT_NO_SQL_VIEW_WIDGETS
diff --git a/src/sql/qdatatable.h b/src/sql/ntqdatatable.h
index 46d9c7e34..11b9c60bf 100644
--- a/src/sql/qdatatable.h
+++ b/src/sql/ntqdatatable.h
@@ -42,14 +42,14 @@
 #define TQDATATABLE_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qvariant.h"
-#include "qtable.h"
-#include "qsql.h"
-#include "qsqlcursor.h"
-#include "qsqlindex.h"
-#include "qsqleditorfactory.h"
-#include "qiconset.h"
+#include "ntqstring.h"
+#include "ntqvariant.h"
+#include "ntqtable.h"
+#include "ntqsql.h"
+#include "ntqsqlcursor.h"
+#include "ntqsqlindex.h"
+#include "ntqsqleditorfactory.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qdataview.h b/src/sql/ntqdataview.h
index 90f488356..244c8039c 100644
--- a/src/sql/qdataview.h
+++ b/src/sql/ntqdataview.h
@@ -42,7 +42,7 @@
 #define TQDATAVIEW_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qeditorfactory.h b/src/sql/ntqeditorfactory.h
index 2798c5939..9ec8485c8 100644
--- a/src/sql/qeditorfactory.h
+++ b/src/sql/ntqeditorfactory.h
@@ -42,8 +42,8 @@
 #define TQEDITORFACTORY_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qvariant.h"
+#include "ntqobject.h"
+#include "ntqvariant.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsql.h b/src/sql/ntqsql.h
index b4fddae1a..68aa971f2 100644
--- a/src/sql/qsql.h
+++ b/src/sql/ntqsql.h
@@ -42,7 +42,7 @@
 #define TQSQL_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlcursor.h b/src/sql/ntqsqlcursor.h
index 8670ef6f8..0e6e3d0b4 100644
--- a/src/sql/qsqlcursor.h
+++ b/src/sql/ntqsqlcursor.h
@@ -42,10 +42,10 @@
 #define TQSQLCURSOR_H
 
 #ifndef QT_H
-#include "qsqlrecord.h"
-#include "qstringlist.h"
-#include "qsqlquery.h"
-#include "qsqlindex.h"
+#include "ntqsqlrecord.h"
+#include "ntqstringlist.h"
+#include "ntqsqlquery.h"
+#include "ntqsqlindex.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqldatabase.h b/src/sql/ntqsqldatabase.h
index 2fd6d4917..3112e2b3b 100644
--- a/src/sql/qsqldatabase.h
+++ b/src/sql/ntqsqldatabase.h
@@ -42,10 +42,10 @@
 #define TQSQLDATABASE_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qstring.h"
-#include "qsqlquery.h"
-#include "qstringlist.h"
+#include "ntqobject.h"
+#include "ntqstring.h"
+#include "ntqsqlquery.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqldriver.h b/src/sql/ntqsqldriver.h
index b312d3a0d..c10597723 100644
--- a/src/sql/qsqldriver.h
+++ b/src/sql/ntqsqldriver.h
@@ -42,15 +42,15 @@
 #define TQSQLDRIVER_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qptrdict.h"
-#include "qstring.h"
-#include "qsqlerror.h"
-#include "qsqlquery.h"
-#include "qsqlfield.h"
-#include "qsqlindex.h"
-#include "qstringlist.h"
-#include "qmap.h"
+#include "ntqobject.h"
+#include "ntqptrdict.h"
+#include "ntqstring.h"
+#include "ntqsqlerror.h"
+#include "ntqsqlquery.h"
+#include "ntqsqlfield.h"
+#include "ntqsqlindex.h"
+#include "ntqstringlist.h"
+#include "ntqmap.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqldriverplugin.h b/src/sql/ntqsqldriverplugin.h
index 54c05b692..e5a9352a9 100644
--- a/src/sql/qsqldriverplugin.h
+++ b/src/sql/ntqsqldriverplugin.h
@@ -42,8 +42,8 @@
 #define TQSQLDRIVERPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_SQL
diff --git a/src/sql/qsqleditorfactory.h b/src/sql/ntqsqleditorfactory.h
index 48757d480..f04e3b35a 100644
--- a/src/sql/qsqleditorfactory.h
+++ b/src/sql/ntqsqleditorfactory.h
@@ -42,7 +42,7 @@
 #define TQSQLEDITORFACTORY_H
 
 #ifndef QT_H
-#include "qeditorfactory.h"
+#include "ntqeditorfactory.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlerror.h b/src/sql/ntqsqlerror.h
index 7eb29f027..04beb09df 100644
--- a/src/sql/qsqlerror.h
+++ b/src/sql/ntqsqlerror.h
@@ -42,7 +42,7 @@
 #define TQSQLERROR_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlfield.h b/src/sql/ntqsqlfield.h
index b81717c7a..0c33bb67f 100644
--- a/src/sql/qsqlfield.h
+++ b/src/sql/ntqsqlfield.h
@@ -42,8 +42,8 @@
 #define TQSQLFIELD_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qvariant.h"
+#include "ntqstring.h"
+#include "ntqvariant.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlform.h b/src/sql/ntqsqlform.h
index 7ca157c0f..f5aefa763 100644
--- a/src/sql/qsqlform.h
+++ b/src/sql/ntqsqlform.h
@@ -42,8 +42,8 @@
 #define TQSQLFORM_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qmap.h"
+#include "ntqobject.h"
+#include "ntqmap.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlindex.h b/src/sql/ntqsqlindex.h
index 61df18aa3..59ca42200 100644
--- a/src/sql/qsqlindex.h
+++ b/src/sql/ntqsqlindex.h
@@ -42,10 +42,10 @@
 #define TQSQLINDEX_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qsqlfield.h"
-#include "qsqlrecord.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqsqlfield.h"
+#include "ntqsqlrecord.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
@@ -94,6 +94,6 @@ private:
 };
 
 #define Q_DEFINED_QSQLINDEX
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif	// QT_NO_SQL
 #endif
diff --git a/src/sql/qsqlpropertymap.h b/src/sql/ntqsqlpropertymap.h
index 2054b134a..57920009b 100644
--- a/src/sql/qsqlpropertymap.h
+++ b/src/sql/ntqsqlpropertymap.h
@@ -42,8 +42,8 @@
 #define TQSQLPROPERTYMAP_H
 
 #ifndef QT_H
-#include "qvariant.h"
-#include "qstring.h"
+#include "ntqvariant.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_SQL_FORM
diff --git a/src/sql/qsqlquery.h b/src/sql/ntqsqlquery.h
index 8ea2462e4..502f07f4a 100644
--- a/src/sql/qsqlquery.h
+++ b/src/sql/ntqsqlquery.h
@@ -42,13 +42,13 @@
 #define TQSQLTQUERY_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qstring.h"
-#include "qvariant.h"
-#include "qvaluelist.h"
-#include "qsqlerror.h"
-#include "qsqlfield.h"
-#include "qsql.h"
+#include "ntqobject.h"
+#include "ntqstring.h"
+#include "ntqvariant.h"
+#include "ntqvaluelist.h"
+#include "ntqsqlerror.h"
+#include "ntqsqlfield.h"
+#include "ntqsql.h"
 #endif // QT_H
 
 #ifndef QT_NO_SQL
diff --git a/src/sql/qsqlrecord.h b/src/sql/ntqsqlrecord.h
index 405961df9..7023cf923 100644
--- a/src/sql/qsqlrecord.h
+++ b/src/sql/ntqsqlrecord.h
@@ -42,10 +42,10 @@
 #define TQSQLRECORD_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qvariant.h"
-#include "qsqlfield.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqvariant.h"
+#include "ntqsqlfield.h"
 #endif // QT_H
 
 #ifndef QT_NO_SQL
diff --git a/src/sql/qsqlresult.h b/src/sql/ntqsqlresult.h
index 5b72b7f94..0ad0d05d0 100644
--- a/src/sql/qsqlresult.h
+++ b/src/sql/ntqsqlresult.h
@@ -42,11 +42,11 @@
 #define TQSQLRESULT_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qvariant.h"
-#include "qsqlerror.h"
-#include "qsqlfield.h"
-#include "qsql.h"
+#include "ntqstring.h"
+#include "ntqvariant.h"
+#include "ntqsqlerror.h"
+#include "ntqsqlfield.h"
+#include "ntqsql.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlselectcursor.h b/src/sql/ntqsqlselectcursor.h
index 91d5c4d6a..5ad13ec48 100644
--- a/src/sql/qsqlselectcursor.h
+++ b/src/sql/ntqsqlselectcursor.h
@@ -42,7 +42,7 @@
 #define TQSQLSELECTCURSOR_H
 
 #ifndef QT_H
-#include "qsqlcursor.h"
+#include "ntqsqlcursor.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qdatabrowser.cpp b/src/sql/qdatabrowser.cpp
index c9570deb2..79ac4ab0b 100644
--- a/src/sql/qdatabrowser.cpp
+++ b/src/sql/qdatabrowser.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qdatabrowser.h"
+#include "ntqdatabrowser.h"
 
 #ifndef QT_NO_SQL_VIEW_WIDGETS
 
-#include "qsqlform.h"
+#include "ntqsqlform.h"
 #include "qsqlmanager_p.h"
-#include "qsqlresult.h"
+#include "ntqsqlresult.h"
 
 class TQDataBrowserPrivate
 {
@@ -58,7 +58,7 @@ public:
 };
 
 /*!
-    \class TQDataBrowser qdatabrowser.h
+    \class TQDataBrowser ntqdatabrowser.h
     \brief The TQDataBrowser class provides data manipulation and
     navigation for data entry forms.
 
diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp
index bd3708eda..f300c43e5 100644
--- a/src/sql/qdatatable.cpp
+++ b/src/sql/qdatatable.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "qdatatable.h"
+#include "ntqdatatable.h"
 
 #ifndef QT_NO_SQL_VIEW_WIDGETS
 
-#include "qsqldriver.h"
-#include "qsqleditorfactory.h"
-#include "qsqlpropertymap.h"
-#include "qapplication.h"
-#include "qlayout.h"
-#include "qpainter.h"
-#include "qpopupmenu.h"
-#include "qvaluelist.h"
+#include "ntqsqldriver.h"
+#include "ntqsqleditorfactory.h"
+#include "ntqsqlpropertymap.h"
+#include "ntqapplication.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
+#include "ntqpopupmenu.h"
+#include "ntqvaluelist.h"
 #include "qsqlmanager_p.h"
-#include "qdatetime.h"
-#include "qcursor.h"
-#include "qtimer.h"
+#include "ntqdatetime.h"
+#include "ntqcursor.h"
+#include "ntqtimer.h"
 
 //#define QT_DEBUG_DATATABLE
 
@@ -132,7 +132,7 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor )
 
 
 /*!
-    \class TQDataTable qdatatable.h
+    \class TQDataTable ntqdatatable.h
     \brief The TQDataTable class provides a flexible SQL table widget that supports browsing and editing.
 
     \ingroup database
diff --git a/src/sql/qdataview.cpp b/src/sql/qdataview.cpp
index a689025f0..32d437ba2 100644
--- a/src/sql/qdataview.cpp
+++ b/src/sql/qdataview.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qdataview.h"
+#include "ntqdataview.h"
 
 #ifndef QT_NO_SQL_VIEW_WIDGETS
 
@@ -53,7 +53,7 @@ public:
 
 
 /*!
-    \class TQDataView qdataview.h
+    \class TQDataView ntqdataview.h
     \brief The TQDataView class provides read-only SQL forms.
 
     \ingroup database
diff --git a/src/sql/qeditorfactory.cpp b/src/sql/qeditorfactory.cpp
index 6f5fb7f36..660434cf8 100644
--- a/src/sql/qeditorfactory.cpp
+++ b/src/sql/qeditorfactory.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qcleanuphandler.h"
-#include "qlabel.h"
-#include "qlineedit.h"
-#include "qspinbox.h"
-#include "qcombobox.h"
+#include "ntqcleanuphandler.h"
+#include "ntqlabel.h"
+#include "ntqlineedit.h"
+#include "ntqspinbox.h"
+#include "ntqcombobox.h"
 
-#include "qeditorfactory.h"
-#include "qdatetimeedit.h"
+#include "ntqeditorfactory.h"
+#include "ntqdatetimeedit.h"
 
 #ifndef QT_NO_SQL_EDIT_WIDGETS
 
 /*!
-    \class TQEditorFactory qeditorfactory.h
+    \class TQEditorFactory ntqeditorfactory.h
     \brief The TQEditorFactory class is used to create editor widgets
     for TQVariant data types.
 
diff --git a/src/sql/qsql.cpp b/src/sql/qsql.cpp
index 42d59c004..74ea4bd4c 100644
--- a/src/sql/qsql.cpp
+++ b/src/sql/qsql.cpp
@@ -40,7 +40,7 @@
 
 
 /*!
-    \class TQSql qsql.h
+    \class TQSql ntqsql.h
     \brief The TQSql class is a namespace for TQt SQL identifiers that
     need to be global-like.
 
diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp
index e5949951b..3ddd2c9e0 100644
--- a/src/sql/qsqlcursor.cpp
+++ b/src/sql/qsqlcursor.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qsqlcursor.h"
+#include "ntqsqlcursor.h"
 
 #ifndef QT_NO_SQL
 
-#include "qsqldriver.h"
-#include "qsqlresult.h"
-#include "qdatetime.h"
-#include "qsqldatabase.h"
-#include "qsql.h"
+#include "ntqsqldriver.h"
+#include "ntqsqlresult.h"
+#include "ntqdatetime.h"
+#include "ntqsqldatabase.h"
+#include "ntqsql.h"
 
 class TQSqlCursorPrivate
 {
@@ -124,7 +124,7 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString&
 }
 
 /*!
-    \class TQSqlCursor qsqlcursor.h
+    \class TQSqlCursor ntqsqlcursor.h
     \brief The TQSqlCursor class provides browsing and editing of SQL
     tables and views.
 
diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp
index 6d01cf419..ebe65d1ba 100644
--- a/src/sql/qsqldatabase.cpp
+++ b/src/sql/qsqldatabase.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qsqldatabase.h"
+#include "ntqsqldatabase.h"
 
 #ifndef QT_NO_SQL
 
@@ -72,16 +72,16 @@
 #include "drivers/ibase/qsql_ibase.h"
 #endif
 
-#include "qapplication.h"
-#include "qsqlresult.h"
-#include "qsqldriver.h"
+#include "ntqapplication.h"
+#include "ntqsqlresult.h"
+#include "ntqsqldriver.h"
 #include "qsqldriverinterface_p.h"
 #include <private/qpluginmanager_p.h>
 #include <private/qsqlextension_p.h>
-#include "qobject.h"
-#include "qguardedptr.h"
-#include "qcleanuphandler.h"
-#include "qdict.h"
+#include "ntqobject.h"
+#include "ntqguardedptr.h"
+#include "ntqcleanuphandler.h"
+#include "ntqdict.h"
 #include <stdlib.h>
 
 QT_STATIC_CONST_IMPL char * const TQSqlDatabase::defaultConnection = "qt_sql_default_connection";
@@ -356,7 +356,7 @@ public:
 };
 
 /*!
-    \class TQSqlDatabase qsqldatabase.h
+    \class TQSqlDatabase ntqsqldatabase.h
     \brief The TQSqlDatabase class is used to create SQL database
     connections and to provide transaction handling.
 
diff --git a/src/sql/qsqldriver.cpp b/src/sql/qsqldriver.cpp
index 6ecbdca88..3bce7ee43 100644
--- a/src/sql/qsqldriver.cpp
+++ b/src/sql/qsqldriver.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qsqldriver.h"
+#include "ntqsqldriver.h"
 
 #ifndef QT_NO_SQL
 
-#include "qdatetime.h"
+#include "ntqdatetime.h"
 #include "qsqlextension_p.h"
 
 // database states
@@ -54,7 +54,7 @@ TQPtrDict<TQSqlDriverExtension> *qSqlDriverExtDict();
 TQPtrDict<TQSqlOpenExtension> *qSqlOpenExtDict();
 
 /*!
-    \class TQSqlDriver qsqldriver.h
+    \class TQSqlDriver ntqsqldriver.h
     \brief The TQSqlDriver class is an abstract base class for accessing
     SQL databases.
 
diff --git a/src/sql/qsqldriverplugin.cpp b/src/sql/qsqldriverplugin.cpp
index fe294ba09..74487f5be 100644
--- a/src/sql/qsqldriverplugin.cpp
+++ b/src/sql/qsqldriverplugin.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qsqldriverplugin.h"
+#include "ntqsqldriverplugin.h"
 
 #ifndef QT_NO_SQL
 #ifndef QT_NO_COMPONENT
@@ -46,7 +46,7 @@
 #include "qsqldriverinterface_p.h"
 
 /*!
-    \class TQSqlDriverPlugin qsqldriverplugin.h
+    \class TQSqlDriverPlugin ntqsqldriverplugin.h
     \brief The TQSqlDriverPlugin class provides an abstract base for custom TQSqlDriver plugins.
 
     \ingroup plugins
diff --git a/src/sql/qsqleditorfactory.cpp b/src/sql/qsqleditorfactory.cpp
index 55a6d5a7e..c962e4ce8 100644
--- a/src/sql/qsqleditorfactory.cpp
+++ b/src/sql/qsqleditorfactory.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qsqleditorfactory.h"
+#include "ntqsqleditorfactory.h"
 
 #ifndef QT_NO_SQL_EDIT_WIDGETS
 
-#include "qsqlfield.h"
-#include "qcleanuphandler.h"
-#include "qlabel.h"
-#include "qlineedit.h"
-#include "qspinbox.h"
-#include "qcombobox.h"
-#include "qdatetimeedit.h"
+#include "ntqsqlfield.h"
+#include "ntqcleanuphandler.h"
+#include "ntqlabel.h"
+#include "ntqlineedit.h"
+#include "ntqspinbox.h"
+#include "ntqcombobox.h"
+#include "ntqdatetimeedit.h"
 
 /*!
-    \class TQSqlEditorFactory qsqleditorfactory.h
+    \class TQSqlEditorFactory ntqsqleditorfactory.h
     \brief The TQSqlEditorFactory class is used to create the editors
     used by TQDataTable and TQSqlForm.
 
diff --git a/src/sql/qsqlerror.cpp b/src/sql/qsqlerror.cpp
index 1d3d1e7df..c837aecfc 100644
--- a/src/sql/qsqlerror.cpp
+++ b/src/sql/qsqlerror.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qsqlerror.h"
-#include <qmessagebox.h>
+#include "ntqsqlerror.h"
+#include <ntqmessagebox.h>
 
 #ifndef QT_NO_SQL
 
 /*!
-    \class TQSqlError qsqlerror.h
+    \class TQSqlError ntqsqlerror.h
     \brief The TQSqlError class provides SQL database error information.
 
     \ingroup database
diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h
index cd189d926..7e4237c6e 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/qsqlextension_p.h
@@ -54,11 +54,11 @@
 //
 
 #ifndef QT_H
-#include "qmap.h"
-#include "qvaluevector.h"
-#include "qstring.h"
-#include "qvariant.h"
-#include "qsql.h"
+#include "ntqmap.h"
+#include "ntqvaluevector.h"
+#include "ntqstring.h"
+#include "ntqvariant.h"
+#include "ntqsql.h"
 #endif // QT_H
 
 #ifndef QT_NO_SQL
@@ -87,7 +87,7 @@ struct Holder {
 };
 
 #define Q_DEFINED_QSQLEXTENSION
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 
 class TQM_EXPORT_SQL TQSqlExtension {
 public:
diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp
index 95c798676..ca7edc3d5 100644
--- a/src/sql/qsqlfield.cpp
+++ b/src/sql/qsqlfield.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qsqlfield.h"
+#include "ntqsqlfield.h"
 
 #ifndef QT_NO_SQL
 
 
 /*!
-    \class TQSqlField qsqlfield.h
+    \class TQSqlField ntqsqlfield.h
     \brief The TQSqlField class manipulates the fields in SQL database tables
     and views.
 
@@ -306,7 +306,7 @@ struct TQSqlFieldInfoPrivate
 };
 
 /*!
-    \class TQSqlFieldInfo qsqlfield.h
+    \class TQSqlFieldInfo ntqsqlfield.h
     \brief The TQSqlFieldInfo class stores meta data associated with a SQL field.
 
     \ingroup database
diff --git a/src/sql/qsqlform.cpp b/src/sql/qsqlform.cpp
index 07d0ef4e3..a03a53d63 100644
--- a/src/sql/qsqlform.cpp
+++ b/src/sql/qsqlform.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qsqlform.h"
+#include "ntqsqlform.h"
 
 #ifndef QT_NO_SQL_FORM
 
-#include "qsqlfield.h"
-#include "qsqlpropertymap.h"
-#include "qsqlrecord.h"
-#include "qstringlist.h"
-#include "qwidget.h"
-#include "qdict.h"
+#include "ntqsqlfield.h"
+#include "ntqsqlpropertymap.h"
+#include "ntqsqlrecord.h"
+#include "ntqstringlist.h"
+#include "ntqwidget.h"
+#include "ntqdict.h"
 
 class TQSqlFormPrivate
 {
diff --git a/src/sql/qsqlindex.cpp b/src/sql/qsqlindex.cpp
index 06f17eca8..d0df39788 100644
--- a/src/sql/qsqlindex.cpp
+++ b/src/sql/qsqlindex.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qsqlindex.h"
+#include "ntqsqlindex.h"
 
 #ifndef QT_NO_SQL
 
-#include "qsqlcursor.h"
+#include "ntqsqlcursor.h"
 
 /*!
-    \class TQSqlIndex qsqlindex.h
+    \class TQSqlIndex ntqsqlindex.h
     \brief The TQSqlIndex class provides functions to manipulate and
     describe TQSqlCursor and TQSqlDatabase indexes.
 
diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp
index 1ca0d5f30..0ed88cf8c 100644
--- a/src/sql/qsqlmanager_p.cpp
+++ b/src/sql/qsqlmanager_p.cpp
@@ -42,14 +42,14 @@
 
 #ifndef QT_NO_SQL
 
-#include "qapplication.h"
-#include "qwidget.h"
-#include "qsqlcursor.h"
-#include "qsqlform.h"
-#include "qsqldriver.h"
-#include "qstring.h"
-#include "qmessagebox.h"
-#include "qbitarray.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
+#include "ntqsqlcursor.h"
+#include "ntqsqlform.h"
+#include "ntqsqldriver.h"
+#include "ntqstring.h"
+#include "ntqmessagebox.h"
+#include "ntqbitarray.h"
 
 //#define QT_DEBUG_DATAMANAGER
 
diff --git a/src/sql/qsqlmanager_p.h b/src/sql/qsqlmanager_p.h
index fd442ead6..b36b4d1ed 100644
--- a/src/sql/qsqlmanager_p.h
+++ b/src/sql/qsqlmanager_p.h
@@ -54,13 +54,13 @@
 //
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qsql.h"
-#include "qsqlerror.h"
-#include "qsqlindex.h"
-#include "qsqlcursor.h"
+#include "ntqglobal.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqsql.h"
+#include "ntqsqlerror.h"
+#include "ntqsqlindex.h"
+#include "ntqsqlcursor.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp
index 98f3fd159..9d619a016 100644
--- a/src/sql/qsqlpropertymap.cpp
+++ b/src/sql/qsqlpropertymap.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qsqlpropertymap.h"
+#include "ntqsqlpropertymap.h"
 
 #ifndef QT_NO_SQL_FORM
 
-#include "qwidget.h"
-#include "qcleanuphandler.h"
-#include "qmetaobject.h"
-#include "qmap.h"
+#include "ntqwidget.h"
+#include "ntqcleanuphandler.h"
+#include "ntqmetaobject.h"
+#include "ntqmap.h"
 
 class TQSqlPropertyMapPrivate
 {
@@ -55,7 +55,7 @@ public:
 };
 
 /*!
-    \class TQSqlPropertyMap qsqlpropertymap.h
+    \class TQSqlPropertyMap ntqsqlpropertymap.h
     \brief The TQSqlPropertyMap class is used to map widgets to SQL fields.
 
     \ingroup database
diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp
index 98b481811..94325d507 100644
--- a/src/sql/qsqlquery.cpp
+++ b/src/sql/qsqlquery.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qsqlquery.h"
+#include "ntqsqlquery.h"
 
 #ifndef QT_NO_SQL
 
 //#define QT_DEBUG_SQL
 
-#include "qsqlresult.h"
-#include "qsqldriver.h"
-#include "qsqldatabase.h"
-#include "qsql.h"
-#include "qregexp.h"
+#include "ntqsqlresult.h"
+#include "ntqsqldriver.h"
+#include "ntqsqldatabase.h"
+#include "ntqsql.h"
+#include "ntqregexp.h"
 #include "private/qsqlextension_p.h"
 
 
@@ -81,7 +81,7 @@ void TQSqlResultShared::slotResultDestroyed()
 }
 
 /*!
-    \class TQSqlQuery qsqlquery.h
+    \class TQSqlQuery ntqsqlquery.h
     \brief The TQSqlQuery class provides a means of executing and
     manipulating SQL statements.
 
diff --git a/src/sql/qsqlrecord.cpp b/src/sql/qsqlrecord.cpp
index f8489b0e0..998ba0a71 100644
--- a/src/sql/qsqlrecord.cpp
+++ b/src/sql/qsqlrecord.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qsqlrecord.h"
+#include "ntqsqlrecord.h"
 
 #ifndef QT_NO_SQL
 
-#include "qregexp.h"
-#include "qvaluevector.h"
-#include "qshared.h"
-#include "qnamespace.h"
+#include "ntqregexp.h"
+#include "ntqvaluevector.h"
+#include "ntqshared.h"
+#include "ntqnamespace.h"
 
 class TQSqlRecordPrivate
 {
@@ -153,7 +153,7 @@ TQSqlRecordShared::~TQSqlRecordShared()
 }
 
 /*!
-    \class TQSqlRecord qsqlfield.h
+    \class TQSqlRecord ntqsqlfield.h
     \brief The TQSqlRecord class encapsulates a database record, i.e. a
     set of database fields.
 
@@ -688,7 +688,7 @@ void TQSqlRecord::setValue( const TQString& name, const TQVariant& val )
 /******************************************/
 
 /*!
-    \class TQSqlRecordInfo qsqlrecord.h
+    \class TQSqlRecordInfo ntqsqlrecord.h
     \brief The TQSqlRecordInfo class encapsulates a set of database field meta data.
 
     \ingroup database
diff --git a/src/sql/qsqlresult.cpp b/src/sql/qsqlresult.cpp
index d0550f329..5afd6a08d 100644
--- a/src/sql/qsqlresult.cpp
+++ b/src/sql/qsqlresult.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qsqlresult.h"
+#include "ntqsqlresult.h"
 #include "private/qsqlextension_p.h"
 
 #ifndef QT_NO_SQL
diff --git a/src/sql/qsqlselectcursor.cpp b/src/sql/qsqlselectcursor.cpp
index f14d2d378..6919ae994 100644
--- a/src/sql/qsqlselectcursor.cpp
+++ b/src/sql/qsqlselectcursor.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "qsqlselectcursor.h"
-#include "qsqldriver.h"
+#include "ntqsqlselectcursor.h"
+#include "ntqsqldriver.h"
 
 #ifndef QT_NO_SQL
 
@@ -52,7 +52,7 @@ public:
 };
 
 /*!
-    \class TQSqlSelectCursor qsqlselectcursor.h
+    \class TQSqlSelectCursor ntqsqlselectcursor.h
     \brief The TQSqlSelectCursor class provides browsing of general SQL
     SELECT statements.
 
diff --git a/src/sql/qt_sql.pri b/src/sql/qt_sql.pri
index 5533c6fbe..6856b5730 100644
--- a/src/sql/qt_sql.pri
+++ b/src/sql/qt_sql.pri
@@ -8,28 +8,28 @@ sql {
 	}
 	
 	SQL_P	    = sql
-	HEADERS     += $$SQL_H/qsql.h \
-		    $$SQL_H/qsqlquery.h \
-		    $$SQL_H/qsqldatabase.h \
-		    $$SQL_H/qsqlfield.h \
-		    $$SQL_H/qsqlrecord.h \
-		    $$SQL_H/qsqlcursor.h \
-		    $$SQL_H/qsqlform.h \
-		    $$SQL_H/qeditorfactory.h \
-		    $$SQL_H/qsqleditorfactory.h \
-		    $$SQL_H/qsqldriver.h \
+	HEADERS     += $$SQL_H/ntqsql.h \
+		    $$SQL_H/ntqsqlquery.h \
+		    $$SQL_H/ntqsqldatabase.h \
+		    $$SQL_H/ntqsqlfield.h \
+		    $$SQL_H/ntqsqlrecord.h \
+		    $$SQL_H/ntqsqlcursor.h \
+		    $$SQL_H/ntqsqlform.h \
+		    $$SQL_H/ntqeditorfactory.h \
+		    $$SQL_H/ntqsqleditorfactory.h \
+		    $$SQL_H/ntqsqldriver.h \
 		    $$SQL_P/qsqldriverinterface_p.h \
 		    $$SQL_P/qsqlextension_p.h \
-		    $$SQL_H/qsqldriverplugin.h \
-		    $$SQL_H/qsqlerror.h \
-		    $$SQL_H/qsqlresult.h \
-		    $$SQL_H/qsqlindex.h \
-		    $$SQL_H/qsqlpropertymap.h \
+		    $$SQL_H/ntqsqldriverplugin.h \
+		    $$SQL_H/ntqsqlerror.h \
+		    $$SQL_H/ntqsqlresult.h \
+		    $$SQL_H/ntqsqlindex.h \
+		    $$SQL_H/ntqsqlpropertymap.h \
 		    $$SQL_P/qsqlmanager_p.h \
-		    $$SQL_H/qdatatable.h \
-		    $$SQL_H/qdataview.h \
-		    $$SQL_H/qdatabrowser.h \
-		    $$SQL_H/qsqlselectcursor.h 
+		    $$SQL_H/ntqdatatable.h \
+		    $$SQL_H/ntqdataview.h \
+		    $$SQL_H/ntqdatabrowser.h \
+		    $$SQL_H/ntqsqlselectcursor.h 
 
 	SOURCES     += $$SQL_CPP/qsqlquery.cpp \
 		    $$SQL_CPP/qsqldatabase.cpp \
diff --git a/src/styles/qcdestyle.h b/src/styles/ntqcdestyle.h
index 47de74162..f82236e1f 100644
--- a/src/styles/qcdestyle.h
+++ b/src/styles/ntqcdestyle.h
@@ -43,7 +43,7 @@
 #define TQCDESTYLE_H
 
 #ifndef QT_H
-#include "qmotifstyle.h"
+#include "ntqmotifstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN)
diff --git a/src/styles/qcommonstyle.h b/src/styles/ntqcommonstyle.h
index a1579ce12..573121765 100644
--- a/src/styles/qcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -42,7 +42,7 @@
 #define TQCOMMONSTYLE_H
 
 #ifndef QT_H
-#include "qstyle.h"
+#include "ntqstyle.h"
 #endif // QT_H
 
 #ifndef QT_NO_STYLE
diff --git a/src/styles/qcompactstyle.h b/src/styles/ntqcompactstyle.h
index ecc5c0b6c..60e298a8e 100644
--- a/src/styles/qcompactstyle.h
+++ b/src/styles/ntqcompactstyle.h
@@ -42,7 +42,7 @@
 #define TQCOMPACTSTYLE_H
 
 #ifndef QT_H
-#include "qwindowsstyle.h"
+#include "ntqwindowsstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
diff --git a/src/styles/qinterlacestyle.h b/src/styles/ntqinterlacestyle.h
index d2caecbe0..7c00675d9 100644
--- a/src/styles/qinterlacestyle.h
+++ b/src/styles/ntqinterlacestyle.h
@@ -43,12 +43,12 @@
 #define TQINTERLACESTYLE_H
 
 #ifndef QT_H
-#include "qmotifstyle.h"
+#include "ntqmotifstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
 
-#include "qpalette.h"
+#include "ntqpalette.h"
 
 class Q_EXPORT TQInterlaceStyle : public TQMotifStyle
 {
diff --git a/src/styles/qmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h
index 8490e84c1..1034d0857 100644
--- a/src/styles/qmotifplusstyle.h
+++ b/src/styles/ntqmotifplusstyle.h
@@ -43,7 +43,7 @@
 
 
 #ifndef QT_H
-#include "qmotifstyle.h"
+#include "ntqmotifstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
diff --git a/src/styles/qmotifstyle.h b/src/styles/ntqmotifstyle.h
index 6490f5d9e..443886601 100644
--- a/src/styles/qmotifstyle.h
+++ b/src/styles/ntqmotifstyle.h
@@ -42,7 +42,7 @@
 #define TQMOTIFSTYLE_H
 
 #ifndef QT_H
-#include "qcommonstyle.h"
+#include "ntqcommonstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
diff --git a/src/styles/qplatinumstyle.h b/src/styles/ntqplatinumstyle.h
index a2f3e5b6d..994cf0516 100644
--- a/src/styles/qplatinumstyle.h
+++ b/src/styles/ntqplatinumstyle.h
@@ -42,7 +42,7 @@
 #define TQPLATINUMSTYLE_H
 
 #ifndef QT_H
-#include "qwindowsstyle.h"
+#include "ntqwindowsstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
diff --git a/src/styles/qsgistyle.h b/src/styles/ntqsgistyle.h
index df0ccb6be..16d3a8ba0 100644
--- a/src/styles/qsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -42,9 +42,9 @@
 #define TQSGISTYLE_H
 
 #ifndef QT_H
-#include "qmotifstyle.h"
-#include "qguardedptr.h"
-#include "qwidget.h"
+#include "ntqmotifstyle.h"
+#include "ntqguardedptr.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN)
diff --git a/src/styles/qstylefactory.h b/src/styles/ntqstylefactory.h
index 0d2a79b37..d011fe999 100644
--- a/src/styles/qstylefactory.h
+++ b/src/styles/ntqstylefactory.h
@@ -40,7 +40,7 @@
 #define TQSTYLEFACTORY_H
 
 #ifndef QT_H
-#include "qstringlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_STYLE
diff --git a/src/styles/qstyleplugin.h b/src/styles/ntqstyleplugin.h
index c282be8ca..d527be7ef 100644
--- a/src/styles/qstyleplugin.h
+++ b/src/styles/ntqstyleplugin.h
@@ -42,8 +42,8 @@
 #define TQSTYLEPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_STYLE
diff --git a/src/styles/qwindowsstyle.h b/src/styles/ntqwindowsstyle.h
index ab3cc4b78..0bfec6199 100644
--- a/src/styles/qwindowsstyle.h
+++ b/src/styles/ntqwindowsstyle.h
@@ -42,7 +42,7 @@
 #define TQWINDOWSSTYLE_H
 
 #ifndef QT_H
-#include "qcommonstyle.h"
+#include "ntqcommonstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
diff --git a/src/styles/qcdestyle.cpp b/src/styles/qcdestyle.cpp
index fd03ab049..7a4f2693d 100644
--- a/src/styles/qcdestyle.cpp
+++ b/src/styles/qcdestyle.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qcdestyle.h"
+#include "ntqcdestyle.h"
 
 #if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN)
 
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qbutton.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqbutton.h"
 #include <limits.h>
 
 /*!
-    \class TQCDEStyle qcdestyle.h
+    \class TQCDEStyle ntqcdestyle.h
     \brief The TQCDEStyle class provides a CDE look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 153174ba6..fb04f7e52 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -38,39 +38,39 @@
 **
 **********************************************************************/
 
-#include "qcommonstyle.h"
+#include "ntqcommonstyle.h"
 
 #ifndef QT_NO_STYLE
 
-#include "qmenubar.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpushbutton.h"
-#include "qtabbar.h"
-#include "qscrollbar.h"
-#include "qtoolbutton.h"
-#include "qtoolbar.h"
-#include "qdockarea.h"
-#include "qheader.h"
-#include "qspinbox.h"
-#include "qrangecontrol.h"
-#include "qgroupbox.h"
-#include "qslider.h"
-#include "qlistview.h"
-#include "qcheckbox.h"
-#include "qradiobutton.h"
-#include "qbitmap.h"
-#include "qprogressbar.h"
+#include "ntqmenubar.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpushbutton.h"
+#include "ntqtabbar.h"
+#include "ntqscrollbar.h"
+#include "ntqtoolbutton.h"
+#include "ntqtoolbar.h"
+#include "ntqdockarea.h"
+#include "ntqheader.h"
+#include "ntqspinbox.h"
+#include "ntqrangecontrol.h"
+#include "ntqgroupbox.h"
+#include "ntqslider.h"
+#include "ntqlistview.h"
+#include "ntqcheckbox.h"
+#include "ntqradiobutton.h"
+#include "ntqbitmap.h"
+#include "ntqprogressbar.h"
 #include "private/qdialogbuttons_p.h"
 #include <limits.h>
-#include <qpixmap.h>
+#include <ntqpixmap.h>
 #include "../widgets/qtitlebar_p.h"
-#include <qtoolbox.h>
+#include <ntqtoolbox.h>
 
 /*!
-    \class TQCommonStyle qcommonstyle.h
+    \class TQCommonStyle ntqcommonstyle.h
     \brief The TQCommonStyle class encapsulates the common Look and Feel of a GUI.
 
     \ingroup appearance
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp
index 59cb2a232..7dc0ab37c 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/qcompactstyle.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qcompactstyle.h"
+#include "ntqcompactstyle.h"
 
 #if !defined(QT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
 
-#include "qfontmetrics.h"
-#include "qpalette.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qmenudata.h"
-#include "qpopupmenu.h"
+#include "ntqfontmetrics.h"
+#include "ntqpalette.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqmenudata.h"
+#include "ntqpopupmenu.h"
 
 TQCompactStyle::TQCompactStyle()
 : TQWindowsStyle()
diff --git a/src/styles/qinterlacestyle.cpp b/src/styles/qinterlacestyle.cpp
index 871554716..cf1efe43c 100644
--- a/src/styles/qinterlacestyle.cpp
+++ b/src/styles/qinterlacestyle.cpp
@@ -40,26 +40,26 @@
 
 #if 0 // ###### not ported to new API yet
 
-#include "qinterlacestyle.h"
+#include "ntqinterlacestyle.h"
 
 #if !defined(QT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
 
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qdrawutil.h" // for now
-#include "qpalette.h" // for now
-#include "qwidget.h"
-#include "qlabel.h"
-#include "qpushbutton.h"
-#include "qwidget.h"
-#include "qrangecontrol.h"
-#include "qscrollbar.h"
-#include "qlistbox.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h" // for now
+#include "ntqpalette.h" // for now
+#include "ntqwidget.h"
+#include "ntqlabel.h"
+#include "ntqpushbutton.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
+#include "ntqscrollbar.h"
+#include "ntqlistbox.h"
 
 #include <limits.h>
 
 /*!
-  \class TQInterlaceStyle qinterlacestyle.h
+  \class TQInterlaceStyle ntqinterlacestyle.h
   \brief The TQInterlaceStyle class provides a Look and Feel suitable for interlaced displays.
   \ingroup appearance
 
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index a3ff8aeb6..528e6dce8 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -38,28 +38,28 @@
 **
 **********************************************************************/
 
-#include "qmotifplusstyle.h"
+#include "ntqmotifplusstyle.h"
 
 #if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
 
-#include "qmenubar.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qframe.h"
-#include "qpushbutton.h"
-#include "qcheckbox.h"
-#include "qradiobutton.h"
-#include "qcombobox.h"
-#include "qlineedit.h"
-#include "qspinbox.h"
-#include "qslider.h"
-#include "qdrawutil.h"
-#include "qscrollbar.h"
-#include "qtabbar.h"
-#include "qtoolbar.h"
-#include "qguardedptr.h"
-#include "qlayout.h"
+#include "ntqmenubar.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqpalette.h"
+#include "ntqframe.h"
+#include "ntqpushbutton.h"
+#include "ntqcheckbox.h"
+#include "ntqradiobutton.h"
+#include "ntqcombobox.h"
+#include "ntqlineedit.h"
+#include "ntqspinbox.h"
+#include "ntqslider.h"
+#include "ntqdrawutil.h"
+#include "ntqscrollbar.h"
+#include "ntqtabbar.h"
+#include "ntqtoolbar.h"
+#include "ntqguardedptr.h"
+#include "ntqlayout.h"
 
 
 struct TQMotifPlusStylePrivate
@@ -132,7 +132,7 @@ static void drawMotifPlusShade(TQPainter *p,
 
 
 /*!
-    \class TQMotifPlusStyle qmotifplusstyle.h
+    \class TQMotifPlusStyle ntqmotifplusstyle.h
     \brief The TQMotifPlusStyle class provides a more sophisticated Motif-ish look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 89ea23316..ce25794f9 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -38,29 +38,29 @@
 **
 **********************************************************************/
 
-#include "qmotifstyle.h"
+#include "ntqmotifstyle.h"
 
 #if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
 
-#include "qpopupmenu.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpalette.h"
-#include "qwidget.h"
-#include "qpushbutton.h"
-#include "qscrollbar.h"
-#include "qtabbar.h"
-#include "qtabwidget.h"
-#include "qlistview.h"
-#include "qsplitter.h"
-#include "qslider.h"
-#include "qcombobox.h"
-#include "qdockwindow.h"
-#include "qdockarea.h"
-#include "qprogressbar.h"
-#include "qimage.h"
+#include "ntqpopupmenu.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpalette.h"
+#include "ntqwidget.h"
+#include "ntqpushbutton.h"
+#include "ntqscrollbar.h"
+#include "ntqtabbar.h"
+#include "ntqtabwidget.h"
+#include "ntqlistview.h"
+#include "ntqsplitter.h"
+#include "ntqslider.h"
+#include "ntqcombobox.h"
+#include "ntqdockwindow.h"
+#include "ntqdockarea.h"
+#include "ntqprogressbar.h"
+#include "ntqimage.h"
 #include <limits.h>
 
 
@@ -77,7 +77,7 @@ static const int motifCheckMarkSpace    = 12;
 
 
 /*!
-    \class TQMotifStyle qmotifstyle.h
+    \class TQMotifStyle ntqmotifstyle.h
     \brief The TQMotifStyle class provides Motif look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/qplatinumstyle.cpp
index ce6bd78b8..8f9f9ab75 100644
--- a/src/styles/qplatinumstyle.cpp
+++ b/src/styles/qplatinumstyle.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qplatinumstyle.h"
+#include "ntqplatinumstyle.h"
 
 #if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
 
-#include "qapplication.h"
-#include "qcombobox.h"
-#include "qdrawutil.h"
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qpixmap.h"
-#include "qpushbutton.h"
-#include "qscrollbar.h"
-#include "qslider.h"
+#include "ntqapplication.h"
+#include "ntqcombobox.h"
+#include "ntqdrawutil.h"
+#include "ntqpainter.h"
+#include "ntqpalette.h"
+#include "ntqpixmap.h"
+#include "ntqpushbutton.h"
+#include "ntqscrollbar.h"
+#include "ntqslider.h"
 #include <limits.h>
 
 /*!
-    \class TQPlatinumStyle qplatinumstyle.h
+    \class TQPlatinumStyle ntqplatinumstyle.h
     \brief The TQPlatinumStyle class provides Mac/Platinum look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index f17562eb7..e09b4aa30 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -38,26 +38,26 @@
 **
 **********************************************************************/
 
-#include "qsgistyle.h"
+#include "ntqsgistyle.h"
 
 #if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN)
 
-#include "qpopupmenu.h"
-#include "qapplication.h"
-#include "qbutton.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpalette.h"
-#include "qwidget.h"
-#include "qpushbutton.h"
-#include "qscrollbar.h"
-#include "qcombobox.h"
-#include "qslider.h"
-#include "qtextedit.h"
-#include "qtoolbar.h"
-#include "qlineedit.h"
-#include "qmenubar.h"
+#include "ntqpopupmenu.h"
+#include "ntqapplication.h"
+#include "ntqbutton.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpalette.h"
+#include "ntqwidget.h"
+#include "ntqpushbutton.h"
+#include "ntqscrollbar.h"
+#include "ntqcombobox.h"
+#include "ntqslider.h"
+#include "ntqtextedit.h"
+#include "ntqtoolbar.h"
+#include "ntqlineedit.h"
+#include "ntqmenubar.h"
 #include <limits.h>
 
 #ifndef QT_NO_SLIDER
@@ -97,7 +97,7 @@ public:
 };
 
 /*!
-    \class TQSGIStyle qsgistyle.h
+    \class TQSGIStyle ntqsgistyle.h
     \brief The TQSGIStyle class provides SGI/Irix look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qstylefactory.cpp b/src/styles/qstylefactory.cpp
index 85e312889..88f25642d 100644
--- a/src/styles/qstylefactory.cpp
+++ b/src/styles/qstylefactory.cpp
@@ -39,18 +39,18 @@
 **********************************************************************/
 
 #include "qstyleinterface_p.h" // up here for GCC 2.7.* compatibility
-#include "qstylefactory.h"
+#include "ntqstylefactory.h"
 
 #ifndef QT_NO_STYLE
 
-#include "qapplication.h"
-#include "qwindowsstyle.h"
-#include "qmotifstyle.h"
-#include "qcdestyle.h"
-#include "qmotifplusstyle.h"
-#include "qplatinumstyle.h"
-#include "qsgistyle.h"
-#include "qcompactstyle.h"
+#include "ntqapplication.h"
+#include "ntqwindowsstyle.h"
+#include "ntqmotifstyle.h"
+#include "ntqcdestyle.h"
+#include "ntqmotifplusstyle.h"
+#include "ntqplatinumstyle.h"
+#include "ntqsgistyle.h"
+#include "ntqcompactstyle.h"
 #ifndef QT_NO_STYLE_WINDOWSXP
 #include "qwindowsxpstyle.h"
 #endif
@@ -99,7 +99,7 @@ TQStyleFactoryPrivate::~TQStyleFactoryPrivate()
 #endif //QT_NO_COMPONENT
 
 /*!
-    \class TQStyleFactory qstylefactory.h
+    \class TQStyleFactory ntqstylefactory.h
     \brief The TQStyleFactory class creates TQStyle objects.
 
     The style factory creates a TQStyle object for a given key with
diff --git a/src/styles/qstyleplugin.cpp b/src/styles/qstyleplugin.cpp
index 22b29bf5b..a76b4d1a4 100644
--- a/src/styles/qstyleplugin.cpp
+++ b/src/styles/qstyleplugin.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qstyleplugin.h"
+#include "ntqstyleplugin.h"
 
 #ifndef QT_NO_STYLE
 #ifndef QT_NO_COMPONENT
 
 #include "qstyleinterface_p.h"
-#include "qobjectcleanuphandler.h"
-#include "qstyle.h"
+#include "ntqobjectcleanuphandler.h"
+#include "ntqstyle.h"
 
 /*!
-    \class TQStylePlugin qstyleplugin.h
+    \class TQStylePlugin ntqstyleplugin.h
     \brief The TQStylePlugin class provides an abstract base for custom TQStyle plugins.
 
     \ingroup plugins
diff --git a/src/styles/qt_styles.pri b/src/styles/qt_styles.pri
index 913828eab..4f3e1be56 100644
--- a/src/styles/qt_styles.pri
+++ b/src/styles/qt_styles.pri
@@ -2,10 +2,10 @@
 
 styles {
 	STYLES_P = styles
-	HEADERS +=$$STYLES_H/qstylefactory.h \
+	HEADERS +=$$STYLES_H/ntqstylefactory.h \
 		  $$STYLES_P/qstyleinterface_p.h \
-		  $$STYLES_H/qstyleplugin.h \
-		  $$STYLES_H/qcommonstyle.h
+		  $$STYLES_H/ntqstyleplugin.h \
+		  $$STYLES_H/ntqcommonstyle.h
 	SOURCES +=$$STYLES_CPP/qstylefactory.cpp \
 		  $$STYLES_CPP/qstyleplugin.cpp \
 		  $$STYLES_CPP/qcommonstyle.cpp
@@ -44,7 +44,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_AQUA
 
 	contains( styles, cde ) {
-		HEADERS +=$$STYLES_H/qcdestyle.h
+		HEADERS +=$$STYLES_H/ntqcdestyle.h
 		SOURCES +=$$STYLES_CPP/qcdestyle.cpp
 
 		!contains( styles, motif ) {
@@ -55,7 +55,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_CDE
 
 	contains( styles, motifplus ) {
-		HEADERS +=$$STYLES_H/qmotifplusstyle.h
+		HEADERS +=$$STYLES_H/ntqmotifplusstyle.h
 		SOURCES +=$$STYLES_CPP/qmotifplusstyle.cpp
 		!contains( styles, motif ) {
 			message( motifplus requires motif )
@@ -65,7 +65,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_MOTIFPLUS
 
 	contains( styles, interlace ) {
-		HEADERS +=$$STYLES_H/qinterlacestyle.h
+		HEADERS +=$$STYLES_H/ntqinterlacestyle.h
 		SOURCES +=$$STYLES_CPP/qinterlacestyle.cpp
 		!contains( styles, windows ) {
 			message( interlace requires windows )
@@ -75,7 +75,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_INTERLACE
 
 	contains( styles, platinum ) {
-		HEADERS +=$$STYLES_H/qplatinumstyle.h
+		HEADERS +=$$STYLES_H/ntqplatinumstyle.h
 		SOURCES +=$$STYLES_CPP/qplatinumstyle.cpp
 		!contains( styles, windows ) {
 			message( platinum requires windows )
@@ -95,7 +95,7 @@ styles {
         else:DEFINES += QT_NO_STYLE_WINDOWSXP
 
 	contains( styles, sgi ) {
-		HEADERS +=$$STYLES_H/qsgistyle.h
+		HEADERS +=$$STYLES_H/ntqsgistyle.h
 		SOURCES +=$$STYLES_CPP/qsgistyle.cpp
 		!contains( styles, motif ) {
 			message( sgi requires motif )
@@ -105,7 +105,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_SGI
 
 	contains( styles, compact ) {
-		HEADERS +=$$STYLES_H/qcompactstyle.h
+		HEADERS +=$$STYLES_H/ntqcompactstyle.h
 		SOURCES +=$$STYLES_CPP/qcompactstyle.cpp
 		!contains( styles, windows ) {
 			message( compact requires windows )
@@ -127,13 +127,13 @@ styles {
         else:DEFINES += QT_NO_STYLE_POCKETPC
         
 	contains( styles, windows ) {
-		HEADERS +=$$STYLES_H/qwindowsstyle.h
+		HEADERS +=$$STYLES_H/ntqwindowsstyle.h
 		SOURCES +=$$STYLES_CPP/qwindowsstyle.cpp
 	}
 	else:DEFINES += QT_NO_STYLE_WINDOWS
 
 	contains( styles, motif ) {
-		HEADERS +=$$STYLES_H/qmotifstyle.h
+		HEADERS +=$$STYLES_H/ntqmotifstyle.h
 		SOURCES +=$$STYLES_CPP/qmotifstyle.cpp
 	}
 	else:DEFINES += QT_NO_STYLE_MOTIF
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index c7677ca02..92c6de147 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -38,33 +38,33 @@
 **
 **********************************************************************/
 
-#include "qwindowsstyle.h"
+#include "ntqwindowsstyle.h"
 
 #if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
 
-#include "qpopupmenu.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qdrawutil.h" // for now
-#include "qpixmap.h" // for now
-#include "qwidget.h"
-#include "qlabel.h"
-#include "qimage.h"
-#include "qpushbutton.h"
-#include "qcombobox.h"
-#include "qlistbox.h"
-#include "qwidget.h"
-#include "qrangecontrol.h"
-#include "qscrollbar.h"
-#include "qslider.h"
-#include "qtabwidget.h"
-#include "qtabbar.h"
-#include "qlistview.h"
-#include "qbitmap.h"
-#include "qcleanuphandler.h"
-#include "qdockwindow.h"
-#include "qobjectlist.h"
-#include "qmenubar.h"
+#include "ntqpopupmenu.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h" // for now
+#include "ntqpixmap.h" // for now
+#include "ntqwidget.h"
+#include "ntqlabel.h"
+#include "ntqimage.h"
+#include "ntqpushbutton.h"
+#include "ntqcombobox.h"
+#include "ntqlistbox.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
+#include "ntqscrollbar.h"
+#include "ntqslider.h"
+#include "ntqtabwidget.h"
+#include "ntqtabbar.h"
+#include "ntqlistview.h"
+#include "ntqbitmap.h"
+#include "ntqcleanuphandler.h"
+#include "ntqdockwindow.h"
+#include "ntqobjectlist.h"
+#include "ntqmenubar.h"
 
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -209,7 +209,7 @@ bool TQWindowsStyle::Private::eventFilter(TQObject *o, TQEvent *e)
 }
 
 /*!
-    \class TQWindowsStyle qwindowsstyle.h
+    \class TQWindowsStyle ntqwindowsstyle.h
     \brief The TQWindowsStyle class provides a Microsoft Windows-like look and feel.
 
     \ingroup appearance
diff --git a/src/table/qtable.h b/src/table/ntqtable.h
index 1f4f7bac1..67f7f2a69 100644
--- a/src/table/qtable.h
+++ b/src/table/ntqtable.h
@@ -42,16 +42,16 @@
 #define TQTABLE_H
 
 #ifndef QT_H
-#include "qscrollview.h"
-#include "qpixmap.h"
-#include "qptrvector.h"
-#include "qheader.h"
-#include "qmemarray.h"
-#include "qptrlist.h"
-#include "qguardedptr.h"
-#include "qshared.h"
-#include "qintdict.h"
-#include "qstringlist.h"
+#include "ntqscrollview.h"
+#include "ntqpixmap.h"
+#include "ntqptrvector.h"
+#include "ntqheader.h"
+#include "ntqmemarray.h"
+#include "ntqptrlist.h"
+#include "ntqguardedptr.h"
+#include "ntqshared.h"
+#include "ntqintdict.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 
@@ -111,7 +111,7 @@ private:
 };
 
 #define Q_DEFINED_QTABLE_SELECTION
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 
 class TQM_EXPORT_TABLE TQTableItem : public TQt
 {
@@ -181,7 +181,7 @@ private:
 };
 
 #define Q_DEFINED_QTABLE_ITEM
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 
 class TQM_EXPORT_TABLE TQComboTableItem : public TQTableItem
 {
@@ -559,6 +559,6 @@ private:
 };
 
 #define Q_DEFINED_QTABLE
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // QT_NO_TABLE
 #endif // TABLE_H
diff --git a/src/table/qt_table.pri b/src/table/qt_table.pri
index c13396389..5a6faafc9 100644
--- a/src/table/qt_table.pri
+++ b/src/table/qt_table.pri
@@ -1,6 +1,6 @@
 # Qt table module
 
 table {
-	HEADERS += $$TABLE_H/qtable.h
+	HEADERS += $$TABLE_H/ntqtable.h
 	SOURCES += $$TABLE_CPP/qtable.cpp
 }
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index 5f8ba78a0..4695d09ac 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -38,31 +38,31 @@
 **
 **********************************************************************/
 
-#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
 
-#include "qtable.h"
+#include "ntqtable.h"
 
 #ifndef QT_NO_TABLE
 
-#include <qpainter.h>
-#include <qlineedit.h>
-#include <qcursor.h>
-#include <qapplication.h>
-#include <qtimer.h>
-#include <qobjectlist.h>
-#include <qiconset.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
-#include <qdragobject.h>
-#include <qevent.h>
-#include <qlistbox.h>
-#include <qstyle.h>
-#include <qdatatable.h>
-#include <qvalidator.h>
+#include <ntqpainter.h>
+#include <ntqlineedit.h>
+#include <ntqcursor.h>
+#include <ntqapplication.h>
+#include <ntqtimer.h>
+#include <ntqobjectlist.h>
+#include <ntqiconset.h>
+#include <ntqcombobox.h>
+#include <ntqcheckbox.h>
+#include <ntqdragobject.h>
+#include <ntqevent.h>
+#include <ntqlistbox.h>
+#include <ntqstyle.h>
+#include <ntqdatatable.h>
+#include <ntqvalidator.h>
 
 #include <stdlib.h>
 #include <limits.h>
@@ -1700,7 +1700,7 @@ TQSize TQCheckTableItem::sizeHint() const
     1, although row and column numbers within TQTable begin at 0.)
 
     If you want to use mouse tracking call setMouseTracking( TRUE ) on
-    the \e viewport; (see \link qscrollview.html#allviews
+    the \e viewport; (see \link ntqscrollview.html#allviews
     TQScrollView\endlink).
 
     \img qtableitems.png Table Items
diff --git a/src/tools/qasciicache.h b/src/tools/ntqasciicache.h
index 42c8a86c1..7323635c6 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 16bf49144..ef09bc025 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 2e50875ab..45a022e6d 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 e638a83e8..ba5aea33b 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 1ecbe2548..9d747e346 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 e90975fff..e1dc339b3 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 96eb9f801..f3893f63e 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 c531b6cf5..73fa584cf 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 9a5b858cc..4c5a3b4f8 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 fe8a5ddde..abe1fc8f1 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 dc3b2fdcb..d363538d0 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 c178ca49f..87083f8f4 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 6e0a38182..6e0a38182 100644
--- a/src/tools/qfeatures.h
+++ b/src/tools/ntqfeatures.h
diff --git a/src/tools/qfile.h b/src/tools/ntqfile.h
index c8255e1cd..40ad46856 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 bd41896e8..36cf4d7a2 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 ee8cdca1a..76a5cf34a 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 6cfabbc8a..d9a3e1edb 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 dd4b04a52..5465fd2f2 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 af1ec86e6..b82f18849 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 568a2b90c..41363a2f9 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 b888c7be4..34d9acea2 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 0e388c0c8..40667c6aa 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 b3401b621..116618058 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 e6a70c5de..162625855 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 2d8d7affa..65c4c59df 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 899333fc0..385726b8e 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 955669c9e..231203f4e 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 372e6da68..7c0d375cf 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 81414fd9c..483671167 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 f5c4ed22a..90c5150c3 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 38f6598d0..60f73f961 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 bf20091e6..5f0690afa 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 510caa89d..181492bd9 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 6e741e8b5..4482d0a9b 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 68b2a0b80..0c1bd5e6b 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 75245407c..913dae356 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 c05db8ae9..046dc9486 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 4276a5f37..075572224 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 c27768348..8b246054c 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 25158f2f9..5c4b24cac 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 90bbbf94a..7f02c772a 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 da0ecaed8..5923e3f17 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 20056e663..85dacc8c2 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 a25c24a26..b5f857d5c 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 dfbcb303d..67d88048e 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 4b9ff24a0..8eb7afd8b 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 fcc8baad8..a99c8e26c 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 3fdcaa9e8..acce6dbaa 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 2cdf10e96..ae8c5af87 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 0ea4ccf62..f518f3e75 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 f47bc8743..c217a7892 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 3415750f5..1c1259fb1 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 e2fe25be2..bef40f54b 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 5dc66a7d4..6e6038801 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 0936ade6c..0936ade6c 100644
--- a/src/tools/qwinexport.h
+++ b/src/tools/ntqwinexport.h
diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp
index 08e0bd9b7..c1433887a 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 ebf3dd0e2..75bb35da7 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 6992f94e8..0bf1f4aea 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 08287bcf3..c6d22e2e8 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 b2cfbe743..201ca476d 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 c02e9f064..9109cc5b2 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 ac7fa4750..60e698f34 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 329bf8f25..3359d68bc 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 c9e34ddba..d1358cc87 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 9c57adfe5..ea23fa639 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 48f2d5b39..17b748510 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 03be15a83..4538e5b26 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 83880d290..c5d7173e7 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 1fabc595f..ab5248fe9 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 d9ed6d82c..85d0fd4fa 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 b144de1b2..014e037c8 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 c1ad38bd9..5f10a2074 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 b5a74eae5..4d7fd38e4 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 f7a4aeead..190e3c9e9 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 18282aa6e..99c0cbc29 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 a72798cec..c9f14102b 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 805e7fd64..2336fb0b1 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 6b22e3b96..5afd8bc41 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 4e4194793..82bfdf053 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 d9602aeff..b53e41721 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 74fbb9f7e..64c39915f 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 71b533a81..a96e0c068 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 cf603e9a4..c2e4166b1 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 59d23f804..dd1769216 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 a11c4ec76..1b80a4c8b 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 e74c8ccf7..4c2884501 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 71e8530d0..146edbec9 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 f0250ef28..48f1beeb4 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 0981cf821..67bd23c03 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 bc6e94540..718a739d1 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 133e04eb7..81e160136 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 a5eb62795..52fbd2765 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 902c5d0c4..9d582d7e1 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 965792c94..73c92ff3b 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 ae582e34c..f4946a01a 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 7234cc40f..3f77cc52d 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 9b37b3b5e..4f4ba4676 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 55c9005cb..9c2d0dfb8 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 59ce53fd2..62c569c42 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 d2c488a2b..05b86b954 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 678d3d5f3..0814e18d7 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 5c64d2317..abcfadf7a 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 4e079dc56..07d4a599e 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 220ff4962..64ec7a3bd 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 5c4e9388d..2f1e5b98a 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 99126c92e..38592c9bb 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>
diff --git a/src/widgets/qaction.h b/src/widgets/ntqaction.h
index 6b227b3af..4811d6bfc 100644
--- a/src/widgets/qaction.h
+++ b/src/widgets/ntqaction.h
@@ -42,10 +42,10 @@
 #define TQACTION_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qiconset.h"
-#include "qstring.h"
-#include "qkeysequence.h"
+#include "ntqobject.h"
+#include "ntqiconset.h"
+#include "ntqstring.h"
+#include "ntqkeysequence.h"
 #endif // QT_H
 
 #ifndef QT_NO_ACTION
diff --git a/src/widgets/qbutton.h b/src/widgets/ntqbutton.h
index dceaa0f8d..17dcdd260 100644
--- a/src/widgets/qbutton.h
+++ b/src/widgets/ntqbutton.h
@@ -42,8 +42,8 @@
 #define TQBUTTON_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qkeysequence.h"
+#include "ntqwidget.h"
+#include "ntqkeysequence.h"
 #endif // QT_H
 
 #ifndef QT_NO_BUTTON
diff --git a/src/widgets/qbuttongroup.h b/src/widgets/ntqbuttongroup.h
index edb28aeb7..155c6a763 100644
--- a/src/widgets/qbuttongroup.h
+++ b/src/widgets/ntqbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQBUTTONGROUP_H
 
 #ifndef QT_H
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #endif // QT_H
 
 #ifndef QT_NO_BUTTONGROUP
diff --git a/src/widgets/qcheckbox.h b/src/widgets/ntqcheckbox.h
index 7c0dc9dfb..16a2b7a7a 100644
--- a/src/widgets/qcheckbox.h
+++ b/src/widgets/ntqcheckbox.h
@@ -42,7 +42,7 @@
 #define TQCHECKBOX_H
 
 #ifndef QT_H
-#include "qbutton.h"
+#include "ntqbutton.h"
 #endif // QT_H
 
 #ifndef QT_NO_CHECKBOX
diff --git a/src/widgets/qcombobox.h b/src/widgets/ntqcombobox.h
index f3f073f61..0b5eb95d7 100644
--- a/src/widgets/qcombobox.h
+++ b/src/widgets/ntqcombobox.h
@@ -42,7 +42,7 @@
 #define TQCOMBOBOX_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_COMBOBOX
diff --git a/src/widgets/qdatetimeedit.h b/src/widgets/ntqdatetimeedit.h
index f725149e7..86b8db22b 100644
--- a/src/widgets/qdatetimeedit.h
+++ b/src/widgets/ntqdatetimeedit.h
@@ -42,9 +42,9 @@
 #define TQDATETIMEEDIT_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qstring.h"
-#include "qdatetime.h"
+#include "ntqwidget.h"
+#include "ntqstring.h"
+#include "ntqdatetime.h"
 #endif // QT_H
 
 #ifndef QT_NO_DATETIMEEDIT
diff --git a/src/widgets/qdial.h b/src/widgets/ntqdial.h
index e171a6b07..8fd34772d 100644
--- a/src/widgets/qdial.h
+++ b/src/widgets/ntqdial.h
@@ -43,8 +43,8 @@
 #define TQDIAL_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qrangecontrol.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
 #endif // QT_H
 
 #ifndef QT_NO_DIAL
diff --git a/src/widgets/qdockarea.h b/src/widgets/ntqdockarea.h
index ca6391d78..2c68842de 100644
--- a/src/widgets/qdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -42,13 +42,13 @@
 #define TQDOCKAREA_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qptrlist.h"
-#include "qdockwindow.h"
-#include "qlayout.h"
-#include "qvaluelist.h"
-#include "qguardedptr.h"
-#include "qtextstream.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
+#include "ntqdockwindow.h"
+#include "ntqlayout.h"
+#include "ntqvaluelist.h"
+#include "ntqguardedptr.h"
+#include "ntqtextstream.h"
 #endif // QT_H
 
 #ifndef QT_NO_MAINWINDOW
@@ -185,7 +185,7 @@ Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & );
 #endif
 
 #define Q_DEFINED_QDOCKAREA
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif
 
 #endif //QT_NO_MAINWINDOW
diff --git a/src/widgets/qdockwindow.h b/src/widgets/ntqdockwindow.h
index 57c66bc71..405a507d3 100644
--- a/src/widgets/qdockwindow.h
+++ b/src/widgets/ntqdockwindow.h
@@ -42,7 +42,7 @@
 #define TQDOCKWINDOW_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_MAINWINDOW
@@ -231,7 +231,7 @@ inline TQDockArea *TQDockWindow::area() const
 }
 
 #define Q_DEFINED_QDOCKWINDOW
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif
 
 #endif // TQDOCKWINDOW_H
diff --git a/src/widgets/qframe.h b/src/widgets/ntqframe.h
index ae174974f..e157ea1ad 100644
--- a/src/widgets/qframe.h
+++ b/src/widgets/ntqframe.h
@@ -42,7 +42,7 @@
 #define TQFRAME_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_FRAME
diff --git a/src/widgets/qgrid.h b/src/widgets/ntqgrid.h
index a1a6508c6..d28eb6d58 100644
--- a/src/widgets/qgrid.h
+++ b/src/widgets/ntqgrid.h
@@ -38,7 +38,7 @@
 #define TQGRID_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_GRID
diff --git a/src/widgets/qgridview.h b/src/widgets/ntqgridview.h
index d3f3f8c54..5e4cd604c 100644
--- a/src/widgets/qgridview.h
+++ b/src/widgets/ntqgridview.h
@@ -42,7 +42,7 @@
 #define TQGRIDVIEW_H
 
 #ifndef QT_H
-#include "qscrollview.h"
+#include "ntqscrollview.h"
 #endif // QT_H
 
 #ifndef QT_NO_GRIDVIEW
diff --git a/src/widgets/qgroupbox.h b/src/widgets/ntqgroupbox.h
index ed95c5c69..602788c15 100644
--- a/src/widgets/qgroupbox.h
+++ b/src/widgets/ntqgroupbox.h
@@ -42,7 +42,7 @@
 #define TQGROUPBOX_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_GROUPBOX
diff --git a/src/widgets/qhbox.h b/src/widgets/ntqhbox.h
index 162fa3e61..3d46ee304 100644
--- a/src/widgets/qhbox.h
+++ b/src/widgets/ntqhbox.h
@@ -39,12 +39,12 @@
 #define TQHBOX_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_HBOX
 
-#include "qframe.h"
+#include "ntqframe.h"
 
 class TQBoxLayout;
 
diff --git a/src/widgets/qhbuttongroup.h b/src/widgets/ntqhbuttongroup.h
index 8a6caff78..1f0000897 100644
--- a/src/widgets/qhbuttongroup.h
+++ b/src/widgets/ntqhbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQHBUTTONGROUP_H
 
 #ifndef QT_H
-#include "qbuttongroup.h"
+#include "ntqbuttongroup.h"
 #endif // QT_H
 
 #ifndef QT_NO_HBUTTONGROUP
diff --git a/src/widgets/qheader.h b/src/widgets/ntqheader.h
index 2f5d000e6..4ebe46c94 100644
--- a/src/widgets/qheader.h
+++ b/src/widgets/ntqheader.h
@@ -42,9 +42,9 @@
 #define TQHEADER_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qstring.h"
-#include "qiconset.h" // conversion TQPixmap->TQIconset
+#include "ntqwidget.h"
+#include "ntqstring.h"
+#include "ntqiconset.h" // conversion TQPixmap->TQIconset
 #endif // QT_H
 
 #ifndef QT_NO_HEADER
diff --git a/src/widgets/qhgroupbox.h b/src/widgets/ntqhgroupbox.h
index 9f61a4a34..401432ba2 100644
--- a/src/widgets/qhgroupbox.h
+++ b/src/widgets/ntqhgroupbox.h
@@ -42,7 +42,7 @@
 #define TQHGROUPBOX_H
 
 #ifndef QT_H
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #endif // QT_H
 
 #ifndef QT_NO_HGROUPBOX
diff --git a/src/widgets/qlabel.h b/src/widgets/ntqlabel.h
index 8e1ba94f7..c2d6ca352 100644
--- a/src/widgets/qlabel.h
+++ b/src/widgets/ntqlabel.h
@@ -42,7 +42,7 @@
 #define TQLABEL_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_LABEL
diff --git a/src/widgets/qlcdnumber.h b/src/widgets/ntqlcdnumber.h
index a872703bc..a936b3e1b 100644
--- a/src/widgets/qlcdnumber.h
+++ b/src/widgets/ntqlcdnumber.h
@@ -42,8 +42,8 @@
 #define TQLCDNUMBER_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qbitarray.h"
+#include "ntqframe.h"
+#include "ntqbitarray.h"
 #endif // QT_H
 
 #ifndef QT_NO_LCDNUMBER
diff --git a/src/widgets/qlineedit.h b/src/widgets/ntqlineedit.h
index 73db03d36..dad904b7c 100644
--- a/src/widgets/qlineedit.h
+++ b/src/widgets/ntqlineedit.h
@@ -47,8 +47,8 @@ class TQValidator;
 class TQPopupMenu;
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qstring.h"
+#include "ntqframe.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_LINEEDIT
diff --git a/src/widgets/qlistbox.h b/src/widgets/ntqlistbox.h
index 385e92b37..a7764791d 100644
--- a/src/widgets/qlistbox.h
+++ b/src/widgets/ntqlistbox.h
@@ -42,8 +42,8 @@
 #define TQLISTBOX_H
 
 #ifndef QT_H
-#include "qscrollview.h"
-#include "qpixmap.h"
+#include "ntqscrollview.h"
+#include "ntqpixmap.h"
 #endif // QT_H
 
 #ifndef QT_NO_LISTBOX
diff --git a/src/widgets/qlistview.h b/src/widgets/ntqlistview.h
index 02abb51ec..61efac96f 100644
--- a/src/widgets/qlistview.h
+++ b/src/widgets/ntqlistview.h
@@ -42,7 +42,7 @@
 #define TQLISTVIEW_H
 
 #ifndef QT_H
-#include "qscrollview.h"
+#include "ntqscrollview.h"
 #endif // QT_H
 
 #ifndef QT_NO_LISTVIEW
diff --git a/src/widgets/qmainwindow.h b/src/widgets/ntqmainwindow.h
index 055259371..14ec3b5e4 100644
--- a/src/widgets/qmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -42,10 +42,10 @@
 #define TQMAINWINDOW_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qtoolbar.h"
-#include "qptrlist.h"
-#include "qtextstream.h"
+#include "ntqwidget.h"
+#include "ntqtoolbar.h"
+#include "ntqptrlist.h"
+#include "ntqtextstream.h"
 #endif // QT_H
 
 #ifndef QT_NO_MAINWINDOW
diff --git a/src/widgets/qmenubar.h b/src/widgets/ntqmenubar.h
index 2878c3dd5..ae2be8d1e 100644
--- a/src/widgets/qmenubar.h
+++ b/src/widgets/ntqmenubar.h
@@ -42,9 +42,9 @@
 #define TQMENUBAR_H
 
 #ifndef QT_H
-#include "qpopupmenu.h" // ### remove or keep for users' convenience?
-#include "qframe.h"
-#include "qmenudata.h"
+#include "ntqpopupmenu.h" // ### remove or keep for users' convenience?
+#include "ntqframe.h"
+#include "ntqmenudata.h"
 #endif // QT_H
 
 #ifndef QT_NO_MENUBAR
diff --git a/src/widgets/qmenudata.h b/src/widgets/ntqmenudata.h
index 71f9a6cfe..fa6d860ee 100644
--- a/src/widgets/qmenudata.h
+++ b/src/widgets/ntqmenudata.h
@@ -42,12 +42,12 @@
 #define TQMENUDATA_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qiconset.h" // conversion TQPixmap->TQIconset
-#include "qkeysequence.h"
-#include "qstring.h"
-#include "qsignal.h"
-#include "qfont.h"
+#include "ntqglobal.h"
+#include "ntqiconset.h" // conversion TQPixmap->TQIconset
+#include "ntqkeysequence.h"
+#include "ntqstring.h"
+#include "ntqsignal.h"
+#include "ntqfont.h"
 #endif // QT_H
 
 #ifndef QT_NO_MENUDATA
@@ -118,7 +118,7 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 typedef TQPtrList<TQMenuItem>	 TQMenuItemList;
 typedef TQPtrListIterator<TQMenuItem> TQMenuItemListIt;
 
diff --git a/src/widgets/qmultilineedit.h b/src/widgets/ntqmultilineedit.h
index 16f36abd1..08b0c9519 100644
--- a/src/widgets/qmultilineedit.h
+++ b/src/widgets/ntqmultilineedit.h
@@ -42,7 +42,7 @@
 #define TQMULTILINEEDIT_H
 
 #ifndef QT_H
-#include "qtextedit.h"
+#include "ntqtextedit.h"
 #endif // QT_H
 
 #ifndef QT_NO_MULTILINEEDIT
diff --git a/src/widgets/qpopupmenu.h b/src/widgets/ntqpopupmenu.h
index 5e7d10f9c..d3b114b1a 100644
--- a/src/widgets/qpopupmenu.h
+++ b/src/widgets/ntqpopupmenu.h
@@ -42,8 +42,8 @@
 #define TQPOPUPMENU_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qmenudata.h"
+#include "ntqframe.h"
+#include "ntqmenudata.h"
 #endif // QT_H
 
 #ifndef QT_NO_POPUPMENU
diff --git a/src/widgets/qprogressbar.h b/src/widgets/ntqprogressbar.h
index 76463f1e7..b848235c4 100644
--- a/src/widgets/qprogressbar.h
+++ b/src/widgets/ntqprogressbar.h
@@ -42,7 +42,7 @@
 #define TQPROGRESSBAR_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_PROGRESSBAR
diff --git a/src/widgets/qpushbutton.h b/src/widgets/ntqpushbutton.h
index 5824802e7..9f74aae31 100644
--- a/src/widgets/qpushbutton.h
+++ b/src/widgets/ntqpushbutton.h
@@ -42,8 +42,8 @@
 #define TQPUSHBUTTON_H
 
 #ifndef QT_H
-#include "qbutton.h"
-#include "qiconset.h"
+#include "ntqbutton.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_PUSHBUTTON
diff --git a/src/widgets/qradiobutton.h b/src/widgets/ntqradiobutton.h
index 6c9546314..9ceb30782 100644
--- a/src/widgets/qradiobutton.h
+++ b/src/widgets/ntqradiobutton.h
@@ -42,7 +42,7 @@
 #define TQRADIOBUTTON_H
 
 #ifndef QT_H
-#include "qbutton.h"
+#include "ntqbutton.h"
 #endif // QT_H
 
 #ifndef QT_NO_RADIOBUTTON
diff --git a/src/widgets/qrangecontrol.h b/src/widgets/ntqrangecontrol.h
index f438ca7aa..940711cce 100644
--- a/src/widgets/qrangecontrol.h
+++ b/src/widgets/ntqrangecontrol.h
@@ -42,8 +42,8 @@
 #define TQRANGECONTROL_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qframe.h"
+#include "ntqglobal.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_RANGECONTROL
diff --git a/src/widgets/qscrollbar.h b/src/widgets/ntqscrollbar.h
index c3552cf41..be9229015 100644
--- a/src/widgets/qscrollbar.h
+++ b/src/widgets/ntqscrollbar.h
@@ -44,8 +44,8 @@
 class TQTimer;
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qrangecontrol.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
 #endif // QT_H
 
 #ifndef QT_NO_SCROLLBAR
diff --git a/src/widgets/qscrollview.h b/src/widgets/ntqscrollview.h
index a935f8e3c..2de0e6a5b 100644
--- a/src/widgets/qscrollview.h
+++ b/src/widgets/ntqscrollview.h
@@ -41,8 +41,8 @@
 #define TQSCROLLVIEW_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qscrollbar.h"
+#include "ntqframe.h"
+#include "ntqscrollbar.h"
 #endif // QT_H
 
 #ifndef QT_NO_SCROLLVIEW
diff --git a/src/widgets/qslider.h b/src/widgets/ntqslider.h
index 4d80b4fab..2a87d3bf3 100644
--- a/src/widgets/qslider.h
+++ b/src/widgets/ntqslider.h
@@ -42,8 +42,8 @@
 #define TQSLIDER_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qrangecontrol.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
 #endif // QT_H
 
 #ifndef QT_NO_SLIDER
diff --git a/src/widgets/qspinbox.h b/src/widgets/ntqspinbox.h
index 8bb8dc9aa..df4a15421 100644
--- a/src/widgets/qspinbox.h
+++ b/src/widgets/ntqspinbox.h
@@ -42,8 +42,8 @@
 #define TQSPINBOX_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qrangecontrol.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
 #endif // QT_H
 
 #ifndef QT_NO_SPINBOX
diff --git a/src/widgets/qsplashscreen.h b/src/widgets/ntqsplashscreen.h
index 9c4660e20..10c4e5c6d 100644
--- a/src/widgets/qsplashscreen.h
+++ b/src/widgets/ntqsplashscreen.h
@@ -40,8 +40,8 @@
 #define TQSPLASHSCREEN_H
 
 #ifndef QT_H
-#include "qpixmap.h"
-#include "qwidget.h"
+#include "ntqpixmap.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_SPLASHSCREEN
diff --git a/src/widgets/qsplitter.h b/src/widgets/ntqsplitter.h
index d614bbbec..8e05120e1 100644
--- a/src/widgets/qsplitter.h
+++ b/src/widgets/ntqsplitter.h
@@ -42,8 +42,8 @@
 #define TQSPLITTER_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qvaluelist.h"
+#include "ntqframe.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 #ifndef QT_NO_SPLITTER
diff --git a/src/widgets/qstatusbar.h b/src/widgets/ntqstatusbar.h
index 9591892f0..1402b2ff7 100644
--- a/src/widgets/qstatusbar.h
+++ b/src/widgets/ntqstatusbar.h
@@ -42,7 +42,7 @@
 #define TQSTATUSBAR_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_STATUSBAR
diff --git a/src/widgets/qsyntaxhighlighter.h b/src/widgets/ntqsyntaxhighlighter.h
index 19d16f7c4..344211008 100644
--- a/src/widgets/qsyntaxhighlighter.h
+++ b/src/widgets/ntqsyntaxhighlighter.h
@@ -42,9 +42,9 @@
 #define TQSYNTAXHIGHLIGHTER_H
 
 #ifndef QT_H
-#include "qfont.h"
-#include "qcolor.h"
-#include "qstring.h"
+#include "ntqfont.h"
+#include "ntqcolor.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 class TQTextEdit;
diff --git a/src/widgets/qtabbar.h b/src/widgets/ntqtabbar.h
index 408632a17..5428e4c92 100644
--- a/src/widgets/qtabbar.h
+++ b/src/widgets/ntqtabbar.h
@@ -40,8 +40,8 @@
 #define TQTABBAR_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qptrlist.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TABBAR
diff --git a/src/widgets/qtabwidget.h b/src/widgets/ntqtabwidget.h
index 9110af889..439eadf0a 100644
--- a/src/widgets/qtabwidget.h
+++ b/src/widgets/ntqtabwidget.h
@@ -42,8 +42,8 @@
 #define TQTABWIDGET_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qiconset.h"
+#include "ntqwidget.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_TABWIDGET
diff --git a/src/widgets/qtextbrowser.h b/src/widgets/ntqtextbrowser.h
index 12f8fb833..c9a3e5f58 100644
--- a/src/widgets/qtextbrowser.h
+++ b/src/widgets/ntqtextbrowser.h
@@ -42,10 +42,10 @@
 #define TQTEXTBROWSER_H
 
 #ifndef QT_H
-#include "qptrlist.h"
-#include "qpixmap.h"
-#include "qcolor.h"
-#include "qtextedit.h"
+#include "ntqptrlist.h"
+#include "ntqpixmap.h"
+#include "ntqcolor.h"
+#include "ntqtextedit.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTBROWSER
diff --git a/src/widgets/qtextedit.h b/src/widgets/ntqtextedit.h
index ac334a58e..b3e28463d 100644
--- a/src/widgets/qtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -42,11 +42,11 @@
 #define TQTEXTEDIT_H
 
 #ifndef QT_H
-#include "qscrollview.h"
-#include "qstylesheet.h"
-#include "qptrvector.h"
-#include "qvaluelist.h"
-#include "qptrlist.h"
+#include "ntqscrollview.h"
+#include "ntqstylesheet.h"
+#include "ntqptrvector.h"
+#include "ntqvaluelist.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTEDIT
diff --git a/src/widgets/qtextview.h b/src/widgets/ntqtextview.h
index 75c7c3a1d..71c568564 100644
--- a/src/widgets/qtextview.h
+++ b/src/widgets/ntqtextview.h
@@ -42,7 +42,7 @@
 #define TQTEXTVIEW_H
 
 #ifndef QT_H
-#include "qtextedit.h"
+#include "ntqtextedit.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTVIEW
diff --git a/src/widgets/qtoolbar.h b/src/widgets/ntqtoolbar.h
index 894f2afab..f8237f3af 100644
--- a/src/widgets/qtoolbar.h
+++ b/src/widgets/ntqtoolbar.h
@@ -42,7 +42,7 @@
 #define TQTOOLBAR_H
 
 #ifndef QT_H
-#include "qdockwindow.h"
+#include "ntqdockwindow.h"
 #endif // QT_H
 
 #ifndef QT_NO_TOOLBAR
diff --git a/src/widgets/qtoolbox.h b/src/widgets/ntqtoolbox.h
index 717200be5..07e128e16 100644
--- a/src/widgets/qtoolbox.h
+++ b/src/widgets/ntqtoolbox.h
@@ -42,8 +42,8 @@
 #define TQTOOLBOX_H
 
 #ifndef QT_H
-#include <qframe.h>
-#include <qiconset.h>
+#include <ntqframe.h>
+#include <ntqiconset.h>
 #endif // QT_H
 
 #ifndef QT_NO_TOOLBOX
diff --git a/src/widgets/qtoolbutton.h b/src/widgets/ntqtoolbutton.h
index ce187e8a5..ac2c2df45 100644
--- a/src/widgets/qtoolbutton.h
+++ b/src/widgets/ntqtoolbutton.h
@@ -42,10 +42,10 @@
 #define TQTOOLBUTTON_H
 
 #ifndef QT_H
-#include "qbutton.h"
-#include "qstring.h"
-#include "qpixmap.h"
-#include "qiconset.h"
+#include "ntqbutton.h"
+#include "ntqstring.h"
+#include "ntqpixmap.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_TOOLBUTTON
diff --git a/src/widgets/qtooltip.h b/src/widgets/ntqtooltip.h
index 37f91e5f2..55b3817b1 100644
--- a/src/widgets/qtooltip.h
+++ b/src/widgets/ntqtooltip.h
@@ -40,7 +40,7 @@
 #define TQTOOLTIP_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_TOOLTIP
diff --git a/src/widgets/qvalidator.h b/src/widgets/ntqvalidator.h
index b24c94989..04902acd4 100644
--- a/src/widgets/qvalidator.h
+++ b/src/widgets/ntqvalidator.h
@@ -42,9 +42,9 @@
 #define TQVALIDATOR_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qstring.h" // char*->TQString conversion
-#include "qregexp.h" // TQString->TQRegExp conversion
+#include "ntqobject.h"
+#include "ntqstring.h" // char*->TQString conversion
+#include "ntqregexp.h" // TQString->TQRegExp conversion
 #endif // QT_H
 
 #ifndef QT_NO_VALIDATOR
diff --git a/src/widgets/qvbox.h b/src/widgets/ntqvbox.h
index 3558997c1..740a2811c 100644
--- a/src/widgets/qvbox.h
+++ b/src/widgets/ntqvbox.h
@@ -42,7 +42,7 @@
 #define TQVBOX_H
 
 #ifndef QT_H
-#include "qhbox.h"
+#include "ntqhbox.h"
 #endif // QT_H
 
 #ifndef QT_NO_VBOX
diff --git a/src/widgets/qvbuttongroup.h b/src/widgets/ntqvbuttongroup.h
index 8f17ce1c4..41d3c263c 100644
--- a/src/widgets/qvbuttongroup.h
+++ b/src/widgets/ntqvbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQVBUTTONGROUP_H
 
 #ifndef QT_H
-#include "qbuttongroup.h"
+#include "ntqbuttongroup.h"
 #endif // QT_H
 
 #ifndef QT_NO_VBUTTONGROUP
diff --git a/src/widgets/qvgroupbox.h b/src/widgets/ntqvgroupbox.h
index e00db426e..f93158af4 100644
--- a/src/widgets/qvgroupbox.h
+++ b/src/widgets/ntqvgroupbox.h
@@ -42,7 +42,7 @@
 #define TQVGROUPBOX_H
 
 #ifndef QT_H
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #endif // QT_H
 
 #ifndef QT_NO_VGROUPBOX
diff --git a/src/widgets/qwhatsthis.h b/src/widgets/ntqwhatsthis.h
index 365e673c6..e4cda6c1d 100644
--- a/src/widgets/qwhatsthis.h
+++ b/src/widgets/ntqwhatsthis.h
@@ -40,12 +40,12 @@
 #define TQWHATSTHIS_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_WHATSTHIS
 
-#include "qcursor.h"
+#include "ntqcursor.h"
 
 class TQToolButton;
 class TQPopupMenu;
diff --git a/src/widgets/qwidgetplugin.h b/src/widgets/ntqwidgetplugin.h
index 0163e00fd..d53bdd962 100644
--- a/src/widgets/qwidgetplugin.h
+++ b/src/widgets/ntqwidgetplugin.h
@@ -42,9 +42,9 @@
 #define TQWIDGETPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
-#include "qiconset.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
+#include "ntqiconset.h"
 #endif // QT_H
 #ifndef QT_NO_WIDGETPLUGIN
 
diff --git a/src/widgets/qwidgetstack.h b/src/widgets/ntqwidgetstack.h
index 466ce2cb3..bbb4275fb 100644
--- a/src/widgets/qwidgetstack.h
+++ b/src/widgets/ntqwidgetstack.h
@@ -42,9 +42,9 @@
 #define TQWIDGETSTACK_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qintdict.h"
-#include "qptrdict.h"
+#include "ntqframe.h"
+#include "ntqintdict.h"
+#include "ntqptrdict.h"
 #endif // QT_H
 
 #ifndef QT_NO_WIDGETSTACK
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 645e8e581..54eb894a1 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -36,24 +36,24 @@
 **
 **********************************************************************/
 
-#include "qaction.h"
+#include "ntqaction.h"
 
 #ifndef QT_NO_ACTION
 
-#include "qtoolbar.h"
-#include "qptrlist.h"
-#include "qpopupmenu.h"
-#include "qaccel.h"
-#include "qtoolbutton.h"
-#include "qcombobox.h"
-#include "qtooltip.h"
-#include "qwhatsthis.h"
-#include "qstatusbar.h"
-#include "qobjectlist.h"
+#include "ntqtoolbar.h"
+#include "ntqptrlist.h"
+#include "ntqpopupmenu.h"
+#include "ntqaccel.h"
+#include "ntqtoolbutton.h"
+#include "ntqcombobox.h"
+#include "ntqtooltip.h"
+#include "ntqwhatsthis.h"
+#include "ntqstatusbar.h"
+#include "ntqobjectlist.h"
 
 
 /*!
-    \class TQAction qaction.h
+    \class TQAction ntqaction.h
     \brief The TQAction class provides an abstract user interface
     action that can appear both in menus and tool bars.
 
@@ -1376,7 +1376,7 @@ void TQActionGroupPrivate::update( const TQActionGroup* that )
 }
 
 /*!
-    \class TQActionGroup qaction.h
+    \class TQActionGroup ntqaction.h
     \brief The TQActionGroup class groups actions together.
 
     \ingroup basic
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index 220dba2fe..a34486808 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -39,22 +39,22 @@
 **********************************************************************/
 
 #undef QT_NO_COMPAT
-#include "qbutton.h"
+#include "ntqbutton.h"
 #ifndef QT_NO_BUTTON
-#include "qbuttongroup.h"
-#include "qbitmap.h"
-#include "qpainter.h"
-#include "qtimer.h"
-#include "qaccel.h"
-#include "qpixmapcache.h"
-#include "qapplication.h"
-#include "qpushbutton.h"
-#include "qradiobutton.h"
-#include "qguardedptr.h"
+#include "ntqbuttongroup.h"
+#include "ntqbitmap.h"
+#include "ntqpainter.h"
+#include "ntqtimer.h"
+#include "ntqaccel.h"
+#include "ntqpixmapcache.h"
+#include "ntqapplication.h"
+#include "ntqpushbutton.h"
+#include "ntqradiobutton.h"
+#include "ntqguardedptr.h"
 #include "../kernel/qinternal_p.h"
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #define AUTO_REPEAT_DELAY  300
@@ -127,7 +127,7 @@ TQTimer *TQButton::timer()
 
 
 /*!
-    \class TQButton qbutton.h
+    \class TQButton ntqbutton.h
     \brief The TQButton class is the abstract base class of button
     widgets, providing functionality common to buttons.
 
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp
index b8aa7c85c..17bcd200b 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/qbuttongroup.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qbuttongroup.h"
+#include "ntqbuttongroup.h"
 #ifndef QT_NO_BUTTONGROUP
-#include "qbutton.h"
-#include "qptrlist.h"
-#include "qapplication.h"
-#include "qradiobutton.h"
+#include "ntqbutton.h"
+#include "ntqptrlist.h"
+#include "ntqapplication.h"
+#include "ntqradiobutton.h"
 
 
 
 /*!
-    \class TQButtonGroup qbuttongroup.h
+    \class TQButtonGroup ntqbuttongroup.h
     \brief The TQButtonGroup widget organizes TQButton widgets in a group.
 
     \ingroup organizers
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index 7b63674fd..b4982a167 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qcheckbox.h"
+#include "ntqcheckbox.h"
 #ifndef QT_NO_CHECKBOX
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpixmapcache.h"
-#include "qbitmap.h"
-#include "qtextstream.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqbitmap.h"
+#include "ntqtextstream.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 
 /*!
-    \class TQCheckBox qcheckbox.h
+    \class TQCheckBox ntqcheckbox.h
     \brief The TQCheckBox widget provides a checkbox with a text label.
 
     \ingroup basic
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index 1e12906f4..59fa0244b 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -38,29 +38,29 @@
 **
 **********************************************************************/
 
-#include "qcombobox.h"
+#include "ntqcombobox.h"
 #ifndef QT_NO_COMBOBOX
-#include "qpopupmenu.h"
-#include "qlistbox.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qstrlist.h"
-#include "qpixmap.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qlineedit.h"
-#include "qbitmap.h"
+#include "ntqpopupmenu.h"
+#include "ntqlistbox.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqstrlist.h"
+#include "ntqpixmap.h"
+#include "ntqtimer.h"
+#include "ntqapplication.h"
+#include "ntqlineedit.h"
+#include "ntqbitmap.h"
 #include "qeffects_p.h"
-#include "qstringlist.h"
-#include "qcombobox.h"
-#include "qstyle.h"
+#include "ntqstringlist.h"
+#include "ntqcombobox.h"
+#include "ntqstyle.h"
 #include <limits.h>
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 /*!
-    \class TQComboBox qcombobox.h
+    \class TQComboBox ntqcombobox.h
     \brief The TQComboBox widget is a combined button and popup list.
 
     \ingroup basic
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp
index 9f82aa519..6a8d274c6 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/qdatetimeedit.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qdatetimeedit.h"
+#include "ntqdatetimeedit.h"
 
 #ifndef QT_NO_DATETIMEEDIT
 
 #include "../kernel/qinternal_p.h"
 #include "../kernel/qrichtext_p.h"
-#include "qrangecontrol.h"
-#include "qapplication.h"
-#include "qpixmap.h"
-#include "qapplication.h"
-#include "qvaluelist.h"
-#include "qstring.h"
-#include "qstyle.h"
+#include "ntqrangecontrol.h"
+#include "ntqapplication.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
+#include "ntqvaluelist.h"
+#include "ntqstring.h"
+#include "ntqstyle.h"
 
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -845,7 +845,7 @@ public:
 
 
 /*!
-    \class TQDateEdit qdatetimeedit.h
+    \class TQDateEdit ntqdatetimeedit.h
     \brief The TQDateEdit class provides a date editor.
 
     \ingroup advanced
@@ -1781,7 +1781,7 @@ public:
 };
 
 /*!
-    \class TQTimeEdit qdatetimeedit.h
+    \class TQTimeEdit ntqdatetimeedit.h
     \brief The TQTimeEdit class provides a time editor.
 
     \ingroup advanced
@@ -2600,7 +2600,7 @@ public:
 };
 
 /*!
-    \class TQDateTimeEdit qdatetimeedit.h
+    \class TQDateTimeEdit ntqdatetimeedit.h
     \brief The TQDateTimeEdit class combines a TQDateEdit and TQTimeEdit
     widget into a single widget for editing datetimes.
 
diff --git a/src/widgets/qdial.cpp b/src/widgets/qdial.cpp
index b7736f5eb..683a634f7 100644
--- a/src/widgets/qdial.cpp
+++ b/src/widgets/qdial.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qdial.h"
+#include "ntqdial.h"
 
 #ifndef QT_NO_DIAL
 
-#include "qpainter.h"
-#include "qpointarray.h"
-#include "qcolor.h"
-#include "qapplication.h"
-#include "qregion.h"
-#include "qbitmap.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqpointarray.h"
+#include "ntqcolor.h"
+#include "ntqapplication.h"
+#include "ntqregion.h"
+#include "ntqbitmap.h"
+#include "ntqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #include <math.h> // sin(), cos(), atan()
@@ -87,7 +87,7 @@ public:
 
 
 /*!
-    \class TQDial qdial.h
+    \class TQDial ntqdial.h
 
     \brief The TQDial class provides a rounded range control (like a speedometer or potentiometer).
 
diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp
index d87288dc8..2aad8a193 100644
--- a/src/widgets/qdialogbuttons.cpp
+++ b/src/widgets/qdialogbuttons.cpp
@@ -39,17 +39,17 @@
 #include "qdialogbuttons_p.h"
 #ifndef QT_NO_DIALOGBUTTONS
 
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qguardedptr.h>
-#include <qmap.h>
-#include <qvariant.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqguardedptr.h>
+#include <ntqmap.h>
+#include <ntqvariant.h>
 #ifndef QT_NO_DIALOG
-#include <qdialog.h>
+#include <ntqdialog.h>
 #endif // QT_NO_DIALOG
-#include <qlayout.h>
-#include <qstyle.h>
-#include <qmap.h>
+#include <ntqlayout.h>
+#include <ntqstyle.h>
+#include <ntqmap.h>
 
 struct TQDialogButtonsPrivate
 {
diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h
index 6422eed9d..f6ecb3784 100644
--- a/src/widgets/qdialogbuttons_p.h
+++ b/src/widgets/qdialogbuttons_p.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 #endif
 
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index 767214c7e..cd56be0b3 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qdockarea.h"
+#include "ntqdockarea.h"
 
 #ifndef QT_NO_MAINWINDOW
-#include "qsplitter.h"
-#include "qlayout.h"
-#include "qptrvector.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qwidgetlist.h"
-#include "qmap.h"
-#include "qmainwindow.h"
+#include "ntqsplitter.h"
+#include "ntqlayout.h"
+#include "ntqptrvector.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqwidgetlist.h"
+#include "ntqmap.h"
+#include "ntqmainwindow.h"
 
 //#define TQDOCKAREA_DEBUG
 
@@ -451,7 +451,7 @@ int TQDockAreaLayout::widthForHeight( int h ) const
 
 
 /*!
-    \class TQDockArea qdockarea.h
+    \class TQDockArea ntqdockarea.h
     \brief The TQDockArea class manages and lays out TQDockWindows.
 
     \ingroup application
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 82fba58a7..867d64a7b 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -38,24 +38,24 @@
 **
 **********************************************************************/
 
-#include "qdockwindow.h"
+#include "ntqdockwindow.h"
 
 #ifndef QT_NO_MAINWINDOW
-#include "qdesktopwidget.h"
-#include "qdockarea.h"
+#include "ntqdesktopwidget.h"
+#include "ntqdockarea.h"
 #include "qwidgetresizehandler_p.h"
 #include "qtitlebar_p.h"
-#include "qpainter.h"
-#include "qapplication.h"
-#include "qtoolbutton.h"
-#include "qtoolbar.h"
-#include "qlayout.h"
-#include "qmainwindow.h"
-#include "qtimer.h"
-#include "qtooltip.h"
-#include "qguardedptr.h"
-#include "qcursor.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqapplication.h"
+#include "ntqtoolbutton.h"
+#include "ntqtoolbar.h"
+#include "ntqlayout.h"
+#include "ntqmainwindow.h"
+#include "ntqtimer.h"
+#include "ntqtooltip.h"
+#include "ntqguardedptr.h"
+#include "ntqcursor.h"
+#include "ntqstyle.h"
 
 #if defined(Q_WS_MAC9)
 #define MAC_DRAG_HACK
@@ -702,7 +702,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * )
 }
 
 /*!
-    \class TQDockWindow qdockwindow.h
+    \class TQDockWindow ntqdockwindow.h
     \brief The TQDockWindow class provides a widget which can be docked
     inside a TQDockArea or floated as a top level window on the
     desktop.
@@ -793,7 +793,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * )
     A dock window can have some preferred settings, for example, you
     can set a preferred offset from the left edge (or top edge for
     vertical dock areas) of the dock area using setOffset(). If you'd
-    prefer a dock window to start on a new \link qdockarea.html#lines
+    prefer a dock window to start on a new \link ntqdockarea.html#lines
     line\endlink when it is docked use setNewLine(). The
     setFixedExtentWidth() and setFixedExtentHeight() functions can be
     used to define the dock window's preferred size, and the
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index 47393ac56..0e5cf7846 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #ifndef QT_NO_EFFECTS
-#include "qwidget.h"
+#include "ntqwidget.h"
 #include "qeffects_p.h"
-#include "qpixmap.h"
-#include "qimage.h"
-#include "qtimer.h"
-#include "qdatetime.h"
-#include "qguardedptr.h"
-#include "qscrollview.h"
+#include "ntqpixmap.h"
+#include "ntqimage.h"
+#include "ntqtimer.h"
+#include "ntqdatetime.h"
+#include "ntqguardedptr.h"
+#include "ntqscrollview.h"
 
 /*
   Internal class to get access to protected TQWidget-members
diff --git a/src/widgets/qeffects_p.h b/src/widgets/qeffects_p.h
index 41de77214..aecfe423d 100644
--- a/src/widgets/qeffects_p.h
+++ b/src/widgets/qeffects_p.h
@@ -56,7 +56,7 @@
 //
 
 #ifndef QT_H
-#include "qnamespace.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 #ifndef QT_NO_EFFECTS
diff --git a/src/widgets/qframe.cpp b/src/widgets/qframe.cpp
index a820f6cb6..2af74737c 100644
--- a/src/widgets/qframe.cpp
+++ b/src/widgets/qframe.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qframe.h"
+#include "ntqframe.h"
 #ifndef QT_NO_FRAME
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qframe.h"
-#include "qbitmap.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqframe.h"
+#include "ntqbitmap.h"
+#include "ntqstyle.h"
 
 /*!
     \class TQFrame
diff --git a/src/widgets/qgrid.cpp b/src/widgets/qgrid.cpp
index d0584418c..97ab089e0 100644
--- a/src/widgets/qgrid.cpp
+++ b/src/widgets/qgrid.cpp
@@ -35,13 +35,13 @@
 **********************************************************************/
 
 
-#include "qgrid.h"
+#include "ntqgrid.h"
 #ifndef QT_NO_GRID
-#include "qlayout.h"
-#include "qapplication.h"
+#include "ntqlayout.h"
+#include "ntqapplication.h"
 
 /*!
-    \class TQGrid qgrid.h
+    \class TQGrid ntqgrid.h
     \brief The TQGrid widget provides simple geometry management of its children.
 
     \ingroup geomanagement
diff --git a/src/widgets/qgridview.cpp b/src/widgets/qgridview.cpp
index 146c31b97..e854d3dfe 100644
--- a/src/widgets/qgridview.cpp
+++ b/src/widgets/qgridview.cpp
@@ -39,14 +39,14 @@
 **********************************************************************/
 
 
-#include "qgridview.h"
+#include "ntqgridview.h"
 
 #ifndef QT_NO_GRIDVIEW
 
-#include "qpainter.h"
+#include "ntqpainter.h"
 
 /*!
-    \class TQGridView qgridview.h
+    \class TQGridView ntqgridview.h
     \brief The TQGridView class provides an abstract base for
     fixed-size grids.
 
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp
index 05f88387f..e6d2ad583 100644
--- a/src/widgets/qgroupbox.cpp
+++ b/src/widgets/qgroupbox.cpp
@@ -38,26 +38,26 @@
 **
 **********************************************************************/
 
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #ifndef QT_NO_GROUPBOX
-#include "qlayout.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qaccel.h"
-#include "qradiobutton.h"
-#include "qfocusdata.h"
-#include "qobjectlist.h"
-#include "qdrawutil.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qcheckbox.h"
-#include "qbuttongroup.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqaccel.h"
+#include "ntqradiobutton.h"
+#include "ntqfocusdata.h"
+#include "ntqobjectlist.h"
+#include "ntqdrawutil.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqcheckbox.h"
+#include "ntqbuttongroup.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 /*!
-    \class TQGroupBox qgroupbox.h
+    \class TQGroupBox ntqgroupbox.h
     \brief The TQGroupBox widget provides a group box frame with a title.
 
     \ingroup organizers
diff --git a/src/widgets/qhbox.cpp b/src/widgets/qhbox.cpp
index cda81fd90..89465fd4f 100644
--- a/src/widgets/qhbox.cpp
+++ b/src/widgets/qhbox.cpp
@@ -34,15 +34,15 @@
 **
 **********************************************************************/
 
-#include "qhbox.h"
+#include "ntqhbox.h"
 #ifndef QT_NO_HBOX
-#include "qlayout.h"
-#include "qapplication.h"
-#include "qobjectlist.h"
+#include "ntqlayout.h"
+#include "ntqapplication.h"
+#include "ntqobjectlist.h"
 
 
 /*!
-    \class TQHBox qhbox.h
+    \class TQHBox ntqhbox.h
     \brief The TQHBox widget provides horizontal geometry management
     for its child widgets.
 
diff --git a/src/widgets/qhbuttongroup.cpp b/src/widgets/qhbuttongroup.cpp
index f8f48d95b..2a72f76e3 100644
--- a/src/widgets/qhbuttongroup.cpp
+++ b/src/widgets/qhbuttongroup.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qhbuttongroup.h"
+#include "ntqhbuttongroup.h"
 #ifndef QT_NO_HBUTTONGROUP
 
 /*!
-    \class TQHButtonGroup qhbuttongroup.h
+    \class TQHButtonGroup ntqhbuttongroup.h
     \brief The TQHButtonGroup widget organizes TQButton widgets in a
     group with one horizontal row.
 
diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp
index 6925d10d4..e20fd3349 100644
--- a/src/widgets/qheader.cpp
+++ b/src/widgets/qheader.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qheader.h"
+#include "ntqheader.h"
 #ifndef QT_NO_HEADER
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qbitarray.h"
-#include "qptrvector.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqbitarray.h"
+#include "ntqptrvector.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 
 class TQHeaderData
 {
@@ -136,7 +136,7 @@ public:
 
 
 /*!
-    \class TQHeader qheader.h
+    \class TQHeader ntqheader.h
     \brief The TQHeader class provides a header row or column, e.g. for
     tables and listviews.
 
diff --git a/src/widgets/qhgroupbox.cpp b/src/widgets/qhgroupbox.cpp
index b06061e06..79324ee58 100644
--- a/src/widgets/qhgroupbox.cpp
+++ b/src/widgets/qhgroupbox.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qhgroupbox.h"
+#include "ntqhgroupbox.h"
 #ifndef QT_NO_HGROUPBOX
 
 /*!
-    \class TQHGroupBox qhgroupbox.h
+    \class TQHGroupBox ntqhgroupbox.h
 
     \brief The TQHGroupBox widget organizes widgets in a group with one
     horizontal row.
diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp
index 73e913dfe..c78b99104 100644
--- a/src/widgets/qlabel.cpp
+++ b/src/widgets/qlabel.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qlabel.h"
+#include "ntqlabel.h"
 #ifndef QT_NO_LABEL
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qaccel.h"
-#include "qmovie.h"
-#include "qimage.h"
-#include "qbitmap.h"
-#include "qpicture.h"
-#include "qapplication.h"
-#include "qsimplerichtext.h"
-#include "qstylesheet.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqaccel.h"
+#include "ntqmovie.h"
+#include "ntqimage.h"
+#include "ntqbitmap.h"
+#include "ntqpicture.h"
+#include "ntqapplication.h"
+#include "ntqsimplerichtext.h"
+#include "ntqstylesheet.h"
+#include "ntqstyle.h"
 
 class TQLabelPrivate
 {
@@ -67,7 +67,7 @@ public:
 
 
 /*!
-    \class TQLabel qlabel.h
+    \class TQLabel ntqlabel.h
     \brief The TQLabel widget provides a text or image display.
 
     \ingroup basic
diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp
index 4937c907c..99eddf56d 100644
--- a/src/widgets/qlcdnumber.cpp
+++ b/src/widgets/qlcdnumber.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qlcdnumber.h"
+#include "ntqlcdnumber.h"
 #ifndef QT_NO_LCDNUMBER
-#include "qbitarray.h"
-#include "qpainter.h"
+#include "ntqbitarray.h"
+#include "ntqpainter.h"
 
 
 /*!
-    \class TQLCDNumber qlcdnumber.h
+    \class TQLCDNumber ntqlcdnumber.h
 
     \brief The TQLCDNumber widget displays a number with LCD-like digits.
 
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 2a4ef1c47..74976e2ef 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -38,37 +38,37 @@
 **
 **********************************************************************/
 
-#include "qlineedit.h"
+#include "ntqlineedit.h"
 #ifndef QT_NO_LINEEDIT
 
 // Keep this position to avoid patch rejection
 #ifndef QT_NO_IM
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 #endif
 
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qfontmetrics.h"
-#include "qpixmap.h"
-#include "qclipboard.h"
-#include "qapplication.h"
-#include "qvalidator.h"
-#include "qdragobject.h"
-#include "qtimer.h"
-#include "qpopupmenu.h"
-#include "qstringlist.h"
-#include "qguardedptr.h"
-#include "qstyle.h"
-#include "qwhatsthis.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqfontmetrics.h"
+#include "ntqpixmap.h"
+#include "ntqclipboard.h"
+#include "ntqapplication.h"
+#include "ntqvalidator.h"
+#include "ntqdragobject.h"
+#include "ntqtimer.h"
+#include "ntqpopupmenu.h"
+#include "ntqstringlist.h"
+#include "ntqguardedptr.h"
+#include "ntqstyle.h"
+#include "ntqwhatsthis.h"
 #include "../kernel/qinternal_p.h"
 #include "private/qtextlayout_p.h"
-#include "qvaluevector.h"
+#include "ntqvaluevector.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #ifndef QT_NO_ACCEL
-#include "qkeysequence.h"
+#include "ntqkeysequence.h"
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
 #define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index c8ca44c91..2dc526655 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -38,28 +38,28 @@
 **
 **********************************************************************/
 
-#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
 
-#include "qlistbox.h"
+#include "ntqlistbox.h"
 #ifndef QT_NO_LISTBOX
-#include "qmemarray.h"
-#include "qfontmetrics.h"
-#include "qpainter.h"
-#include "qstrlist.h"
-#include "qpixmap.h"
-#include "qapplication.h"
-#include "qptrdict.h"
-#include "qtimer.h"
-#include "qstringlist.h"
-#include "qstyle.h"
-#include "qpopupmenu.h"
-#include "qguardedptr.h"
+#include "ntqmemarray.h"
+#include "ntqfontmetrics.h"
+#include "ntqpainter.h"
+#include "ntqstrlist.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
+#include "ntqptrdict.h"
+#include "ntqtimer.h"
+#include "ntqstringlist.h"
+#include "ntqstyle.h"
+#include "ntqpopupmenu.h"
+#include "ntqguardedptr.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #include <stdlib.h>
@@ -161,7 +161,7 @@ TQListBoxPrivate::~TQListBoxPrivate()
 
 
 /*!
-    \class TQListBoxItem qlistbox.h
+    \class TQListBoxItem ntqlistbox.h
     \brief The TQListBoxItem class is the base class of all list box items.
 
     This class is an abstract base class used for all list box items.
@@ -525,7 +525,7 @@ bool TQListBoxItem::isSelectable() const
 
 
 /*!
-    \class TQListBoxText qlistbox.h
+    \class TQListBoxText ntqlistbox.h
     \brief The TQListBoxText class provides list box items that display text.
 
     \ingroup advanced
@@ -635,7 +635,7 @@ int TQListBoxText::rtti() const
 }
 
 /*!
-    \class TQListBoxPixmap qlistbox.h
+    \class TQListBoxPixmap ntqlistbox.h
     \brief The TQListBoxPixmap class provides list box items with a
     pixmap and optional text.
 
@@ -806,7 +806,7 @@ int TQListBoxPixmap::rtti() const
 }
 
 /*!
-    \class TQListBox qlistbox.h
+    \class TQListBox ntqlistbox.h
     \brief The TQListBox widget provides a list of selectable, read-only items.
 
     \ingroup advanced
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 7340bf35b..18d87f624 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -38,34 +38,34 @@
 **
 **********************************************************************/
 
-#include "qlistview.h"
+#include "ntqlistview.h"
 #ifndef QT_NO_LISTVIEW
-#include "qtimer.h"
-#include "qheader.h"
-#include "qpainter.h"
-#include "qcursor.h"
-#include "qptrstack.h"
-#include "qptrlist.h"
-#include "qstrlist.h"
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qdatetime.h"
-#include "qptrdict.h"
-#include "qptrvector.h"
-#include "qiconset.h"
-#include "qcleanuphandler.h"
-#include "qpixmapcache.h"
-#include "qpopupmenu.h"
-#include "qtl.h"
-#include "qdragobject.h"
-#include "qlineedit.h"
-#include "qvbox.h"
-#include "qtooltip.h"
-#include "qstyle.h"
-#include "qstylesheet.h"
+#include "ntqtimer.h"
+#include "ntqheader.h"
+#include "ntqpainter.h"
+#include "ntqcursor.h"
+#include "ntqptrstack.h"
+#include "ntqptrlist.h"
+#include "ntqstrlist.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqdatetime.h"
+#include "ntqptrdict.h"
+#include "ntqptrvector.h"
+#include "ntqiconset.h"
+#include "ntqcleanuphandler.h"
+#include "ntqpixmapcache.h"
+#include "ntqpopupmenu.h"
+#include "ntqtl.h"
+#include "ntqdragobject.h"
+#include "ntqlineedit.h"
+#include "ntqvbox.h"
+#include "ntqtooltip.h"
+#include "ntqstyle.h"
+#include "ntqstylesheet.h"
 #include "../kernel/qinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 const int Unsorted = 16383;
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index 3da52b6f7..26a96dbeb 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -38,30 +38,30 @@
 **
 **********************************************************************/
 
-#include "qmainwindow.h"
+#include "ntqmainwindow.h"
 #ifndef QT_NO_MAINWINDOW
 
-#include "qtimer.h"
-#include "qlayout.h"
-#include "qobjectlist.h"
-#include "qintdict.h"
-#include "qapplication.h"
-#include "qptrlist.h"
-#include "qmap.h"
-#include "qcursor.h"
-#include "qpainter.h"
-#include "qmenubar.h"
-#include "qpopupmenu.h"
-#include "qtoolbar.h"
-#include "qstatusbar.h"
-#include "qscrollview.h"
-#include "qtooltip.h"
-#include "qdatetime.h"
-#include "qwhatsthis.h"
-#include "qbitmap.h"
-#include "qdockarea.h"
-#include "qstringlist.h"
-#include "qstyle.h"
+#include "ntqtimer.h"
+#include "ntqlayout.h"
+#include "ntqobjectlist.h"
+#include "ntqintdict.h"
+#include "ntqapplication.h"
+#include "ntqptrlist.h"
+#include "ntqmap.h"
+#include "ntqcursor.h"
+#include "ntqpainter.h"
+#include "ntqmenubar.h"
+#include "ntqpopupmenu.h"
+#include "ntqtoolbar.h"
+#include "ntqstatusbar.h"
+#include "ntqscrollview.h"
+#include "ntqtooltip.h"
+#include "ntqdatetime.h"
+#include "ntqwhatsthis.h"
+#include "ntqbitmap.h"
+#include "ntqdockarea.h"
+#include "ntqstringlist.h"
+#include "ntqstyle.h"
 #ifdef Q_WS_MACX
 #  include "qt_mac.h"
 #endif
@@ -507,7 +507,7 @@ void TQHideToolTip::maybeTip( const TQPoint &pos )
 #endif
 
 /*!
-    \class TQMainWindow qmainwindow.h
+    \class TQMainWindow ntqmainwindow.h
     \brief The TQMainWindow class provides a main application window,
     with a menu bar, dock windows (e.g. for toolbars), and a status
     bar.
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index ebe231853..96a111b49 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-// qmainwindow.h before qmenubar.h because of GCC-2.7.* compatibility
+// ntqmainwindow.h before ntqmenubar.h because of GCC-2.7.* compatibility
 // ### could be reorganised by discarding INCLUDE_MENUITEM_DEF and put
 // the relevant declarations in a private header?
-#include "qmainwindow.h"
+#include "ntqmainwindow.h"
 #ifndef QT_NO_MENUBAR
-#include "qmenubar.h"
-#include "qpopupmenu.h"
-#include "qaccel.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qapplication.h"
-#include "qguardedptr.h"
-#include "qlayout.h"
-#include "qcleanuphandler.h"
+#include "ntqmenubar.h"
+#include "ntqpopupmenu.h"
+#include "ntqaccel.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqapplication.h"
+#include "ntqguardedptr.h"
+#include "ntqlayout.h"
+#include "ntqcleanuphandler.h"
 #include "../kernel/qinternal_p.h"
-#include "qstyle.h"
-#include "qtimer.h"
+#include "ntqstyle.h"
+#include "ntqtimer.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 class TQMenuDataData {
@@ -76,7 +76,7 @@ extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp
 #endif
 
 /*!
-    \class TQMenuBar qmenubar.h
+    \class TQMenuBar ntqmenubar.h
     \brief The TQMenuBar class provides a horizontal menu bar.
 
     \ingroup application
diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp
index a5c2c8b09..4bacd22f8 100644
--- a/src/widgets/qmenudata.cpp
+++ b/src/widgets/qmenudata.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qmenudata.h"
+#include "ntqmenudata.h"
 #ifndef QT_NO_MENUDATA
-#include "qpopupmenu.h"
-#include "qmenubar.h"
-#include "qapplication.h"
-#include "qguardedptr.h"
+#include "ntqpopupmenu.h"
+#include "ntqmenubar.h"
+#include "ntqapplication.h"
+#include "ntqguardedptr.h"
 
 class TQMenuItemData {
 public:
@@ -62,7 +62,7 @@ TQMenuDataData::TQMenuDataData()
 {}
 
 /*!
-    \class TQMenuData qmenudata.h
+    \class TQMenuData ntqmenudata.h
     \brief The TQMenuData class is a base class for TQMenuBar and TQPopupMenu.
 
     \ingroup misc
@@ -415,7 +415,7 @@ void TQMenuData::removePopup( TQPopupMenu *popup )
     Returns the allocated menu identifier number (\a id if \a id >= 0).
 
     \sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
-    qnamespace.h
+    ntqnamespace.h
 */
 
 int TQMenuData::insertItem( const TQString &text,
@@ -442,7 +442,7 @@ int TQMenuData::insertItem( const TQString &text,
     Returns the allocated menu identifier number (\a id if \a id >= 0).
 
     \sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
-    qnamespace.h
+    ntqnamespace.h
 */
 
 int TQMenuData::insertItem( const TQIconSet& icon,
@@ -504,7 +504,7 @@ int TQMenuData::insertItem( const TQPixmap &pixmap,
     Returns the allocated menu identifier number (\a id if \a id >= 0).
 
     \sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
-    qnamespace.h
+    ntqnamespace.h
 */
 
 int TQMenuData::insertItem( const TQIconSet& icon,
@@ -864,7 +864,7 @@ void TQMenuData::clear()
     item \a id, or 0 if it has no accelerator key or if there is no
     such menu item.
 
-    \sa setAccel(), TQAccel, qnamespace.h
+    \sa setAccel(), TQAccel, ntqnamespace.h
 */
 
 TQKeySequence TQMenuData::accel( int id ) const
@@ -880,7 +880,7 @@ TQKeySequence TQMenuData::accel( int id ) const
 
     An accelerator key consists of a key code and a combination of the
     modifiers \c SHIFT, \c CTRL, \c ALT or \c UNICODE_ACCEL (OR'ed or
-    added). The header file \c qnamespace.h contains a list of key
+    added). The header file \c ntqnamespace.h contains a list of key
     codes.
 
     Defining an accelerator key produces a text that is added to the
@@ -1462,7 +1462,7 @@ TQString TQMenuData::whatsThis( int id ) const
 
 
 /*!
-    \class TQCustomMenuItem qmenudata.h
+    \class TQCustomMenuItem ntqmenudata.h
     \brief The TQCustomMenuItem class is an abstract base class for custom menu items in popup menus.
 
     \ingroup misc
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index affe2febe..e34d3f9b3 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -38,24 +38,24 @@
 **
 **********************************************************************/
 
-#include "qmultilineedit.h"
+#include "ntqmultilineedit.h"
 #ifndef QT_NO_MULTILINEEDIT
-#include "qpainter.h"
-#include "qscrollbar.h"
-#include "qcursor.h"
-#include "qclipboard.h"
-#include "qpixmap.h"
-#include "qregexp.h"
-#include "qapplication.h"
-#include "qdragobject.h"
-#include "qpopupmenu.h"
-#include "qtimer.h"
-#include "qdict.h"
+#include "ntqpainter.h"
+#include "ntqscrollbar.h"
+#include "ntqcursor.h"
+#include "ntqclipboard.h"
+#include "ntqpixmap.h"
+#include "ntqregexp.h"
+#include "ntqapplication.h"
+#include "ntqdragobject.h"
+#include "ntqpopupmenu.h"
+#include "ntqtimer.h"
+#include "ntqdict.h"
 #include "../kernel/qrichtext_p.h"
 
 
 /*!
-  \class TQMultiLineEdit qmultilineedit.h
+  \class TQMultiLineEdit ntqmultilineedit.h
   \obsolete
 
   \brief The TQMultiLineEdit widget is a simple editor for inputting text.
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 77d7b9947..9c03b0319 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -38,26 +38,26 @@
 **
 **********************************************************************/
 
-#include "qpopupmenu.h"
+#include "ntqpopupmenu.h"
 #ifndef QT_NO_POPUPMENU
-#include "qmenubar.h"
-#include "qaccel.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qapplication.h"
-#include "qpixmap.h"
-#include "qpixmapcache.h"
-#include "qtimer.h"
-#include "qwhatsthis.h"
-#include "qobjectlist.h"
-#include "qguardedptr.h"
+#include "ntqmenubar.h"
+#include "ntqaccel.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqapplication.h"
+#include "ntqpixmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqtimer.h"
+#include "ntqwhatsthis.h"
+#include "ntqobjectlist.h"
+#include "ntqguardedptr.h"
 #include "qeffects_p.h"
-#include "qcursor.h"
-#include "qstyle.h"
-#include "qtimer.h"
-#include "qdatetime.h"
+#include "ntqcursor.h"
+#include "ntqstyle.h"
+#include "ntqtimer.h"
+#include "ntqdatetime.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 //#define ANIMATED_POPUP
@@ -129,7 +129,7 @@ static TQMenuItem* whatsThisItem = 0;
 #endif
 
 /*!
-    \class TQPopupMenu qpopupmenu.h
+    \class TQPopupMenu ntqpopupmenu.h
     \brief The TQPopupMenu class provides a popup menu widget.
 
     \ingroup application
diff --git a/src/widgets/qprogressbar.cpp b/src/widgets/qprogressbar.cpp
index 345038e8b..09d6befd7 100644
--- a/src/widgets/qprogressbar.cpp
+++ b/src/widgets/qprogressbar.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qprogressbar.h"
+#include "ntqprogressbar.h"
 #ifndef QT_NO_PROGRESSBAR
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqstyle.h"
 #include "../kernel/qinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #include <limits.h>
 
 /*!
-    \class TQProgressBar qprogressbar.h
+    \class TQProgressBar ntqprogressbar.h
     \brief The TQProgressBar widget provides a horizontal progress bar.
 
     \ingroup advanced
diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp
index 31641161e..cbb45e443 100644
--- a/src/widgets/qpushbutton.cpp
+++ b/src/widgets/qpushbutton.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-#include "qpushbutton.h"
+#include "ntqpushbutton.h"
 #ifndef QT_NO_PUSHBUTTON
-#include "qdialog.h"
-#include "qfontmetrics.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qbitmap.h"
-#include "qpopupmenu.h"
-#include "qguardedptr.h"
-#include "qapplication.h"
-#include "qtoolbar.h"
-#include "qstyle.h"
+#include "ntqdialog.h"
+#include "ntqfontmetrics.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqbitmap.h"
+#include "ntqpopupmenu.h"
+#include "ntqguardedptr.h"
+#include "ntqapplication.h"
+#include "ntqtoolbar.h"
+#include "ntqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 /*!
-    \class TQPushButton qpushbutton.h
+    \class TQPushButton ntqpushbutton.h
     \brief The TQPushButton widget provides a command button.
 
     \ingroup basic
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index 39f0e9740..e4c343f90 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qradiobutton.h"
+#include "ntqradiobutton.h"
 #ifndef QT_NO_RADIOBUTTON
-#include "qbuttongroup.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpixmapcache.h"
-#include "qbitmap.h"
-#include "qtextstream.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqbuttongroup.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqbitmap.h"
+#include "ntqtextstream.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 
 /*!
-    \class TQRadioButton qradiobutton.h
+    \class TQRadioButton ntqradiobutton.h
     \brief The TQRadioButton widget provides a radio button with a text or pixmap label.
 
     \ingroup basic
diff --git a/src/widgets/qrangecontrol.cpp b/src/widgets/qrangecontrol.cpp
index a561b3d77..036f8c7b6 100644
--- a/src/widgets/qrangecontrol.cpp
+++ b/src/widgets/qrangecontrol.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qrangecontrol.h"
+#include "ntqrangecontrol.h"
 #ifndef QT_NO_RANGECONTROL
-#include "qglobal.h"
+#include "ntqglobal.h"
 #include <limits.h>
 
 static bool sumOutOfRange(int current, int add);
 
 
 /*!
-    \class TQRangeControl qrangecontrol.h
+    \class TQRangeControl ntqrangecontrol.h
     \brief The TQRangeControl class provides an integer value within a range.
 
     \ingroup misc
diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp
index e73dc2ed5..cd5b73f29 100644
--- a/src/widgets/qscrollbar.cpp
+++ b/src/widgets/qscrollbar.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "qscrollbar.h"
+#include "ntqscrollbar.h"
 #ifndef QT_NO_SCROLLBAR
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qapplication.h"
-#include "qtimer.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqapplication.h"
+#include "ntqtimer.h"
+#include "ntqstyle.h"
 #ifndef QT_NO_CURSOR
-#include <qcursor.h>
+#include <ntqcursor.h>
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #include <limits.h>
 
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index 03cf1ae17..484e67da4 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qwidget.h"
+#include "ntqwidget.h"
 #ifndef QT_NO_SCROLLVIEW
-#include "qscrollbar.h"
-#include "qobjectlist.h"
-#include "qpainter.h"
-#include "qpixmap.h"
-#include "qcursor.h"
-#include "qfocusdata.h"
-#include "qscrollview.h"
-#include "qptrdict.h"
-#include "qapplication.h"
-#include "qtimer.h"
-#include "qstyle.h"
-#include "qlistview.h"
+#include "ntqscrollbar.h"
+#include "ntqobjectlist.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
+#include "ntqcursor.h"
+#include "ntqfocusdata.h"
+#include "ntqscrollview.h"
+#include "ntqptrdict.h"
+#include "ntqapplication.h"
+#include "ntqtimer.h"
+#include "ntqstyle.h"
+#include "ntqlistview.h"
 #ifdef Q_WS_MAC
 # include "qt_mac.h"
 #endif
@@ -348,7 +348,7 @@ void TQScrollViewData::viewportResized( int w, int h )
 
 
 /*!
-    \class TQScrollView qscrollview.h
+    \class TQScrollView ntqscrollview.h
     \brief The TQScrollView widget provides a scrolling area with on-demand scroll bars.
 
     \ingroup abstractwidgets
diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp
index 6c1349b71..e6b555a18 100644
--- a/src/widgets/qslider.cpp
+++ b/src/widgets/qslider.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qslider.h"
+#include "ntqslider.h"
 #ifndef QT_NO_SLIDER
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qtimer.h"
-#include "qbitmap.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqtimer.h"
+#include "ntqbitmap.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 static const int thresholdTime = 300;
diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp
index f92b3ac49..c4419cee2 100644
--- a/src/widgets/qspinbox.cpp
+++ b/src/widgets/qspinbox.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qspinbox.h"
+#include "ntqspinbox.h"
 #ifndef QT_NO_SPINBOX
 
-#include "qcursor.h"
-#include "qpushbutton.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qlineedit.h"
-#include "qvalidator.h"
-#include "qpixmapcache.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqcursor.h"
+#include "ntqpushbutton.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqlineedit.h"
+#include "ntqvalidator.h"
+#include "ntqpixmapcache.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 static bool sumOutOfRange(int current, int add)
diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp
index 080f2ee34..f0b6b7809 100644
--- a/src/widgets/qspinwidget.cpp
+++ b/src/widgets/qspinwidget.cpp
@@ -36,14 +36,14 @@
 **
 **********************************************************************/
 
-#include "qrangecontrol.h"
+#include "ntqrangecontrol.h"
 
 #ifndef QT_NO_SPINWIDGET
 
-#include "qrect.h"
-#include "qtimer.h"
-#include "qstyle.h"
-#include "qpainter.h"
+#include "ntqrect.h"
+#include "ntqtimer.h"
+#include "ntqstyle.h"
+#include "ntqpainter.h"
 
 class TQSpinWidgetPrivate
 {
diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/qsplashscreen.cpp
index fe18ebe27..6be1506be 100644
--- a/src/widgets/qsplashscreen.cpp
+++ b/src/widgets/qsplashscreen.cpp
@@ -36,13 +36,13 @@
 **
 **********************************************************************/
 
-#include "qsplashscreen.h"
+#include "ntqsplashscreen.h"
 
 #ifndef QT_NO_SPLASHSCREEN
 
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qpixmap.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
 
 class TQSplashScreenPrivate
 {
@@ -54,7 +54,7 @@ public:
 };
 
 /*!
-   \class TQSplashScreen qsplashscreen.h
+   \class TQSplashScreen ntqsplashscreen.h
    \brief The TQSplashScreen widget provides a splash screen that can
    be shown during application startup.
 
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp
index 7dd3f75e9..95ec5d5ae 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/qsplitter.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qsplitter.h"
+#include "ntqsplitter.h"
 #ifndef QT_NO_SPLITTER
 
-#include "qlayout.h"
+#include "ntqlayout.h"
 #include "../kernel/qlayoutengine_p.h"
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qdrawutil.h"
-#include "qmemarray.h"
-#include "qobjectlist.h"
-#include "qpainter.h"
-#include "qptrlist.h"
-#include "qstyle.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqdrawutil.h"
+#include "ntqmemarray.h"
+#include "ntqobjectlist.h"
+#include "ntqpainter.h"
+#include "ntqptrlist.h"
+#include "ntqstyle.h"
 
 const uint Default = QT_QSPLITTER_DEFAULT;
 
diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp
index c2c8a1570..ea4172e29 100644
--- a/src/widgets/qstatusbar.cpp
+++ b/src/widgets/qstatusbar.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qstatusbar.h"
+#include "ntqstatusbar.h"
 #ifndef QT_NO_STATUSBAR
 
-#include "qptrlist.h"
-#include "qlayout.h"
-#include "qpainter.h"
-#include "qtimer.h"
-#include "qdrawutil.h"
-#include "qstyle.h"
-#include "qsizegrip.h"
+#include "ntqptrlist.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
+#include "ntqtimer.h"
+#include "ntqdrawutil.h"
+#include "ntqstyle.h"
+#include "ntqsizegrip.h"
 
 /*!
-    \class TQStatusBar qstatusbar.h
+    \class TQStatusBar ntqstatusbar.h
     \brief The TQStatusBar class provides a horizontal bar suitable for
     presenting status information.
 
diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp
index bf8938bbc..6c97ac517 100644
--- a/src/widgets/qsyntaxhighlighter.cpp
+++ b/src/widgets/qsyntaxhighlighter.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qsyntaxhighlighter.h"
+#include "ntqsyntaxhighlighter.h"
 #include "private/qsyntaxhighlighter_p.h"
 
 #ifndef QT_NO_SYNTAXHIGHLIGHTER
 #include "../kernel/qrichtext_p.h"
-#include "qtextedit.h"
-#include "qtimer.h"
+#include "ntqtextedit.h"
+#include "ntqtimer.h"
 
 /*!
-    \class TQSyntaxHighlighter qsyntaxhighlighter.h
+    \class TQSyntaxHighlighter ntqsyntaxhighlighter.h
     \brief The TQSyntaxHighlighter class is a base class for
     implementing TQTextEdit syntax highlighters.
 
diff --git a/src/widgets/qsyntaxhighlighter_p.h b/src/widgets/qsyntaxhighlighter_p.h
index 28f7fa844..594a73e57 100644
--- a/src/widgets/qsyntaxhighlighter_p.h
+++ b/src/widgets/qsyntaxhighlighter_p.h
@@ -42,7 +42,7 @@
 #define TQSYNTAXHIGHLIGHTER_P_H
 
 #ifndef QT_NO_SYNTAXHIGHLIGHTER
-#include "qsyntaxhighlighter.h"
+#include "ntqsyntaxhighlighter.h"
 #include "private/qrichtext_p.h"
 
 class TQSyntaxHighlighterPrivate
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index a4917e9bf..9410e3e4a 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -3,66 +3,66 @@
 widgets {
 	WIDGETS_P	= widgets
 
-	HEADERS += $$WIDGETS_H/qbuttongroup.h \
-		  $$WIDGETS_H/qbutton.h \
+	HEADERS += $$WIDGETS_H/ntqbuttongroup.h \
+		  $$WIDGETS_H/ntqbutton.h \
 		  $$WIDGETS_P/qdialogbuttons_p.h \
-		  $$WIDGETS_H/qcheckbox.h \
-		  $$WIDGETS_H/qcombobox.h \
+		  $$WIDGETS_H/ntqcheckbox.h \
+		  $$WIDGETS_H/ntqcombobox.h \
 		  $$WIDGETS_P/qwidgetresizehandler_p.h \
-		  $$WIDGETS_H/qdial.h \
-		  $$WIDGETS_H/qdockarea.h \
-		  $$WIDGETS_H/qdockwindow.h \
-		  $$WIDGETS_H/qframe.h \
-		  $$WIDGETS_H/qgrid.h \
-		  $$WIDGETS_H/qgridview.h \
-		  $$WIDGETS_H/qgroupbox.h \
-		  $$WIDGETS_H/qhbuttongroup.h \
-		  $$WIDGETS_H/qheader.h \
-		  $$WIDGETS_H/qhgroupbox.h \
-		  $$WIDGETS_H/qhbox.h \
-		  $$WIDGETS_H/qlabel.h \
-		  $$WIDGETS_H/qlcdnumber.h \
-		  $$WIDGETS_H/qlineedit.h \
-		  $$WIDGETS_H/qlistbox.h \
-		  $$WIDGETS_H/qlistview.h \
-		  $$WIDGETS_H/qmainwindow.h \
-		  $$WIDGETS_H/qmenubar.h \
-		  $$WIDGETS_H/qmenudata.h \
-		  $$WIDGETS_H/qmultilineedit.h \
-		  $$WIDGETS_H/qpopupmenu.h \
-		  $$WIDGETS_H/qprogressbar.h \
-		  $$WIDGETS_H/qpushbutton.h \
-		  $$WIDGETS_H/qradiobutton.h \
-		  $$WIDGETS_H/qrangecontrol.h \
-		  $$WIDGETS_H/qscrollbar.h \
-		  $$WIDGETS_H/qscrollview.h \
-		  $$WIDGETS_H/qslider.h \
-		  $$WIDGETS_H/qsplashscreen.h \
-		  $$WIDGETS_H/qspinbox.h \
-		  $$WIDGETS_H/qsplitter.h \
-		  $$WIDGETS_H/qstatusbar.h \
-		  $$WIDGETS_H/qtabbar.h \
-		  $$WIDGETS_H/qsyntaxhighlighter.h \
+		  $$WIDGETS_H/ntqdial.h \
+		  $$WIDGETS_H/ntqdockarea.h \
+		  $$WIDGETS_H/ntqdockwindow.h \
+		  $$WIDGETS_H/ntqframe.h \
+		  $$WIDGETS_H/ntqgrid.h \
+		  $$WIDGETS_H/ntqgridview.h \
+		  $$WIDGETS_H/ntqgroupbox.h \
+		  $$WIDGETS_H/ntqhbuttongroup.h \
+		  $$WIDGETS_H/ntqheader.h \
+		  $$WIDGETS_H/ntqhgroupbox.h \
+		  $$WIDGETS_H/ntqhbox.h \
+		  $$WIDGETS_H/ntqlabel.h \
+		  $$WIDGETS_H/ntqlcdnumber.h \
+		  $$WIDGETS_H/ntqlineedit.h \
+		  $$WIDGETS_H/ntqlistbox.h \
+		  $$WIDGETS_H/ntqlistview.h \
+		  $$WIDGETS_H/ntqmainwindow.h \
+		  $$WIDGETS_H/ntqmenubar.h \
+		  $$WIDGETS_H/ntqmenudata.h \
+		  $$WIDGETS_H/ntqmultilineedit.h \
+		  $$WIDGETS_H/ntqpopupmenu.h \
+		  $$WIDGETS_H/ntqprogressbar.h \
+		  $$WIDGETS_H/ntqpushbutton.h \
+		  $$WIDGETS_H/ntqradiobutton.h \
+		  $$WIDGETS_H/ntqrangecontrol.h \
+		  $$WIDGETS_H/ntqscrollbar.h \
+		  $$WIDGETS_H/ntqscrollview.h \
+		  $$WIDGETS_H/ntqslider.h \
+		  $$WIDGETS_H/ntqsplashscreen.h \
+		  $$WIDGETS_H/ntqspinbox.h \
+		  $$WIDGETS_H/ntqsplitter.h \
+		  $$WIDGETS_H/ntqstatusbar.h \
+		  $$WIDGETS_H/ntqtabbar.h \
+		  $$WIDGETS_H/ntqsyntaxhighlighter.h \
 		  $$WIDGETS_P/qsyntaxhighlighter_p.h \
-		  $$WIDGETS_H/qtabwidget.h \
+		  $$WIDGETS_H/ntqtabwidget.h \
 		  $$WIDGETS_P/qtitlebar_p.h \
-		  $$WIDGETS_H/qtoolbar.h \
-		  $$WIDGETS_H/qtoolbox.h \
-		  $$WIDGETS_H/qtoolbutton.h \
-		  $$WIDGETS_H/qtooltip.h \
-		  $$WIDGETS_H/qvalidator.h \
-		  $$WIDGETS_H/qvbox.h \
-		  $$WIDGETS_H/qvbuttongroup.h \
-		  $$WIDGETS_H/qvgroupbox.h \
-		  $$WIDGETS_H/qwhatsthis.h \
-		  $$WIDGETS_H/qwidgetstack.h \
-		  $$WIDGETS_H/qaction.h \
-		  $$WIDGETS_H/qdatetimeedit.h \
-		  $$WIDGETS_H/qtextview.h \
-		  $$WIDGETS_H/qtextbrowser.h \
-		  $$WIDGETS_H/qtextedit.h \
+		  $$WIDGETS_H/ntqtoolbar.h \
+		  $$WIDGETS_H/ntqtoolbox.h \
+		  $$WIDGETS_H/ntqtoolbutton.h \
+		  $$WIDGETS_H/ntqtooltip.h \
+		  $$WIDGETS_H/ntqvalidator.h \
+		  $$WIDGETS_H/ntqvbox.h \
+		  $$WIDGETS_H/ntqvbuttongroup.h \
+		  $$WIDGETS_H/ntqvgroupbox.h \
+		  $$WIDGETS_H/ntqwhatsthis.h \
+		  $$WIDGETS_H/ntqwidgetstack.h \
+		  $$WIDGETS_H/ntqaction.h \
+		  $$WIDGETS_H/ntqdatetimeedit.h \
+		  $$WIDGETS_H/ntqtextview.h \
+		  $$WIDGETS_H/ntqtextbrowser.h \
+		  $$WIDGETS_H/ntqtextedit.h \
 		  $$WIDGETS_P/qwidgetinterface_p.h \
-		  $$WIDGETS_H/qwidgetplugin.h
+		  $$WIDGETS_H/ntqwidgetplugin.h
 
 	SOURCES += $$WIDGETS_CPP/qbuttongroup.cpp \
 		  $$WIDGETS_CPP/qbutton.cpp \
@@ -134,6 +134,6 @@ wince-* {
 	SOURCES -= $$WIDGETS_CPP/qsyntaxhighlighter.cpp \
 		   $$WIDGETS_CPP/qsplashscreen.cpp
 
-	HEADERS -= $$WIDGETS_H/qsyntaxhighlighter.h \
-		   $$WIDGETS_H/qsplashscreen.h
+	HEADERS -= $$WIDGETS_H/ntqsyntaxhighlighter.h \
+		   $$WIDGETS_H/ntqsplashscreen.h
 }
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp
index e86ff041c..b141de8d4 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/qtabbar.cpp
@@ -36,20 +36,20 @@
 **
 **********************************************************************/
 
-#include "qtabbar.h"
+#include "ntqtabbar.h"
 #ifndef QT_NO_TABBAR
-#include "qaccel.h"
-#include "qbitmap.h"
-#include "qtoolbutton.h"
-#include "qtooltip.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qpainter.h"
-#include "qiconset.h"
-#include "qcursor.h"
+#include "ntqaccel.h"
+#include "ntqbitmap.h"
+#include "ntqtoolbutton.h"
+#include "ntqtooltip.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqpainter.h"
+#include "ntqiconset.h"
+#include "ntqcursor.h"
 #include "../kernel/qinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #ifdef Q_WS_MACX
@@ -58,7 +58,7 @@
 
 
 /*!
-    \class TQTab qtabbar.h
+    \class TQTab ntqtabbar.h
     \brief The TQTab class provides the structures in a TQTabBar.
 
     \ingroup advanced
@@ -169,7 +169,7 @@ TQTab::~TQTab()
 }
 
 /*!
-    \class TQTabBar qtabbar.h
+    \class TQTabBar ntqtabbar.h
     \brief The TQTabBar class provides a tab bar, e.g. for use in tabbed dialogs.
 
     \ingroup advanced
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index 0621f0e38..9da69d02e 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -38,24 +38,24 @@
 **
 **********************************************************************/
 
-#include "qtabwidget.h"
+#include "ntqtabwidget.h"
 #ifndef QT_NO_TABWIDGET
-#include "qobjectlist.h"
-#include "qtabbar.h"
-#include "qapplication.h"
-#include "qwidgetstack.h"
-#include "qbitmap.h"
-#include "qaccel.h"
-#include "qstyle.h"
-#include "qpainter.h"
-#include "qtoolbutton.h"
+#include "ntqobjectlist.h"
+#include "ntqtabbar.h"
+#include "ntqapplication.h"
+#include "ntqwidgetstack.h"
+#include "ntqbitmap.h"
+#include "ntqaccel.h"
+#include "ntqstyle.h"
+#include "ntqpainter.h"
+#include "ntqtoolbutton.h"
 
 #ifdef Q_OS_MACX
 #include <qmacstyle_mac.h>
 #endif
 
 /*!
-    \class TQTabWidget qtabwidget.h
+    \class TQTabWidget ntqtabwidget.h
     \brief The TQTabWidget class provides a stack of tabbed widgets.
 
     \ingroup organizers
diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp
index 984f66751..d8d9b8a27 100644
--- a/src/widgets/qtextbrowser.cpp
+++ b/src/widgets/qtextbrowser.cpp
@@ -38,29 +38,29 @@
 **
 **********************************************************************/
 
-#include "qtextbrowser.h"
+#include "ntqtextbrowser.h"
 #ifndef QT_NO_TEXTBROWSER
 #include "../kernel/qrichtext_p.h"
 
-#include "qapplication.h"
-#include "qlayout.h"
-#include "qpainter.h"
+#include "ntqapplication.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
 
-#include "qvaluestack.h"
+#include "ntqvaluestack.h"
 #include "stdio.h"
-#include "qfile.h"
-#include "qtextstream.h"
-#include "qlayout.h"
-#include "qbitmap.h"
-#include "qtimer.h"
-#include "qimage.h"
-#include "qsimplerichtext.h"
-#include "qdragobject.h"
-#include "qurl.h"
-#include "qcursor.h"
+#include "ntqfile.h"
+#include "ntqtextstream.h"
+#include "ntqlayout.h"
+#include "ntqbitmap.h"
+#include "ntqtimer.h"
+#include "ntqimage.h"
+#include "ntqsimplerichtext.h"
+#include "ntqdragobject.h"
+#include "ntqurl.h"
+#include "ntqcursor.h"
 
 /*!
-    \class TQTextBrowser qtextbrowser.h
+    \class TQTextBrowser ntqtextbrowser.h
     \brief The TQTextBrowser class provides a rich text browser with hypertext navigation.
 
     \ingroup advanced
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index e2a78743d..561903ab1 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -38,48 +38,48 @@
 **
 **********************************************************************/
 
-#include "qtextedit.h"
+#include "ntqtextedit.h"
 
 #ifndef QT_NO_TEXTEDIT
 
 // Keep this position to avoid patch rejection
 #ifndef QT_NO_IM
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 #endif
 
 #include "../kernel/qrichtext_p.h"
-#include "qpainter.h"
-#include "qpen.h"
-#include "qbrush.h"
-#include "qpixmap.h"
-#include "qfont.h"
-#include "qcolor.h"
-#include "qstyle.h"
-#include "qsize.h"
-#include "qevent.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qlistbox.h"
-#include "qvbox.h"
-#include "qapplication.h"
-#include "qclipboard.h"
-#include "qcolordialog.h"
-#include "qfontdialog.h"
-#include "qstylesheet.h"
-#include "qdragobject.h"
-#include "qurl.h"
-#include "qcursor.h"
-#include "qregexp.h"
-#include "qpopupmenu.h"
-#include "qptrstack.h"
-#include "qmetaobject.h"
-#include "qtextbrowser.h"
+#include "ntqpainter.h"
+#include "ntqpen.h"
+#include "ntqbrush.h"
+#include "ntqpixmap.h"
+#include "ntqfont.h"
+#include "ntqcolor.h"
+#include "ntqstyle.h"
+#include "ntqsize.h"
+#include "ntqevent.h"
+#include "ntqtimer.h"
+#include "ntqapplication.h"
+#include "ntqlistbox.h"
+#include "ntqvbox.h"
+#include "ntqapplication.h"
+#include "ntqclipboard.h"
+#include "ntqcolordialog.h"
+#include "ntqfontdialog.h"
+#include "ntqstylesheet.h"
+#include "ntqdragobject.h"
+#include "ntqurl.h"
+#include "ntqcursor.h"
+#include "ntqregexp.h"
+#include "ntqpopupmenu.h"
+#include "ntqptrstack.h"
+#include "ntqmetaobject.h"
+#include "ntqtextbrowser.h"
 #include <private/qucom_p.h>
 #include "private/qsyntaxhighlighter_p.h"
-#include <qguardedptr.h>
+#include <ntqguardedptr.h>
 
 #ifndef QT_NO_ACCEL
-#include <qkeysequence.h>
+#include <ntqkeysequence.h>
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
 #define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)
@@ -213,7 +213,7 @@ const char* TQRichTextDrag::format( int i ) const
 static bool block_set_alignment = FALSE;
 
 /*!
-    \class TQTextEdit qtextedit.h
+    \class TQTextEdit ntqtextedit.h
     \brief The TQTextEdit widget provides a powerful single-page rich text editor.
 
     \ingroup basic
diff --git a/src/widgets/qtextview.cpp b/src/widgets/qtextview.cpp
index 3aa444524..475236dc8 100644
--- a/src/widgets/qtextview.cpp
+++ b/src/widgets/qtextview.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qtextview.h"
+#include "ntqtextview.h"
 
 #ifndef QT_NO_TEXTVIEW
 
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index fc607b080..1bf94d6d6 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -44,19 +44,19 @@
 
 #ifndef QT_NO_TITLEBAR
 
-#include <qcursor.h>
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qdatetime.h"
+#include <ntqcursor.h>
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqdatetime.h"
 #include "private/qapplication_p.h"
-#include "qtooltip.h"
-#include "qimage.h"
-#include "qtimer.h"
-#include "qpainter.h"
-#include "qstyle.h"
+#include "ntqtooltip.h"
+#include "ntqimage.h"
+#include "ntqtimer.h"
+#include "ntqpainter.h"
+#include "ntqstyle.h"
 #include "private/qinternal_p.h"
 #ifndef QT_NO_WORKSPACE
-#include "qworkspace.h"
+#include "ntqworkspace.h"
 #endif
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index 27a9871e1..e50315804 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -56,8 +56,8 @@
 
 
 #ifndef QT_H
-#include "qbutton.h"
-#include "qlabel.h"
+#include "ntqbutton.h"
+#include "ntqlabel.h"
 #endif // QT_H
 
 #if !defined(QT_NO_TITLEBAR)
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp
index 103c3b429..024ad323d 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/qtoolbar.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qtoolbar.h"
+#include "ntqtoolbar.h"
 #ifndef QT_NO_TOOLBAR
 
-#include "qmainwindow.h"
-#include "qtooltip.h"
-#include "qcursor.h"
-#include "qlayout.h"
-#include "qframe.h"
-#include "qobjectlist.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qtoolbutton.h"
-#include "qpopupmenu.h"
-#include "qcombobox.h"
-#include "qtimer.h"
-#include "qwidgetlist.h"
-#include "qstyle.h"
+#include "ntqmainwindow.h"
+#include "ntqtooltip.h"
+#include "ntqcursor.h"
+#include "ntqlayout.h"
+#include "ntqframe.h"
+#include "ntqobjectlist.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqtoolbutton.h"
+#include "ntqpopupmenu.h"
+#include "ntqcombobox.h"
+#include "ntqtimer.h"
+#include "ntqwidgetlist.h"
+#include "ntqstyle.h"
 
 static const char * const arrow_v_xpm[] = {
     "7 9 3 1",
@@ -211,7 +211,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * )
 
 
 /*!
-    \class TQToolBar qtoolbar.h
+    \class TQToolBar ntqtoolbar.h
     \brief The TQToolBar class provides a movable panel containing
     widgets such as tool buttons.
 
@@ -258,7 +258,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * )
     in the example above) as a child of a TQMainWindow the toolbar will
     be added to the top dock area. You can move it to another dock
     area (or float it) by calling TQMainWindow::moveDockWindow(). TQDock
-    areas lay out their windows in \link qdockarea.html#lines
+    areas lay out their windows in \link ntqdockarea.html#lines
     Lines\endlink.
 
     If the main window is resized so that the area occupied by the
diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp
index dd7d59e8c..05793a7de 100644
--- a/src/widgets/qtoolbox.cpp
+++ b/src/widgets/qtoolbox.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qtoolbox.h"
+#include "ntqtoolbox.h"
 
 #ifndef QT_NO_TOOLBOX
 
-#include <qbutton.h>
-#include <qlayout.h>
-#include <qscrollview.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qobjectlist.h>
-#include <qapplication.h>
-#include <qwidgetlist.h>
-#include <qlayout.h>
-#include <qvaluelist.h>
-#include <qtooltip.h>
-#include <qeventloop.h>
-#include <qdatetime.h>
+#include <ntqbutton.h>
+#include <ntqlayout.h>
+#include <ntqscrollview.h>
+#include <ntqpainter.h>
+#include <ntqstyle.h>
+#include <ntqobjectlist.h>
+#include <ntqapplication.h>
+#include <ntqwidgetlist.h>
+#include <ntqlayout.h>
+#include <ntqvaluelist.h>
+#include <ntqtooltip.h>
+#include <ntqeventloop.h>
+#include <ntqdatetime.h>
 
 class TQToolBoxButton : public TQButton
 {
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp
index 7243e8e8f..eac653d99 100644
--- a/src/widgets/qtoolbutton.cpp
+++ b/src/widgets/qtoolbutton.cpp
@@ -39,23 +39,23 @@
 **********************************************************************/
 
 #undef QT_NO_COMPAT
-#include "qtoolbutton.h"
+#include "ntqtoolbutton.h"
 #ifndef QT_NO_TOOLBUTTON
 
-#include "qdrawutil.h"
-#include "qpainter.h"
-#include "qpixmap.h"
-#include "qwmatrix.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qmainwindow.h"
-#include "qtooltip.h"
-#include "qtoolbar.h"
-#include "qimage.h"
-#include "qiconset.h"
-#include "qtimer.h"
-#include "qpopupmenu.h"
-#include "qguardedptr.h"
+#include "ntqdrawutil.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
+#include "ntqwmatrix.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqmainwindow.h"
+#include "ntqtooltip.h"
+#include "ntqtoolbar.h"
+#include "ntqimage.h"
+#include "ntqiconset.h"
+#include "ntqtimer.h"
+#include "ntqpopupmenu.h"
+#include "ntqguardedptr.h"
 
 class TQToolButtonPrivate
 {
@@ -76,7 +76,7 @@ public:
 
 
 /*!
-    \class TQToolButton qtoolbutton.h
+    \class TQToolButton ntqtoolbutton.h
     \brief The TQToolButton class provides a tquick-access button to
     commands or options, usually used inside a TQToolBar.
 
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index e61707f58..ace4fd317 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -36,13 +36,13 @@
 **
 **********************************************************************/
 
-#include "qtooltip.h"
+#include "ntqtooltip.h"
 #ifndef QT_NO_TOOLTIP
-#include "qlabel.h"
-#include "qptrdict.h"
-#include "qapplication.h"
-#include "qguardedptr.h"
-#include "qtimer.h"
+#include "ntqlabel.h"
+#include "ntqptrdict.h"
+#include "ntqapplication.h"
+#include "ntqguardedptr.h"
+#include "ntqtimer.h"
 #include "qeffects_p.h"
 
 static bool globally_enabled = TRUE;
@@ -649,7 +649,7 @@ void TQTipManager::setWakeUpDelay ( int i )
 }
 
 /*!
-    \class TQToolTip qtooltip.h
+    \class TQToolTip ntqtooltip.h
     \brief The TQToolTip class provides tool tips (balloon help) for
     any widget or rectangular part of a widget.
 
@@ -1102,7 +1102,7 @@ void TQToolTip::clear()
 
 
 /*!
-    \class TQToolTipGroup qtooltip.h
+    \class TQToolTipGroup ntqtooltip.h
     \brief The TQToolTipGroup class collects tool tips into related groups.
 
     \ingroup helpsystem
diff --git a/src/widgets/qvalidator.cpp b/src/widgets/qvalidator.cpp
index b5df08e9a..20c86bfc3 100644
--- a/src/widgets/qvalidator.cpp
+++ b/src/widgets/qvalidator.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qvalidator.h"
+#include "ntqvalidator.h"
 #ifndef QT_NO_VALIDATOR
 
 #include <limits.h>
diff --git a/src/widgets/qvbox.cpp b/src/widgets/qvbox.cpp
index a80e952db..975c2416a 100644
--- a/src/widgets/qvbox.cpp
+++ b/src/widgets/qvbox.cpp
@@ -39,11 +39,11 @@
 **********************************************************************/
 
 
-#include "qvbox.h"
+#include "ntqvbox.h"
 #ifndef QT_NO_VBOX
 
 /*!
-    \class TQVBox qvbox.h
+    \class TQVBox ntqvbox.h
     \brief The TQVBox widget provides vertical geometry management of
     its child widgets.
 
diff --git a/src/widgets/qvbuttongroup.cpp b/src/widgets/qvbuttongroup.cpp
index 79dc9ea2b..c817d3c97 100644
--- a/src/widgets/qvbuttongroup.cpp
+++ b/src/widgets/qvbuttongroup.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qvbuttongroup.h"
+#include "ntqvbuttongroup.h"
 #ifndef QT_NO_VBUTTONGROUP
 
 /*!
-  \class TQVButtonGroup qvbuttongroup.h
+  \class TQVButtonGroup ntqvbuttongroup.h
   \brief The TQVButtonGroup widget organizes TQButton widgets in a
   vertical column.
 
diff --git a/src/widgets/qvgroupbox.cpp b/src/widgets/qvgroupbox.cpp
index 5f8b235e4..5ae77babb 100644
--- a/src/widgets/qvgroupbox.cpp
+++ b/src/widgets/qvgroupbox.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qvgroupbox.h"
+#include "ntqvgroupbox.h"
 #ifndef QT_NO_VGROUPBOX
 
 /*!
-  \class TQVGroupBox qvgroupbox.h
+  \class TQVGroupBox ntqvgroupbox.h
   \brief The TQVGroupBox widget organizes a group of widgets in a
   vertical column.
 
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 50c75fff6..55d653e92 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -36,23 +36,23 @@
 **
 **********************************************************************/
 
-#include "qwhatsthis.h"
+#include "ntqwhatsthis.h"
 #ifndef QT_NO_WHATSTHIS
-#include "qapplication.h"
-#include "qpaintdevicemetrics.h"
-#include "qpixmap.h"
-#include "qpainter.h"
-#include "qtimer.h"
-#include "qptrdict.h"
-#include "qtoolbutton.h"
-#include "qshared.h"
-#include "qcursor.h"
-#include "qbitmap.h"
-#include "qtooltip.h"
-#include "qsimplerichtext.h"
-#include "qstylesheet.h"
+#include "ntqapplication.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpixmap.h"
+#include "ntqpainter.h"
+#include "ntqtimer.h"
+#include "ntqptrdict.h"
+#include "ntqtoolbutton.h"
+#include "ntqshared.h"
+#include "ntqcursor.h"
+#include "ntqbitmap.h"
+#include "ntqtooltip.h"
+#include "ntqsimplerichtext.h"
+#include "ntqstylesheet.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -62,7 +62,7 @@
 #endif
 
 /*!
-    \class TQWhatsThis qwhatsthis.h
+    \class TQWhatsThis ntqwhatsthis.h
     \brief The TQWhatsThis class provides a simple description of any
     widget, i.e. answering the question "What's this?".
 
diff --git a/src/widgets/qwidgetinterface_p.h b/src/widgets/qwidgetinterface_p.h
index 128a2771f..38505841e 100644
--- a/src/widgets/qwidgetinterface_p.h
+++ b/src/widgets/qwidgetinterface_p.h
@@ -53,7 +53,7 @@
 
 #ifndef QT_H
 #include <private/qcom_p.h>
-#include "qiconset.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_WIDGETPLUGIN
diff --git a/src/widgets/qwidgetplugin.cpp b/src/widgets/qwidgetplugin.cpp
index 1cd2434d2..37b5156bb 100644
--- a/src/widgets/qwidgetplugin.cpp
+++ b/src/widgets/qwidgetplugin.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "qwidgetplugin.h"
+#include "ntqwidgetplugin.h"
 
 #ifndef QT_NO_WIDGETPLUGIN
 #include "qwidgetinterface_p.h"
-#include "qobjectcleanuphandler.h"
-#include "qwidget.h"
+#include "ntqobjectcleanuphandler.h"
+#include "ntqwidget.h"
 #ifdef QT_CONTAINER_CUSTOM_WIDGETS
-#include "qwidgetlist.h"
+#include "ntqwidgetlist.h"
 #endif
 
 /*!
-    \class TQWidgetPlugin qwidgetplugin.h
+    \class TQWidgetPlugin ntqwidgetplugin.h
     \brief The TQWidgetPlugin class provides an abstract base for custom TQWidget plugins.
 
     \ingroup plugins
@@ -440,7 +440,7 @@ bool TQWidgetPlugin::isContainer( const TQString & ) const
 #ifdef QT_CONTAINER_CUSTOM_WIDGETS
 
 /*!
-    \class TQWidgetContainerPlugin qwidgetplugin.h
+    \class TQWidgetContainerPlugin ntqwidgetplugin.h
     \brief The TQWidgetContainerPlugin class provides an abstract base
     for complex custom container TQWidget plugins.
 
diff --git a/src/widgets/qwidgetresizehandler.cpp b/src/widgets/qwidgetresizehandler.cpp
index 2dd5383e6..ff964b12c 100644
--- a/src/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/qwidgetresizehandler.cpp
@@ -41,10 +41,10 @@
 #include "qwidgetresizehandler_p.h"
 
 #ifndef QT_NO_RESIZEHANDLER
-#include "qframe.h"
-#include "qapplication.h"
-#include "qcursor.h"
-#include "qsizegrip.h"
+#include "ntqframe.h"
+#include "ntqapplication.h"
+#include "ntqcursor.h"
+#include "ntqsizegrip.h"
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
 #endif
diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/qwidgetresizehandler_p.h
index 676b53658..395e3d1eb 100644
--- a/src/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/qwidgetresizehandler_p.h
@@ -54,7 +54,7 @@
 //
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 #ifndef QT_NO_RESIZEHANDLER
 class TQMouseEvent;
diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp
index 72d9e1e1a..9b80a2fdb 100644
--- a/src/widgets/qwidgetstack.cpp
+++ b/src/widgets/qwidgetstack.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qwidgetstack.h"
-#include "qlayout.h"
+#include "ntqwidgetstack.h"
+#include "ntqlayout.h"
 #include "../kernel/qlayoutengine_p.h"
 #ifndef QT_NO_WIDGETSTACK
 
-#include "qobjectlist.h"
-#include "qfocusdata.h"
-#include "qbutton.h"
-#include "qbuttongroup.h"
+#include "ntqobjectlist.h"
+#include "ntqfocusdata.h"
+#include "ntqbutton.h"
+#include "ntqbuttongroup.h"
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 class TQWidgetStackPrivate {
 public:
diff --git a/src/workspace/qworkspace.h b/src/workspace/ntqworkspace.h
index 96cc83ff2..7a29e975d 100644
--- a/src/workspace/qworkspace.h
+++ b/src/workspace/ntqworkspace.h
@@ -42,8 +42,8 @@
 #define TQWORKSPACE_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qwidgetlist.h"
+#include "ntqwidget.h"
+#include "ntqwidgetlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_WORKSPACE
diff --git a/src/workspace/qt_workspace.pri b/src/workspace/qt_workspace.pri
index d5d4288d7..629d27aee 100644
--- a/src/workspace/qt_workspace.pri
+++ b/src/workspace/qt_workspace.pri
@@ -1,6 +1,6 @@
 # Qt workspace module
 
 workspace {
-	HEADERS += $$WORKSPACE_H/qworkspace.h
+	HEADERS += $$WORKSPACE_H/ntqworkspace.h
 	SOURCES += $$WORKSPACE_CPP/qworkspace.cpp
 }
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index e11d5cc35..d37f25737 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -38,44 +38,44 @@
 **
 **********************************************************************/
 
-#include "qworkspace.h"
+#include "ntqworkspace.h"
 #ifndef QT_NO_WORKSPACE
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "../widgets/qtitlebar_p.h"
-#include "qobjectlist.h"
-#include "qlayout.h"
-#include "qtoolbutton.h"
-#include "qlabel.h"
-#include "qvbox.h"
-#include "qaccel.h"
-#include "qcursor.h"
-#include "qpopupmenu.h"
-#include "qmenubar.h"
-#include "qguardedptr.h"
-#include "qiconset.h"
+#include "ntqobjectlist.h"
+#include "ntqlayout.h"
+#include "ntqtoolbutton.h"
+#include "ntqlabel.h"
+#include "ntqvbox.h"
+#include "ntqaccel.h"
+#include "ntqcursor.h"
+#include "ntqpopupmenu.h"
+#include "ntqmenubar.h"
+#include "ntqguardedptr.h"
+#include "ntqiconset.h"
 #include "../widgets/qwidgetresizehandler_p.h"
-#include "qfocusdata.h"
-#include "qdatetime.h"
-#include "qtooltip.h"
-#include "qwmatrix.h"
-#include "qimage.h"
-#include "qscrollbar.h"
-#include "qstyle.h"
-#include "qbitmap.h"
+#include "ntqfocusdata.h"
+#include "ntqdatetime.h"
+#include "ntqtooltip.h"
+#include "ntqwmatrix.h"
+#include "ntqimage.h"
+#include "ntqscrollbar.h"
+#include "ntqstyle.h"
+#include "ntqbitmap.h"
 
 // magic non-mdi things
-#include "qtimer.h"
-#include "qdockarea.h"
-#include "qstatusbar.h"
-#include "qmainwindow.h"
-#include "qdockwindow.h"
-#include "qtoolbar.h"
+#include "ntqtimer.h"
+#include "ntqdockarea.h"
+#include "ntqstatusbar.h"
+#include "ntqmainwindow.h"
+#include "ntqdockwindow.h"
+#include "ntqtoolbar.h"
 
 #define BUTTON_WIDTH	16
 #define BUTTON_HEIGHT	14
 
 /*!
-    \class TQWorkspace qworkspace.h
+    \class TQWorkspace ntqworkspace.h
     \brief The TQWorkspace widget provides a workspace window that can
     contain decorated windows, e.g. for MDI.
 
diff --git a/src/xml/qdom.h b/src/xml/ntqdom.h
index 2cd1e3f5d..47d11b181 100644
--- a/src/xml/qdom.h
+++ b/src/xml/ntqdom.h
@@ -42,7 +42,7 @@
 #define TQDOM_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
diff --git a/src/xml/qxml.h b/src/xml/ntqxml.h
index 4bdceeea1..f69147d29 100644
--- a/src/xml/qxml.h
+++ b/src/xml/ntqxml.h
@@ -42,11 +42,11 @@
 #define TQXML_H
 
 #ifndef QT_H
-#include "qtextstream.h"
-#include "qfile.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qvaluevector.h"
+#include "ntqtextstream.h"
+#include "ntqfile.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqvaluevector.h"
 #endif // QT_H
 
 #if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
diff --git a/src/xml/qdom.cpp b/src/xml/qdom.cpp
index b4d891a97..954321c48 100644
--- a/src/xml/qdom.cpp
+++ b/src/xml/qdom.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "qdom.h"
+#include "ntqdom.h"
 
 #ifndef QT_NO_DOM
 
-#include "qxml.h"
-#include "qptrlist.h"
-#include "qdict.h"
-#include "qtextstream.h"
-#include "qtextcodec.h"
-#include "qiodevice.h"
-#include "qregexp.h"
-#include "qbuffer.h"
+#include "ntqxml.h"
+#include "ntqptrlist.h"
+#include "ntqdict.h"
+#include "ntqtextstream.h"
+#include "ntqtextcodec.h"
+#include "ntqiodevice.h"
+#include "ntqregexp.h"
+#include "ntqbuffer.h"
 
 /*
   ### old todo comments -- I don't know if they still apply...
@@ -610,7 +610,7 @@ TQDomImplementationPrivate* TQDomImplementationPrivate::clone()
  **************************************************************/
 
 /*!
-    \class TQDomImplementation qdom.h
+    \class TQDomImplementation ntqdom.h
     \reentrant
     \brief The TQDomImplementation class provides information about the
     features of the DOM implementation.
@@ -914,7 +914,7 @@ uint TQDomNodeListPrivate::length() const
  **************************************************************/
 
 /*!
-    \class TQDomNodeList qdom.h
+    \class TQDomNodeList ntqdom.h
     \reentrant
     \brief The TQDomNodeList class is a list of TQDomNode objects.
 \if defined(commercial)
@@ -1529,7 +1529,7 @@ void TQDomNodePrivate::save( TQTextStream& s, int depth, int indent ) const
 #define IMPL ((TQDomNodePrivate*)impl)
 
 /*!
-    \class TQDomNode qdom.h
+    \class TQDomNode ntqdom.h
     \reentrant
     \brief The TQDomNode class is the base class for all the nodes in a DOM tree.
 \if defined(commercial)
@@ -2640,7 +2640,7 @@ bool TQDomNamedNodeMapPrivate::containsNS( const TQString& nsURI, const TQString
 #define IMPL ((TQDomNamedNodeMapPrivate*)impl)
 
 /*!
-    \class TQDomNamedNodeMap qdom.h
+    \class TQDomNamedNodeMap ntqdom.h
     \reentrant
     \brief The TQDomNamedNodeMap class contains a collection of nodes
     that can be accessed by name.
@@ -3056,7 +3056,7 @@ void TQDomDocumentTypePrivate::save( TQTextStream& s, int, int indent ) const
 #define IMPL ((TQDomDocumentTypePrivate*)impl)
 
 /*!
-    \class TQDomDocumentType qdom.h
+    \class TQDomDocumentType ntqdom.h
     \reentrant
     \brief The TQDomDocumentType class is the representation of the DTD
     in the document tree.
@@ -3253,7 +3253,7 @@ TQDomNodePrivate* TQDomDocumentFragmentPrivate::cloneNode( bool deep)
 #define IMPL ((TQDomDocumentFragmentPrivate*)impl)
 
 /*!
-    \class TQDomDocumentFragment qdom.h
+    \class TQDomDocumentFragment ntqdom.h
     \reentrant
     \brief The TQDomDocumentFragment class is a tree of TQDomNodes which is not usually a complete TQDomDocument.
 \if defined(commercial)
@@ -3416,7 +3416,7 @@ void TQDomCharacterDataPrivate::appendData( const TQString& arg )
 #define IMPL ((TQDomCharacterDataPrivate*)impl)
 
 /*!
-    \class TQDomCharacterData qdom.h
+    \class TQDomCharacterData ntqdom.h
     \reentrant
     \brief The TQDomCharacterData class represents a generic string in the DOM.
 \if defined(commercial)
@@ -3718,7 +3718,7 @@ void TQDomAttrPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomAttrPrivate*)impl)
 
 /*!
-    \class TQDomAttr qdom.h
+    \class TQDomAttr ntqdom.h
     \reentrant
     \brief The TQDomAttr class represents one attribute of a TQDomElement.
 \if defined(commercial)
@@ -4119,7 +4119,7 @@ void TQDomElementPrivate::save( TQTextStream& s, int depth, int indent ) const
 #define IMPL ((TQDomElementPrivate*)impl)
 
 /*!
-    \class TQDomElement qdom.h
+    \class TQDomElement ntqdom.h
     \reentrant
     \brief The TQDomElement class represents one element in the DOM tree.
 \if defined(commercial)
@@ -4677,7 +4677,7 @@ void TQDomTextPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomTextPrivate*)impl)
 
 /*!
-    \class TQDomText qdom.h
+    \class TQDomText ntqdom.h
     \reentrant
     \brief The TQDomText class represents text data in the parsed XML document.
 \if defined(commercial)
@@ -4821,7 +4821,7 @@ void TQDomCommentPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomCommentPrivate*)impl)
 
 /*!
-    \class TQDomComment qdom.h
+    \class TQDomComment ntqdom.h
     \reentrant
     \brief The TQDomComment class represents an XML comment.
 \if defined(commercial)
@@ -4953,7 +4953,7 @@ void TQDomCDATASectionPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomCDATASectionPrivate*)impl)
 
 /*!
-    \class TQDomCDATASection qdom.h
+    \class TQDomCDATASection ntqdom.h
     \reentrant
     \brief The TQDomCDATASection class represents an XML CDATA section.
 \if defined(commercial)
@@ -5100,7 +5100,7 @@ void TQDomNotationPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomNotationPrivate*)impl)
 
 /*!
-    \class TQDomNotation qdom.h
+    \class TQDomNotation ntqdom.h
     \reentrant
     \brief The TQDomNotation class represents an XML notation.
 \if defined(commercial)
@@ -5313,7 +5313,7 @@ void TQDomEntityPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomEntityPrivate*)impl)
 
 /*!
-    \class TQDomEntity qdom.h
+    \class TQDomEntity ntqdom.h
     \reentrant
     \brief The TQDomEntity class represents an XML entity.
 \if defined(commercial)
@@ -5487,7 +5487,7 @@ void TQDomEntityReferencePrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomEntityReferencePrivate*)impl)
 
 /*!
-    \class TQDomEntityReference qdom.h
+    \class TQDomEntityReference ntqdom.h
     \reentrant
     \brief The TQDomEntityReference class represents an XML entity reference.
 \if defined(commercial)
@@ -5633,7 +5633,7 @@ void TQDomProcessingInstructionPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomProcessingInstructionPrivate*)impl)
 
 /*!
-    \class TQDomProcessingInstruction qdom.h
+    \class TQDomProcessingInstruction ntqdom.h
     \reentrant
     \brief The TQDomProcessingInstruction class represents an XML processing
     instruction.
@@ -6044,7 +6044,7 @@ void TQDomDocumentPrivate::save( TQTextStream& s, int, int indent ) const
 #define IMPL ((TQDomDocumentPrivate*)impl)
 
 /*!
-    \class TQDomDocument qdom.h
+    \class TQDomDocument ntqdom.h
     \reentrant
     \brief The TQDomDocument class represents an XML document.
 \if defined(commercial)
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index df9b55100..dac7ff80c 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -40,15 +40,15 @@
 
 #ifndef QT_NO_SVG
 
-#include "qpainter.h"
-#include "qpaintdevicemetrics.h"
-#include "qfile.h"
-#include "qmap.h"
-#include "qregexp.h"
-#include "qvaluelist.h"
-#include "qtextstream.h"
-#include "qimage.h"
-#include "qpixmap.h"
+#include "ntqpainter.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqfile.h"
+#include "ntqmap.h"
+#include "ntqregexp.h"
+#include "ntqvaluelist.h"
+#include "ntqtextstream.h"
+#include "ntqimage.h"
+#include "ntqpixmap.h"
 
 #include <math.h>
 
diff --git a/src/xml/qsvgdevice_p.h b/src/xml/qsvgdevice_p.h
index 1dd58f28a..bc717c5cc 100644
--- a/src/xml/qsvgdevice_p.h
+++ b/src/xml/qsvgdevice_p.h
@@ -54,9 +54,9 @@
 //
 
 #ifndef QT_H
-#include "qpaintdevice.h"
-#include "qrect.h"
-#include "qdom.h"
+#include "ntqpaintdevice.h"
+#include "ntqrect.h"
+#include "ntqdom.h"
 #endif // QT_H
 
 #if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
diff --git a/src/xml/qt_xml.pri b/src/xml/qt_xml.pri
index 4edd51e30..b8fe7099a 100644
--- a/src/xml/qt_xml.pri
+++ b/src/xml/qt_xml.pri
@@ -1,7 +1,7 @@
 # Qt xml module
 
 xml {
-	HEADERS += $$XML_H/qxml.h $$XML_H/qdom.h $$XML_CPP/qsvgdevice_p.h
+	HEADERS += $$XML_H/ntqxml.h $$XML_H/ntqdom.h $$XML_CPP/qsvgdevice_p.h
 	SOURCES += $$XML_CPP/qxml.cpp $$XML_CPP/qdom.cpp $$XML_CPP/qsvgdevice.cpp
 	win32-borland {
 		QMAKE_CFLAGS_WARN_ON	+= -w-use
diff --git a/src/xml/qxml.cpp b/src/xml/qxml.cpp
index 34dbeeb20..ccc3498d7 100644
--- a/src/xml/qxml.cpp
+++ b/src/xml/qxml.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qxml.h"
-#include "qtextcodec.h"
-#include "qbuffer.h"
-#include "qregexp.h"
-#include "qptrstack.h"
-#include "qmap.h"
-#include "qvaluestack.h"
+#include "ntqxml.h"
+#include "ntqtextcodec.h"
+#include "ntqbuffer.h"
+#include "ntqregexp.h"
+#include "ntqptrstack.h"
+#include "ntqmap.h"
+#include "ntqvaluestack.h"
 
 // needed for QT_TRANSLATE_NOOP:
-#include "qobject.h"
+#include "ntqobject.h"
 
 #ifndef QT_NO_XML
 
@@ -216,7 +216,7 @@ class TQXmlDefaultHandlerPrivate
 };
 
 /*!
-    \class TQXmlParseException qxml.h
+    \class TQXmlParseException ntqxml.h
     \reentrant
     \brief The TQXmlParseException class is used to report errors with
     the TQXmlErrorHandler interface.
@@ -281,7 +281,7 @@ TQString TQXmlParseException::systemId() const
 
 
 /*!
-    \class TQXmlLocator qxml.h
+    \class TQXmlLocator ntqxml.h
     \reentrant
     \brief The TQXmlLocator class provides the XML handler classes with
     information about the parsing position within a file.
@@ -378,7 +378,7 @@ public:
 };
 
 /*!
-    \class TQXmlNamespaceSupport qxml.h
+    \class TQXmlNamespaceSupport ntqxml.h
     \reentrant
     \brief The TQXmlNamespaceSupport class is a helper class for XML
     readers which want to include namespace support.
@@ -648,7 +648,7 @@ void TQXmlNamespaceSupport::reset()
  *********************************************/
 
 /*!
-    \class TQXmlAttributes qxml.h
+    \class TQXmlAttributes ntqxml.h
     \reentrant
     \brief The TQXmlAttributes class provides XML attributes.
 \if defined(commercial)
@@ -893,7 +893,7 @@ void TQXmlAttributes::append( const TQString &qName, const TQString &uri, const
  *********************************************/
 
 /*!
-    \class TQXmlInputSource qxml.h
+    \class TQXmlInputSource ntqxml.h
     \reentrant
     \brief The TQXmlInputSource class provides the input data for the
     TQXmlReader subclasses.
@@ -1208,7 +1208,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
  *********************************************/
 
 /*!
-    \class TQXmlContentHandler qxml.h
+    \class TQXmlContentHandler ntqxml.h
     \reentrant
     \brief The TQXmlContentHandler class provides an interface to
     report the logical content of XML data.
@@ -1457,7 +1457,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlErrorHandler qxml.h
+    \class TQXmlErrorHandler ntqxml.h
     \reentrant
     \brief The TQXmlErrorHandler class provides an interface to report
     errors in XML data.
@@ -1531,7 +1531,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlDTDHandler qxml.h
+    \class TQXmlDTDHandler ntqxml.h
     \reentrant
     \brief The TQXmlDTDHandler class provides an interface to report
     DTD content of XML data.
@@ -1597,7 +1597,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlEntityResolver qxml.h
+    \class TQXmlEntityResolver ntqxml.h
     \reentrant
     \brief The TQXmlEntityResolver class provides an interface to
     resolve external entities contained in XML data.
@@ -1652,7 +1652,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlLexicalHandler qxml.h
+    \class TQXmlLexicalHandler ntqxml.h
     \reentrant
     \brief The TQXmlLexicalHandler class provides an interface to
     report the lexical content of XML data.
@@ -1802,7 +1802,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlDeclHandler qxml.h
+    \class TQXmlDeclHandler ntqxml.h
     \reentrant
     \brief The TQXmlDeclHandler class provides an interface to report declaration
     content of XML data.
@@ -1888,7 +1888,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlDefaultHandler qxml.h
+    \class TQXmlDefaultHandler ntqxml.h
     \reentrant
     \brief The TQXmlDefaultHandler class provides a default implementation of all
     the XML handler classes.
@@ -2349,7 +2349,7 @@ private:
  *********************************************/
 
 /*!
-    \class TQXmlReader qxml.h
+    \class TQXmlReader ntqxml.h
     \reentrant
     \brief The TQXmlReader class provides an interface for XML readers (i.e.
     parsers).
@@ -2569,7 +2569,7 @@ private:
 
 
 /*!
-    \class TQXmlSimpleReader qxml.h
+    \class TQXmlSimpleReader ntqxml.h
     \reentrant
     \brief The TQXmlSimpleReader class provides an implementation of a
     simple XML reader (parser).