diff --git a/src/cpupanel.cpp b/src/cpupanel.cpp
index ec10b02..f7a75ab 100644
--- a/src/cpupanel.cpp
+++ b/src/cpupanel.cpp
@@ -18,9 +18,9 @@
 #include "cpupanel.h"
 #include "qlcddraw.h"
 
-#include <ntqcolor.h>
-#include <ntqpainter.h>
-#include <ntqlcdnumber.h>
+#include <tqcolor.h>
+#include <tqpainter.h>
+#include <tqlcdnumber.h>
 
 #include <string.h>
 
diff --git a/src/cpupanel.h b/src/cpupanel.h
index b82abcf..ac48526 100644
--- a/src/cpupanel.h
+++ b/src/cpupanel.h
@@ -20,7 +20,7 @@
 
 #include "panel.h"
 
-#include <ntqlcdnumber.h>
+#include <tqlcdnumber.h>
 #include "qlcdstring.h"
 
 /**
diff --git a/src/cputimepanel.h b/src/cputimepanel.h
index d2b5f42..ac06ebd 100644
--- a/src/cputimepanel.h
+++ b/src/cputimepanel.h
@@ -18,7 +18,7 @@
 #ifndef CPUTIMEPANEL_H
 #define CPUTIMEPANEL_H
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 #include <panel.h>
 #include "qlcdstring.h"
diff --git a/src/generalcfg.cpp b/src/generalcfg.cpp
index 1955dc6..f833c45 100644
--- a/src/generalcfg.cpp
+++ b/src/generalcfg.cpp
@@ -17,11 +17,11 @@
 
 #include "generalcfg.h"
 
-#include <ntqgroupbox.h>
-#include <ntqlayout.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
-#include <ntqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
 
 #include "lmsensorswidget.h"
 #include "lmsensorsdock.h"
diff --git a/src/hdsensorslist.cpp b/src/hdsensorslist.cpp
index 54fe789..f2dcdda 100644
--- a/src/hdsensorslist.cpp
+++ b/src/hdsensorslist.cpp
@@ -21,9 +21,9 @@
 #include <dirent.h>
 #include <sys/types.h>
 #include <stdlib.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <tdelocale.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 
 #include "sensor.h"
 #include "hdsensorslist.h"
diff --git a/src/infopanels.h b/src/infopanels.h
index 0184508..a4ad51a 100644
--- a/src/infopanels.h
+++ b/src/infopanels.h
@@ -18,7 +18,7 @@
 #ifndef INFOPANELS_H
 #define INFOPANELS_H
 
-#include <ntqtimer.h>
+#include <tqtimer.h>
 #include <tdeglobal.h>
 
 #include "panelsgroup.h"
diff --git a/src/ksensors.cpp b/src/ksensors.cpp
index c99ada1..e085eb6 100644
--- a/src/ksensors.cpp
+++ b/src/ksensors.cpp
@@ -4,7 +4,7 @@
 
 #include "ksensors.h"
 
-#include <ntqlabel.h>
+#include <tqlabel.h>
 
 #include <tdemainwindow.h>
 #include <tdelocale.h>
diff --git a/src/ksensorscfg.cpp b/src/ksensorscfg.cpp
index f35495b..19c84f3 100644
--- a/src/ksensorscfg.cpp
+++ b/src/ksensorscfg.cpp
@@ -17,14 +17,14 @@
 
 #include "ksensorscfg.h"
 
-#include <ntqvariant.h>
-#include <ntqframe.h>
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
-#include <ntqimage.h>
-#include <ntqpixmap.h>
+#include <tqvariant.h>
+#include <tqframe.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqimage.h>
+#include <tqpixmap.h>
 
 #include <kiconloader.h>
 #include <tdelocale.h>
diff --git a/src/ksensorscfg.h b/src/ksensorscfg.h
index bc8d896..3ebea8b 100644
--- a/src/ksensorscfg.h
+++ b/src/ksensorscfg.h
@@ -18,7 +18,7 @@
 #ifndef KSENSORSCFG_H
 #define KSENSORSCFG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <kdialogbase.h>
 
 //class TQVBoxLayout;
diff --git a/src/ksensorssplash.h b/src/ksensorssplash.h
index d9d22e5..694010a 100644
--- a/src/ksensorssplash.h
+++ b/src/ksensorssplash.h
@@ -18,8 +18,8 @@
 #ifndef KSENSORSSPLASH_H
 #define KSENSORSSPLASH_H
 
-#include <ntqwidget.h>
-//#include <ntqwidget.h>
+#include <tqwidget.h>
+//#include <tqwidget.h>
 
 
 /**
diff --git a/src/lmsensor.h b/src/lmsensor.h
index 5ab39a5..da11a3f 100644
--- a/src/lmsensor.h
+++ b/src/lmsensor.h
@@ -18,10 +18,10 @@
 #ifndef LMSENSOR_H
 #define LMSENSOR_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <tdeconfig.h>
-#include <ntqstring.h>
-#include <ntqcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
 
 #include <sensors/sensors.h>
 #include "sensor.h"
diff --git a/src/lmsensordockpanel.cpp b/src/lmsensordockpanel.cpp
index a0cc8f1..b73bbf3 100644
--- a/src/lmsensordockpanel.cpp
+++ b/src/lmsensordockpanel.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 #include <kstddirs.h>
 #include <tdelocale.h>
diff --git a/src/lmsensordockpanel.h b/src/lmsensordockpanel.h
index 295a924..9293d8d 100644
--- a/src/lmsensordockpanel.h
+++ b/src/lmsensordockpanel.h
@@ -21,7 +21,7 @@
 
 #include <ksystemtray.h>
 #include <tdepopupmenu.h>
-#include <ntqcolor.h>
+#include <tqcolor.h>
 
 #include "qlcddraw.h"
 
diff --git a/src/lmsensorpanel.h b/src/lmsensorpanel.h
index f91fec7..88228fc 100644
--- a/src/lmsensorpanel.h
+++ b/src/lmsensorpanel.h
@@ -18,7 +18,7 @@
 #ifndef LMSENSORPANEL_H
 #define LMSENSORPANEL_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 #include "panel.h"
 #include "sensor.h"
diff --git a/src/lmsensors.cpp b/src/lmsensors.cpp
index eecb552..4ae34e8 100644
--- a/src/lmsensors.cpp
+++ b/src/lmsensors.cpp
@@ -21,8 +21,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include <ntqstrlist.h>
-#include <ntqobjectlist.h>
+#include <tqstrlist.h>
+#include <tqobjectlist.h>
 
 #include "lmsensors.h"
 
diff --git a/src/lmsensors.h b/src/lmsensors.h
index c20790d..e16626a 100644
--- a/src/lmsensors.h
+++ b/src/lmsensors.h
@@ -18,10 +18,10 @@
 #ifndef LMSENSORS_H
 #define LMSENSORS_H
 
-#include <ntqobject.h>
-#include <ntqobjectlist.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
 #include <tdeconfig.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 #include <sensors/sensors.h>
 
diff --git a/src/lmsensorsalarms.cpp b/src/lmsensorsalarms.cpp
index f44300e..a7f8d0b 100644
--- a/src/lmsensorsalarms.cpp
+++ b/src/lmsensorsalarms.cpp
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tdeglobal.h>
 #include <kprocess.h>
 #include <kaudioplayer.h>
diff --git a/src/lmsensorsalarms.h b/src/lmsensorsalarms.h
index 192c7a7..83d7a88 100644
--- a/src/lmsensorsalarms.h
+++ b/src/lmsensorsalarms.h
@@ -18,8 +18,8 @@
 #ifndef LMSENSORSALARMS_H
 #define LMSENSORSALARMS_H
 
-#include <ntqobject.h>
-#include <ntqstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
 #include "lmsensors.h"
 
 /**
diff --git a/src/lmsensorscfg.cpp b/src/lmsensorscfg.cpp
index d2d0371..068c030 100644
--- a/src/lmsensorscfg.cpp
+++ b/src/lmsensorscfg.cpp
@@ -22,18 +22,18 @@
 #include "lmsensordockpanel.h"
 #include "lmsensorswidget.h"
 
-#include <ntqcolor.h>
-#include <ntqlistbox.h>
-#include <ntqlineedit.h>
-#include <ntqcheckbox.h>
-#include <ntqgroupbox.h>
-#include <ntqradiobutton.h>
-#include <ntqpushbutton.h>
-#include <ntqobjectlist.h>
-#include <ntqtabwidget.h>
-#include <ntqcombobox.h>
-#include <ntqspinbox.h>
-#include <ntqlayout.h>
+#include <tqcolor.h>
+#include <tqlistbox.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqradiobutton.h>
+#include <tqpushbutton.h>
+#include <tqobjectlist.h>
+#include <tqtabwidget.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
+#include <tqlayout.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
diff --git a/src/lmsensorscfg.h b/src/lmsensorscfg.h
index 64b2564..72d4a23 100644
--- a/src/lmsensorscfg.h
+++ b/src/lmsensorscfg.h
@@ -18,7 +18,7 @@
 #ifndef LMSENSORSCFG_H
 #define LMSENSORSCFG_H
 
-//#include <ntqobject.h>
+//#include <tqobject.h>
 
 #include "sensorslist.h"
 #include "lmsensorscfgdesign.h"
diff --git a/src/lmsensorsdock.cpp b/src/lmsensorsdock.cpp
index 8125cae..8667f15 100644
--- a/src/lmsensorsdock.cpp
+++ b/src/lmsensorsdock.cpp
@@ -17,7 +17,7 @@
 
 #include "lmsensorsdock.h"
 
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <kapp.h>
diff --git a/src/lmsensorsdock.h b/src/lmsensorsdock.h
index abdfdce..40347e5 100644
--- a/src/lmsensorsdock.h
+++ b/src/lmsensorsdock.h
@@ -24,8 +24,8 @@
 #endif
 
 
-#include <ntqobject.h>
-#include <ntqguardedptr.h>
+#include <tqobject.h>
+#include <tqguardedptr.h>
 
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
diff --git a/src/lmsensorswidget.cpp b/src/lmsensorswidget.cpp
index 630dd51..3846366 100644
--- a/src/lmsensorswidget.cpp
+++ b/src/lmsensorswidget.cpp
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqobject.h>
-#include <ntqobjectlist.h>
-#include <ntqpixmap.h>
-#include <ntqtimer.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
+#include <tqpixmap.h>
+#include <tqtimer.h>
 
 #include <kiconloader.h>
 #include <kstddirs.h>
diff --git a/src/lmsensorswidget.h b/src/lmsensorswidget.h
index 031088b..011d458 100644
--- a/src/lmsensorswidget.h
+++ b/src/lmsensorswidget.h
@@ -18,8 +18,8 @@
 #ifndef LMSENSORSWIDGET_H
 #define LMSENSORSWIDGET_H
 
-#include <ntqwidget.h>
-#include <ntqpixmap.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
 
 #include "lmsensors.h"
 #include "lmsensorpanel.h"
diff --git a/src/palettecfg.cpp b/src/palettecfg.cpp
index d963d9a..4a92013 100644
--- a/src/palettecfg.cpp
+++ b/src/palettecfg.cpp
@@ -18,9 +18,9 @@
 #include "palettecfg.h"
 #include "lmsensorswidget.h"
 
-#include <ntqlabel.h>
-#include <ntqpalette.h>
-#include <ntqcombobox.h>
+#include <tqlabel.h>
+#include <tqpalette.h>
+#include <tqcombobox.h>
 #include <kcolorbutton.h>
 
 PaletteCfg::PaletteCfg(TQWidget *parent, const char *name): PaletteCfgDesign(parent,name)
diff --git a/src/panel.h b/src/panel.h
index 2666431..5778e13 100644
--- a/src/panel.h
+++ b/src/panel.h
@@ -18,9 +18,9 @@
 #ifndef PANEL_H
 #define PANEL_H
 
-#include <ntqframe.h>
+#include <tqframe.h>
 #include <tdeconfig.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 
 /**
   *@author Miguel Novas
diff --git a/src/panelsgroup.h b/src/panelsgroup.h
index fac3b7b..197e8d8 100644
--- a/src/panelsgroup.h
+++ b/src/panelsgroup.h
@@ -18,7 +18,7 @@
 #ifndef PANELSGROUP_H
 #define PANELSGROUP_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 
 #include <panel.h>
 /**
diff --git a/src/qbarmeter.h b/src/qbarmeter.h
index d0be386..5fd3c7c 100644
--- a/src/qbarmeter.h
+++ b/src/qbarmeter.h
@@ -18,9 +18,9 @@
 #ifndef TQBARMETER_H
 #define TQBARMETER_H
 
-#include <ntqpainter.h>
-#include <ntqwidget.h>
-#include <ntqcolor.h>
+#include <tqpainter.h>
+#include <tqwidget.h>
+#include <tqcolor.h>
 
 /**
   *@author Miguel Novas
diff --git a/src/qdialarc.cpp b/src/qdialarc.cpp
index 9474d90..3d17872 100644
--- a/src/qdialarc.cpp
+++ b/src/qdialarc.cpp
@@ -18,7 +18,7 @@
 
 #include "qdialarc.h"
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/qdialarc.h b/src/qdialarc.h
index ef8c53c..625b8a3 100644
--- a/src/qdialarc.h
+++ b/src/qdialarc.h
@@ -18,7 +18,7 @@
 #ifndef TQDIALARC_H
 #define TQDIALARC_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 /**
   *@author Miguel Novas
diff --git a/src/qlcddraw.h b/src/qlcddraw.h
index a02a340..533087a 100644
--- a/src/qlcddraw.h
+++ b/src/qlcddraw.h
@@ -19,8 +19,8 @@
 #ifndef TQLCDDRAW_H
 #define TQLCDDRAW_H
 
-#include <ntqpainter.h>
-#include <ntqcolor.h>
+#include <tqpainter.h>
+#include <tqcolor.h>
 
 
 class TQLcd {
diff --git a/src/qlcdstring.cpp b/src/qlcdstring.cpp
index f37dbc0..5d00630 100644
--- a/src/qlcdstring.cpp
+++ b/src/qlcdstring.cpp
@@ -18,7 +18,7 @@
 
 #include "qlcdstring.h"
 
-#include <ntqpalette.h>
+#include <tqpalette.h>
 
 
 TQLCDString::TQLCDString( TQWidget *parent, const char *name ): TQWidget( parent, name )
diff --git a/src/qlcdstring.h b/src/qlcdstring.h
index b47b168..6f70eb4 100644
--- a/src/qlcdstring.h
+++ b/src/qlcdstring.h
@@ -18,10 +18,10 @@
 #ifndef TQLCDSTRING_H
 #define TQLCDSTRING_H
 
-#include <ntqframe.h>
-#include <ntqpainter.h>
-#include <ntqcolor.h>
-#include <ntqstring.h>
+#include <tqframe.h>
+#include <tqpainter.h>
+#include <tqcolor.h>
+#include <tqstring.h>
 
 #include "qlcddraw.h"
 
@@ -29,7 +29,7 @@
   *@author Miguel Novas
   */
 
-#include <ntqpalette.h>
+#include <tqpalette.h>
 
 class TQLCDString : public TQWidget  {
 TQ_OBJECT
diff --git a/src/sensor.h b/src/sensor.h
index 9c15cdb..4979c18 100644
--- a/src/sensor.h
+++ b/src/sensor.h
@@ -18,10 +18,10 @@
 #ifndef SENSOR_H
 #define SENSOR_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <tdeconfig.h>
-#include <ntqstring.h>
-#include <ntqcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
 
 /**
   *@author Miguel Novas
diff --git a/src/sensorslist.h b/src/sensorslist.h
index 267b4f8..d4ed463 100644
--- a/src/sensorslist.h
+++ b/src/sensorslist.h
@@ -18,10 +18,10 @@
 #ifndef SENSORSLIST_H
 #define SENSORSLIST_H
 
-#include <ntqobject.h>
-#include <ntqobjectlist.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
 #include <tdeconfig.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 #include <sensor.h>
 
diff --git a/src/systemcfg.cpp b/src/systemcfg.cpp
index 97c2480..8eca841 100644
--- a/src/systemcfg.cpp
+++ b/src/systemcfg.cpp
@@ -15,13 +15,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <ntqlistbox.h>
-#include <ntqspinbox.h>
-#include <ntqpushbutton.h>
-#include <ntqgroupbox.h>
-#include <ntqcheckbox.h>
-#include <ntqlayout.h>
-#include <ntqtabwidget.h>
+#include <tqlistbox.h>
+#include <tqspinbox.h>
+#include <tqpushbutton.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
 #include <tdelocale.h>
 #include "systemcfg.h"
 
diff --git a/src/uptimepanel.cpp b/src/uptimepanel.cpp
index f5d4ec6..044521b 100644
--- a/src/uptimepanel.cpp
+++ b/src/uptimepanel.cpp
@@ -19,8 +19,8 @@
 #include "procinfo.h"
 #include "qlcddraw.h"
 
-#include <ntqcolor.h>
-#include <ntqpainter.h>
+#include <tqcolor.h>
+#include <tqpainter.h>
 
 
 
diff --git a/src/uptimepanel.h b/src/uptimepanel.h
index 0982717..3551b29 100644
--- a/src/uptimepanel.h
+++ b/src/uptimepanel.h
@@ -21,7 +21,7 @@
 #include "panel.h"
 #include "qlcdstring.h"
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 /**
   *@author Miguel Novas