diff --git a/src/calltreedlg.cpp b/src/calltreedlg.cpp
index 78d57c2..b0619f4 100644
--- a/src/calltreedlg.cpp
+++ b/src/calltreedlg.cpp
@@ -25,10 +25,10 @@
  *
  ***************************************************************************/
 
-#include <ntqfile.h>
-#include <ntqtoolbutton.h>
-#include <ntqbuttongroup.h>
-#include <ntqwidgetstack.h>
+#include <tqfile.h>
+#include <tqtoolbutton.h>
+#include <tqbuttongroup.h>
+#include <tqwidgetstack.h>
 #include <tdelocale.h>
 #include <tdefiledialog.h>
 #include "calltreedlg.h"
diff --git a/src/calltreedlg.h b/src/calltreedlg.h
index 092fd7d..6c80fdd 100644
--- a/src/calltreedlg.h
+++ b/src/calltreedlg.h
@@ -28,8 +28,8 @@
 #ifndef CALLTREEDLG_H
 #define CALLTREEDLG_H
 
-#include <ntqwidget.h>
-#include <ntqlistview.h>
+#include <tqwidget.h>
+#include <tqlistview.h>
 #include <calltreelayout.h>
 
 /**
diff --git a/src/calltreemanager.h b/src/calltreemanager.h
index 09d47f7..a5b293e 100644
--- a/src/calltreemanager.h
+++ b/src/calltreemanager.h
@@ -28,8 +28,8 @@
 #ifndef CALLTREEMANAGER_H
 #define CALLTREEMANAGER_H
 
-#include <ntqwidget.h>
-#include <ntqptrlist.h>
+#include <tqwidget.h>
+#include <tqptrlist.h>
 
 class CallTreeDlg;
 
diff --git a/src/configfrontend.h b/src/configfrontend.h
index 4c43c35..e44b9f3 100644
--- a/src/configfrontend.h
+++ b/src/configfrontend.h
@@ -28,7 +28,7 @@
 #ifndef CONFIGFRONTEND_H
 #define CONFIGFRONTEND_H
 
-#include <frontend.h>
+#include "frontend.h"
 
 /**
  * Frontend to the kscope_config shell script.
diff --git a/src/cscopefrontend.cpp b/src/cscopefrontend.cpp
index b25c924..e272b14 100644
--- a/src/cscopefrontend.cpp
+++ b/src/cscopefrontend.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
-#include <ntqtimer.h>
+#include <tqfileinfo.h>
+#include <tqtimer.h>
 #include <tdeconfig.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
diff --git a/src/cscopefrontend.h b/src/cscopefrontend.h
index 1743e34..58e0c62 100644
--- a/src/cscopefrontend.h
+++ b/src/cscopefrontend.h
@@ -28,9 +28,9 @@
 #ifndef CSCOPEFRONTEND_H
 #define CSCOPEFRONTEND_H
 
-#include <ntqstringlist.h>
-#include <ntqprogressbar.h>
-#include <ntqlabel.h>
+#include <tqstringlist.h>
+#include <tqprogressbar.h>
+#include <tqlabel.h>
 #include "frontend.h"
 
 #define CSCOPE_RECORD_SIZE 4
diff --git a/src/cscopemsgdlg.cpp b/src/cscopemsgdlg.cpp
index 2ffb469..fe6bd87 100644
--- a/src/cscopemsgdlg.cpp
+++ b/src/cscopemsgdlg.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqtextedit.h>
-#include <ntqpushbutton.h>
+#include <tqtextedit.h>
+#include <tqpushbutton.h>
 #include "cscopemsgdlg.h"
 
 /**
diff --git a/src/ctagsfrontend.cpp b/src/ctagsfrontend.cpp
index 646dc2a..88bf3f6 100644
--- a/src/ctagsfrontend.cpp
+++ b/src/ctagsfrontend.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <kshell.h>
diff --git a/src/ctagsfrontend.h b/src/ctagsfrontend.h
index 68985be..1d633d4 100644
--- a/src/ctagsfrontend.h
+++ b/src/ctagsfrontend.h
@@ -28,7 +28,7 @@
 #ifndef CTAGSFRONTEND_H
 #define CTAGSFRONTEND_H
 
-#include <frontend.h>
+#include "frontend.h"
 
 #define CTAGS_RECORD_SIZE 3
 
diff --git a/src/ctagslist.cpp b/src/ctagslist.cpp
index 147a9aa..8c5dca1 100644
--- a/src/ctagslist.cpp
+++ b/src/ctagslist.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tdelocale.h>
 #include "ctagslist.h"
 #include "kscopeconfig.h"
diff --git a/src/ctagslist.h b/src/ctagslist.h
index 03d1560..381d7f1 100644
--- a/src/ctagslist.h
+++ b/src/ctagslist.h
@@ -28,9 +28,9 @@
 #ifndef CTAGSLIST_H
 #define CTAGSLIST_H
 
-#include <ntqwidget.h>
-#include <ntqpixmap.h>
-#include <ntqmemarray.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
+#include <tqmemarray.h>
 #include "searchlist.h"
 #include "frontend.h"
 
diff --git a/src/dirscanner.cpp b/src/dirscanner.cpp
index ba8717e..27c8738 100644
--- a/src/dirscanner.cpp
+++ b/src/dirscanner.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "dirscanner.h"
 
 /**
diff --git a/src/dirscanner.h b/src/dirscanner.h
index a494052..89868a8 100644
--- a/src/dirscanner.h
+++ b/src/dirscanner.h
@@ -28,13 +28,13 @@
 #ifndef DIRSCANNER_H
 #define DIRSCANNER_H
 
-#include <ntqobject.h>
-#include <ntqevent.h>
-#include <ntqthread.h>
-#include <ntqdir.h>
-#include <ntqstringlist.h>
-#include <ntqdict.h>
-#include <ntqlistview.h>
+#include <tqobject.h>
+#include <tqevent.h>
+#include <tqthread.h>
+#include <tqdir.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
+#include <tqlistview.h>
 
 class DirScanner;
 
diff --git a/src/dotfrontend.cpp b/src/dotfrontend.cpp
index 9330730..8aff54c 100644
--- a/src/dotfrontend.cpp
+++ b/src/dotfrontend.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqfileinfo.h>
+#include <tqpaintdevicemetrics.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include "dotfrontend.h"
diff --git a/src/dotfrontend.h b/src/dotfrontend.h
index 4f75b6f..e49e72a 100644
--- a/src/dotfrontend.h
+++ b/src/dotfrontend.h
@@ -27,8 +27,8 @@
 #ifndef DOTFRONTEND_H
 #define DOTFRONTEND_H
 
-#include <frontend.h>
-#include <ntqpointarray.h>
+#include "frontend.h"
+#include <tqpointarray.h>
 
 class GraphWidget;
 
diff --git a/src/dotparse.ypp b/src/dotparse.ypp
index 37b501d..93d373f 100644
--- a/src/dotparse.ypp
+++ b/src/dotparse.ypp
@@ -1,9 +1,9 @@
 /* dot.y */
 
 %{
-#include <ntqdict.h>
-#include <ntqptrstack.h>
-#include <ntqlistview.h>
+#include <tqdict.h>
+#include <tqptrstack.h>
+#include <tqlistview.h>
 #include "calltreedlg.h"
 #include "graphwidget.h"
 #include "treewidget.h"
diff --git a/src/editormanager.h b/src/editormanager.h
index 5136823..903f111 100644
--- a/src/editormanager.h
+++ b/src/editormanager.h
@@ -28,7 +28,7 @@
 #ifndef EDITORMANAGER_H
 #define EDITORMANAGER_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <tdeparts/partmanager.h>
 #include <klibloader.h>
 #include <tdetexteditor/document.h>
diff --git a/src/editorpage.cpp b/src/editorpage.cpp
index df69e0c..945159b 100644
--- a/src/editorpage.cpp
+++ b/src/editorpage.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tdeversion.h>
 #include <tdetexteditor/selectioninterface.h>
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/src/editorpage.h b/src/editorpage.h
index 5c5be31..82b9c12 100644
--- a/src/editorpage.h
+++ b/src/editorpage.h
@@ -28,11 +28,11 @@
 #ifndef EDITORPAGE_H
 #define EDITORPAGE_H
 
-#include <ntqwidget.h>
-#include <ntqhbox.h>
-#include <ntqsplitter.h>
-#include <ntqtabwidget.h>
-#include <ntqpopupmenu.h>
+#include <tqwidget.h>
+#include <tqhbox.h>
+#include <tqsplitter.h>
+#include <tqtabwidget.h>
+#include <tqpopupmenu.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/view.h>
 #include <tdetexteditor/markinterfaceextension.h>
diff --git a/src/editortabs.cpp b/src/editortabs.cpp
index d72a37f..24aa6d4 100644
--- a/src/editortabs.cpp
+++ b/src/editortabs.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kurldrag.h>
diff --git a/src/editortabs.h b/src/editortabs.h
index 76fb4b2..7ace1b7 100644
--- a/src/editortabs.h
+++ b/src/editortabs.h
@@ -28,8 +28,8 @@
 #ifndef EDITORTABS_H
 #define EDITORTABS_H
 
-#include <ntqwidget.h>
-#include <ntqpopupmenu.h>
+#include <tqwidget.h>
+#include <tqpopupmenu.h>
 #include "tabwidget.h"
 #include "editorpage.h"
 #include "projectmanager.h"
diff --git a/src/encoder.cpp b/src/encoder.cpp
index a400a47..aa0ef34 100644
--- a/src/encoder.cpp
+++ b/src/encoder.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include "ntqstring.h"
+#include <tqstring.h>
 #include "encoder.h"
 
 #define CHAR_TO_HEX(c)		((c) < 0xA ? '0' + (c) : ('A' - 0xA) + (c))
diff --git a/src/filelist.cpp b/src/filelist.cpp
index 7694d7c..275daae 100644
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqlineedit.h>
-#include <ntqfileinfo.h>
+#include <tqlineedit.h>
+#include <tqfileinfo.h>
 #include <tdelocale.h>
 #include "filelist.h"
 #include "kscope.h"
diff --git a/src/filelist.h b/src/filelist.h
index 59bad1d..571a571 100644
--- a/src/filelist.h
+++ b/src/filelist.h
@@ -28,7 +28,7 @@
 #ifndef FILELIST_H
 #define FILELIST_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "searchlist.h"
 #include "projectmanager.h"
 
diff --git a/src/fileview.cpp b/src/fileview.cpp
index d8d4fb6..f7ac9aa 100644
--- a/src/fileview.cpp
+++ b/src/fileview.cpp
@@ -25,9 +25,9 @@
  *
  ***************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqfileinfo.h>
-#include <ntqtabwidget.h>
+#include <tqpushbutton.h>
+#include <tqfileinfo.h>
+#include <tqtabwidget.h>
 #include <tdefiledialog.h>
 #include "fileview.h"
 #include "filelist.h"
diff --git a/src/frontend.cpp b/src/frontend.cpp
index 28e0342..1bcace8 100644
--- a/src/frontend.cpp
+++ b/src/frontend.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
-#include <ntqdir.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
 #include <tdelocale.h>
 #include "frontend.h"
 
diff --git a/src/frontend.h b/src/frontend.h
index 1de524b..16a41c4 100644
--- a/src/frontend.h
+++ b/src/frontend.h
@@ -28,7 +28,7 @@
 #ifndef FRONTEND_H
 #define FRONTEND_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <kprocess.h>
 
 
diff --git a/src/graphedge.cpp b/src/graphedge.cpp
index 33ac306..95ca270 100644
--- a/src/graphedge.cpp
+++ b/src/graphedge.cpp
@@ -27,7 +27,7 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include "graphedge.h"
 #include "graphnode.h"
 
diff --git a/src/graphedge.h b/src/graphedge.h
index 7b5fc4e..87836fe 100644
--- a/src/graphedge.h
+++ b/src/graphedge.h
@@ -28,7 +28,7 @@
 #ifndef GRAPHEDGE_H
 #define GRAPHEDGE_H
 
-#include <ntqcanvas.h>
+#include <tqcanvas.h>
 
 class GraphNode;
 
diff --git a/src/graphnode.cpp b/src/graphnode.cpp
index 9f8fe9d..89d135e 100644
--- a/src/graphnode.cpp
+++ b/src/graphnode.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqpainter.h>
-#include <ntqfontmetrics.h>
+#include <tqpainter.h>
+#include <tqfontmetrics.h>
 #include "graphnode.h"
 
 int GraphNode::RTTI = 1001;
diff --git a/src/graphnode.h b/src/graphnode.h
index a54b4ea..04b59db 100644
--- a/src/graphnode.h
+++ b/src/graphnode.h
@@ -28,8 +28,8 @@
 #ifndef GRAPHNODE_H
 #define GRAPHNODE_H
 
-#include <ntqcanvas.h>
-#include <ntqdict.h>
+#include <tqcanvas.h>
+#include <tqdict.h>
 #include "graphedge.h"
 
 /**
diff --git a/src/graphprefdlg.cpp b/src/graphprefdlg.cpp
index 11b7914..e7cf7aa 100644
--- a/src/graphprefdlg.cpp
+++ b/src/graphprefdlg.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
 #include "graphprefdlg.h"
 #include "preferencesdlg.h"
 #include "kscopeconfig.h"
diff --git a/src/graphwidget.cpp b/src/graphwidget.cpp
index 7805ec4..c412520 100644
--- a/src/graphwidget.cpp
+++ b/src/graphwidget.cpp
@@ -27,9 +27,9 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include <ntqfile.h>
-#include <ntqpainter.h>
-#include <ntqtooltip.h>
+#include <tqfile.h>
+#include <tqpainter.h>
+#include <tqtooltip.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include "graphwidget.h"
diff --git a/src/graphwidget.h b/src/graphwidget.h
index 55224c6..ef92ebf 100644
--- a/src/graphwidget.h
+++ b/src/graphwidget.h
@@ -28,9 +28,9 @@
 #ifndef GRAPHWIDGET_H
 #define GRAPHWIDGET_H
 
-#include <ntqcanvas.h>
-#include <ntqpopupmenu.h>
-#include <ntqdict.h>
+#include <tqcanvas.h>
+#include <tqpopupmenu.h>
+#include <tqdict.h>
 #include "cscopefrontend.h"
 #include "graphnode.h"
 #include "dotfrontend.h"
diff --git a/src/kscope.cpp b/src/kscope.cpp
index b1d6d76..8d7d1d5 100644
--- a/src/kscope.cpp
+++ b/src/kscope.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tdefiledialog.h>
 #include <tdemenubar.h>
 #include <tdelocale.h>
diff --git a/src/kscope.h b/src/kscope.h
index a9cbf89..f657493 100644
--- a/src/kscope.h
+++ b/src/kscope.h
@@ -32,7 +32,7 @@
 #include <config.h>
 #endif
 
-#include <ntqtimer.h>
+#include <tqtimer.h>
 #include <tdecmdlineargs.h>
 #include <kapp.h>
 #include <tdeparts/dockmainwindow.h>
diff --git a/src/kscopeconfig.h b/src/kscopeconfig.h
index 2d5b48d..700d685 100644
--- a/src/kscopeconfig.h
+++ b/src/kscopeconfig.h
@@ -28,9 +28,9 @@
 #ifndef KSCOPECONFIG_H
 #define KSCOPECONFIG_H
 
-#include <ntqobject.h>
-#include <ntqstringlist.h>
-#include <ntqcolor.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
+#include <tqcolor.h>
 #include <kdockwidget.h>
 
 typedef TQValueList<int> SPLIT_SIZES;
diff --git a/src/kscopepixmaps.h b/src/kscopepixmaps.h
index f284674..078c83e 100644
--- a/src/kscopepixmaps.h
+++ b/src/kscopepixmaps.h
@@ -28,7 +28,7 @@
 #ifndef KSCOPEPIXMAPS_H
 #define KSCOPEPIXMAPS_H
 
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <kiconloader.h>
 
 #define GET_PIXMAP(_pix) \
diff --git a/src/makedlg.cpp b/src/makedlg.cpp
index b11741a..2037224 100644
--- a/src/makedlg.cpp
+++ b/src/makedlg.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <ktextbrowser.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
diff --git a/src/makefrontend.cpp b/src/makefrontend.cpp
index 2977d8f..326faf1 100644
--- a/src/makefrontend.cpp
+++ b/src/makefrontend.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include "makefrontend.h"
 
 // TODO:
diff --git a/src/makefrontend.h b/src/makefrontend.h
index c3ab3f1..1fc0a04 100644
--- a/src/makefrontend.h
+++ b/src/makefrontend.h
@@ -28,7 +28,7 @@
 #ifndef MAKEFRONTEND_H
 #define MAKEFRONTEND_H
 
-#include <frontend.h>
+#include "frontend.h"
 
 /**
  * A shell-process front-end intended for running make-like tasks.
diff --git a/src/newprojectdlg.cpp b/src/newprojectdlg.cpp
index 961cd3d..da9cb38 100644
--- a/src/newprojectdlg.cpp
+++ b/src/newprojectdlg.cpp
@@ -25,11 +25,11 @@
  *
  ***************************************************************************/
 
-#include <ntqregexp.h>
-#include <ntqpushbutton.h>
-#include <ntqspinbox.h>
-#include <ntqlabel.h>
-#include <ntqtextedit.h>
+#include <tqregexp.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqlabel.h>
+#include <tqtextedit.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <tdemessagebox.h>
diff --git a/src/newprojectdlg.h b/src/newprojectdlg.h
index ff96337..7886bf3 100644
--- a/src/newprojectdlg.h
+++ b/src/newprojectdlg.h
@@ -28,8 +28,8 @@
 #ifndef NEWPROJECTDLG_H
 #define NEWPROJECTDLG_H
 
-#include <ntqlineedit.h>
-#include <ntqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
 #include <newprojectlayout.h>
 #include <autocompletionlayout.h>
 #include "projectbase.h"
diff --git a/src/openprojectdlg.cpp b/src/openprojectdlg.cpp
index c6d510f..9f13489 100644
--- a/src/openprojectdlg.cpp
+++ b/src/openprojectdlg.cpp
@@ -25,9 +25,9 @@
  *
  ***************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
-#include <ntqlistbox.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqlistbox.h>
 #include <kurlrequester.h>
 #include "openprojectdlg.h"
 #include "kscopeconfig.h"
diff --git a/src/openprojectdlg.h b/src/openprojectdlg.h
index e9c2477..f8baf6a 100644
--- a/src/openprojectdlg.h
+++ b/src/openprojectdlg.h
@@ -28,7 +28,7 @@
 #ifndef OPENPROJECTDLG_H
 #define OPENPROJECTDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <openprojectlayout.h>
 
 /**
diff --git a/src/prefcolor.cpp b/src/prefcolor.cpp
index 79bba7c..4c77066 100644
--- a/src/prefcolor.cpp
+++ b/src/prefcolor.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqlistview.h>
-#include <ntqpainter.h>
+#include <tqlistview.h>
+#include <tqpainter.h>
 #include <kcolordialog.h>
 #include "prefcolor.h"
 #include "kscopeconfig.h"
diff --git a/src/preferencesdlg.cpp b/src/preferencesdlg.cpp
index d1a7ae5..983c3c2 100644
--- a/src/preferencesdlg.cpp
+++ b/src/preferencesdlg.cpp
@@ -25,12 +25,12 @@
  *
  ***************************************************************************/
 
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <kcolorbutton.h>
 #include <tdemessagebox.h>
 #include <tdefontrequester.h>
diff --git a/src/preferencesdlg.h b/src/preferencesdlg.h
index 30200d9..921f448 100644
--- a/src/preferencesdlg.h
+++ b/src/preferencesdlg.h
@@ -28,7 +28,7 @@
 #ifndef PREFERENCESDLG_H
 #define PREFERENCESDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <kdialogbase.h>
 
 class PrefFrontend;
diff --git a/src/preffont.cpp b/src/preffont.cpp
index bbed937..960719c 100644
--- a/src/preffont.cpp
+++ b/src/preffont.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqlistview.h>
-#include <ntqpainter.h>
+#include <tqlistview.h>
+#include <tqpainter.h>
 #include <tdefontdialog.h>
 #include <tdelocale.h>
 #include "preffont.h"
diff --git a/src/preffrontend.cpp b/src/preffrontend.cpp
index 6b3c9c5..effeb69 100644
--- a/src/preffrontend.cpp
+++ b/src/preffrontend.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqtextedit.h>
+#include <tqcheckbox.h>
+#include <tqtextedit.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
diff --git a/src/preffrontend.h b/src/preffrontend.h
index d0ac278..345ac38 100644
--- a/src/preffrontend.h
+++ b/src/preffrontend.h
@@ -28,7 +28,7 @@
 #ifndef PREFFRONTENDDLG_H
 #define PREFFRONTENDDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <preffrontendlayout.h>
 
 /**
diff --git a/src/prefopt.cpp b/src/prefopt.cpp
index aefb6c8..2610eff 100644
--- a/src/prefopt.cpp
+++ b/src/prefopt.cpp
@@ -25,10 +25,10 @@
  *
  ***************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqradiobutton.h>
-#include <ntqlineedit.h>
-#include <ntqlabel.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
 #include "prefopt.h"
 #include "kscopeconfig.h"
 
diff --git a/src/progressdlg.h b/src/progressdlg.h
index 995be48..26caa39 100644
--- a/src/progressdlg.h
+++ b/src/progressdlg.h
@@ -28,8 +28,8 @@
 #ifndef PROGRESSDLG_H
 #define PROGRESSDLG_H
 
-#include <ntqwidget.h>
-#include <ntqtimer.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
 #include <kprogress.h>
 
 /**
diff --git a/src/project.h b/src/project.h
index bcca58a..5607f73 100644
--- a/src/project.h
+++ b/src/project.h
@@ -28,7 +28,7 @@
 #ifndef PROJECT_H
 #define PROJECT_H
 
-#include <projectbase.h>
+#include "projectbase.h"
 
 /**
  * @author Elad Lahav
diff --git a/src/projectbase.h b/src/projectbase.h
index 5cd63e2..1e7b6a7 100644
--- a/src/projectbase.h
+++ b/src/projectbase.h
@@ -28,9 +28,9 @@
 #ifndef PROJECTBASE_H
 #define PROJECTBASE_H
 
-#include <ntqstringlist.h>
-#include <ntqdir.h>
-#include <ntqfile.h>
+#include <tqstringlist.h>
+#include <tqdir.h>
+#include <tqfile.h>
 #include <tdeconfig.h>
 
 #define DEF_IS_KERNEL		false
diff --git a/src/projectfilesdlg.cpp b/src/projectfilesdlg.cpp
index 5ff4987..3c9cf2b 100644
--- a/src/projectfilesdlg.cpp
+++ b/src/projectfilesdlg.cpp
@@ -25,10 +25,10 @@
  *
  ***************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqlistview.h>
-#include <ntqlineedit.h>
-#include <ntqregexp.h>
+#include <tqpushbutton.h>
+#include <tqlistview.h>
+#include <tqlineedit.h>
+#include <tqregexp.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdefiledialog.h>
diff --git a/src/projectfilesdlg.h b/src/projectfilesdlg.h
index abd86ef..000a662 100644
--- a/src/projectfilesdlg.h
+++ b/src/projectfilesdlg.h
@@ -28,9 +28,9 @@
 #ifndef PROJECTFILESDLG_H
 #define PROJECTFILESDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <projectfileslayout.h>
-#include <ntqdict.h>
+#include <tqdict.h>
 #include "project.h"
 
 class DirScanner;
diff --git a/src/querypage.cpp b/src/querypage.cpp
index d1ee2ff..06a77b5 100644
--- a/src/querypage.cpp
+++ b/src/querypage.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tdelocale.h>
 #include "querypage.h"
 #include "queryview.h"
diff --git a/src/querypage.h b/src/querypage.h
index a1a78e0..0ebcf09 100644
--- a/src/querypage.h
+++ b/src/querypage.h
@@ -28,9 +28,9 @@
 #ifndef QUERYPAGE_H
 #define QUERYPAGE_H
 
-#include <ntqwidget.h>
-#include <ntqlistview.h>
-#include <ntqregexp.h>
+#include <tqwidget.h>
+#include <tqlistview.h>
+#include <tqregexp.h>
 #include "querypagebase.h"
 #include "cscopefrontend.h"
 
diff --git a/src/querypagebase.cpp b/src/querypagebase.cpp
index 8af1872..430110a 100644
--- a/src/querypagebase.cpp
+++ b/src/querypagebase.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include "querypagebase.h"
 #include "queryview.h"
 #include "kscopeconfig.h"
diff --git a/src/querypagebase.h b/src/querypagebase.h
index 1fe086c..00a33d5 100644
--- a/src/querypagebase.h
+++ b/src/querypagebase.h
@@ -28,7 +28,7 @@
 #ifndef QUERYPAGEBASE_H
 #define QUERYPAGEBASE_H
 
-#include <ntqhbox.h>
+#include <tqhbox.h>
 
 class QueryView;
 
diff --git a/src/queryresultsmenu.h b/src/queryresultsmenu.h
index 8a34af5..acb3037 100644
--- a/src/queryresultsmenu.h
+++ b/src/queryresultsmenu.h
@@ -28,9 +28,9 @@
 #ifndef QUERYRESULTSMENU_H
 #define QUERYRESULTSMENU_H
 
-#include <ntqpopupmenu.h>
-#include <ntqlistview.h>
-#include <ntqregexp.h>
+#include <tqpopupmenu.h>
+#include <tqlistview.h>
+#include <tqregexp.h>
 
 /**
  * Provides a popup-menu for list views containing query results.
diff --git a/src/queryview.cpp b/src/queryview.cpp
index 06567a4..172e484 100644
--- a/src/queryview.cpp
+++ b/src/queryview.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqapplication.h>
-#include <ntqclipboard.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
 #include <tdelocale.h>
 #include "queryview.h"
 #include "queryresultsmenu.h"
diff --git a/src/queryview.h b/src/queryview.h
index abdcc82..ede2427 100644
--- a/src/queryview.h
+++ b/src/queryview.h
@@ -28,8 +28,8 @@
 #ifndef QUERYVIEW_H
 #define QUERYVIEW_H
 
-#include <ntqlistview.h>
-#include <ntqregexp.h>
+#include <tqlistview.h>
+#include <tqregexp.h>
 
 class QueryResultsMenu;
 
diff --git a/src/queryviewdriver.h b/src/queryviewdriver.h
index 7851cea..4e8e743 100644
--- a/src/queryviewdriver.h
+++ b/src/queryviewdriver.h
@@ -28,8 +28,8 @@
 #ifndef QUERYVIEWDRIVER_H
 #define QUERYVIEWDRIVER_H
 
-#include <ntqobject.h>
-#include <ntqlistview.h>
+#include <tqobject.h>
+#include <tqlistview.h>
 #include "cscopefrontend.h"
 
 class QueryView;
diff --git a/src/querywidget.cpp b/src/querywidget.cpp
index ea55dca..c28e051 100644
--- a/src/querywidget.cpp
+++ b/src/querywidget.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqtoolbutton.h>
-#include <ntqtooltip.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include "querywidget.h"
diff --git a/src/querywidget.h b/src/querywidget.h
index a362236..790b360 100644
--- a/src/querywidget.h
+++ b/src/querywidget.h
@@ -28,8 +28,8 @@
 #ifndef QUERYWIDGET_H
 #define QUERYWIDGET_H
 
-#include <ntqlistview.h>
-#include <ntqpopupmenu.h>
+#include <tqlistview.h>
+#include <tqpopupmenu.h>
 #include <tdeaction.h>
 #include "querywidgetlayout.h"
 #include "tabwidget.h"
diff --git a/src/scanprogressdlg.cpp b/src/scanprogressdlg.cpp
index 0f98c1b..52dcf08 100644
--- a/src/scanprogressdlg.cpp
+++ b/src/scanprogressdlg.cpp
@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqlabel.h>
-#include <ntqpushbutton.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
 #include <tdelocale.h>
 #include "scanprogressdlg.h"
 
diff --git a/src/scanprogressdlg.h b/src/scanprogressdlg.h
index 2e18ed5..e753869 100644
--- a/src/scanprogressdlg.h
+++ b/src/scanprogressdlg.h
@@ -28,7 +28,7 @@
 #ifndef SCANPROGRESSDLG_H
 #define SCANPROGRESSDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <scanprogresslayout.h>
 
 /**
diff --git a/src/searchlist.cpp b/src/searchlist.cpp
index 867807d..b784ee5 100644
--- a/src/searchlist.cpp
+++ b/src/searchlist.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqheader.h>
+#include <tqheader.h>
 #include "searchlist.h"
 
 /**
diff --git a/src/searchlist.h b/src/searchlist.h
index 3986b4b..13d1ad7 100644
--- a/src/searchlist.h
+++ b/src/searchlist.h
@@ -28,11 +28,11 @@
 #ifndef SEARCHLIST_H
 #define SEARCHLIST_H
 
-#include <ntqwidget.h>
-#include <ntqvbox.h>
-#include <ntqlineedit.h>
-#include <ntqlistview.h>
-#include <ntqtooltip.h>
+#include <tqwidget.h>
+#include <tqvbox.h>
+#include <tqlineedit.h>
+#include <tqlistview.h>
+#include <tqtooltip.h>
 
 class SearchList;
 
diff --git a/src/searchresultsdlg.cpp b/src/searchresultsdlg.cpp
index bbcdd9b..c6183d6 100644
--- a/src/searchresultsdlg.cpp
+++ b/src/searchresultsdlg.cpp
@@ -25,10 +25,10 @@
  *
  ***************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
-#include <ntqcombobox.h>
-#include <ntqradiobutton.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqradiobutton.h>
 #include "searchresultsdlg.h"
 
 int SearchResultsDlg::s_nType = PlainText;
diff --git a/src/searchresultsdlg.h b/src/searchresultsdlg.h
index 9c30500..0917282 100644
--- a/src/searchresultsdlg.h
+++ b/src/searchresultsdlg.h
@@ -28,8 +28,8 @@
 #ifndef SEARCHRESULTSDLG_H
 #define SEARCHRESULTSDLG_H
 
-#include <ntqregexp.h>
-#include <ntqcheckbox.h>
+#include <tqregexp.h>
+#include <tqcheckbox.h>
 #include "searchresultslayout.h"
 
 /**
diff --git a/src/symbolcompletion.cpp b/src/symbolcompletion.cpp
index d566b1b..ee603b4 100644
--- a/src/symbolcompletion.cpp
+++ b/src/symbolcompletion.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqtimer.h> 
+#include <tqtimer.h>
 #include <tdelocale.h>
 #include "symbolcompletion.h"
 
diff --git a/src/symbolcompletion.h b/src/symbolcompletion.h
index c540e12..ba5a899 100644
--- a/src/symbolcompletion.h
+++ b/src/symbolcompletion.h
@@ -28,8 +28,8 @@
 #ifndef SYMBOLCOMPLETION_H
 #define SYMBOLCOMPLETION_H
 
-#include <ntqobject.h>
-#include <ntqregexp.h>
+#include <tqobject.h>
+#include <tqregexp.h>
 #include <tdetexteditor/codecompletioninterface.h>
 #include <tdetexteditor/view.h>
 #include "cscopefrontend.h"
diff --git a/src/symboldlg.cpp b/src/symboldlg.cpp
index 997f4bb..24b654b 100644
--- a/src/symboldlg.cpp
+++ b/src/symboldlg.cpp
@@ -25,12 +25,12 @@
  *
  ***************************************************************************/
 
-#include <ntqlabel.h>
-#include <ntqlistview.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
-#include <ntqcheckbox.h>
-#include <ntqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlistview.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
 #include <kcombobox.h>
 #include <tdelocale.h>
 #include "symboldlg.h"
diff --git a/src/symboldlg.h b/src/symboldlg.h
index 1e5b463..2421e78 100644
--- a/src/symboldlg.h
+++ b/src/symboldlg.h
@@ -28,7 +28,7 @@
 #ifndef SYMBOLDLG_H
 #define SYMBOLDLG_H
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include "symbollayout.h"
 #include "cscopefrontend.h"
 
diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp
index bc9f00a..405c368 100644
--- a/src/tabwidget.cpp
+++ b/src/tabwidget.cpp
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 #include <tdelocale.h>
 #include "tabwidget.h"
 #include "kscopepixmaps.h"
diff --git a/src/tabwidget.h b/src/tabwidget.h
index 4c79820..36bab30 100644
--- a/src/tabwidget.h
+++ b/src/tabwidget.h
@@ -29,8 +29,8 @@
 #define TABWIDGET_H
 
 
-#include <ntqtoolbutton.h>
-#include <ntqpopupmenu.h>
+#include <tqtoolbutton.h>
+#include <tqpopupmenu.h>
 #include <ktabwidget.h>
 
 /**