diff --git a/konversation/src/alias_preferences.cpp b/konversation/src/alias_preferences.cpp
index 5d4e4c7..3130013 100644
--- a/konversation/src/alias_preferences.cpp
+++ b/konversation/src/alias_preferences.cpp
@@ -17,7 +17,7 @@
 #include <tqpushbutton.h>
 #include <tqheader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp
index d1fde5e..4c4dfde 100644
--- a/konversation/src/autoreplace_preferences.cpp
+++ b/konversation/src/autoreplace_preferences.cpp
@@ -20,7 +20,7 @@
 #include <tqtooltip.h>
 #include <tqdialog.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
index 9a0e1ee..d9a5393 100644
--- a/konversation/src/config/preferences.cpp
+++ b/konversation/src/config/preferences.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kurl.h>
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index 69bdb0d..1028200 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 DccTransferPanel::DccTransferPanel(TQWidget* parent) : ChatWindow(parent)
diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp
index 52c3890..227701e 100644
--- a/konversation/src/ignore_preferences.cpp
+++ b/konversation/src/ignore_preferences.cpp
@@ -21,7 +21,7 @@
 #include <tqlineedit.h>
 #include <tqheader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
index f06d405..476a32d 100644
--- a/konversation/src/ircinput.cpp
+++ b/konversation/src/ircinput.cpp
@@ -27,7 +27,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <tdecompletionbox.h>
diff --git a/konversation/src/ircviewbox.cpp b/konversation/src/ircviewbox.cpp
index 54089e9..0cb3218 100644
--- a/konversation/src/ircviewbox.cpp
+++ b/konversation/src/ircviewbox.cpp
@@ -14,7 +14,7 @@
 #include "searchbar.h"
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
 
diff --git a/konversation/src/konvdcop.cpp b/konversation/src/konvdcop.cpp
index e0054af..bed1288 100644
--- a/konversation/src/konvdcop.cpp
+++ b/konversation/src/konvdcop.cpp
@@ -20,7 +20,7 @@
 #include "identity.h"
 #include "server.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <klocale.h>
diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
index ec267aa..c5dcd20 100644
--- a/konversation/src/konversationapplication.cpp
+++ b/konversation/src/konversationapplication.cpp
@@ -36,7 +36,7 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>
 #include <tdeversion.h>
diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp
index 0a12336..9948687 100644
--- a/konversation/src/linkaddressbook/addressbook.cpp
+++ b/konversation/src/linkaddressbook/addressbook.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <twin.h>
 
diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp
index c2ba71b..e572dfa 100644
--- a/konversation/src/linkaddressbook/addressbook_base.cpp
+++ b/konversation/src/linkaddressbook/addressbook_base.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kstringhandler.h>
 #include <krun.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kmessagebox.h>
 
diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp
index 225c1db..f4b5638 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui.cpp
+++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp
@@ -32,7 +32,7 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/konversation/src/main.cpp b/konversation/src/main.cpp
index 24b28ee..d3db469 100644
--- a/konversation/src/main.cpp
+++ b/konversation/src/main.cpp
@@ -12,9 +12,9 @@
   email:     eisfuchs@tigress.com
 */
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/konversation/src/nicklistbehavior_preferences.cpp b/konversation/src/nicklistbehavior_preferences.cpp
index a439696..90aaaea 100644
--- a/konversation/src/nicklistbehavior_preferences.cpp
+++ b/konversation/src/nicklistbehavior_preferences.cpp
@@ -17,7 +17,7 @@
 
 #include <tqheader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 
diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp
index ec088a9..6443864 100644
--- a/konversation/src/osd.cpp
+++ b/konversation/src/osd.cpp
@@ -22,7 +22,7 @@ the Free Software Foundation; either version 2 of the License, or
 #include <tqregexp.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>                      //unsetColors()
 
diff --git a/konversation/src/queuetuner.cpp b/konversation/src/queuetuner.cpp
index bef0f4b..10c64ec 100644
--- a/konversation/src/queuetuner.cpp
+++ b/konversation/src/queuetuner.cpp
@@ -24,7 +24,7 @@
 #include <tqevent.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kstdguiitem.h>
diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp
index 885a6ac..371a939 100644
--- a/konversation/src/quickbuttons_preferences.cpp
+++ b/konversation/src/quickbuttons_preferences.cpp
@@ -17,7 +17,7 @@
 #include <tqpushbutton.h>
 #include <tqheader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/konversation/src/searchbar.cpp b/konversation/src/searchbar.cpp
index 1e1f2f9..54c25af 100644
--- a/konversation/src/searchbar.cpp
+++ b/konversation/src/searchbar.cpp
@@ -24,7 +24,7 @@
 #include <tqwidgetstack.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index fd372dd..0a5029d 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -47,7 +47,7 @@
 #include <tqtextcodec.h>
 #include <tqdatetime.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
index d06614d..3a531d5 100644
--- a/konversation/src/urlcatcher.cpp
+++ b/konversation/src/urlcatcher.cpp
@@ -25,7 +25,7 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp
index ba271c1..45635e8 100644
--- a/konversation/src/viewtree.cpp
+++ b/konversation/src/viewtree.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 class ViewTree::ToolTip : public TQToolTip
diff --git a/konversation/src/warnings_preferences.cpp b/konversation/src/warnings_preferences.cpp
index 8edd057..f5518ab 100644
--- a/konversation/src/warnings_preferences.cpp
+++ b/konversation/src/warnings_preferences.cpp
@@ -18,7 +18,7 @@
 #include <tqlistview.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdelistview.h>
diff --git a/konversation/src/watchednicknames_preferences.cpp b/konversation/src/watchednicknames_preferences.cpp
index a7c47f8..9a7db30 100644
--- a/konversation/src/watchednicknames_preferences.cpp
+++ b/konversation/src/watchednicknames_preferences.cpp
@@ -20,7 +20,7 @@
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kpushbutton.h>
 #include <klineedit.h>