diff --git a/apps/ktorrent/ktorrent.h b/apps/ktorrent/ktorrent.h
index 5fa219e..7297ac2 100644
--- a/apps/ktorrent/ktorrent.h
+++ b/apps/ktorrent/ktorrent.h
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <newui/dmainwindow.h>
 #include <tqtimer.h>
 #include <interfaces/guiinterface.h>
diff --git a/apps/ktorrent/ktorrentapp.cpp b/apps/ktorrent/ktorrentapp.cpp
index 8b9cd77..bc4a4b6 100644
--- a/apps/ktorrent/ktorrentapp.cpp
+++ b/apps/ktorrent/ktorrentapp.cpp
@@ -22,7 +22,7 @@
 
 #include <kglobal.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index 5216f86..d194919 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -26,7 +26,7 @@
 #include <kprogress.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tqregexp.h>
diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp
index 64abdff..96018b5 100644
--- a/apps/ktorrent/main.cpp
+++ b/apps/ktorrent/main.cpp
@@ -23,9 +23,9 @@
 
 #include <signal.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include <stdlib.h>
 
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index e591009..f550018 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -32,7 +32,7 @@
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "buttonbar.h"
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index f63c0c7..4c87ed0 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -33,7 +33,7 @@
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "buttonbar.h"
 #include "button.h"
diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
index 9073d76..e630e36 100644
--- a/apps/ktorrent/newui/dmainwindow.cpp
+++ b/apps/ktorrent/newui/dmainwindow.cpp
@@ -20,7 +20,7 @@
 #include "dmainwindow.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 
diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp
index e2f67b8..50cf9cd 100644
--- a/apps/ktorrent/newui/dtabwidget.cpp
+++ b/apps/ktorrent/newui/dtabwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 DTabWidget::DTabWidget(TQWidget *parent, const char *name)
     :KTabWidget(parent, name), m_closeButton(0)
diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index c9864d4..3ab560d 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -20,7 +20,7 @@
  ***************************************************************************/
 #include <tdepopupmenu.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "ktorrent.h"
 #include "trayicon.h"
 #include <tqtooltip.h>
diff --git a/apps/ktupnptest/main.cpp b/apps/ktupnptest/main.cpp
index 4d7228d..40bd783 100644
--- a/apps/ktupnptest/main.cpp
+++ b/apps/ktupnptest/main.cpp
@@ -20,9 +20,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <libktorrent/functions.h>
 
 
diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp
index 58f1ff7..5725e8a 100644
--- a/apps/ktupnptest/upnptestapp.cpp
+++ b/apps/ktupnptest/upnptestapp.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <kpushbutton.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tqtextbrowser.h>
 #include <util/error.h>
diff --git a/libktorrent/datachecker/multidatachecker.cpp b/libktorrent/datachecker/multidatachecker.cpp
index d791f97..dcbac73 100644
--- a/libktorrent/datachecker/multidatachecker.cpp
+++ b/libktorrent/datachecker/multidatachecker.cpp
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <util/log.h>
 #include <util/file.h>
 #include <util/fileops.h>
diff --git a/libktorrent/datachecker/singledatachecker.cpp b/libktorrent/datachecker/singledatachecker.cpp
index 948537c..21341bb 100644
--- a/libktorrent/datachecker/singledatachecker.cpp
+++ b/libktorrent/datachecker/singledatachecker.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <util/log.h>
 #include <util/file.h>
 #include <util/error.h>
diff --git a/libktorrent/torrent/cachefile.cpp b/libktorrent/torrent/cachefile.cpp
index dc5c640..cb6f902 100644
--- a/libktorrent/torrent/cachefile.cpp
+++ b/libktorrent/torrent/cachefile.cpp
@@ -36,7 +36,7 @@
 #include <util/fileops.h>
 #include <torrent/globals.h>
 #include <interfaces/functions.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <util/log.h>
 #include <util/error.h>
 #include "cachefile.h"
diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp
index 3cd627a..1ee2604 100644
--- a/plugins/ipfilter/convertdialog.cpp
+++ b/plugins/ipfilter/convertdialog.cpp
@@ -19,7 +19,7 @@
 ***************************************************************************/
 #include "convertdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp
index e9416ae..d68651a 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/plugins/ipfilter/ipblockingprefpage.cpp
@@ -24,7 +24,7 @@
 #include "ipfilterplugin.h"
 #include "convertdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp
index 4a02ff0..bef989c 100644
--- a/plugins/rssfeed/rss/testlibrss.cpp
+++ b/plugins/rssfeed/rss/testlibrss.cpp
@@ -2,9 +2,9 @@
 
 #include "image.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/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index d3172c6..94f77da 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -23,7 +23,7 @@
 #include <kiconloader.h>
 #include <kstdaction.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <krun.h>
 #include <interfaces/guiinterface.h>
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index f77af71..d6b4154 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdehtmlview.h>
 #include <tqlayout.h>
 #include <tqfile.h> 
diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
index 3f01945..97aafae 100644
--- a/plugins/webinterface/httpserver.cpp
+++ b/plugins/webinterface/httpserver.cpp
@@ -20,7 +20,7 @@
 #include <tqtimer.h>
 #include <tqcstring.h>
 #include <tqdatetime.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>