Rename common header files for consistency with class renaming

143 files changed, 207 insertions, 207 deletions

diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 35930454..23e4cd4f 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -22,10 +22,10 @@
 #include <tqscrollview.h>
 #include <tqpopupmenu.h>
 
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <tdeaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp
index 65c35d4c..693f9b09 100644
--- a/atlantik/client/main.cpp
+++ b/atlantik/client/main.cpp
@@ -14,10 +14,10 @@
 // the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 // Boston, MA 02110-1301, USA.
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 
 #include "main.h"
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 	TDEApplication kapplication;
     TDEGlobal::locale()->insertCatalogue("libtdegames");
 
-	if (kapplication.isRestored())
+	if (tdeapplication.isRestored())
 		RESTORE(Atlantik)
 	else
 	{
@@ -74,5 +74,5 @@ int main(int argc, char *argv[])
 		atlantik->show();
 	}
 
-	return kapplication.exec();
+	return tdeapplication.exec();
 }
diff --git a/kasteroids/main.cpp b/kasteroids/main.cpp
index 1438bfc9..43101e7c 100644
--- a/kasteroids/main.cpp
+++ b/kasteroids/main.cpp
@@ -6,9 +6,9 @@
 #include <config.h>
 
 #include <kstandarddirs.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 
 #include "version.h"
 #include "toplevel.h"
diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp
index fd49ca1a..32604b59 100644
--- a/kasteroids/toplevel.cpp
+++ b/kasteroids/toplevel.cpp
@@ -11,7 +11,7 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
diff --git a/kasteroids/view.cpp b/kasteroids/view.cpp
index 3d886d7d..c35b7fcb 100644
--- a/kasteroids/view.cpp
+++ b/kasteroids/view.cpp
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp
index 7e247d9b..c27cdeb3 100644
--- a/katomic/gamewidget.cpp
+++ b/katomic/gamewidget.cpp
@@ -29,7 +29,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kscoredialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/katomic/main.cpp b/katomic/main.cpp
index d359617e..0847e846 100644
--- a/katomic/main.cpp
+++ b/katomic/main.cpp
@@ -21,10 +21,10 @@
 
 #include "toplevel.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 
 static const char description[] =
diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp
index 10609524..30c369bd 100644
--- a/katomic/toplevel.cpp
+++ b/katomic/toplevel.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "gamewidget.h"
 #include "toplevel.h"
diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp
index f6c1c679..f6de53f3 100644
--- a/kbackgammon/engines/fibs/kbgfibs.cpp
+++ b/kbackgammon/engines/fibs/kbgfibs.cpp
@@ -35,7 +35,7 @@
 #include "kbgfibs.h"
 #include "kbgfibs.moc"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqtimer.h>
 #include <tqcheckbox.h>
diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp
index a763d15c..bab4fdb9 100644
--- a/kbackgammon/engines/fibs/kbgfibschat.cpp
+++ b/kbackgammon/engines/fibs/kbgfibschat.cpp
@@ -48,7 +48,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstdaction.h>
 #include <ktabctl.h>
diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp
index 78051057..1cc43754 100644
--- a/kbackgammon/engines/fibs/kplayerlist.cpp
+++ b/kbackgammon/engines/fibs/kplayerlist.cpp
@@ -34,7 +34,7 @@
 #include <tqdatetime.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp
index b4a502a1..ed40188c 100644
--- a/kbackgammon/engines/gnubg/kbggnubg.cpp
+++ b/kbackgammon/engines/gnubg/kbggnubg.cpp
@@ -24,7 +24,7 @@
 #include "kbggnubg.moc"
 #include "kbggnubg.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp
index 2b3b27a6..eb78c4d8 100644
--- a/kbackgammon/engines/nextgen/kbgng.cpp
+++ b/kbackgammon/engines/nextgen/kbgng.cpp
@@ -24,7 +24,7 @@
 #include "kbgng.moc"
 #include "kbgng.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp
index 5e34f2c4..c0dc8126 100644
--- a/kbackgammon/engines/offline/kbgoffline.cpp
+++ b/kbackgammon/engines/offline/kbgoffline.cpp
@@ -33,7 +33,7 @@
 #include <tqlineedit.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kstdaction.h>
diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp
index 6543b43f..a6a0fd84 100644
--- a/kbackgammon/kbg.cpp
+++ b/kbackgammon/kbg.cpp
@@ -37,14 +37,14 @@
 
 #include <kmenubar.h>
 #include <tdetoolbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
 #include <klocale.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <kcompletion.h>
diff --git a/kbackgammon/kbgboard.cpp b/kbackgammon/kbgboard.cpp
index 8382dec3..dfd0a5da 100644
--- a/kbackgammon/kbgboard.cpp
+++ b/kbackgammon/kbgboard.cpp
@@ -29,7 +29,7 @@
 
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kbgboard.h"
 #include "kbgboard.moc"
diff --git a/kbackgammon/kbgtextview.cpp b/kbackgammon/kbgtextview.cpp
index 697f6c8a..ba8cdd0c 100644
--- a/kbackgammon/kbgtextview.cpp
+++ b/kbackgammon/kbgtextview.cpp
@@ -27,7 +27,7 @@
 #include <kcmenumngr.h>
 #include <tdefontdialog.h>
 #include <tqfont.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <iostream>
 
diff --git a/kbackgammon/main.cpp b/kbackgammon/main.cpp
index af57085a..57e31823 100644
--- a/kbackgammon/main.cpp
+++ b/kbackgammon/main.cpp
@@ -19,11 +19,11 @@
 
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "kbg.h"
 #include "version.h"
diff --git a/kbattleship/kbattleship/kbaiplayer.cpp b/kbattleship/kbattleship/kbaiplayer.cpp
index 0a30913a..e1ea7d75 100644
--- a/kbattleship/kbattleship/kbaiplayer.cpp
+++ b/kbattleship/kbattleship/kbaiplayer.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "kbchooserstrategy.h"
diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp
index 9a3c141a..f59e5a7a 100644
--- a/kbattleship/kbattleship/kbattleship.cpp
+++ b/kbattleship/kbattleship/kbattleship.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdgameaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <kuser.h>
 
diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h
index a47dd72b..ed63623f 100644
--- a/kbattleship/kbattleship/kbattleship.h
+++ b/kbattleship/kbattleship/kbattleship.h
@@ -19,7 +19,7 @@
 #define KBATTLESHIP_H
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kbattleship/kbattleship/kbchooserstrategy.cpp b/kbattleship/kbattleship/kbchooserstrategy.cpp
index 723c2932..548670fe 100644
--- a/kbattleship/kbattleship/kbchooserstrategy.cpp
+++ b/kbattleship/kbattleship/kbchooserstrategy.cpp
@@ -16,7 +16,7 @@
 
 #include "kbchooserstrategy.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kbrandomshotstrategy.h"
 #include "kbdiagonalwrapstrategy.h"
diff --git a/kbattleship/kbattleship/kchatwidget.cpp b/kbattleship/kbattleship/kchatwidget.cpp
index ef545cd2..f6b804ee 100644
--- a/kbattleship/kbattleship/kchatwidget.cpp
+++ b/kbattleship/kbattleship/kchatwidget.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kchatwidget.moc"
 
 KChatWidget::KChatWidget(TQWidget *parent, const char *name) : chatDlg(parent, name)
diff --git a/kbattleship/kbattleship/kclientdialog.h b/kbattleship/kbattleship/kclientdialog.h
index ead29ee5..f5998fca 100644
--- a/kbattleship/kbattleship/kclientdialog.h
+++ b/kbattleship/kbattleship/kclientdialog.h
@@ -18,7 +18,7 @@
 #ifndef KCLIENTDIALOG_H
 #define KCLIENTDIALOG_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <dnssd/servicebrowser.h>
 #include <dnssd/remoteservice.h>
diff --git a/kbattleship/kbattleship/main.cpp b/kbattleship/kbattleship/main.cpp
index faffd375..35011c08 100644
--- a/kbattleship/kbattleship/main.cpp
+++ b/kbattleship/kbattleship/main.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include "kbattleship.h"
diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp
index ccb0dcde..8b26d813 100644
--- a/kblackbox/kbbgame.cpp
+++ b/kblackbox/kbbgame.cpp
@@ -19,7 +19,7 @@
 
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
diff --git a/kblackbox/main.cpp b/kblackbox/main.cpp
index 7fd684b2..3ecc170f 100644
--- a/kblackbox/main.cpp
+++ b/kblackbox/main.cpp
@@ -9,10 +9,10 @@
 //
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "kbbgame.h"
 #include "version.h"
diff --git a/kbounce/game.cpp b/kbounce/game.cpp
index 5ba84ee0..f6583de8 100644
--- a/kbounce/game.cpp
+++ b/kbounce/game.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <tqtimer.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqimage.h>
 #include <kglobalsettings.h>
diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp
index ed05cf7f..bdfa4f32 100644
--- a/kbounce/kbounce.cpp
+++ b/kbounce/kbounce.cpp
@@ -18,7 +18,7 @@
 
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <tqtimer.h>
diff --git a/kbounce/main.cpp b/kbounce/main.cpp
index ebbfa6b0..e3243c56 100644
--- a/kbounce/main.cpp
+++ b/kbounce/main.cpp
@@ -16,9 +16,9 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "../config.h"
 
diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp
index 536096ca..750d988d 100644
--- a/kenolaba/AbTop.cpp
+++ b/kenolaba/AbTop.cpp
@@ -5,7 +5,7 @@
 #include <tqclipboard.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/kenolaba/Ball.cpp b/kenolaba/Ball.cpp
index 1c97ca84..8590a059 100644
--- a/kenolaba/Ball.cpp
+++ b/kenolaba/Ball.cpp
@@ -472,7 +472,7 @@ void BallTest::mouseReleaseEvent( TQMouseEvent * )
 
 /* Test...
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/kenolaba/EvalDlgImpl.cpp b/kenolaba/EvalDlgImpl.cpp
index ead21880..79f4dde7 100644
--- a/kenolaba/EvalDlgImpl.cpp
+++ b/kenolaba/EvalDlgImpl.cpp
@@ -13,7 +13,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "EvalDlgImpl.h"
 #include "Board.h"
diff --git a/kenolaba/EvalScheme.cpp b/kenolaba/EvalScheme.cpp
index dc51760c..54fb34f6 100644
--- a/kenolaba/EvalScheme.cpp
+++ b/kenolaba/EvalScheme.cpp
@@ -7,7 +7,7 @@
  * (C) JW, 2000
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "EvalScheme.h"
diff --git a/kenolaba/Spy.cpp b/kenolaba/Spy.cpp
index b10892cc..614c810f 100644
--- a/kenolaba/Spy.cpp
+++ b/kenolaba/Spy.cpp
@@ -9,7 +9,7 @@
 #include <tqlabel.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "BoardWidget.h"
 #include "Spy.h"
diff --git a/kenolaba/kenolaba.cpp b/kenolaba/kenolaba.cpp
index d391cbb1..f2f15504 100644
--- a/kenolaba/kenolaba.cpp
+++ b/kenolaba/kenolaba.cpp
@@ -2,12 +2,12 @@
 
 #include <tqobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "version.h"
 #include "AbTop.h"
diff --git a/kfouleggs/main.cpp b/kfouleggs/main.cpp
index 89295d08..0ea94b01 100644
--- a/kfouleggs/main.cpp
+++ b/kfouleggs/main.cpp
@@ -2,7 +2,7 @@
 #include "main.moc"
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khighscore.h>
 
 #include "common/inter.h"
diff --git a/kgoldrunner/src/kgoldrunner.h b/kgoldrunner/src/kgoldrunner.h
index 61da818f..1b2e1437 100644
--- a/kgoldrunner/src/kgoldrunner.h
+++ b/kgoldrunner/src/kgoldrunner.h
@@ -20,7 +20,7 @@ const int L_LIVES       = 15;		// Lengths of fields.
 const int L_SCORE       = 17;
 const int L_LEVEL       = 15;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
diff --git a/kgoldrunner/src/main.cpp b/kgoldrunner/src/main.cpp
index 394ae415..c8057ca8 100644
--- a/kgoldrunner/src/main.cpp
+++ b/kgoldrunner/src/main.cpp
@@ -2,10 +2,10 @@
  * Copyright (C) 2003 Ian Wadham and Marco Krüger <ianw2@optusnet.com.au>
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include "kgrconsts.h"
diff --git a/kjumpingcube/brain.cpp b/kjumpingcube/brain.cpp
index e2d63815..d662057e 100644
--- a/kjumpingcube/brain.cpp
+++ b/kjumpingcube/brain.cpp
@@ -25,7 +25,7 @@
 
 #include <math.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #undef DEBUG // uncomment this to get useful messages
 #include <assert.h>
diff --git a/kjumpingcube/kcubeboxwidget.cpp b/kjumpingcube/kcubeboxwidget.cpp
index 3457852c..9b589b96 100644
--- a/kjumpingcube/kcubeboxwidget.cpp
+++ b/kjumpingcube/kcubeboxwidget.cpp
@@ -21,7 +21,7 @@
 **************************************************************************** */
 #include "kcubeboxwidget.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
diff --git a/kjumpingcube/kcubewidget.cpp b/kjumpingcube/kcubewidget.cpp
index f3db2828..b98ca82e 100644
--- a/kjumpingcube/kcubewidget.cpp
+++ b/kjumpingcube/kcubewidget.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 /* ****************************************************** **
diff --git a/kjumpingcube/main.cpp b/kjumpingcube/main.cpp
index 236577fb..39812a61 100644
--- a/kjumpingcube/main.cpp
+++ b/kjumpingcube/main.cpp
@@ -21,9 +21,9 @@
 **************************************************************************** */
 #include "version.h"
 #include "kjumpingcube.h"
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 
 static const char description[] =
diff --git a/klickety/field.cpp b/klickety/field.cpp
index 19d7d6ff..9288e24f 100644
--- a/klickety/field.cpp
+++ b/klickety/field.cpp
@@ -4,7 +4,7 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kgamelcd.h>
 
diff --git a/klickety/main.cpp b/klickety/main.cpp
index da6b0afe..46381858 100644
--- a/klickety/main.cpp
+++ b/klickety/main.cpp
@@ -2,9 +2,9 @@
 #include "main.moc"
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khighscore.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "base/settings.h"
 #include "piece.h"
diff --git a/klines/ballpainter.cpp b/klines/ballpainter.cpp
index 131b81f8..034ecb3d 100644
--- a/klines/ballpainter.cpp
+++ b/klines/ballpainter.cpp
@@ -14,7 +14,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 //#include "shotcounter.h"
 #include <tqpainter.h>
diff --git a/klines/klines.cpp b/klines/klines.cpp
index bfd6346a..85d4aa16 100644
--- a/klines/klines.cpp
+++ b/klines/klines.cpp
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdeconfig.h>
diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp
index bd5610cb..356db61a 100644
--- a/klines/linesboard.cpp
+++ b/klines/linesboard.cpp
@@ -22,7 +22,7 @@
 #include <tqtooltip.h>
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
diff --git a/klines/main.cpp b/klines/main.cpp
index 42127644..933acb92 100644
--- a/klines/main.cpp
+++ b/klines/main.cpp
@@ -20,10 +20,10 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "klines.h"
 
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index cfb4e83f..43594a72 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -1,6 +1,6 @@
 
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqpainter.h>
 
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index 94782cff..c91d99a7 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -11,7 +11,7 @@
 #include <kiconloader.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp
index 0f6af54b..e9d192b4 100644
--- a/kmahjongg/Preview.cpp
+++ b/kmahjongg/Preview.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp
index ec4ff595..933e2f3b 100644
--- a/kmahjongg/boardwidget.cpp
+++ b/kmahjongg/boardwidget.cpp
@@ -2,7 +2,7 @@
 #include "prefs.h"
 
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <klocale.h>
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index 54b9716f..954e4caa 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -27,7 +27,7 @@
 
 #include <limits.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <tdeconfigdialog.h>
 #include <kinputdialog.h>
diff --git a/kmahjongg/main.cpp b/kmahjongg/main.cpp
index 7a65959f..472d9dc2 100644
--- a/kmahjongg/main.cpp
+++ b/kmahjongg/main.cpp
@@ -1,9 +1,9 @@
 #include "kmahjongg.h"
 #include "version.h"
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kimageio.h>
 
 static const char description[] = I18N_NOOP("Mahjongg for TDE");
diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp
index 08554d00..b6991d19 100644
--- a/kmines/dialogs.cpp
+++ b/kmines/dialogs.cpp
@@ -36,7 +36,7 @@
 #include <knuminput.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 
 #include "settings.h"
diff --git a/kmines/highscores.cpp b/kmines/highscores.cpp
index e175a926..6ad1e617 100644
--- a/kmines/highscores.cpp
+++ b/kmines/highscores.cpp
@@ -20,7 +20,7 @@
 
 #include <kurl.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "version.h"
diff --git a/kmines/main.cpp b/kmines/main.cpp
index 1c24d246..602fc044 100644
--- a/kmines/main.cpp
+++ b/kmines/main.cpp
@@ -22,10 +22,10 @@
 #include <tqptrvector.h>
 
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kstdaction.h>
 #include <kkeydialog.h>
 #include <kstdgameaction.h>
diff --git a/kmines/status.cpp b/kmines/status.cpp
index de2eb109..3c88961e 100644
--- a/kmines/status.cpp
+++ b/kmines/status.cpp
@@ -27,7 +27,7 @@
 #include <tqtextedit.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
diff --git a/knetwalk/src/highscores.cpp b/knetwalk/src/highscores.cpp
index a8ed2c6e..a33185eb 100644
--- a/knetwalk/src/highscores.cpp
+++ b/knetwalk/src/highscores.cpp
@@ -14,7 +14,7 @@
 
 #include <kurl.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "defines.h"
diff --git a/knetwalk/src/main.cpp b/knetwalk/src/main.cpp
index 581bb636..326ed74c 100644
--- a/knetwalk/src/main.cpp
+++ b/knetwalk/src/main.cpp
@@ -12,9 +12,9 @@
  *   GNU General Public License for more details.                          *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <khighscore.h>
diff --git a/knetwalk/src/mainwindow.h b/knetwalk/src/mainwindow.h
index e62c0919..1962aba8 100644
--- a/knetwalk/src/mainwindow.h
+++ b/knetwalk/src/mainwindow.h
@@ -15,7 +15,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 class Cell;
diff --git a/kolf/ball.cpp b/kolf/ball.cpp
index 9ac849bc..175d0bd1 100644
--- a/kolf/ball.cpp
+++ b/kolf/ball.cpp
@@ -2,7 +2,7 @@
 #include <tqcolor.h>
 #include <tqpen.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <math.h>
diff --git a/kolf/game.cpp b/kolf/game.cpp
index 8aeb09cb..8544cbd6 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -2,7 +2,7 @@
 #include <arts/kplayobject.h>
 #include <arts/kplayobjectfactory.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 57793f07..2fe55956 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -1,5 +1,5 @@
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/kolf/main.cpp b/kolf/main.cpp
index 7fae6ee8..235ef614 100644
--- a/kolf/main.cpp
+++ b/kolf/main.cpp
@@ -1,10 +1,10 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kurl.h>
 
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 4f6f4181..d4e4e00a 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index 2b5e7f98..147c8e1e 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -7,7 +7,7 @@
 
 #include <klocale.h>
 #include <klibloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index f5ed6753..7e0fe011 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -7,7 +7,7 @@
 
 #include <klocale.h>
 #include <klibloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 
diff --git a/kolf/slope.cpp b/kolf/slope.cpp
index c5dc9031..82708d0f 100644
--- a/kolf/slope.cpp
+++ b/kolf/slope.cpp
@@ -5,7 +5,7 @@
 #include <tqpixmapcache.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
diff --git a/konquest/Konquest.cc b/konquest/Konquest.cc
index 25a08857..953852a2 100644
--- a/konquest/Konquest.cc
+++ b/konquest/Konquest.cc
@@ -1,7 +1,7 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "version.h"
 #include "mainwin.h"
diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc
index ebe230c3..bfa7a696 100644
--- a/konquest/fleetdlg.cc
+++ b/konquest/fleetdlg.cc
@@ -1,5 +1,5 @@
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <math.h>
 #include <kglobal.h>
diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc
index ce8ae2e0..2f279f27 100644
--- a/konquest/gameboard.cc
+++ b/konquest/gameboard.cc
@@ -10,7 +10,7 @@
 #include <tqvalidator.h>
 #include <tqtextedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc
index 270d7e30..c8c954f4 100644
--- a/konquest/gameenddlg.cc
+++ b/konquest/gameenddlg.cc
@@ -3,7 +3,7 @@
 #include <tqslider.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
diff --git a/konquest/mainwin.cc b/konquest/mainwin.cc
index cc19110e..7ccdfe9f 100644
--- a/konquest/mainwin.cc
+++ b/konquest/mainwin.cc
@@ -2,7 +2,7 @@
 
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmenubar.h>
diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc
index ed3770b0..a5bc0069 100644
--- a/konquest/map_widget.cc
+++ b/konquest/map_widget.cc
@@ -2,7 +2,7 @@
 #include <tqpainter.h>
 #include <tqcolor.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 
diff --git a/konquest/minimap.cc b/konquest/minimap.cc
index a287ab79..479e997e 100644
--- a/konquest/minimap.cc
+++ b/konquest/minimap.cc
@@ -1,7 +1,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include "minimap.h"
diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cc
index 6e0ca2b9..85672550 100644
--- a/konquest/newgamedlg.cc
+++ b/konquest/newgamedlg.cc
@@ -9,7 +9,7 @@
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc
index 29e2436e..afc80f72 100644
--- a/konquest/planet_info.cc
+++ b/konquest/planet_info.cc
@@ -2,7 +2,7 @@
 #include <tqlayout.h>
 #include <tqpalette.h>
 #include <tqcolor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "planet_info.h"
diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc
index 0e259b95..bcbe45ec 100644
--- a/konquest/scoredlg.cc
+++ b/konquest/scoredlg.cc
@@ -1,5 +1,5 @@
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/kpat/cardmaps.cpp b/kpat/cardmaps.cpp
index e38d91dd..d00fc8cf 100644
--- a/kpat/cardmaps.cpp
+++ b/kpat/cardmaps.cpp
@@ -31,7 +31,7 @@
 
 #include <config.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include "version.h"
 #include <kstaticdeleter.h>
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index 8cb3e3c3..49395057 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -4,7 +4,7 @@
 #include "deck.h"
 #include <assert.h>
 #include "tdemainwindow.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqtimer.h>
 #include <tdeaction.h>
diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp
index e15c7674..0de9da08 100644
--- a/kpat/gamestatsimpl.cpp
+++ b/kpat/gamestatsimpl.cpp
@@ -5,7 +5,7 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/kpat/main.cpp b/kpat/main.cpp
index 0d7ffd1f..5209d5ed 100644
--- a/kpat/main.cpp
+++ b/kpat/main.cpp
@@ -16,9 +16,9 @@
 
  */
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "version.h"
 #include "pwidget.h"
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index 839325f4..dbc211ec 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -24,7 +24,7 @@
 #include <tqtimer.h>
 #include <tqimage.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeaction.h>
 #include <kdebug.h>
diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp
index 02a5a319..7cfec655 100644
--- a/kpoker/kpoker.cpp
+++ b/kpoker/kpoker.cpp
@@ -26,7 +26,7 @@
 
 // KDE includes
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/kpoker/main.cpp b/kpoker/main.cpp
index 9ed05f9b..df81b0d3 100644
--- a/kpoker/main.cpp
+++ b/kpoker/main.cpp
@@ -14,10 +14,10 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "version.h"
 #include "top.h"
diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp
index b8f5f19c..5ac23449 100644
--- a/kpoker/newgamedlg.cpp
+++ b/kpoker/newgamedlg.cpp
@@ -25,7 +25,7 @@
 // KDE includes
 #include <klocale.h>
 #include <knuminput.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <knumvalidator.h>
 
diff --git a/kpoker/top.cpp b/kpoker/top.cpp
index 11c5ee34..731d1d6f 100644
--- a/kpoker/top.cpp
+++ b/kpoker/top.cpp
@@ -20,7 +20,7 @@
 #include <tqcursor.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kmessagebox.h>
diff --git a/kreversi/board.cpp b/kreversi/board.cpp
index 2d8e034e..7ac24169 100644
--- a/kreversi/board.cpp
+++ b/kreversi/board.cpp
@@ -41,7 +41,7 @@
 #include <tqpainter.h>
 #include <tqfont.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <knotifyclient.h>
diff --git a/kreversi/highscores.cpp b/kreversi/highscores.cpp
index 6f34d097..74fd1590 100644
--- a/kreversi/highscores.cpp
+++ b/kreversi/highscores.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 namespace KExtHighscore
diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp
index a0aebf65..24bfc5d8 100644
--- a/kreversi/kreversi.cpp
+++ b/kreversi/kreversi.cpp
@@ -43,7 +43,7 @@
 #include <tqlabel.h>
 #include <tqlistbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/kreversi/main.cpp b/kreversi/main.cpp
index 711559a6..d6655827 100644
--- a/kreversi/main.cpp
+++ b/kreversi/main.cpp
@@ -37,10 +37,10 @@
  */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageio.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <khighscore.h>
 
 #include "version.h"
diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp
index 36a5345a..c64932b9 100644
--- a/kreversi/qreversigameview.cpp
+++ b/kreversi/qreversigameview.cpp
@@ -50,7 +50,7 @@
 #include <tqpainter.h>
 #include <tqfont.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <knotifyclient.h>
diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp
index e076d3a3..90b20b10 100644
--- a/ksame/KSameWidget.cpp
+++ b/ksame/KSameWidget.cpp
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <kscoredialog.h>
diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp
index 0985aa48..6f6372f9 100644
--- a/ksame/StoneWidget.cpp
+++ b/ksame/StoneWidget.cpp
@@ -28,7 +28,7 @@
 #include <tqimage.h>
 #include <tqcursor.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 
diff --git a/ksame/main.cpp b/ksame/main.cpp
index f85a7f85..8bb084c6 100644
--- a/ksame/main.cpp
+++ b/ksame/main.cpp
@@ -21,13 +21,13 @@
 
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "version.h"
 #include "KSameWidget.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 
 static const char description[] = I18N_NOOP("Same Game - a little game about balls and how to get rid of them");
diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index e8c3f932..c392fe65 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -36,7 +36,7 @@
  *******************************************************************
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kseparator.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
diff --git a/kshisen/board.cpp b/kshisen/board.cpp
index 475b3672..110460d2 100644
--- a/kshisen/board.cpp
+++ b/kshisen/board.cpp
@@ -36,7 +36,7 @@
  *******************************************************************
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
diff --git a/kshisen/main.cpp b/kshisen/main.cpp
index e71e399e..614bf20f 100644
--- a/kshisen/main.cpp
+++ b/kshisen/main.cpp
@@ -36,9 +36,9 @@
  *******************************************************************
  */
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 
 #include "version.h"
diff --git a/kshisen/tileset.cpp b/kshisen/tileset.cpp
index fdaf184f..30f055e9 100644
--- a/kshisen/tileset.cpp
+++ b/kshisen/tileset.cpp
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/ksirtet/ksirtet/check_score.cpp b/ksirtet/ksirtet/check_score.cpp
index f6c97210..b833aaa6 100644
--- a/ksirtet/ksirtet/check_score.cpp
+++ b/ksirtet/ksirtet/check_score.cpp
@@ -1,6 +1,6 @@
 #include <iostream.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 
 int main(int argc, char **argv)
diff --git a/ksirtet/ksirtet/main.cpp b/ksirtet/ksirtet/main.cpp
index 4c66c22f..7b2eee1e 100644
--- a/ksirtet/ksirtet/main.cpp
+++ b/ksirtet/ksirtet/main.cpp
@@ -2,7 +2,7 @@
 #include "main.moc"
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khighscore.h>
 
 #include "common/inter.h"
diff --git a/ksmiletris/gamewidget.cpp b/ksmiletris/gamewidget.cpp
index 13583f15..f1417a8c 100644
--- a/ksmiletris/gamewidget.cpp
+++ b/ksmiletris/gamewidget.cpp
@@ -24,7 +24,7 @@ this software.
 #include "config.h"
 
 #include <kaudioplayer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqbitmap.h>
 #include <tqpainter.h>
diff --git a/ksmiletris/gamewindow.cpp b/ksmiletris/gamewindow.cpp
index ec6bd90b..fc53b5ff 100644
--- a/ksmiletris/gamewindow.cpp
+++ b/ksmiletris/gamewindow.cpp
@@ -23,7 +23,7 @@ this software.
 
 #include "config.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kmenubar.h>
diff --git a/ksmiletris/main.cpp b/ksmiletris/main.cpp
index c64db46c..20f1e4ba 100644
--- a/ksmiletris/main.cpp
+++ b/ksmiletris/main.cpp
@@ -23,10 +23,10 @@ this software.
 
 #include "config.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "gamewindow.h"
 
diff --git a/ksmiletris/screenwidget.cpp b/ksmiletris/screenwidget.cpp
index d8e87f4c..9013b254 100644
--- a/ksmiletris/screenwidget.cpp
+++ b/ksmiletris/screenwidget.cpp
@@ -23,7 +23,7 @@ this software.
 
 #include "config.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqframe.h>
 #include <tqpainter.h>
diff --git a/ksnake/main.cpp b/ksnake/main.cpp
index ae4f9098..bb4b0474 100644
--- a/ksnake/main.cpp
+++ b/ksnake/main.cpp
@@ -25,9 +25,9 @@
 
 #include "game.h"
 #include "version.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 static const char description[] = I18N_NOOP("TDE Snake Race Game");
 
diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp
index df9748ad..ed9758fb 100644
--- a/ksnake/rattler.cpp
+++ b/ksnake/rattler.cpp
@@ -27,7 +27,7 @@
 
 #include <tqtimer.h>
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdgameaction.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/ksokoban/Bookmark.cpp b/ksokoban/Bookmark.cpp
index 87414938..693a886c 100644
--- a/ksokoban/Bookmark.cpp
+++ b/ksokoban/Bookmark.cpp
@@ -23,7 +23,7 @@
 
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/ksokoban/LevelCollection.cpp b/ksokoban/LevelCollection.cpp
index e02acca0..300ba068 100644
--- a/ksokoban/LevelCollection.cpp
+++ b/ksokoban/LevelCollection.cpp
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static inline unsigned long
 forward(unsigned long a, unsigned long b, unsigned long c, unsigned long d)
diff --git a/ksokoban/LevelMap.cpp b/ksokoban/LevelMap.cpp
index 59a2976b..ca96353d 100644
--- a/ksokoban/LevelMap.cpp
+++ b/ksokoban/LevelMap.cpp
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index 3138c859..7c02c1d8 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kmenubar.h>
 #include <tqpopupmenu.h>
diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp
index 93ee7d1e..4fd7b25c 100644
--- a/ksokoban/ModalLabel.cpp
+++ b/ksokoban/ModalLabel.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlabel.h>
 #include <tqfont.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <tqwidgetlist.h>
 #include <tqstring.h>
diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp
index eb6a9520..b5433ed9 100644
--- a/ksokoban/PlayField.cpp
+++ b/ksokoban/PlayField.cpp
@@ -24,7 +24,7 @@
 #include <tqpixmap.h>
 #include <tqkeycode.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqpainter.h>
 #include <kmessagebox.h>
diff --git a/ksokoban/main.cpp b/ksokoban/main.cpp
index cdef8419..5f589a8f 100644
--- a/ksokoban/main.cpp
+++ b/ksokoban/main.cpp
@@ -18,11 +18,11 @@
  */
 
 // #include <kuniqueapplication.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageio.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "MainWindow.h"
 
diff --git a/kspaceduel/main.cpp b/kspaceduel/main.cpp
index 5b30fa63..94f56cc8 100644
--- a/kspaceduel/main.cpp
+++ b/kspaceduel/main.cpp
@@ -1,6 +1,6 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "version.h"
 #include "topwidget.h"
diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp
index 7a0264a6..eb5f437f 100644
--- a/kspaceduel/mainview.cpp
+++ b/kspaceduel/mainview.cpp
@@ -5,7 +5,7 @@
 #include <tqfile.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp
index 7fc8db39..8fab5eac 100644
--- a/ktron/ktron.cpp
+++ b/ktron/ktron.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <tdeaction.h>
 #include <kstdgameaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 
 // Settings
diff --git a/ktron/main.cpp b/ktron/main.cpp
index f86bd398..d08971c0 100644
--- a/ktron/main.cpp
+++ b/ktron/main.cpp
@@ -18,10 +18,10 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
   ****************************************************************************/  
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageio.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "ktron.h"
 #include "version.h"
diff --git a/ktron/tron.cpp b/ktron/tron.cpp
index 260893b0..2ed4cd74 100644
--- a/ktron/tron.cpp
+++ b/ktron/tron.cpp
@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <tdeaction.h>
diff --git a/ktuberling/main.cpp b/ktuberling/main.cpp
index 17430152..a8525e8d 100644
--- a/ktuberling/main.cpp
+++ b/ktuberling/main.cpp
@@ -4,11 +4,11 @@
    mailto:e.bischoff@noos.fr
  ------------------------------------------------------------- */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageio.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "toplevel.h"
 
diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp
index d057fb3f..a0eeafbc 100644
--- a/ktuberling/toplevel.cpp
+++ b/ktuberling/toplevel.cpp
@@ -4,7 +4,7 @@
    mailto:e.bischoff@noos.fr
  ------------------------------------------------------------- */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/libksirtet/base/factory.cpp b/libksirtet/base/factory.cpp
index 121e02c1..00b8874d 100644
--- a/libksirtet/base/factory.cpp
+++ b/libksirtet/base/factory.cpp
@@ -1,8 +1,8 @@
 #include "factory.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/libksirtet/base/settings.cpp b/libksirtet/base/settings.cpp
index a695d746..83c1a7a6 100644
--- a/libksirtet/base/settings.cpp
+++ b/libksirtet/base/settings.cpp
@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 
 #include "piece.h"
diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp
index 5cd470d7..36e4716c 100644
--- a/libksirtet/common/ai.cpp
+++ b/libksirtet/common/ai.cpp
@@ -12,7 +12,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "commonprefs.h"
 #include "board.h"
diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp
index 98073524..9ac4a005 100644
--- a/libksirtet/common/highscores.cpp
+++ b/libksirtet/common/highscores.cpp
@@ -1,7 +1,7 @@
 #include "highscores.h"
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "base/factory.h"
diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp
index 312e355b..2cd3e981 100644
--- a/libksirtet/common/inter.cpp
+++ b/libksirtet/common/inter.cpp
@@ -3,7 +3,7 @@
 
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "factory.h"
 #include "field.h"
diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp
index 74c6beee..fda2c909 100644
--- a/libksirtet/lib/mp_interface.cpp
+++ b/libksirtet/lib/mp_interface.cpp
@@ -6,7 +6,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kkeydialog.h>
 
 #include "defines.h"
diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp
index 2070ae4f..073e0986 100644
--- a/libksirtet/lib/wizard.cpp
+++ b/libksirtet/lib/wizard.cpp
@@ -13,7 +13,7 @@
 #include <tqgrid.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialogbase.h>
diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp
index d11d10ce..1cdeb170 100644
--- a/libtdegames/highscore/kexthighscore_gui.cpp
+++ b/libtdegames/highscore/kexthighscore_gui.cpp
@@ -26,7 +26,7 @@
 #include <tqgrid.h>
 #include <tqvgroupbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kurllabel.h>
 #include <kopenwith.h>
diff --git a/libtdegames/highscore/kexthighscore_internal.h b/libtdegames/highscore/kexthighscore_internal.h
index fd690b07..5c5ab53b 100644
--- a/libtdegames/highscore/kexthighscore_internal.h
+++ b/libtdegames/highscore/kexthighscore_internal.h
@@ -20,7 +20,7 @@
 #ifndef KEXTHIGHSCORE_INTERNAL_H
 #define KEXTHIGHSCORE_INTERNAL_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kurl.h>
diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp
index 3555c76e..004c98fa 100644
--- a/libtdegames/highscore/khighscore.cpp
+++ b/libtdegames/highscore/khighscore.cpp
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <sys/file.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <kglobal.h>
 #include <kstdguiitem.h>
diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index 8db70fee..aadb3fd1 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -32,7 +32,7 @@ this software.
 #include <tqevent.h>
 #include <tqptrvector.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kseparator.h>
diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp
index 9434b799..a347e578 100644
--- a/libtdegames/kcarddialog.cpp
+++ b/libtdegames/kcarddialog.cpp
@@ -31,7 +31,7 @@
 #include <tqslider.h>
 #include <tqwmatrix.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kiconview.h>
diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp
index 14395d1e..386c005e 100644
--- a/libtdegames/kchatbase.cpp
+++ b/libtdegames/kchatbase.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqlayout.h>
diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp
index 469d6393..7327a70f 100644
--- a/libtdegames/kgameprogress.cpp
+++ b/libtdegames/kgameprogress.cpp
@@ -27,7 +27,7 @@
 
 #include "kgameprogress.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KGameProgress::KGameProgress(TQWidget *parent, const char *name)
 	: TQFrame(parent, name),
diff --git a/lskat/lskat/lskat.h b/lskat/lskat/lskat.h
index 950fd1ab..6571ce5d 100644
--- a/lskat/lskat/lskat.h
+++ b/lskat/lskat/lskat.h
@@ -27,7 +27,7 @@
 #include <tqstrlist.h>
 
 // include files for TDE 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaccel.h>
 
diff --git a/lskat/lskat/main.cpp b/lskat/lskat/main.cpp
index 00b8b7a1..a37ded0a 100644
--- a/lskat/lskat/main.cpp
+++ b/lskat/lskat/main.cpp
@@ -12,9 +12,9 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include "lskat.h"
 
 static TDECmdLineOptions options[] =
diff --git a/twin4/twin4/main.cpp b/twin4/twin4/main.cpp
index 408489e2..92db41f2 100644
--- a/twin4/twin4/main.cpp
+++ b/twin4/twin4/main.cpp
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "twin4.h"
 
diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp
index a0fe4661..f4b90c6a 100644
--- a/twin4/twin4/twin4.cpp
+++ b/twin4/twin4/twin4.cpp
@@ -25,7 +25,7 @@
 #include <tqlcdnumber.h>
 
 // include files for TDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdgameaction.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
diff --git a/twin4/twin4/twin4doc.cpp b/twin4/twin4/twin4doc.cpp
index 672c6501..ce99ca57 100644
--- a/twin4/twin4/twin4doc.cpp
+++ b/twin4/twin4/twin4doc.cpp
@@ -27,7 +27,7 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <krandomsequence.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // application specific includes
 #include "kspritecache.h"
diff --git a/twin4/twin4/twin4view.cpp b/twin4/twin4/twin4view.cpp
index 81441368..6a02d6f2 100644
--- a/twin4/twin4/twin4view.cpp
+++ b/twin4/twin4/twin4view.cpp
@@ -22,7 +22,7 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 #include "twin4doc.h"