diff --git a/amor/amoranim.cpp b/amor/amoranim.cpp
index a87bdf1..3dcfef5 100644
--- a/amor/amoranim.cpp
+++ b/amor/amoranim.cpp
@@ -25,7 +25,7 @@
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include "amoranim.h"
 #include "amorpm.h"
diff --git a/amor/amorbubble.h b/amor/amorbubble.h
index a7df655..3a99b7d 100644
--- a/amor/amorbubble.h
+++ b/amor/amorbubble.h
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqbitmap.h>
 
diff --git a/amor/amorconfig.cpp b/amor/amorconfig.cpp
index 8e7f590..b58c2b5 100644
--- a/amor/amorconfig.cpp
+++ b/amor/amorconfig.cpp
@@ -24,7 +24,7 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "amorconfig.h"
 #include <tdeconfig.h>
 
diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp
index 36cc629..ced2f7a 100644
--- a/amor/amordialog.cpp
+++ b/amor/amordialog.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqslider.h>
 #include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include "amordialog.h"
 #include "amordialog.moc"
diff --git a/amor/amortips.cpp b/amor/amortips.cpp
index 377de01..e20e98f 100644
--- a/amor/amortips.cpp
+++ b/amor/amortips.cpp
@@ -25,7 +25,7 @@
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "amortips.h"
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/amor/amorwidget.h b/amor/amorwidget.h
index f7a19d6..d5cdd88 100644
--- a/amor/amorwidget.h
+++ b/amor/amorwidget.h
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 
 //---------------------------------------------------------------------------
diff --git a/amor/main.cpp b/amor/main.cpp
index 4fc7600..4be2da7 100644
--- a/amor/main.cpp
+++ b/amor/main.cpp
@@ -32,8 +32,8 @@
 
 #include <kuniqueapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
 
 #include "version.h"
diff --git a/eyesapplet/eyes.cpp b/eyesapplet/eyes.cpp
index 1cb4470..23139b7 100644
--- a/eyesapplet/eyes.cpp
+++ b/eyesapplet/eyes.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "eyes.h"
 #include "eyes.moc"
diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp
index 0b297a1..ce9c0af 100644
--- a/fifteenapplet/fifteenapplet.cpp
+++ b/fifteenapplet/fifteenapplet.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kiconloader.h>
 
 #include "fifteenapplet.h"
diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp
index 03da384..f3a4a49 100644
--- a/kmoon/kmoonapplet.cpp
+++ b/kmoon/kmoonapplet.cpp
@@ -31,14 +31,14 @@
 
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <kstartupinfo.h>
 #include <kmessagebox.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <tdeconfig.h>
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index 603173f..862d93e 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqpushbutton.h>
 
 #include "kmoondlg.h"
diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp
index eb428c7..9440749 100644
--- a/kmoon/kmoonwidget.cpp
+++ b/kmoon/kmoonwidget.cpp
@@ -31,14 +31,14 @@
 
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <kstartupinfo.h>
 #include <kmessagebox.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <tdeconfig.h>
diff --git a/kodo/kodometer.h b/kodo/kodometer.h
index e5d8269..9a3bf13 100644
--- a/kodo/kodometer.h
+++ b/kodo/kodometer.h
@@ -35,9 +35,9 @@
 #include <tqkeycode.h>
 #include <tqtooltip.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
diff --git a/kteatime/main.cpp b/kteatime/main.cpp
index 94d8f5f..5cc06df 100644
--- a/kteatime/main.cpp
+++ b/kteatime/main.cpp
@@ -26,8 +26,8 @@
 
 #include <twin.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "toplevel.h"
 
diff --git a/kteatime/toplevel.h b/kteatime/toplevel.h
index a67c51d..45567e5 100644
--- a/kteatime/toplevel.h
+++ b/kteatime/toplevel.h
@@ -23,7 +23,7 @@
 #ifndef TOPLEVEL_H
 #define TOPLEVEL_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqpopupmenu.h>
 #include <tqtimer.h>
 #include <tqlineedit.h>
diff --git a/ktux/spritemisc.cpp b/ktux/spritemisc.cpp
index 80a1a2f..0f21c59 100644
--- a/ktux/spritemisc.cpp
+++ b/ktux/spritemisc.cpp
@@ -5,7 +5,7 @@
 // Copyright (c)  Martin R. Jones 1999
 //
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "spritemisc.h"
 
 TQSize SpriteRange::mFieldSize;
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index 2d15ca8..366a346 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -26,8 +26,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index 1d64ee0..8f06982 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index f688225..704dbe1 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -16,8 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kaboutapplication.h>
-#include <kapplication.h>
+#include <tdeaboutapplication.h>
+#include <tdeapplication.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kweather/main.cpp b/kweather/main.cpp
index ba4f64f..864b551 100644
--- a/kweather/main.cpp
+++ b/kweather/main.cpp
@@ -1,7 +1,7 @@
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include "weatherservice.h"
diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp
index d5e06fc..3e1926f 100644
--- a/kweather/reportmain.cpp
+++ b/kweather/reportmain.cpp
@@ -1,10 +1,10 @@
 #include "reportview.h"
 
 #include <stdlib.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <dcopclient.h>
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index 3671be4..7457049 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -22,7 +22,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index 1905a75..2b3bf9f 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -21,7 +21,7 @@
 
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kglobalsettings.h>
 #include <kiconeffect.h>
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index c0313ad..c4c5128 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -32,7 +32,7 @@ email                : geiseri@msoe.edu
 #include <knotifyclient.h>
 #include <ktempfile.h>
 #include <unistd.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpassivepopup.h>
 
 #include "metar_parser.h"
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index 7fa3b0c..7416976 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp
index 4559c92..644fa6d 100644
--- a/kworldwatch/applet.cpp
+++ b/kworldwatch/applet.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index 023ae07..ce56cb2 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -35,10 +35,10 @@
 #include <tqwidget.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index de50bdc..4812a97 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -35,8 +35,8 @@
 
 #include <tqdatetime.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
 #include <kglobal.h>