From 41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:20:33 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 atlantik/ChangeLog                              | 2 +-
 atlantik/client/atlantik.cpp                    | 4 ++--
 atlantik/client/atlantik.h                      | 2 +-
 atlantik/client/eventlogwidget.cpp              | 2 +-
 atlantik/client/selectconfiguration_widget.h    | 2 +-
 atlantik/client/selectgame_widget.h             | 2 +-
 atlantik/client/selectserver_widget.h           | 2 +-
 atlantik/libatlantikui/auction_widget.h         | 2 +-
 atlantik/libatlantikui/estatedetails.cpp        | 2 +-
 atlantik/libatlantikui/estateview.cpp           | 2 +-
 atlantik/libatlantikui/kwrappedlistviewitem.cpp | 2 +-
 atlantik/libatlantikui/kwrappedlistviewitem.h   | 2 +-
 atlantik/libatlantikui/portfolioview.cpp        | 2 +-
 atlantik/libatlantikui/trade_widget.cpp         | 4 ++--
 atlantik/pics/toolbar/Makefile.am               | 4 ++--
 kasteroids/toplevel.cpp                         | 2 +-
 kasteroids/toplevel.h                           | 4 ++--
 katomic/toplevel.cpp                            | 2 +-
 katomic/toplevel.h                              | 2 +-
 kbackgammon/engines/fibs/kbgfibs.cpp            | 4 ++--
 kbackgammon/engines/fibs/kbgfibschat.cpp        | 2 +-
 kbackgammon/engines/fibs/kplayerlist.cpp        | 2 +-
 kbackgammon/engines/fibs/kplayerlist.h          | 2 +-
 kbackgammon/engines/gnubg/kbggnubg.cpp          | 2 +-
 kbackgammon/engines/gnubg/kbggnubg.h            | 2 +-
 kbackgammon/engines/nextgen/kbgng.cpp           | 2 +-
 kbackgammon/engines/nextgen/kbgng.h             | 2 +-
 kbackgammon/engines/offline/kbgoffline.cpp      | 4 ++--
 kbackgammon/kbg.cpp                             | 6 +++---
 kbackgammon/kbg.h                               | 2 +-
 kbackgammon/kbgboard.h                          | 2 +-
 kbackgammon/kbgtextview.cpp                     | 2 +-
 kbattleship/kbattleship/kbattleship.h           | 4 ++--
 kbattleship/kbattleship/kbattleshipview.h       | 2 +-
 kblackbox/kbbgame.cpp                           | 2 +-
 kblackbox/kbbgame.h                             | 2 +-
 kbounce/kbounce.cpp                             | 2 +-
 kbounce/kbounce.h                               | 2 +-
 kenolaba/AbTop.cpp                              | 4 ++--
 kenolaba/AbTop.h                                | 2 +-
 kgoldrunner/src/kgoldrunner.cpp                 | 8 ++++----
 kgoldrunner/src/kgoldrunner.h                   | 4 ++--
 kjumpingcube/kjumpingcube.cpp                   | 2 +-
 kjumpingcube/kjumpingcube.h                     | 2 +-
 klines/klines.cpp                               | 4 ++--
 klines/klines.h                                 | 2 +-
 kmahjongg/Editor.cpp                            | 2 +-
 kmahjongg/Editor.h                              | 2 +-
 kmahjongg/kmahjongg.cpp                         | 2 +-
 kmahjongg/kmahjongg.h                           | 2 +-
 kmines/kzoommainwindow.cpp                      | 2 +-
 kmines/kzoommainwindow.h                        | 2 +-
 kmines/main.cpp                                 | 4 ++--
 kmines/status.cpp                               | 2 +-
 knetwalk/src/mainwindow.cpp                     | 2 +-
 knetwalk/src/mainwindow.h                       | 2 +-
 kolf/editor.cpp                                 | 2 +-
 kolf/kolf.cpp                                   | 6 +++---
 kolf/kolf.h                                     | 2 +-
 kolf/newgame.cpp                                | 2 +-
 konquest/fleetdlg.h                             | 2 +-
 konquest/mainwin.cc                             | 4 ++--
 konquest/mainwin.h                              | 2 +-
 konquest/scoredlg.h                             | 2 +-
 kpat/dealer.cpp                                 | 4 ++--
 kpat/grandf.cpp                                 | 2 +-
 kpat/pwidget.cpp                                | 4 ++--
 kpat/pwidget.h                                  | 2 +-
 kpoker/top.cpp                                  | 6 +++---
 kpoker/top.h                                    | 2 +-
 kreversi/kreversi.cpp                           | 2 +-
 kreversi/kzoommainwindow.cpp                    | 2 +-
 kreversi/kzoommainwindow.h                      | 2 +-
 ksame/KSameWidget.cpp                           | 2 +-
 ksame/KSameWidget.h                             | 2 +-
 kshisen/app.cpp                                 | 4 ++--
 kshisen/app.h                                   | 2 +-
 ksirtet/CHANGELOG                               | 2 +-
 ksmiletris/gamewindow.cpp                       | 2 +-
 ksmiletris/gamewindow.h                         | 2 +-
 ksnake/game.h                                   | 2 +-
 ksnake/rattler.h                                | 2 +-
 ksokoban/MainWindow.cpp                         | 4 ++--
 ksokoban/MainWindow.h                           | 2 +-
 kspaceduel/mainview.cpp                         | 2 +-
 kspaceduel/topwidget.cpp                        | 4 ++--
 kspaceduel/topwidget.h                          | 2 +-
 ktron/ktron.cpp                                 | 2 +-
 ktron/ktron.h                                   | 2 +-
 ktron/tron.cpp                                  | 2 +-
 ktuberling/toplevel.cpp                         | 2 +-
 ktuberling/toplevel.h                           | 2 +-
 libksirtet/base/kzoommainwindow.cpp             | 2 +-
 libksirtet/base/kzoommainwindow.h               | 2 +-
 libksirtet/base/main.cpp                        | 2 +-
 libksirtet/common/inter.cpp                     | 2 +-
 libksirtet/common/main.cpp                      | 2 +-
 libksirtet/lib/keys.h                           | 2 +-
 libksirtet/lib/mp_simple_interface.cpp          | 4 ++--
 libtdegames/highscore/kexthighscore_gui.h       | 2 +-
 libtdegames/highscore/kexthighscore_tab.cpp     | 2 +-
 libtdegames/kchatdialog.cpp                     | 2 +-
 libtdegames/kgame/dialogs/kgamedebugdialog.cpp  | 4 ++--
 libtdegames/kgame/dialogs/kgamedialogconfig.cpp | 2 +-
 libtdegames/kstdgameaction.cpp                  | 4 ++--
 lskat/lskat/lskat.cpp                           | 2 +-
 lskat/lskat/lskat.h                             | 4 ++--
 twin4/twin4/twin4.cpp                           | 2 +-
 twin4/twin4/twin4.h                             | 2 +-
 109 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/atlantik/ChangeLog b/atlantik/ChangeLog
index b16274aa..6b84a3a9 100644
--- a/atlantik/ChangeLog
+++ b/atlantik/ChangeLog
@@ -97,7 +97,7 @@
 - use disability to join game when size == MAX in gameupdate (games in
   updategamelist now have canbejoined boolean attribute)
 - using playerupdate for player list in SelectConfiguration
-- use portfolioview instead of klistview for players during config
+- use portfolioview instead of tdelistview for players during config
 - better handling of display messages from server
 - fixed token animation
 
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 9557b80b..565ff0c6 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -23,7 +23,7 @@
 #include <tqpopupmenu.h>
 
 #include <kaboutapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <tdeconfig.h>
@@ -34,7 +34,7 @@
 #include <kstatusbar.h>
 #include <kstdgameaction.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <tdeversion.h>
 #undef KDE_3_2_FEATURES
diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h
index 7370204c..2d41c35f 100644
--- a/atlantik/client/atlantik.h
+++ b/atlantik/client/atlantik.h
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqptrlist.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "configdlg.h"
 #include "portfolioview.h"
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index 064aa71e..43733a7b 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -21,7 +21,7 @@
 #include <tqdatetime.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
diff --git a/atlantik/client/selectconfiguration_widget.h b/atlantik/client/selectconfiguration_widget.h
index bf293e40..c95f6091 100644
--- a/atlantik/client/selectconfiguration_widget.h
+++ b/atlantik/client/selectconfiguration_widget.h
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 class TQCheckBox;
diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h
index 0f8427a0..59ed600a 100644
--- a/atlantik/client/selectgame_widget.h
+++ b/atlantik/client/selectgame_widget.h
@@ -20,7 +20,7 @@
 #include <tqwidget.h>
 #include <tqlayout.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 class AtlanticCore;
diff --git a/atlantik/client/selectserver_widget.h b/atlantik/client/selectserver_widget.h
index ef8965fa..485cc8cb 100644
--- a/atlantik/client/selectserver_widget.h
+++ b/atlantik/client/selectserver_widget.h
@@ -22,7 +22,7 @@
 #include <tqradiobutton.h>
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 #include "monopigator.h"
diff --git a/atlantik/libatlantikui/auction_widget.h b/atlantik/libatlantikui/auction_widget.h
index 6bf93220..775944e0 100644
--- a/atlantik/libatlantikui/auction_widget.h
+++ b/atlantik/libatlantikui/auction_widget.h
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqmap.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQVGroupBox;
 class TQSpinBox;
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index 75837b99..242ae778 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpixmap.h>
 #include <kpushbutton.h>
diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp
index 5cb865e5..4481117c 100644
--- a/atlantik/libatlantikui/estateview.cpp
+++ b/atlantik/libatlantikui/estateview.cpp
@@ -26,7 +26,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kpixmapeffect.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
index ffcf6728..f437cf62 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 
 #include <kglobalsettings.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kwordwrap.h>
 
 #include "kwrappedlistviewitem.h"
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.h b/atlantik/libatlantikui/kwrappedlistviewitem.h
index 09e91a29..13907348 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.h
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.h
@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KWordWrap;
 
diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp
index ce8474d1..d0ab8e92 100644
--- a/atlantik/libatlantikui/portfolioview.cpp
+++ b/atlantik/libatlantikui/portfolioview.cpp
@@ -22,7 +22,7 @@
 #include <kiconeffect.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 #include <atlantic_core.h>
diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp
index f581af6a..f6bd126c 100644
--- a/atlantik/libatlantikui/trade_widget.cpp
+++ b/atlantik/libatlantikui/trade_widget.cpp
@@ -27,14 +27,14 @@
 #include <tqspinbox.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <atlantic_core.h>
 #include <player.h>
diff --git a/atlantik/pics/toolbar/Makefile.am b/atlantik/pics/toolbar/Makefile.am
index 76f0a0a7..82a0ad7a 100644
--- a/atlantik/pics/toolbar/Makefile.am
+++ b/atlantik/pics/toolbar/Makefile.am
@@ -1,2 +1,2 @@
-atlantiktoolbardir = $(kde_datadir)/atlantik/icons
-atlantiktoolbar_ICON = AUTO
+atlantitdetoolbardir = $(kde_datadir)/atlantik/icons
+atlantitdetoolbar_ICON = AUTO
diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp
index 44d00995..fd49ca1a 100644
--- a/kasteroids/toplevel.cpp
+++ b/kasteroids/toplevel.cpp
@@ -17,7 +17,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kkeydialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kaudioplayer.h>
 #include <kscoredialog.h>
diff --git a/kasteroids/toplevel.h b/kasteroids/toplevel.h
index 72d0f19c..77111603 100644
--- a/kasteroids/toplevel.h
+++ b/kasteroids/toplevel.h
@@ -7,8 +7,8 @@
 #ifndef __KAST_TOPLEVEL_H__
 #define __KAST_TOPLEVEL_H__
 
-#include <kmainwindow.h>
-#include <kaccel.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
 #include <tqdict.h>
 #include <tqmap.h>
 
diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp
index 1a26d4ac..10609524 100644
--- a/katomic/toplevel.cpp
+++ b/katomic/toplevel.cpp
@@ -31,7 +31,7 @@
 #include "toplevel.h"
 #include "settings.h"
 #include "configbox.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 #include <kdebug.h>
diff --git a/katomic/toplevel.h b/katomic/toplevel.h
index 2f29229b..5d997004 100644
--- a/katomic/toplevel.h
+++ b/katomic/toplevel.h
@@ -11,7 +11,7 @@ class GameWidget;
 class TDEAction;
 class TDEConfig;
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**
  * This is the class AtomTopLevel. The class is used only for the program
diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp
index 531010bf..3d37e0ba 100644
--- a/kbackgammon/engines/fibs/kbgfibs.cpp
+++ b/kbackgammon/engines/fibs/kbgfibs.cpp
@@ -46,7 +46,7 @@
 #include <tqgroupbox.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
 #include <tqdatetime.h>
@@ -59,7 +59,7 @@
 #include <kpassdlg.h>
 #include <tqcstring.h>
 #include <knotifyclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 #include <stdlib.h>
diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp
index 95fd222d..09c14be7 100644
--- a/kbackgammon/engines/fibs/kbgfibschat.cpp
+++ b/kbackgammon/engines/fibs/kbgfibschat.cpp
@@ -52,7 +52,7 @@
 #include <kdebug.h>
 #include <kstdaction.h>
 #include <ktabctl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 #include "clip.h"
diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp
index 1c4feb47..06b4bd99 100644
--- a/kbackgammon/engines/fibs/kplayerlist.cpp
+++ b/kbackgammon/engines/fibs/kplayerlist.cpp
@@ -36,7 +36,7 @@
 
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <ktabctl.h>
 #include <kiconloader.h>
diff --git a/kbackgammon/engines/fibs/kplayerlist.h b/kbackgammon/engines/fibs/kplayerlist.h
index 054960a9..47f86ce4 100644
--- a/kbackgammon/engines/fibs/kplayerlist.h
+++ b/kbackgammon/engines/fibs/kplayerlist.h
@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KTabCtl;
 class KFibsPlayerListPrivate;
diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp
index df845f5f..4d8d0e23 100644
--- a/kbackgammon/engines/gnubg/kbggnubg.cpp
+++ b/kbackgammon/engines/gnubg/kbggnubg.cpp
@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <iostream>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineeditdlg.h>
 #include <tqregexp.h>
 #include <kregexp.h>
diff --git a/kbackgammon/engines/gnubg/kbggnubg.h b/kbackgammon/engines/gnubg/kbggnubg.h
index dd4bc9b2..6ced7ea1 100644
--- a/kbackgammon/engines/gnubg/kbggnubg.h
+++ b/kbackgammon/engines/gnubg/kbggnubg.h
@@ -32,7 +32,7 @@
 
 #include <tqtimer.h>
 #include <tqspinbox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <krandomsequence.h>
 #include <kprocess.h>
 #include <tqstringlist.h>
diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp
index 0bc1d26c..2b3b27a6 100644
--- a/kbackgammon/engines/nextgen/kbgng.cpp
+++ b/kbackgammon/engines/nextgen/kbgng.cpp
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineeditdlg.h>
 #include <krandomsequence.h>
 #include <tqstringlist.h>
diff --git a/kbackgammon/engines/nextgen/kbgng.h b/kbackgammon/engines/nextgen/kbgng.h
index 58d86172..8fb2f8b5 100644
--- a/kbackgammon/engines/nextgen/kbgng.h
+++ b/kbackgammon/engines/nextgen/kbgng.h
@@ -31,7 +31,7 @@
 
 #include <tqtimer.h>
 #include <tqspinbox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqdatastream.h>
 #include <kgameproperty.h>
 
diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp
index 57b6aa2a..4ca3010c 100644
--- a/kbackgammon/engines/offline/kbgoffline.cpp
+++ b/kbackgammon/engines/offline/kbgoffline.cpp
@@ -39,9 +39,9 @@
 #include <kstdaction.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineeditdlg.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <krandomsequence.h>
 #include <ktabctl.h>
 #include <stdlib.h>
diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp
index 70bff939..cd717148 100644
--- a/kbackgammon/kbg.cpp
+++ b/kbackgammon/kbg.cpp
@@ -36,12 +36,12 @@
 #include <tqvbox.h>
 
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 #include <kaboutdata.h>
@@ -49,7 +49,7 @@
 #include <tdeconfig.h>
 #include <kcompletion.h>
 #include <kcompletionbox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurllabel.h>
 #include <krun.h>
 #include <kstatusbar.h>
diff --git a/kbackgammon/kbg.h b/kbackgammon/kbg.h
index b7daa0c8..73aa9e63 100644
--- a/kbackgammon/kbg.h
+++ b/kbackgammon/kbg.h
@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TQSplitter;
 class TQCheckBox;
diff --git a/kbackgammon/kbgboard.h b/kbackgammon/kbgboard.h
index 11988e4f..524f1658 100644
--- a/kbackgammon/kbgboard.h
+++ b/kbackgammon/kbgboard.h
@@ -57,7 +57,7 @@
 #include <tqpopupmenu.h>
 #include <tqcombobox.h>
 #include <kdialogbase.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 #include "kbgstatus.h"
 
diff --git a/kbackgammon/kbgtextview.cpp b/kbackgammon/kbgtextview.cpp
index 61ff1d5d..697f6c8a 100644
--- a/kbackgammon/kbgtextview.cpp
+++ b/kbackgammon/kbgtextview.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kcmenumngr.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <tqfont.h>
 #include <kapplication.h>
 
diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h
index 47a2f4d7..a47dd72b 100644
--- a/kbattleship/kbattleship/kbattleship.h
+++ b/kbattleship/kbattleship/kbattleship.h
@@ -18,12 +18,12 @@
 #ifndef KBATTLESHIP_H
 #define KBATTLESHIP_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
diff --git a/kbattleship/kbattleship/kbattleshipview.h b/kbattleship/kbattleship/kbattleshipview.h
index 53e0a243..399931ae 100644
--- a/kbattleship/kbattleship/kbattleshipview.h
+++ b/kbattleship/kbattleship/kbattleshipview.h
@@ -18,7 +18,7 @@
 #ifndef KBATTLESHIPVIEW_H
 #define KBATTLESHIPVIEW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqpainter.h>
 #include <tqptrlist.h>
diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp
index a8c51100..ccb0dcde 100644
--- a/kblackbox/kbbgame.cpp
+++ b/kblackbox/kbbgame.cpp
@@ -26,7 +26,7 @@
 #include <kmenubar.h>
 #include <kiconloader.h>
 #include <khelpmenu.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstatusbar.h>
 #include <kstdgameaction.h>
diff --git a/kblackbox/kbbgame.h b/kblackbox/kbbgame.h
index de73cb9e..94837871 100644
--- a/kblackbox/kbbgame.h
+++ b/kblackbox/kbbgame.h
@@ -15,7 +15,7 @@
 #include "kbbgfx.h"
 #include "util.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <krandomsequence.h>
 
 class TDESelectAction;
diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp
index 4a3e09ff..ed05cf7f 100644
--- a/kbounce/kbounce.cpp
+++ b/kbounce/kbounce.cpp
@@ -19,7 +19,7 @@
 #include <tqlayout.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <tqtimer.h>
 #include <tqlcdnumber.h>
diff --git a/kbounce/kbounce.h b/kbounce/kbounce.h
index 408adde4..884e3298 100644
--- a/kbounce/kbounce.h
+++ b/kbounce/kbounce.h
@@ -19,7 +19,7 @@
 #ifndef KBOUNCE_H
 #define KBOUNCE_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class JezzGame;
 class TQLCDNumber;
diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp
index e58d53bd..536096ca 100644
--- a/kenolaba/AbTop.cpp
+++ b/kenolaba/AbTop.cpp
@@ -4,14 +4,14 @@
 #include <tqtimer.h>
 #include <tqclipboard.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kglobal.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
diff --git a/kenolaba/AbTop.h b/kenolaba/AbTop.h
index e13b34c3..317ccbfc 100644
--- a/kenolaba/AbTop.h
+++ b/kenolaba/AbTop.h
@@ -6,7 +6,7 @@
 #ifndef _ABTOP_H_
 #define _ABTOP_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "Move.h"
 
diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp
index b7a31d78..665d804f 100644
--- a/kgoldrunner/src/kgoldrunner.cpp
+++ b/kgoldrunner/src/kgoldrunner.cpp
@@ -12,16 +12,16 @@
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
 
 #include <kedittoolbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 
diff --git a/kgoldrunner/src/kgoldrunner.h b/kgoldrunner/src/kgoldrunner.h
index d96fd707..61da818f 100644
--- a/kgoldrunner/src/kgoldrunner.h
+++ b/kgoldrunner/src/kgoldrunner.h
@@ -21,9 +21,9 @@ const int L_SCORE       = 17;
 const int L_LEVEL       = 15;
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KGrGame;
 class KGrCanvas;
diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp
index dfab89ff..ac5bf928 100644
--- a/kjumpingcube/kjumpingcube.cpp
+++ b/kjumpingcube/kjumpingcube.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kstdgameaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeio/netaccess.h>
 #include <kstatusbar.h>
 
diff --git a/kjumpingcube/kjumpingcube.h b/kjumpingcube/kjumpingcube.h
index 0da7127b..09930b05 100644
--- a/kjumpingcube/kjumpingcube.h
+++ b/kjumpingcube/kjumpingcube.h
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 class TDEAction;
diff --git a/klines/klines.cpp b/klines/klines.cpp
index 39cf4b71..bfd6346a 100644
--- a/klines/klines.cpp
+++ b/klines/klines.cpp
@@ -36,9 +36,9 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kscoredialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 
diff --git a/klines/klines.h b/klines/klines.h
index 93f7f80f..49a9f795 100644
--- a/klines/klines.h
+++ b/klines/klines.h
@@ -16,7 +16,7 @@
 #ifndef KLINES_H
 #define KLINES_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "linesboard.h"
 #include "mwidget.h"
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 3d3166ca..657f7d3b 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -11,7 +11,7 @@
 #include <klocale.h>     // Needed to use TDELocale
 #include <kiconloader.h> //
 #include <kstandarddirs.h>
-#include <ktoolbarradiogroup.h>
+#include <tdetoolbarradiogroup.h>
 
 #define ID_TOOL_NEW  100
 #define ID_TOOL_LOAD 101
diff --git a/kmahjongg/Editor.h b/kmahjongg/Editor.h
index 53537ba1..b772f2ae 100644
--- a/kmahjongg/Editor.h
+++ b/kmahjongg/Editor.h
@@ -3,7 +3,7 @@
 
 #include <tqdialog.h>
 #include <tqframe.h>   
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
 
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index a55c7769..54b9716f 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -28,7 +28,7 @@
 #include <limits.h>
 
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfigdialog.h>
 #include <kinputdialog.h>
 #include <kmenubar.h>
diff --git a/kmahjongg/kmahjongg.h b/kmahjongg/kmahjongg.h
index 7a0f5839..a3cb237b 100644
--- a/kmahjongg/kmahjongg.h
+++ b/kmahjongg/kmahjongg.h
@@ -28,7 +28,7 @@
 #ifndef _KMAHJONGG_H
 #define _KMAHJONGG_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "KmTypes.h"
 #include "Tileset.h"
diff --git a/kmines/kzoommainwindow.cpp b/kmines/kzoommainwindow.cpp
index 3bab5661..8c3fef13 100644
--- a/kmines/kzoommainwindow.cpp
+++ b/kmines/kzoommainwindow.cpp
@@ -20,7 +20,7 @@
 #include "kzoommainwindow.h"
 #include "kzoommainwindow.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <kcmenumngr.h>
diff --git a/kmines/kzoommainwindow.h b/kmines/kzoommainwindow.h
index 38b857bc..1af9bc8b 100644
--- a/kmines/kzoommainwindow.h
+++ b/kmines/kzoommainwindow.h
@@ -20,7 +20,7 @@
 #ifndef KZOOMMAINWINDOW_H
 #define KZOOMMAINWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEToggleAction;
 
diff --git a/kmines/main.cpp b/kmines/main.cpp
index 335c4208..1c24d246 100644
--- a/kmines/main.cpp
+++ b/kmines/main.cpp
@@ -21,7 +21,7 @@
 
 #include <tqptrvector.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
@@ -29,7 +29,7 @@
 #include <kstdaction.h>
 #include <kkeydialog.h>
 #include <kstdgameaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
diff --git a/kmines/status.cpp b/kmines/status.cpp
index e4464655..de2eb109 100644
--- a/kmines/status.cpp
+++ b/kmines/status.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <ktempfile.h>
diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp
index ff83825b..43c50cb7 100644
--- a/knetwalk/src/mainwindow.cpp
+++ b/knetwalk/src/mainwindow.cpp
@@ -37,7 +37,7 @@
 #include <kscoredialog.h>
 #include <khighscore.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
diff --git a/knetwalk/src/mainwindow.h b/knetwalk/src/mainwindow.h
index 4fa08593..e62c0919 100644
--- a/knetwalk/src/mainwindow.h
+++ b/knetwalk/src/mainwindow.h
@@ -16,7 +16,7 @@
 #define MAINWINDOW_H
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class Cell;
 class TQAction;
diff --git a/kolf/editor.cpp b/kolf/editor.cpp
index 422db798..589096f3 100644
--- a/kolf/editor.cpp
+++ b/kolf/editor.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index d51df8df..57793f07 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -1,4 +1,4 @@
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -7,14 +7,14 @@
 #include <kglobal.h>
 #include <tdeio/netaccess.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kscoredialog.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 #include <kstdguiitem.h>
diff --git a/kolf/kolf.h b/kolf/kolf.h
index 987f710f..f4295dd9 100644
--- a/kolf/kolf.h
+++ b/kolf/kolf.h
@@ -1,7 +1,7 @@
 #ifndef KOLF_H
 #define KOLF_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include <tqmap.h>
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 4fb92f4e..4f6f4181 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -18,7 +18,7 @@
 #include <tqpen.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqstyle.h>
 #include <tqrect.h>
 #include <tqmap.h>
diff --git a/konquest/fleetdlg.h b/konquest/fleetdlg.h
index a82ebfa9..d7425207 100644
--- a/konquest/fleetdlg.h
+++ b/konquest/fleetdlg.h
@@ -1,7 +1,7 @@
 #ifndef FLEETDLG_H
 #define FLEETDLG_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqdialog.h>
 
diff --git a/konquest/mainwin.cc b/konquest/mainwin.cc
index fdc44e13..cc19110e 100644
--- a/konquest/mainwin.cc
+++ b/konquest/mainwin.cc
@@ -6,9 +6,9 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 
diff --git a/konquest/mainwin.h b/konquest/mainwin.h
index 63a68c0d..36c31038 100644
--- a/konquest/mainwin.h
+++ b/konquest/mainwin.h
@@ -1,7 +1,7 @@
 #ifndef _MAIN_WIN_H
 #define _MAIN_WIN_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "gameboard.h"
 
diff --git a/konquest/scoredlg.h b/konquest/scoredlg.h
index 22fbc549..ee1e5c1b 100644
--- a/konquest/scoredlg.h
+++ b/konquest/scoredlg.h
@@ -1,7 +1,7 @@
 #ifndef _SCOREDLG_H_
 #define _SCOREDLG_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqdialog.h>
 
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index 6757680c..8cb3e3c3 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -3,11 +3,11 @@
 #include <kdebug.h>
 #include "deck.h"
 #include <assert.h>
-#include "kmainwindow.h"
+#include "tdemainwindow.h"
 #include <kapplication.h>
 #include <kpixmapeffect.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include "cardmaps.h"
 #include "speeds.h"
diff --git a/kpat/grandf.cpp b/kpat/grandf.cpp
index 39cd1280..bbd40848 100644
--- a/kpat/grandf.cpp
+++ b/kpat/grandf.cpp
@@ -21,7 +21,7 @@
 #include "grandf.h"
 #include <klocale.h>
 #include "deck.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <assert.h>
 #include "cardmaps.h"
 
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index 003b4b6f..a22c147b 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -26,7 +26,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kcarddialog.h>
 #include <kinputdialog.h>
@@ -36,7 +36,7 @@
 #include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kmenubar.h>
 
 #include "pwidget.h"
diff --git a/kpat/pwidget.h b/kpat/pwidget.h
index 1c1564f5..29d5d698 100644
--- a/kpat/pwidget.h
+++ b/kpat/pwidget.h
@@ -23,7 +23,7 @@
 #ifndef __PWIDGET__H__
 #define __PWIDGET__H__
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class Dealer;
 class TDEToggleAction;
diff --git a/kpoker/top.cpp b/kpoker/top.cpp
index 30365fd1..11c5ee34 100644
--- a/kpoker/top.cpp
+++ b/kpoker/top.cpp
@@ -26,11 +26,11 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
-#include <kaction.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
 
 // own includes
 #include "top.h"
diff --git a/kpoker/top.h b/kpoker/top.h
index f1a3010c..9653e955 100644
--- a/kpoker/top.h
+++ b/kpoker/top.h
@@ -19,7 +19,7 @@
 #define __PokerWindow__
 
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class TQLabel;
diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp
index 5132d730..a0aebf65 100644
--- a/kreversi/kreversi.cpp
+++ b/kreversi/kreversi.cpp
@@ -50,7 +50,7 @@
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kkeydialog.h>
 #include <tdeconfigdialog.h>
diff --git a/kreversi/kzoommainwindow.cpp b/kreversi/kzoommainwindow.cpp
index edc0311f..7500f7cb 100644
--- a/kreversi/kzoommainwindow.cpp
+++ b/kreversi/kzoommainwindow.cpp
@@ -21,7 +21,7 @@
 #include "kzoommainwindow.h"
 #include "kzoommainwindow.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <kcmenumngr.h>
diff --git a/kreversi/kzoommainwindow.h b/kreversi/kzoommainwindow.h
index 2eccc59d..5b79ad9a 100644
--- a/kreversi/kzoommainwindow.h
+++ b/kreversi/kzoommainwindow.h
@@ -22,7 +22,7 @@
 #define KZOOMMAINWINDOW_H
 
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class TDEToggleAction;
diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp
index 438154f1..e076d3a3 100644
--- a/ksame/KSameWidget.cpp
+++ b/ksame/KSameWidget.cpp
@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <kstdgameaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 
 #include "StoneWidget.h"
diff --git a/ksame/KSameWidget.h b/ksame/KSameWidget.h
index 599c8d9b..692070b4 100644
--- a/ksame/KSameWidget.h
+++ b/ksame/KSameWidget.h
@@ -22,7 +22,7 @@
 #ifndef _KSAMEWIDGET
 #define _KSAMEWIDGET
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEToggleAction;
 class StoneWidget;
diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index 87d14fae..e8c3f932 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -40,12 +40,12 @@
 #include <kseparator.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <khighscore.h>
 #include <kdebug.h>
 #include <kkeydialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/kshisen/app.h b/kshisen/app.h
index 06ac6957..72112570 100644
--- a/kshisen/app.h
+++ b/kshisen/app.h
@@ -43,7 +43,7 @@
 // Should this get the whole HAVE_SYS_TIME_H TIME_WITH_SYS_TIME treatment?
 #include <time.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "board.h"
 
 class KHighscore;
diff --git a/ksirtet/CHANGELOG b/ksirtet/CHANGELOG
index dfff48a3..a3768e64 100644
--- a/ksirtet/CHANGELOG
+++ b/ksirtet/CHANGELOG
@@ -123,7 +123,7 @@
    name [proposed by Lotta Inkovaara]
  * fixed repaint problems of piece shadow [some flicker added though]
  * keys bindings should be now saved [due to some obscure bug in
-   tdelibs/kaccel ; thanks to Chris]
+   tdelibs/tdeaccel ; thanks to Chris]
 
 2.0.3
  * use of TDEMainWindow + interception of LayoutHint events to fix the resize
diff --git a/ksmiletris/gamewindow.cpp b/ksmiletris/gamewindow.cpp
index 1937e996..ec6bd90b 100644
--- a/ksmiletris/gamewindow.cpp
+++ b/ksmiletris/gamewindow.cpp
@@ -34,7 +34,7 @@ this software.
 #include "gamewidget.h"
 #include "kscoredialog.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 
 
diff --git a/ksmiletris/gamewindow.h b/ksmiletris/gamewindow.h
index 565192a3..96b265eb 100644
--- a/ksmiletris/gamewindow.h
+++ b/ksmiletris/gamewindow.h
@@ -24,7 +24,7 @@ this software.
 #ifndef GAMEWINDOW_H
 #define GAMEWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "ksmiletris.h"
 
diff --git a/ksnake/game.h b/ksnake/game.h
index 35e8cb38..4a5156c1 100644
--- a/ksnake/game.h
+++ b/ksnake/game.h
@@ -26,7 +26,7 @@
 #ifndef GAME_H
 #define GAME_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEAction;
 class Rattler;
diff --git a/ksnake/rattler.h b/ksnake/rattler.h
index bd61e871..af981c36 100644
--- a/ksnake/rattler.h
+++ b/ksnake/rattler.h
@@ -27,7 +27,7 @@
 #define RATTLER_H
 
 #include <tqwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "ball.h"
 #include "snake.h"
 
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index 2efaad97..3138c859 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -35,9 +35,9 @@
 #include <kiconloader.h>
 #include <tqiconset.h>
 #include <tqdragobject.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurldrag.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include "MainWindow.h"
 #include "PlayField.h"
diff --git a/ksokoban/MainWindow.h b/ksokoban/MainWindow.h
index 3e81f35d..f732d1df 100644
--- a/ksokoban/MainWindow.h
+++ b/ksokoban/MainWindow.h
@@ -20,7 +20,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 #include "Bookmark.h"
 #include "InternalCollections.h"
diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp
index 16766d5b..7a0264a6 100644
--- a/kspaceduel/mainview.cpp
+++ b/kspaceduel/mainview.cpp
@@ -6,7 +6,7 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp
index b805447a..8d614f88 100644
--- a/kspaceduel/topwidget.cpp
+++ b/kspaceduel/topwidget.cpp
@@ -1,7 +1,7 @@
 #include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kkeydialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <tqlayout.h>
 #include <kstatusbar.h>
diff --git a/kspaceduel/topwidget.h b/kspaceduel/topwidget.h
index d0d020d5..6b3c475f 100644
--- a/kspaceduel/topwidget.h
+++ b/kspaceduel/topwidget.h
@@ -1,7 +1,7 @@
 #ifndef __MY_TOP_WIDGET_H
 #define __MY_TOP_WIDGET_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class PlayerInfo;
 class MyMainView;
diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp
index 19786300..7fc8db39 100644
--- a/ktron/ktron.cpp
+++ b/ktron/ktron.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfigdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kapplication.h>
 #include <kstatusbar.h>
diff --git a/ktron/ktron.h b/ktron/ktron.h
index 262d56ef..160c6ea7 100644
--- a/ktron/ktron.h
+++ b/ktron/ktron.h
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "tron.h"
 
 class TDEAccel;
diff --git a/ktron/tron.cpp b/ktron/tron.cpp
index ae219a7d..260893b0 100644
--- a/ktron/tron.cpp
+++ b/ktron/tron.cpp
@@ -30,7 +30,7 @@
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "settings.h"
 #include "tron.h"
diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp
index 16869adb..d057fb3f 100644
--- a/ktuberling/toplevel.cpp
+++ b/ktuberling/toplevel.cpp
@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 
diff --git a/ktuberling/toplevel.h b/ktuberling/toplevel.h
index 7373fdac..31cf5c18 100644
--- a/ktuberling/toplevel.h
+++ b/ktuberling/toplevel.h
@@ -8,7 +8,7 @@
 #ifndef _TOPLEVEL_H_
 #define _TOPLEVEL_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 class TQDomDocument;
diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp
index 3bab5661..8c3fef13 100644
--- a/libksirtet/base/kzoommainwindow.cpp
+++ b/libksirtet/base/kzoommainwindow.cpp
@@ -20,7 +20,7 @@
 #include "kzoommainwindow.h"
 #include "kzoommainwindow.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <kcmenumngr.h>
diff --git a/libksirtet/base/kzoommainwindow.h b/libksirtet/base/kzoommainwindow.h
index 3e47cb0d..a15344c8 100644
--- a/libksirtet/base/kzoommainwindow.h
+++ b/libksirtet/base/kzoommainwindow.h
@@ -20,7 +20,7 @@
 #ifndef KZOOMMAINWINDOW_H
 #define KZOOMMAINWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdemacros.h>
 
 
diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp
index 20856dcb..bda4982e 100644
--- a/libksirtet/base/main.cpp
+++ b/libksirtet/base/main.cpp
@@ -1,7 +1,7 @@
 #include "main.h"
 #include "main.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <kstdgameaction.h>
diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp
index c5630108..312e355b 100644
--- a/libksirtet/common/inter.cpp
+++ b/libksirtet/common/inter.cpp
@@ -2,7 +2,7 @@
 #include "inter.moc"
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 
 #include "factory.h"
diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp
index 0b3aa414..9c4f98f4 100644
--- a/libksirtet/common/main.cpp
+++ b/libksirtet/common/main.cpp
@@ -2,7 +2,7 @@
 #include "main.moc"
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kkeydialog.h>
 #include <tdeconfigdialog.h>
diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h
index 83b63e49..9b7ecd82 100644
--- a/libksirtet/lib/keys.h
+++ b/libksirtet/lib/keys.h
@@ -2,7 +2,7 @@
 #define KEYS_H
 
 #include <tqmap.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "mp_interface.h"
 
diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp
index bf81d750..80dfe0eb 100644
--- a/libksirtet/lib/mp_simple_interface.cpp
+++ b/libksirtet/lib/mp_simple_interface.cpp
@@ -4,8 +4,8 @@
 #include <kmessagebox.h>
 #include <tqtimer.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
 
 
 #define PAUSE_ACTION \
diff --git a/libtdegames/highscore/kexthighscore_gui.h b/libtdegames/highscore/kexthighscore_gui.h
index fbd1422c..0749d682 100644
--- a/libtdegames/highscore/kexthighscore_gui.h
+++ b/libtdegames/highscore/kexthighscore_gui.h
@@ -25,7 +25,7 @@
 #include <tqvbox.h>
 #include <tqtabwidget.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kdialogbase.h>
diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp
index 94e87f23..13e32894 100644
--- a/libtdegames/highscore/kexthighscore_tab.cpp
+++ b/libtdegames/highscore/kexthighscore_tab.cpp
@@ -27,7 +27,7 @@
 #include <tqheader.h>
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp
index cb2ae837..c4756f44 100644
--- a/libtdegames/kchatdialog.cpp
+++ b/libtdegames/kchatdialog.cpp
@@ -22,7 +22,7 @@
 #include "kchatbase.h"
 
 #include <klocale.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
index e9ff7232..b4de9985 100644
--- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
+++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
@@ -25,8 +25,8 @@
 #include "kplayer.h"
 #include "kgamepropertyhandler.h"
 
-#include <klistview.h>
-#include <klistbox.h>
+#include <tdelistview.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
index fee9a48b..52a42151 100644
--- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
+++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmessagebox.h>
 
 #include <tqlayout.h>
diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp
index 0f7ec346..79797afd 100644
--- a/libtdegames/kstdgameaction.cpp
+++ b/libtdegames/kstdgameaction.cpp
@@ -20,8 +20,8 @@
 #include "kstdgameaction.h"
 
 #include <klocale.h>
-#include <kaction.h>
-#include <kstdaccel.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp
index 73e372f9..236c1e5d 100644
--- a/lskat/lskat/lskat.cpp
+++ b/lskat/lskat/lskat.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/lskat/lskat/lskat.h b/lskat/lskat/lskat.h
index 83882358..950fd1ab 100644
--- a/lskat/lskat/lskat.h
+++ b/lskat/lskat/lskat.h
@@ -28,8 +28,8 @@
 
 // include files for TDE 
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaccel.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
 
 #include "KEInput.h"
 #include "KEMessage.h"
diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp
index 6a56bbb3..a0fe4661 100644
--- a/twin4/twin4/twin4.cpp
+++ b/twin4/twin4/twin4.cpp
@@ -34,7 +34,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqpushbutton.h>
 #include <kstatusbar.h>
 #include <tdeconfigdialog.h>
diff --git a/twin4/twin4/twin4.h b/twin4/twin4/twin4.h
index b9663a50..c07c1687 100644
--- a/twin4/twin4/twin4.h
+++ b/twin4/twin4/twin4.h
@@ -18,7 +18,7 @@
 #ifndef TWIN4_H
 #define TWIN4_H
  
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdialogbase.h>
 #include "twin4doc.h"
 #include <kdemacros.h>