diff --git a/dcoprss/client.cpp b/dcoprss/client.cpp
index 01b6003e..4bb32aa3 100644
--- a/dcoprss/client.cpp
+++ b/dcoprss/client.cpp
@@ -1,5 +1,5 @@
 /* $Id$ */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tqdatastream.h>
diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp
index d2feee28..62b670bb 100644
--- a/dcoprss/feedbrowser.cpp
+++ b/dcoprss/feedbrowser.cpp
@@ -1,8 +1,8 @@
 #include "feedbrowser.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
diff --git a/dcoprss/main.cpp b/dcoprss/main.cpp
index 4d00133c..fb822a22 100644
--- a/dcoprss/main.cpp
+++ b/dcoprss/main.cpp
@@ -1,10 +1,10 @@
 /* $Id$ */
 
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include "service.h"
diff --git a/dcoprss/service.cpp b/dcoprss/service.cpp
index 00e56281..fad8e674 100644
--- a/dcoprss/service.cpp
+++ b/dcoprss/service.cpp
@@ -16,7 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include "service.h"
 #include "cache.h"
diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
index ddfb7219..a2a5c03e 100644
--- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
@@ -31,7 +31,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
  
-#include <kapplication.h> 
+#include <tdeapplication.h> 
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 07446885..327e6f6a 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -39,7 +39,7 @@
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kuser.h>
 #include <kurl.h>
 #include <kprocess.h>
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 011d77ac..7ef1f847 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 
 #include "kdictapplet.h"
diff --git a/kdict/application.cpp b/kdict/application.cpp
index 6d5e5ada..de0c294e 100644
--- a/kdict/application.cpp
+++ b/kdict/application.cpp
@@ -11,7 +11,7 @@
 
 #include <twin.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "application.h"
 #include "toplevel.h"
diff --git a/kdict/main.cpp b/kdict/main.cpp
index 91a8d18d..7325e8f8 100644
--- a/kdict/main.cpp
+++ b/kdict/main.cpp
@@ -12,8 +12,8 @@
 
 #include <config.h>
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdelibs_export.h>
 
diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index 56553af6..ccc9cf1f 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -23,7 +23,7 @@
 
 #include <tdepopupmenu.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index 5b85a034..1c71ab05 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -32,7 +32,7 @@
 #include "options.h"
 #include "dict.h"
 #include "queryview.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index eb317a4a..aee8c156 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -18,7 +18,7 @@
 
 #include <tdestdaccel.h>
 #include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <twin.h>
diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp
index 61688190..bf12aa32 100644
--- a/kget/dlgDirectories.cpp
+++ b/kget/dlgDirectories.cpp
@@ -40,7 +40,7 @@
 
 #include "settings.h"
 #include "dlgDirectories.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 DlgDirectories::DlgDirectories(TQWidget * parent)
     : DlgDirectoriesBase(parent)
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp
index d4e04297..7add48c0 100644
--- a/kget/dlgIndividual.cpp
+++ b/kget/dlgIndividual.cpp
@@ -38,7 +38,7 @@
 #include <ksqueezedtextlabel.h>
 #include <kdatetimewidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <klocale.h>
 #include <tdetoolbar.h>
diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp
index 4a6758e2..736ce7d3 100644
--- a/kget/dlgPreferences.cpp
+++ b/kget/dlgPreferences.cpp
@@ -27,7 +27,7 @@
 
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeaction.h>
 #include <kcombobox.h>
diff --git a/kget/docking.cpp b/kget/docking.cpp
index cb68c5b4..a8a11393 100644
--- a/kget/docking.cpp
+++ b/kget/docking.cpp
@@ -26,8 +26,8 @@
 
 #include <tqtooltip.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdepopupmenu.h>
diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index 7e8de183..28f246b2 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -27,7 +27,7 @@
 #include <tqpainter.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp
index 4195573d..d16882dc 100644
--- a/kget/kget_plug_in/kget_linkview.cpp
+++ b/kget/kget_plug_in/kget_linkview.cpp
@@ -4,7 +4,7 @@
 
 #include <dcopclient.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdelistviewsearchline.h>
 #include <klocale.h>
diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp
index f8148fdf..ecf35986 100644
--- a/kget/logwindow.cpp
+++ b/kget/logwindow.cpp
@@ -36,7 +36,7 @@
 #include "tdemainwidget.h"
 #include "logwindow.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqtextedit.h>
 
 // // Replace regular space with nbsp
diff --git a/kget/main.cpp b/kget/main.cpp
index 5c107ec3..48bdf170 100644
--- a/kget/main.cpp
+++ b/kget/main.cpp
@@ -27,8 +27,8 @@
 
 #include <twin.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kurl.h>
 #include <kuniqueapplication.h>
 #include <kstartupinfo.h>
diff --git a/kget/settings.cpp b/kget/settings.cpp
index 3489c9b4..c98bbd7e 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -23,7 +23,7 @@
  *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
diff --git a/kget/slave.cpp b/kget/slave.cpp
index 96ba3547..9aa91810 100644
--- a/kget/slave.cpp
+++ b/kget/slave.cpp
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/scheduler.h>
 
 #include "getfilejob.h"
diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp
index d009d87d..57171e2f 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -51,7 +51,7 @@
 
 #include <kprotocolinfo.h>
 #include <tdefiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kurl.h>
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index 43bc6939..b1da4d5a 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -44,7 +44,7 @@
 #include "transferlist.h"
 #include "transfer.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/passdlg.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp
index 16d2f4d6..12ce3b8e 100644
--- a/kget/transferlist.cpp
+++ b/kget/transferlist.cpp
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp
index e503c7b1..d0c8c214 100644
--- a/knewsticker/common/newsengine.cpp
+++ b/knewsticker/common/newsengine.cpp
@@ -14,7 +14,7 @@
 #include "xmlnewsaccess.h"
 #include "newsiconmgr.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp
index 8864478a..228e0618 100644
--- a/knewsticker/common/newsiconmgr.cpp
+++ b/knewsticker/common/newsiconmgr.cpp
@@ -12,7 +12,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index a6ea7ce3..01b5c000 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -15,8 +15,8 @@
 #include "newsiconmgr.h"
 #include "knewstickerconfig.h"
 
-#include <kaboutapplication.h>
-#include <kapplication.h>
+#include <tdeaboutapplication.h>
+#include <tdeapplication.h>
 #include <karrowbutton.h>
 #include <kbugreport.h>
 #include <kdebug.h>
diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp
index 8ec90bd8..77689310 100644
--- a/knewsticker/knewstickerconfig.cpp
+++ b/knewsticker/knewstickerconfig.cpp
@@ -14,7 +14,7 @@
 #include "newsiconmgr.h"
 #include "newssourcedlgimpl.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <kdebug.h>
diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp
index 3a2b4bd5..234752b7 100644
--- a/knewsticker/knewstickerstub/knewstickerstub.cpp
+++ b/knewsticker/knewstickerstub/knewstickerstub.cpp
@@ -9,9 +9,9 @@
  * accompanying file 'COPYING'.
  */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include <dcopclient.h>
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index 6f5f8532..15ebe7f7 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -17,7 +17,7 @@
 #include <document.h>
 #include <loader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistbox.h>
 #include <klocale.h>
 #include <kurl.h>
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index 1cb992fd..cd9d9000 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -23,7 +23,7 @@
 #include "configaccess.h"
 #include "newsscroller.h"
 #include "newsengine.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 class Headline
 {
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 97907246..7f43c5c8 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -45,7 +45,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 0e95021f..d5215c40 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -47,7 +47,7 @@
 
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdefiledialog.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 5e056d5e..28a58abf 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -26,7 +26,7 @@
 #include <tqtooltip.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <klocale.h>
 #include <kmenubar.h>
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 48d9381a..3981b9bf 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -32,7 +32,7 @@
 #include "kopeteviewmanager.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index 747cb1ee..6cf32161 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -24,7 +24,7 @@
 
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmenubar.h>
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index 27d54264..21cf6988 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -27,7 +27,7 @@
 #include <tqtextstream.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeunittest/module.h>
 #include <kinstance.h>
 #include <kdebug.h>
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 89f7655e..d308c57c 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -40,7 +40,7 @@
 #include <tdeversion.h>
 #include <kinputdialog.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorcombo.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h> // for KNewStuff emoticon fetching
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index bafc62c5..c161eeff 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -34,7 +34,7 @@
 #include <tqguardedptr.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
index 988ef1d8..67fc9b79 100644
--- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp
+++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kopetecontactlistview.h"
 #include "kopetegroupviewitem.h"
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index b791dc5b..8b583856 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -35,7 +35,7 @@
 #include <tdepopupmenu.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp
index 27aa0ecc..fd7bc38d 100644
--- a/kopete/kopete/kimifaceimpl.cpp
+++ b/kopete/kopete/kimifaceimpl.cpp
@@ -18,7 +18,7 @@
 #include <tqstringlist.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index 5b07089f..c3b94e06 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 
 #include "addaccountwizard.h"
diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp
index c961a91a..88e68645 100644
--- a/kopete/kopete/kopeteballoon.cpp
+++ b/kopete/kopete/kopeteballoon.cpp
@@ -27,7 +27,7 @@
 #include <tdeversion.h>
 #include <kglobalsettings.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp
index 27870226..4008dfe5 100644
--- a/kopete/kopete/main.cpp
+++ b/kopete/kopete/main.cpp
@@ -17,8 +17,8 @@
     *************************************************************************
 */
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include "kopeteapplication.h"
 
 #include <dcopclient.h>
diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp
index eda74da0..6d7bcf75 100644
--- a/kopete/kopete/systemtray.cpp
+++ b/kopete/kopete/systemtray.cpp
@@ -24,9 +24,9 @@
 #include <tqregexp.h>
 
 #include <twin.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include "kopeteuiglobal.h"
diff --git a/kopete/libkopete/avdevice/videodevicepool.h b/kopete/libkopete/avdevice/videodevicepool.h
index 2a42f97f..b793172d 100644
--- a/kopete/libkopete/avdevice/videodevicepool.h
+++ b/kopete/libkopete/avdevice/videodevicepool.h
@@ -31,7 +31,7 @@
 #include <kcombobox.h>
 #include "videodevice.h"
 #include "kopete_export.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 
diff --git a/kopete/libkopete/connectionmanager.cpp b/kopete/libkopete/connectionmanager.cpp
index 4530fa9e..781ea22f 100644
--- a/kopete/libkopete/connectionmanager.cpp
+++ b/kopete/libkopete/connectionmanager.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index b3595516..3ac39409 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -24,7 +24,7 @@
 #include <tqsqlpropertymap.h>
 #include <tqobjectlist.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 
 /**
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index ea28132f..44529554 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -19,7 +19,7 @@
 #include "knotification.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp
index e0bf1553..fe23ee9e 100644
--- a/kopete/libkopete/kopeteaway.cpp
+++ b/kopete/libkopete/kopeteaway.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeconfig.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 
 #include <klocale.h>
diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp
index 63cf8e38..a5e2810a 100644
--- a/kopete/libkopete/kopetechatsessionmanager.cpp
+++ b/kopete/libkopete/kopetechatsessionmanager.cpp
@@ -18,7 +18,7 @@
 #include "kopetechatsessionmanager.h"
 #include "kopeteviewmanager.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "ui/kopeteview.h"
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index cb96ee5c..481f8b88 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -14,7 +14,7 @@
     *************************************************************************
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp
index 95c625c3..ca947582 100644
--- a/kopete/libkopete/kopetecontactlist.cpp
+++ b/kopete/libkopete/kopetecontactlist.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kabc/stdaddressbook.h>
 #include <kdebug.h>
 #include <ksavefile.h>
diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp
index 4b77444d..bf4a89d3 100644
--- a/kopete/libkopete/kopeteglobal.cpp
+++ b/kopete/libkopete/kopeteglobal.cpp
@@ -18,7 +18,7 @@
 #include "kopeteglobal.h"
 #include "kopeteuiglobal.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeio/netaccess.h>
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index 7bfd87e7..d71962e4 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -20,7 +20,7 @@
 
 #include "kopetemetacontact.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp
index 90da909b..8f4741b8 100644
--- a/kopete/libkopete/kopetemimetypehandler.cpp
+++ b/kopete/libkopete/kopetemimetypehandler.cpp
@@ -21,7 +21,7 @@
 
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeio/netaccess.h>
diff --git a/kopete/libkopete/kopeteonlinestatus.cpp b/kopete/libkopete/kopeteonlinestatus.cpp
index 35ec4e4f..f37c18f8 100644
--- a/kopete/libkopete/kopeteonlinestatus.cpp
+++ b/kopete/libkopete/kopeteonlinestatus.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index 02daf0ab..e5c2476f 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcpuinfo.h> // for WORDS_BIGENDIAN
 
 #include <algorithm> // for min
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index 766dfb46..62ba7d42 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index 4c94a326..85a0d1fe 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 #include <tqvaluestack.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeparts/componentfactory.h>
 #include <kplugininfo.h>
diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index 77e8381a..4701edfb 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -20,7 +20,7 @@
 #include <tqfont.h>
 #include <tqmetaobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp
index 0681b4c7..efd632bd 100644
--- a/kopete/libkopete/kopeteutils.cpp
+++ b/kopete/libkopete/kopeteutils.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <kdatastream.h>
diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp
index 116fee30..1c7ff584 100644
--- a/kopete/libkopete/private/kopetecommand.cpp
+++ b/kopete/libkopete/private/kopetecommand.cpp
@@ -14,7 +14,7 @@
 */
 
 #include <tqstringlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index 2109a3d8..4a18e924 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -27,7 +27,7 @@
 #include <tqimage.h>
 #include <tqdatetime.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp
index 9fbc19c7..a3150403 100644
--- a/kopete/libkopete/private/kopeteviewmanager.cpp
+++ b/kopete/libkopete/private/kopeteviewmanager.cpp
@@ -15,7 +15,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index fe1f8a35..b38c3572 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index 238bdb57..43f66f88 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -21,7 +21,7 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index 45f0b0f9..8239ca86 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -21,9 +21,9 @@
 #include <tqpixmap.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp
index e9405c66..f7ce6e5e 100644
--- a/kopete/libkopete/tests/kopetepropertiestest.cpp
+++ b/kopete/libkopete/tests/kopetepropertiestest.cpp
@@ -23,8 +23,8 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index 953124b0..85201f40 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -17,9 +17,9 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 6ae61bff..9e03292b 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -26,7 +26,7 @@
 */
 
 #include <tqcheckbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index ee6ab0d5..856e421e 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqvaluelist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp
index 130973ce..8c0b2765 100644
--- a/kopete/libkopete/ui/userinfodialog.cpp
+++ b/kopete/libkopete/ui/userinfodialog.cpp
@@ -20,7 +20,7 @@
 
 #include <tdehtml_part.h>
 #include <ktextbrowser.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index e402567c..5e10cec9 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kopetemetacontact.h"
 #include "kopetecontactlist.h"
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index 34d2a426..f3616ee4 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -26,7 +26,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksavefile.h>
 #include <tqdir.h>
 #include <tqdom.h>
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index b5b65b80..37ddb921 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -42,7 +42,7 @@
 #include <tqlabel.h>
 #include <tqclipboard.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index 83405ee2..bf53fee4 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -16,7 +16,7 @@
 */
 
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kmessagebox.h>
 //#include <tdeconfig.h>
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index eaf777dd..17dfcc0b 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -19,7 +19,7 @@
 #include <kgenericfactory.h>
 #include <tdeaction.h>
 #include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kopetepluginmanager.h"
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index 3ab8539b..6fcc21cd 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeaction.h>
 
diff --git a/kopete/plugins/smpppdcs/detectordcop.cpp b/kopete/plugins/smpppdcs/detectordcop.cpp
index f5f5f992..931d5e3a 100644
--- a/kopete/plugins/smpppdcs/detectordcop.cpp
+++ b/kopete/plugins/smpppdcs/detectordcop.cpp
@@ -14,7 +14,7 @@
     *************************************************************************
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index b6f6fc30..57ca728d 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "iconnector.h"
 #include "detectorsmpppd.h"
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index 64d5ffd2..931fbb83 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -20,7 +20,7 @@
 #include <tqradiobutton.h>
 
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 #include <kresolver.h>
 #include <knuminput.h>
diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp
index eefcd731..79b0656c 100644
--- a/kopete/plugins/smpppdcs/unittest/main.cpp
+++ b/kopete/plugins/smpppdcs/unittest/main.cpp
@@ -14,10 +14,10 @@
 	*************************************************************************
 */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdeunittest/runnergui.h>
 
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 6082158c..0feed26c 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -19,7 +19,7 @@
 #include "sqlite3.h"
 
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index c5da24bb..49ddfb18 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -19,7 +19,7 @@
 #include <tqtimer.h>
 
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 6b8cb61d..f052af16 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -31,7 +31,7 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kopetemetacontact.h"
 #include "kopetecontactlist.h"
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index c61f9dfc..622311c3 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -22,8 +22,8 @@
 
 #include <tqvalidator.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index 53ec8224..94be6350 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 910c99f4..62ff00ae 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -24,7 +24,7 @@
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index d4c0100c..2b8dc549 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -41,8 +41,8 @@
 #include "kopetepassword.h"
 
 #include <tdeaction.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdecompletionbox.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp
index 71071610..91b7459f 100644
--- a/kopete/protocols/irc/ircchannelcontact.cpp
+++ b/kopete/protocols/irc/ircchannelcontact.cpp
@@ -32,8 +32,8 @@
 #include <kdebug.h>
 #include <krun.h>
 #include <kinputdialog.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index d3615fc5..8d248152 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -26,7 +26,7 @@
 #include <ksslpeerinfo.h>
 #include <ksslcertchain.h>
 #include <ksslcertificatecache.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "ksslsocket.h"
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 5d1caae1..29e542be 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -41,8 +41,8 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tdesocketbase.h>
 #include <kpassdlg.h>
 #include <kinputdialog.h>
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 54dc25d9..d019a734 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kinputdialog.h>
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
index 18cb9319..a075bbde 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
@@ -26,7 +26,7 @@
 #include <tqthread.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include <xmpp_tasks.h>
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index cab1407d..2670d2a0 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kopeteaccountmanager.h"
 #include "kopeteglobal.h"
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 9dc475ab..179b45e3 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -36,8 +36,8 @@
 // kde
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <ktempfile.h>
 #include <tdeconfig.h>
 #include <kmdcodec.h>
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index 29cd585a..fcd51501 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 #include <tqtextcodec.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp
index c1eef1ab..eb013a4a 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -31,7 +31,7 @@
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ktextedit.h>
 #include <krun.h>
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 5acd5859..a6bd9b83 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kopete/protocols/oscar/liboscar/buffer.cpp b/kopete/protocols/oscar/liboscar/buffer.cpp
index 48f68349..e2466213 100644
--- a/kopete/protocols/oscar/liboscar/buffer.cpp
+++ b/kopete/protocols/oscar/liboscar/buffer.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "buffer.h"
 
 #include <ctype.h>
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index ec45b36c..3fb180d2 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -21,7 +21,7 @@
 #include "chatservicetask.h"
 
 #include <tqstring.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp
index 80bfa8d6..16757785 100644
--- a/kopete/protocols/oscar/liboscar/connection.cpp
+++ b/kopete/protocols/oscar/liboscar/connection.cpp
@@ -26,7 +26,7 @@
 #include "rateclassmanager.h"
 #include "task.h"
 #include "transfer.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "oscartypeclasses.h"
diff --git a/kopete/protocols/oscar/liboscar/oscarutils.cpp b/kopete/protocols/oscar/liboscar/oscarutils.cpp
index 8dc7d9df..e157e346 100644
--- a/kopete/protocols/oscar/liboscar/oscarutils.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarutils.cpp
@@ -18,7 +18,7 @@
 
 #include "oscarutils.h"
 #include <tqhostaddress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 
diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
index 3856a994..5f4146e3 100644
--- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
@@ -16,7 +16,7 @@
 
 #include "sendmessagetask.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include "connection.h"
 #include "oscartypes.h"
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 05eabee7..605315fa 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -21,7 +21,7 @@
 #include <tqregexp.h>
 
 // KDE Includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 5673ed69..c66094fe 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -33,7 +33,7 @@
 #include <klineedit.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 0e193c39..c3f3a038 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -23,7 +23,7 @@
 #include <tqdict.h>
 
 // KDE Includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index 9cfe6763..4cb17847 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -21,7 +21,7 @@
 #include "client.h"
 #include <tqstring.h>
 #include <tqtimer.h>
-#include <kapplication.h> // for random()
+#include <tdeapplication.h> // for random()
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstreamsocket.h>
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 1ca1a3db..77e03b27 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -46,7 +46,7 @@
 // KDE Includes
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <krun.h>
 #include <tdeshortcut.h>
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index f5feb871..9529809d 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -34,11 +34,11 @@
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurldrag.h>
 
 #include "System.h"
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index e47e0ee2..3cbd9080 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "Defines.h"
 #include "AppletItem.h"
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index 5696e2c9..7c39d541 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -33,7 +33,7 @@
 #include <tqdir.h>
 #include <tqlineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <dcopclient.h>
 #include <kdialogbase.h>
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 139d863b..4b200b3f 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 #include <tqlineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 79f4f487..7832ecd9 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "Defines.h"
diff --git a/kpf/src/WebServerManager.cpp b/kpf/src/WebServerManager.cpp
index fbb55439..c70f9111 100644
--- a/kpf/src/WebServerManager.cpp
+++ b/kpf/src/WebServerManager.cpp
@@ -24,7 +24,7 @@
 // KDE includes
 #include <tdeconfig.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes
 #include "Defines.h"
diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index 2605ad86..39d41cca 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 #include <tqmessagebox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kppp/connect.cpp b/kppp/connect.cpp
index 9343bae1..3b7eb6fc 100644
--- a/kppp/connect.cpp
+++ b/kppp/connect.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kppp/edit.cpp b/kppp/edit.cpp
index 6e5b8553..9e24bd99 100644
--- a/kppp/edit.cpp
+++ b/kppp/edit.cpp
@@ -29,7 +29,7 @@
 #include <kmessagebox.h>
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 92789fdf..e8176fa8 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -35,11 +35,11 @@
 #include <kdialogbase.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kglobalsettings.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h> // For BarIcon
diff --git a/kppp/logview/log.cpp b/kppp/logview/log.cpp
index 53508bdc..8335e55c 100644
--- a/kppp/logview/log.cpp
+++ b/kppp/logview/log.cpp
@@ -26,7 +26,7 @@
 #include <tqprogressdialog.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index 67f37cdf..ea37aa70 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -20,13 +20,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "log.h"
 #include "monthly.h"
 #include "main.h"
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <kiconloader.h>
diff --git a/kppp/main.cpp b/kppp/main.cpp
index 873a204d..d7c40cf1 100644
--- a/kppp/main.cpp
+++ b/kppp/main.cpp
@@ -44,9 +44,9 @@
 #include <sys/param.h>
 #endif
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index ff9bfcff..5eaa1404 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <tdepopupmenu.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmenubar.h>
 #include <kstdguiitem.h>
 
diff --git a/kppp/modem.cpp b/kppp/modem.cpp
index 7b464cc9..4fc3e503 100644
--- a/kppp/modem.cpp
+++ b/kppp/modem.cpp
@@ -38,7 +38,7 @@
 #include "requester.h"
 #include <klocale.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <config.h>
 
 static sigjmp_buf jmp_buffer;
diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index d641918f..6f89ae90 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -28,7 +28,7 @@
 #include <tqslider.h>
 #include <kbuttonbox.h>
 #include <stdlib.h>
-#include <kapplication.h> // for getMiniIcon()
+#include <tdeapplication.h> // for getMiniIcon()
 #include <klocale.h>
 #include "modemcmds.h"
 #include "pppdata.h"
diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp
index 14543ce2..dd7ed5a0 100644
--- a/kppp/modeminfo.cpp
+++ b/kppp/modeminfo.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <twin.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 #include "modeminfo.h"
 #include "modem.h"
diff --git a/kppp/modems.cpp b/kppp/modems.cpp
index 491c5b1b..4f15c17d 100644
--- a/kppp/modems.cpp
+++ b/kppp/modems.cpp
@@ -32,7 +32,7 @@
 #include <tqwhatsthis.h>
 #include <tqmessagebox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp
index 72cf1f49..6a662be6 100644
--- a/kppp/pppdargs.cpp
+++ b/kppp/pppdargs.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <kbuttonbox.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "pppdargs.h"
 #include "pppdata.h"
 #include <klocale.h>
diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp
index 5fd1147d..08b0aaf8 100644
--- a/kppp/pppdata.cpp
+++ b/kppp/pppdata.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <assert.h>
 
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index 073d3f55..dcf6f48e 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqpainter.h>
 #include <twin.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqlabel.h>
 #include <tqframe.h>
diff --git a/krdc/hostpreferences.cpp b/krdc/hostpreferences.cpp
index cd573b57..f2b6a384 100644
--- a/krdc/hostpreferences.cpp
+++ b/krdc/hostpreferences.cpp
@@ -20,7 +20,7 @@
 #include "vnc/vnchostpref.h"
 #include "rdp/rdphostpref.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstaticdeleter.h>
 
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index 5e953109..1cec72c0 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -20,7 +20,7 @@
 #include "maindialog.h"
 #include "hostpreferences.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcombobox.h>
diff --git a/krdc/main.cpp b/krdc/main.cpp
index b856932d..d97145a8 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -16,9 +16,9 @@
  ***************************************************************************/
 
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
diff --git a/krdc/maindialog.cpp b/krdc/maindialog.cpp
index c6d559a5..3afb0f81 100644
--- a/krdc/maindialog.cpp
+++ b/krdc/maindialog.cpp
@@ -21,7 +21,7 @@
 #include "maindialogwidget.h"
 #include "preferencesdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kguiitem.h>
 #include <klocale.h>
 
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 782aa673..273f89d0 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -19,7 +19,7 @@
      For any questions, comments or whatever, you may mail me at: arend@auton.nl
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 531a0a35..751a2db3 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -19,7 +19,7 @@
 #include "vncprefs.h"
 #include "vnchostpref.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp
index cb33b46c..05d55df9 100644
--- a/krdc/vnc/threads.cpp
+++ b/krdc/vnc/threads.cpp
@@ -18,7 +18,7 @@
 #include "kvncview.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "vncviewer.h"
 #include "threads.h"
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 4279fb0f..50855f4f 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -27,11 +27,11 @@
 #include <tqbuttongroup.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <knuminput.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kdatastream.h>
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index b0be2c25..926c915c 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -20,7 +20,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <ksockaddr.h>
diff --git a/krfb/krfb/invitation.h b/krfb/krfb/invitation.h
index 8456f0db..125b28ba 100644
--- a/krfb/krfb/invitation.h
+++ b/krfb/krfb/invitation.h
@@ -18,7 +18,7 @@
 #ifndef INVITATION_H
 #define INVITATION_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <tdeconfig.h>
 #include <tqobject.h>
diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp
index 125bbdb8..d9d12ad8 100644
--- a/krfb/krfb/main.cpp
+++ b/krfb/krfb/main.cpp
@@ -23,12 +23,12 @@
 #include <kpixmap.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 #include <ksystemtray.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kaboutapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqobject.h>
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index 3e6afcbc..85673464 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -36,7 +36,7 @@
 #include <strings.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index f1956d21..06807967 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -18,7 +18,7 @@
 #include "trayicon.h"
 #include <tqtooltip.h>
 #include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index 340c882c..47e52a25 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -14,7 +14,7 @@
 #include <tqlistbox.h>
 #include <tqlineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index f562b2af..8062cf57 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <tdeconfig.h>
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 86a78c6d..bb2d165f 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -16,7 +16,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <knuminput.h>
diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp
index cf4f04d8..31d22044 100644
--- a/ksirc/KSPrefs/page_colors.cpp
+++ b/ksirc/KSPrefs/page_colors.cpp
@@ -15,7 +15,7 @@
 #include <tqlabel.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 
diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp
index 6be5ef5b..91edf864 100644
--- a/ksirc/KSPrefs/page_servchan.cpp
+++ b/ksirc/KSPrefs/page_servchan.cpp
@@ -12,7 +12,7 @@
 #include <tqlistbox.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name)
diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp
index 691b8cc2..d95a2725 100644
--- a/ksirc/KSPrefs/page_startup.cpp
+++ b/ksirc/KSPrefs/page_startup.cpp
@@ -11,7 +11,7 @@
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <keditlistbox.h>
 
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index 4e9891cb..d6488c45 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -6,7 +6,7 @@
 #include <tqtooltip.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefontdialog.h>
 #include <klocale.h>
 
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp
index 6c4bd80e..342fae32 100644
--- a/ksirc/KSTicker/ksttest.cpp
+++ b/ksirc/KSTicker/ksttest.cpp
@@ -1,10 +1,10 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqapplication.h>
 #include <tqsocketnotifier.h>
 #include <tqregexp.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include <unistd.h>
diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp
index 9ec1136a..d6462405 100644
--- a/ksirc/NewWindowDialog.cpp
+++ b/ksirc/NewWindowDialog.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
diff --git a/ksirc/dccMgrTest.cpp b/ksirc/dccMgrTest.cpp
index cd2d1f57..1650f9f2 100644
--- a/ksirc/dccMgrTest.cpp
+++ b/ksirc/dccMgrTest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "dccManager.h"
 
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index 22257c0d..aa03a0b6 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -13,7 +13,7 @@
 #include <tqstringlist.h>
 #include <tqlistbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurlrequester.h>
diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index 89e05ad8..8f33b2ce 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -8,7 +8,7 @@
 #include <twin.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp
index 26de77de..50ed150a 100644
--- a/ksirc/ksirc.cpp
+++ b/ksirc/ksirc.cpp
@@ -18,8 +18,8 @@
 #include <tqsessionmanager.h>
 
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 2aefe7d1..947277c1 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -106,7 +106,7 @@
 #include <time.h>
 
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp
index d9035f19..7bce5604 100644
--- a/ksirc/ksopts.cpp
+++ b/ksirc/ksopts.cpp
@@ -1,5 +1,5 @@
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #if KDE_IS_VERSION(3,1,92)
diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp
index 2879ce10..911f246a 100644
--- a/ksirc/kstextview.cpp
+++ b/ksirc/kstextview.cpp
@@ -27,7 +27,7 @@
 #include <tqclipboard.h>
 #include <tqdict.h>
 #include <kcharsets.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmimesourcefactory.h>
 #include <kcursor.h>
 #include <kurldrag.h>
diff --git a/ksirc/kstextviewtest.cpp b/ksirc/kstextviewtest.cpp
index c3dadec6..7dcc2d74 100644
--- a/ksirc/kstextviewtest.cpp
+++ b/ksirc/kstextviewtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kstextview.h"
 
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index 07a06b60..377ee2c8 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -25,7 +25,7 @@
 #include <tqvaluestack.h>
 #include <tqstylesheet.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <krun.h>
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index 334f4ff5..bce3ca9f 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -3,7 +3,7 @@
 
 #include <tqtabbar.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index baf92e43..fac84e6b 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -109,7 +109,7 @@
 #include <paths.h>
 #endif
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 
 DisplayMgr *displayMgr;
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index 7238d62f..47a16e58 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -15,7 +15,7 @@
 #include <tqtextedit.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <krun.h>
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index e2530cc9..5ad00a69 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -60,7 +60,7 @@
 #include <tqlabel.h>
 
 #include <kmenubar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <knotifyclient.h>
diff --git a/ksirc/usercontrolmenu.cpp b/ksirc/usercontrolmenu.cpp
index 522a5ada..fd05b49a 100644
--- a/ksirc/usercontrolmenu.cpp
+++ b/ksirc/usercontrolmenu.cpp
@@ -1,6 +1,6 @@
 #include "usercontrolmenu.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 4c254b6c..1c5e89b5 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -29,9 +29,9 @@
 #include <tqmessagebox.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp
index b73e8507..e60eb6f2 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmlisa.cpp
@@ -37,7 +37,7 @@
 #include <tqgrid.h>
 #include <tqvbuttongroup.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/librss/testlibrss.cpp b/librss/testlibrss.cpp
index 37c78228..d68b2768 100644
--- a/librss/testlibrss.cpp
+++ b/librss/testlibrss.cpp
@@ -1,8 +1,8 @@
 #include "testlibrss.h"
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 using namespace RSS;
diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp
index b8401b75..65aa9cb3 100644
--- a/tdednssd/ioslave/dnssd.cpp
+++ b/tdednssd/ioslave/dnssd.cpp
@@ -39,12 +39,12 @@
 #include <kstandarddirs.h>
 #include <tdesocketaddress.h>
 #include <kprotocolinfo.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <ksock.h>
 #include <tqmap.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqeventloop.h>
 #include <dnssd/domainbrowser.h>
 #include <krun.h>
diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index 3544bb7a..603546f5 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -23,7 +23,7 @@
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 2b2a1fc3..0500105c 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kmenubar.h>
 #include <klocale.h>
diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp
index f2eabb6a..c09aa33e 100644
--- a/wifi/kwireless/kwireless.cpp
+++ b/wifi/kwireless/kwireless.cpp
@@ -10,7 +10,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "kwireless.h"
diff --git a/wifi/main.cpp b/wifi/main.cpp
index b533f5b3..c705185f 100644
--- a/wifi/main.cpp
+++ b/wifi/main.cpp
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kwifimanager.h"
 #ifndef VERSION