diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp
index f506b1e..708621e 100644
--- a/kbstateapplet/kbstate.cpp
+++ b/kbstateapplet/kbstate.cpp
@@ -22,13 +22,13 @@
 #include <tqimage.h>
 #include <tqpopupmenu.h>
 
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <tdepopupmenu.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <knotifyclient.h>
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 7eb6560..0bd9cdd 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -32,7 +32,7 @@
 
 // include files for KDE
 #if TDE_VERSION > 300
-#include <kapplication.h>
+#include <tdeapplication.h>
 #else
 #include <kapp.h>
 #endif // KDE 3.x
diff --git a/kmag/kmag.h b/kmag/kmag.h
index 2ed5da7..10a85a1 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -33,7 +33,7 @@
 #include <tqstringlist.h>
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kdockwidget.h>
 #include <tdeaction.h>
diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp
index 73caf5a..cde24d1 100644
--- a/kmag/kmagselrect.cpp
+++ b/kmag/kmagselrect.cpp
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <tqbitmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 static uchar line_bits[] = {0x2d, 0x96, 0x4b, 0xa5, 0xd2, 0x69, 0xb4, 0x5a};
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index 2a26b2c..da8bc8e 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -33,7 +33,7 @@
 #include <tqwidget.h>
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kmag/main.cpp b/kmag/main.cpp
index 4cbcbc7..0eb747f 100644
--- a/kmag/main.cpp
+++ b/kmag/main.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "kmag.h"
diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp
index 2a76f2c..c71a360 100644
--- a/kmousetool/kmousetool/kmousetool.cpp
+++ b/kmousetool/kmousetool/kmousetool.cpp
@@ -48,7 +48,7 @@
 #include <kstdguiitem.h>
 #include <knuminput.h>
 #include <tdepopupmenu.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 
 //#include <arts/soundserver.h>
 #include <netwm.h>
diff --git a/kmousetool/kmousetool/kmousetool.h b/kmousetool/kmousetool/kmousetool.h
index 8550710..818dadc 100644
--- a/kmousetool/kmousetool/kmousetool.h
+++ b/kmousetool/kmousetool/kmousetool.h
@@ -30,7 +30,7 @@
 
 #include "version.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksystemtray.h>
 #include <tqwidget.h>
 #include "mtstroke.h"
diff --git a/kmousetool/kmousetool/main.cpp b/kmousetool/kmousetool/main.cpp
index 3970f4a..975c193 100644
--- a/kmousetool/kmousetool/main.cpp
+++ b/kmousetool/kmousetool/main.cpp
@@ -17,8 +17,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kuniqueapplication.h>
diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp
index ce1facf..41c8dfc 100644
--- a/kmouth/configwizard.cpp
+++ b/kmouth/configwizard.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 #include <tdelistview.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <ksconfig.h>
 #include <tdeconfig.h>
diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h
index 241e4e1..79f1aa0 100644
--- a/kmouth/kmouth.h
+++ b/kmouth/kmouth.h
@@ -27,7 +27,7 @@
 // include files for TQt
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
diff --git a/kmouth/main.cpp b/kmouth/main.cpp
index 779de1b..50cf6ee 100644
--- a/kmouth/main.cpp
+++ b/kmouth/main.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kuniqueapplication.h>
 
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index 97d5de7..0d60ea0 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -33,7 +33,7 @@
 #include <tdepopupmenu.h>
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmouth/texttospeechsystem.cpp b/kmouth/texttospeechsystem.cpp
index 36e1f67..8664a99 100644
--- a/kmouth/texttospeechsystem.cpp
+++ b/kmouth/texttospeechsystem.cpp
@@ -22,7 +22,7 @@
 #include <tqptrlist.h>
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
 
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index c89c9cf..8584e60 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kcombobox.h>
 #include <ksconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <tdeconfig.h>
diff --git a/kmouth/wordcompletion/wordcompletion.cpp b/kmouth/wordcompletion/wordcompletion.cpp
index 1c49d86..8d5f1e4 100644
--- a/kmouth/wordcompletion/wordcompletion.cpp
+++ b/kmouth/wordcompletion/wordcompletion.cpp
@@ -1,7 +1,7 @@
 #include <tqregexp.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp
index d01520c..d081110 100644
--- a/kmouth/wordcompletion/wordlist.cpp
+++ b/kmouth/wordcompletion/wordlist.cpp
@@ -20,7 +20,7 @@
 #include <tqregexp.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <klocale.h>
diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h
index 44c9bf8..65fe54c 100644
--- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h
+++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h
@@ -18,7 +18,7 @@
 
 // KDE includes
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klibloader.h>
 #include <kinstance.h>
 
diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h
index 52b3272..73e7240 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.h
+++ b/ksayit/KTTSD_Lib/kttsdlib.h
@@ -25,7 +25,7 @@ using namespace std;
 #include "kdeexportfix.h"
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // App specific includes
 
diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.h b/ksayit/KTTSD_Lib/kttsdlibtalker2.h
index e3a6104..fe33161 100644
--- a/ksayit/KTTSD_Lib/kttsdlibtalker2.h
+++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.h
@@ -20,7 +20,7 @@
 #include <kspeechsink.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 /**
diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp
index c5a8b26..54e3cf1 100644
--- a/ksayit/src/fxpluginhandler.cpp
+++ b/ksayit/src/fxpluginhandler.cpp
@@ -15,7 +15,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kservice.h>
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index f0e3479..f82bd5b 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -29,7 +29,7 @@ using namespace std;
 #include <tqclipboard.h>
 
 // include files for KDE 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
diff --git a/ksayit/src/ksayit_fxplugin.h b/ksayit/src/ksayit_fxplugin.h
index 87ff053..b9ef351 100644
--- a/ksayit/src/ksayit_fxplugin.h
+++ b/ksayit/src/ksayit_fxplugin.h
@@ -17,7 +17,7 @@
 #include <tqstring.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <arts/kartsserver.h>
 #include <arts/artsflow.h>
 
diff --git a/ksayit/src/ksayit_ttsplugin.h b/ksayit/src/ksayit_ttsplugin.h
index 0125ff1..2ce918a 100644
--- a/ksayit/src/ksayit_ttsplugin.h
+++ b/ksayit/src/ksayit_ttsplugin.h
@@ -21,7 +21,7 @@
 
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // App specific includes
 
diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h
index d5dd4bc..ddade16 100644
--- a/ksayit/src/ksayitsystemtray.h
+++ b/ksayit/src/ksayitsystemtray.h
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksystemtray.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
diff --git a/ksayit/src/main.cpp b/ksayit/src/main.cpp
index 6b23aba..b8ba783 100644
--- a/ksayit/src/main.cpp
+++ b/ksayit/src/main.cpp
@@ -20,9 +20,9 @@
 // QT includes
 
 // KDE includes
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <arts/kartsdispatcher.h>
diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp
index 7459a6f..137953f 100644
--- a/kttsd/app-plugins/kate/katekttsd.cpp
+++ b/kttsd/app-plugins/kate/katekttsd.cpp
@@ -29,7 +29,7 @@
 #include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 
 // KateKttsdPlugin includes.
diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp
index b8d113f..a97349d 100644
--- a/kttsd/filters/main.cpp
+++ b/kttsd/filters/main.cpp
@@ -29,9 +29,9 @@ using namespace std;
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 9a5f52e..050e629 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -42,10 +42,10 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <kcombobox.h>
diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp
index ee32780..3cd18f8 100644
--- a/kttsd/kttsd/kttsd.cpp
+++ b/kttsd/kttsd/kttsd.cpp
@@ -27,14 +27,14 @@
 
 // KDE includes.
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
 #include <dcopclient.h>
 #include <knotifyclient.h>
 #include <krun.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 // KTTS includes.
 #include "notify.h"
diff --git a/kttsd/kttsd/main.cpp b/kttsd/kttsd/main.cpp
index 01938e3..4f02938 100644
--- a/kttsd/kttsd/main.cpp
+++ b/kttsd/kttsd/main.cpp
@@ -23,8 +23,8 @@
  ******************************************************************************/
 
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <dcopclient.h>
diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp
index f56e803..5bbaa27 100644
--- a/kttsd/kttsd/speaker.cpp
+++ b/kttsd/kttsd/speaker.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <tdeparts/componentfactory.h>
 #include <ktrader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 //#include <tdeio/job.h>
diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp
index 716b0ae..db76327 100644
--- a/kttsd/kttsd/speechdata.cpp
+++ b/kttsd/kttsd/speechdata.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // KTTS includes.
 #include "talkermgr.h"
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index 33222d9..bcbbef9 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -30,12 +30,12 @@
 // KDE includes.
 #include <kinstance.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kencodingfiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <ktextedit.h>
 
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index 47e407e..3473968 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -29,13 +29,13 @@
 #include <tdeconfig.h>
 #include <kuniqueapplication.h>
 #include <kcmultidialog.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <ksystemtray.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <dcopclient.h>
 #include <tdeversion.h>
 
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index 1df1c7b..948c629 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 
 // KDE includes.
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <kstandarddirs.h>
 #include <tdeparts/componentfactory.h>
diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp
index c07294e..a62a2e9 100644
--- a/kttsd/players/gstplayer/gstreamerplayer.cpp
+++ b/kttsd/players/gstplayer/gstreamerplayer.cpp
@@ -16,7 +16,7 @@
 #include <tqfile.h>
 
 // KDE includes.
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index f86c773..08b8ab0 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -26,8 +26,8 @@
 
 // KDE includes.
 #include <ktempfile.h>
-#include <kaboutdata.h>
-#include <kaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdialog.h>