diff --git a/kkbswitch/boldlistboxitem.cpp b/kkbswitch/boldlistboxitem.cpp
index 7e247d0..fdb80c2 100644
--- a/kkbswitch/boldlistboxitem.cpp
+++ b/kkbswitch/boldlistboxitem.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "boldlistboxitem.h"
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 BoldListBoxItem::BoldListBoxItem(TQListBox *listbox, const TQPixmap &pix,
   const TQString &text, bool bold)
diff --git a/kkbswitch/boldlistboxitem.h b/kkbswitch/boldlistboxitem.h
index 78949c7..b75424b 100644
--- a/kkbswitch/boldlistboxitem.h
+++ b/kkbswitch/boldlistboxitem.h
@@ -18,7 +18,7 @@
 #ifndef BOLDLISTBOXITEM_H
 #define BOLDLISTBOXITEM_H
 
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 
 /**Listbox item that can optionally display its text in bold
   *@author Leonid Zeitlin
diff --git a/kkbswitch/boldmenuitem.cpp b/kkbswitch/boldmenuitem.cpp
index e98d3bb..ab9abbc 100644
--- a/kkbswitch/boldmenuitem.cpp
+++ b/kkbswitch/boldmenuitem.cpp
@@ -16,10 +16,10 @@
  ***************************************************************************/
 
 #include "boldmenuitem.h"
-#include <ntqfont.h>
-#include <ntqpainter.h>
-#include <ntqpalette.h>
-#include <ntqstyle.h>
+#include <tqfont.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqstyle.h>
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
 #include <tdeversion.h>
diff --git a/kkbswitch/boldmenuitem.h b/kkbswitch/boldmenuitem.h
index bc87c95..f091945 100644
--- a/kkbswitch/boldmenuitem.h
+++ b/kkbswitch/boldmenuitem.h
@@ -18,7 +18,7 @@
 #ifndef BOLDMENUITEM_H
 #define BOLDMENUITEM_H
 
-#include <ntqmenudata.h>
+#include <tqmenudata.h>
 
 /**A custom menu item that can display its text in bold
   *@author Leonid Zeitlin
diff --git a/kkbswitch/kbconfig.cpp b/kkbswitch/kbconfig.cpp
index a50a3a9..f2e7fff 100644
--- a/kkbswitch/kbconfig.cpp
+++ b/kkbswitch/kbconfig.cpp
@@ -32,9 +32,9 @@
 #include <kdebug.h>
 #include <kglobalaccel.h>
 
-#include <ntqnamespace.h>
-#include <ntqpainter.h>
-#include <ntqimage.h>
+#include <tqnamespace.h>
+#include <tqpainter.h>
+#include <tqimage.h>
 
 #include "kbconfig.h"
 #include "xkeyboard.h"
diff --git a/kkbswitch/kbconfig.h b/kkbswitch/kbconfig.h
index 93fd13c..92b7df2 100644
--- a/kkbswitch/kbconfig.h
+++ b/kkbswitch/kbconfig.h
@@ -20,8 +20,8 @@
 
 #include "kbgroup.h"
 
-#include <ntqptrvector.h>
-#include <ntqvaluevector.h>
+#include <tqptrvector.h>
+#include <tqvaluevector.h>
 #include <tdeconfig.h>
 
 #define ICONS_SECTION "Icons"
diff --git a/kkbswitch/kbconfigdlg.cpp b/kkbswitch/kbconfigdlg.cpp
index 234802d..84475f0 100644
--- a/kkbswitch/kbconfigdlg.cpp
+++ b/kkbswitch/kbconfigdlg.cpp
@@ -19,17 +19,17 @@
 #include "kbpickicondlg.h"
 #include "boldlistboxitem.h"
 
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqcheckbox.h>
-#include <ntqwhatsthis.h>
-#include <ntqvbox.h>
-#include <ntqstyle.h>
-#include <ntqgroupbox.h>
-#include <ntqheader.h>
-#include <ntqobjectlist.h>
-#include <ntqpushbutton.h>
-#include <ntqcombobox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqvbox.h>
+#include <tqstyle.h>
+#include <tqgroupbox.h>
+#include <tqheader.h>
+#include <tqobjectlist.h>
+#include <tqpushbutton.h>
+#include <tqcombobox.h>
 
 #include <tdeversion.h>
 #include <tdelistbox.h>
diff --git a/kkbswitch/kbgroup.h b/kkbswitch/kbgroup.h
index 3e5eb43..39272cb 100644
--- a/kkbswitch/kbgroup.h
+++ b/kkbswitch/kbgroup.h
@@ -18,8 +18,8 @@
 #ifndef KBGROUP_H
 #define KBGROUP_H
 
-#include <ntqpixmap.h>
-#include <ntqstring.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
 
 /**A helper class the holds keyboard group's name and pixmap
   *@author Leonid Zeitlin
diff --git a/kkbswitch/kbpickicondlg.cpp b/kkbswitch/kbpickicondlg.cpp
index a69c052..a9a15f4 100644
--- a/kkbswitch/kbpickicondlg.cpp
+++ b/kkbswitch/kbpickicondlg.cpp
@@ -17,11 +17,11 @@
 
 #include "kbpickicondlg.h"
 
-#include <ntqvbox.h>
-#include <ntqdir.h>
-#include <ntqwhatsthis.h>
-#include <ntqpushbutton.h>
-#include <ntqimage.h>
+#include <tqvbox.h>
+#include <tqdir.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
+#include <tqimage.h>
 
 #include <tdeversion.h>
 #include <tdelocale.h>
diff --git a/kkbswitch/kbswitchapp.h b/kkbswitch/kbswitchapp.h
index d76aa52..62d58c1 100644
--- a/kkbswitch/kbswitchapp.h
+++ b/kkbswitch/kbswitchapp.h
@@ -29,7 +29,7 @@
   #include <kuniqueapp.h>
 #endif
 
-//#include <ntqmap.h>
+//#include <tqmap.h>
 
 #include "kbgroup.h"
 #include "kbswitchtrayicon.h"
diff --git a/kkbswitch/kbswitchintf.h b/kkbswitch/kbswitchintf.h
index 9fad92e..6ac37bd 100644
--- a/kkbswitch/kbswitchintf.h
+++ b/kkbswitch/kbswitchintf.h
@@ -19,8 +19,8 @@
 #define KBSWITCHINTF_H
 
 #include <dcopobject.h>
-#include <ntqobject.h>
-#include <ntqstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
 
 #include "kbconfig.h"
 
diff --git a/kkbswitch/kbswitchtrayicon.cpp b/kkbswitch/kbswitchtrayicon.cpp
index b585965..057d3ab 100644
--- a/kkbswitch/kbswitchtrayicon.cpp
+++ b/kkbswitch/kbswitchtrayicon.cpp
@@ -42,9 +42,9 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <ntqtooltip.h>
-#include <ntqstyle.h>
-#include <ntqpainter.h>
+#include <tqtooltip.h>
+#include <tqstyle.h>
+#include <tqpainter.h>
 
 #ifdef USE_BOLD_MENUITEM
 static TQColor getActiveTextColor(TDEPopupMenu *menu)
diff --git a/kkbswitch/pathlistboxitem.h b/kkbswitch/pathlistboxitem.h
index 2d469b4..f4030bb 100644
--- a/kkbswitch/pathlistboxitem.h
+++ b/kkbswitch/pathlistboxitem.h
@@ -18,8 +18,8 @@
 #ifndef PATHLISTBOXITEM_H
 #define PATHLISTBOXITEM_H
 
-#include <ntqlistbox.h>
-#include <ntqstring.h>
+#include <tqlistbox.h>
+#include <tqstring.h>
 
 /**
   *@author Leonid Zeitlin
diff --git a/kkbswitch/singlewindowwatcher.h b/kkbswitch/singlewindowwatcher.h
index 637b07a..65da395 100644
--- a/kkbswitch/singlewindowwatcher.h
+++ b/kkbswitch/singlewindowwatcher.h
@@ -21,7 +21,7 @@
 #define SINGLEWINDOWWATCHER_H
 
 #include "windowwatcher.h"
-#include <ntqmap.h>
+#include <tqmap.h>
 
 /**
 Watches for changes of active window and keep a group per each window
diff --git a/kkbswitch/windowclasswatcher.h b/kkbswitch/windowclasswatcher.h
index 03e6e80..2667714 100644
--- a/kkbswitch/windowclasswatcher.h
+++ b/kkbswitch/windowclasswatcher.h
@@ -21,7 +21,7 @@
 #define WINDOWCLASSWATCHER_H
 
 #include "windowwatcher.h"
-#include <ntqmap.h>
+#include <tqmap.h>
 
 class TQString;
 
diff --git a/kkbswitch/windowwatcher.h b/kkbswitch/windowwatcher.h
index e8d7b23..c2a803a 100644
--- a/kkbswitch/windowwatcher.h
+++ b/kkbswitch/windowwatcher.h
@@ -22,7 +22,7 @@
 #ifndef WINDOWWATCHER_H
 #define WINDOWWATCHER_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 
 class KBConfig;
 class KWinModule;
diff --git a/kkbswitch/xkeyboard.cpp b/kkbswitch/xkeyboard.cpp
index 148cc2d..56ee6a8 100644
--- a/kkbswitch/xkeyboard.cpp
+++ b/kkbswitch/xkeyboard.cpp
@@ -17,8 +17,8 @@
 
 #include "xkeyboard.h"
 
-#include <ntqwindowdefs.h>
-#include <ntqstringlist.h>
+#include <tqwindowdefs.h>
+#include <tqstringlist.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/kkbswitch/xkeyboard.h b/kkbswitch/xkeyboard.h
index 19d200d..352b83b 100644
--- a/kkbswitch/xkeyboard.h
+++ b/kkbswitch/xkeyboard.h
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <ntqobject.h>
+#include <tqobject.h>
 
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>