diff --git a/src/commonwidget.cpp b/src/commonwidget.cpp
index 6170907..e27663f 100644
--- a/src/commonwidget.cpp
+++ b/src/commonwidget.cpp
@@ -20,17 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqbuttongroup.h>
-#include <ntqcheckbox.h>
-#include <ntqcombobox.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqlistbox.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
-#include <ntqstringlist.h>
-#include <ntqvalidator.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqlistbox.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqstringlist.h>
+#include <tqvalidator.h>
 
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/src/commonwidget.h b/src/commonwidget.h
index 2c571a9..edad76c 100644
--- a/src/commonwidget.h
+++ b/src/commonwidget.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/compoundwidget.cpp b/src/compoundwidget.cpp
index 071e5ea..b450ce4 100644
--- a/src/compoundwidget.cpp
+++ b/src/compoundwidget.cpp
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqiconset.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
-#include <ntqspinbox.h>
+#include <tqcheckbox.h>
+#include <tqiconset.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
 
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/src/compoundwidget.h b/src/compoundwidget.h
index 9086096..cb19230 100644
--- a/src/compoundwidget.h
+++ b/src/compoundwidget.h
@@ -26,7 +26,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/htmlwidget.cpp b/src/htmlwidget.cpp
index bc48fed..3a0b395 100644
--- a/src/htmlwidget.cpp
+++ b/src/htmlwidget.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/htmlwidget.h b/src/htmlwidget.h
index 2c87b8d..0ccc918 100644
--- a/src/htmlwidget.h
+++ b/src/htmlwidget.h
@@ -27,8 +27,8 @@
 #	include <config.h>
 #endif
 
-#include <ntqstringlist.h>
-#include <ntqwidget.h>
+#include <tqstringlist.h>
+#include <tqwidget.h>
 #include <kurl.h>
 #include "global.h"
 
diff --git a/src/indexwidget.cpp b/src/indexwidget.cpp
index 77a8e8a..33e48af 100644
--- a/src/indexwidget.cpp
+++ b/src/indexwidget.cpp
@@ -20,11 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqdragobject.h>
-#include <ntqfontmetrics.h>
-#include <ntqpainter.h>
-#include <ntqpopupmenu.h>
-#include <ntqtimer.h>
+#include <tqdragobject.h>
+#include <tqfontmetrics.h>
+#include <tqpainter.h>
+#include <tqpopupmenu.h>
+#include <tqtimer.h>
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/indexwidget.h b/src/indexwidget.h
index 292d9e6..c6cca76 100644
--- a/src/indexwidget.h
+++ b/src/indexwidget.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqscrollview.h>
+#include <tqscrollview.h>
 
 //	forward class definitions
 //	=========================
diff --git a/src/knmap.cpp b/src/knmap.cpp
index c5e1cd5..1400710 100644
--- a/src/knmap.cpp
+++ b/src/knmap.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqdir.h>
-#include <ntqlineedit.h>
+#include <tqdir.h>
+#include <tqlineedit.h>
 
 #include <tdeaction.h>
 #include <tdeapplication.h>
diff --git a/src/knmap.h b/src/knmap.h
index bb0df8d..e1dec0a 100644
--- a/src/knmap.h
+++ b/src/knmap.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <tdemainwindow.h>
 #include "global.h"
 
diff --git a/src/loggingoptions.cpp b/src/loggingoptions.cpp
index ad1e6a5..819b207 100644
--- a/src/loggingoptions.cpp
+++ b/src/loggingoptions.cpp
@@ -20,11 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqbuttongroup.h>
-#include <ntqcheckbox.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
 
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/src/loggingoptions.h b/src/loggingoptions.h
index 566cf28..55eb712 100644
--- a/src/loggingoptions.h
+++ b/src/loggingoptions.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
index fcdb625..e355677 100644
--- a/src/mainwidget.cpp
+++ b/src/mainwidget.cpp
@@ -20,7 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqtimer.h>
+#include <tqtimer.h>
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/mainwidget.h b/src/mainwidget.h
index bb6aa75..38963a5 100644
--- a/src/mainwidget.h
+++ b/src/mainwidget.h
@@ -27,8 +27,8 @@
 #	include <config.h>
 #endif
 
-#include <ntqsplitter.h>
-#include <ntqstringlist.h>
+#include <tqsplitter.h>
+#include <tqstringlist.h>
 
 #include "global.h"
 
diff --git a/src/outputwidget.cpp b/src/outputwidget.cpp
index 9855a8a..7c58469 100644
--- a/src/outputwidget.cpp
+++ b/src/outputwidget.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqfile.h>
-#include <ntqtimer.h>
+#include <tqfile.h>
+#include <tqtimer.h>
 
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/src/outputwidget.h b/src/outputwidget.h
index af02622..901dae8 100644
--- a/src/outputwidget.h
+++ b/src/outputwidget.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/pandsoptions.cpp b/src/pandsoptions.cpp
index e44deee..6441d92 100644
--- a/src/pandsoptions.cpp
+++ b/src/pandsoptions.cpp
@@ -20,10 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
 
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/src/pandsoptions.h b/src/pandsoptions.h
index 7e3aced..f5b4682 100644
--- a/src/pandsoptions.h
+++ b/src/pandsoptions.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/profiledialog.cpp b/src/profiledialog.cpp
index d426926..df52ee3 100644
--- a/src/profiledialog.cpp
+++ b/src/profiledialog.cpp
@@ -20,12 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqlistbox.h>
-#include <ntqmap.h>
-#include <ntqpopupmenu.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqlistbox.h>
+#include <tqmap.h>
+#include <tqpopupmenu.h>
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/scanmonitor.cpp b/src/scanmonitor.cpp
index 91c66f7..5019234 100644
--- a/src/scanmonitor.cpp
+++ b/src/scanmonitor.cpp
@@ -27,7 +27,7 @@
 #include <sys/select.h> 
 #include <sys/time.h> 
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 #include <tdelocale.h>
 
diff --git a/src/scanmonitor.h b/src/scanmonitor.h
index 19dec64..6917d81 100644
--- a/src/scanmonitor.h
+++ b/src/scanmonitor.h
@@ -27,8 +27,8 @@
 #	include <config.h>
 #endif
 
-#include <ntqptrlist.h>
-#include <ntqthread.h>
+#include <tqptrlist.h>
+#include <tqthread.h>
 
 #include "global.h"
 
diff --git a/src/scanmonitorevent.h b/src/scanmonitorevent.h
index aecea5a..6b31cf0 100644
--- a/src/scanmonitorevent.h
+++ b/src/scanmonitorevent.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqevent.h>
+#include <tqevent.h>
 #include "global.h"
 
 class ScanMonitorEvent : public TQCustomEvent
diff --git a/src/scannamedialog.cpp b/src/scannamedialog.cpp
index 827a46a..a29a14e 100644
--- a/src/scannamedialog.cpp
+++ b/src/scannamedialog.cpp
@@ -20,10 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/src/scanstack.cpp b/src/scanstack.cpp
index 5f5644b..9b96585 100644
--- a/src/scanstack.cpp
+++ b/src/scanstack.cpp
@@ -20,7 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqdict.h>
+#include <tqdict.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/src/scanstack.h b/src/scanstack.h
index 2b1ecce..9881e0a 100644
--- a/src/scanstack.h
+++ b/src/scanstack.h
@@ -27,8 +27,8 @@
 #	include <config.h>
 #endif
 
-#include <ntqdict.h>
-#include <ntqwidgetstack.h>
+#include <tqdict.h>
+#include <tqwidgetstack.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/scanwidget.cpp b/src/scanwidget.cpp
index 75679a8..aaf8d04 100644
--- a/src/scanwidget.cpp
+++ b/src/scanwidget.cpp
@@ -28,11 +28,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <ntqfile.h>
-#include <ntqlayout.h>
-#include <ntqpushbutton.h>
-#include <ntqstringlist.h>
-#include <ntqtimer.h>
+#include <tqfile.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/scanwidget.h b/src/scanwidget.h
index a1ef15b..36977e5 100644
--- a/src/scanwidget.h
+++ b/src/scanwidget.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqframe.h>
+#include <tqframe.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/simpleoptions.cpp b/src/simpleoptions.cpp
index 682008c..76f5a86 100644
--- a/src/simpleoptions.cpp
+++ b/src/simpleoptions.cpp
@@ -20,9 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
 
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/src/simpleoptions.h b/src/simpleoptions.h
index 7fb52ac..7aa8430 100644
--- a/src/simpleoptions.h
+++ b/src/simpleoptions.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/stylesheetdialog.cpp b/src/stylesheetdialog.cpp
index 58f22ee..a54cce1 100644
--- a/src/stylesheetdialog.cpp
+++ b/src/stylesheetdialog.cpp
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqiconset.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqlistbox.h>
-#include <ntqpushbutton.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqiconset.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqlistbox.h>
+#include <tqpushbutton.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/src/tabwidgetdata.cpp b/src/tabwidgetdata.cpp
index bb9bc08..e9add88 100644
--- a/src/tabwidgetdata.cpp
+++ b/src/tabwidgetdata.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqstring.h>
-#include <ntqwidget.h>
+#include <tqstring.h>
+#include <tqwidget.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/src/tabwidgetptrlist.cpp b/src/tabwidgetptrlist.cpp
index af4f827..a7e09c5 100644
--- a/src/tabwidgetptrlist.cpp
+++ b/src/tabwidgetptrlist.cpp
@@ -20,7 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqptrcollection.h>
+#include <tqptrcollection.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/src/tabwidgetptrlist.h b/src/tabwidgetptrlist.h
index 3decf7f..5d29cfd 100644
--- a/src/tabwidgetptrlist.h
+++ b/src/tabwidgetptrlist.h
@@ -27,7 +27,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqptrlist.h>
+#include <tqptrlist.h>
 #include "global.h"
 #include "tabwidgetdata.h"
 
diff --git a/src/timingwidget.cpp b/src/timingwidget.cpp
index 1a85f45..9cce8fc 100644
--- a/src/timingwidget.cpp
+++ b/src/timingwidget.cpp
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqbuttongroup.h>
-#include <ntqcheckbox.h>
-#include <ntqiconset.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqiconset.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
 
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/src/timingwidget.h b/src/timingwidget.h
index b43e5c2..15f56c4 100644
--- a/src/timingwidget.h
+++ b/src/timingwidget.h
@@ -26,7 +26,7 @@
 #	include <config.h>
 #endif
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "global.h"
 
 //	forward class definitions
diff --git a/src/whatsthis.h b/src/whatsthis.h
index 04ad610..7ca4643 100644
--- a/src/whatsthis.h
+++ b/src/whatsthis.h
@@ -27,8 +27,8 @@
 #	include <config.h>
 #endif
 
-#include <ntqobject.h>
-#include <ntqwhatsthis.h>
+#include <tqobject.h>
+#include <tqwhatsthis.h>
 #include "global.h"
 
 //	forward class definitions