diff --git a/amor/amor.cpp b/amor/amor.cpp
index cbbfd54..d98cbd1 100644
--- a/amor/amor.cpp
+++ b/amor/amor.cpp
@@ -35,9 +35,9 @@
 #include <tqcursor.h>
 #include <tqvaluelist.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kstartupinfo.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdestartupinfo.h>
 #include <twin.h>
 #include <twinmodule.h>
 #include <kstandarddirs.h>
diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp
index ced2f7a..e38e88e 100644
--- a/amor/amordialog.cpp
+++ b/amor/amordialog.cpp
@@ -34,7 +34,7 @@
 #include "amordialog.h"
 #include "amordialog.moc"
 #include "version.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqvbox.h>
 #include <kstandarddirs.h>
 
diff --git a/amor/amortips.cpp b/amor/amortips.cpp
index e20e98f..6b3582f 100644
--- a/amor/amortips.cpp
+++ b/amor/amortips.cpp
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include "amortips.h"
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <kdebug.h>
diff --git a/amor/main.cpp b/amor/main.cpp
index 4be2da7..79c0738 100644
--- a/amor/main.cpp
+++ b/amor/main.cpp
@@ -31,7 +31,7 @@
 #include <time.h>
 
 #include <kuniqueapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <dcopclient.h>
diff --git a/eyesapplet/eyes.cpp b/eyesapplet/eyes.cpp
index 23139b7..8bd35d4 100644
--- a/eyesapplet/eyes.cpp
+++ b/eyesapplet/eyes.cpp
@@ -22,8 +22,8 @@
 #include <tqcursor.h>
 #include <tqimage.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 
 #include "eyes.h"
diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp
index ce9c0af..787c8a1 100644
--- a/fifteenapplet/fifteenapplet.cpp
+++ b/fifteenapplet/fifteenapplet.cpp
@@ -28,9 +28,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <tdeaboutapplication.h>
 #include <kiconloader.h>
 
diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp
index f3a4a49..1a653f9 100644
--- a/kmoon/kmoonapplet.cpp
+++ b/kmoon/kmoonapplet.cpp
@@ -33,10 +33,10 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <twin.h>
-#include <kstartupinfo.h>
-#include <kmessagebox.h>
+#include <tdestartupinfo.h>
+#include <tdemessagebox.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdecmdlineargs.h>
 #include <kiconloader.h>
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index 862d93e..d1a8105 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -20,7 +20,7 @@
 
 #include <tqslider.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
 #include <tdeapplication.h>
diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp
index 9440749..8ef85a3 100644
--- a/kmoon/kmoonwidget.cpp
+++ b/kmoon/kmoonwidget.cpp
@@ -33,10 +33,10 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <twin.h>
-#include <kstartupinfo.h>
-#include <kmessagebox.h>
+#include <tdestartupinfo.h>
+#include <tdemessagebox.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdecmdlineargs.h>
 #include <kiconloader.h>
diff --git a/kodo/kodometer.h b/kodo/kodometer.h
index 9a3bf13..f9c2cad 100644
--- a/kodo/kodometer.h
+++ b/kodo/kodometer.h
@@ -42,8 +42,8 @@
 #include <kdebug.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdetoolbar.h>
diff --git a/kteatime/main.cpp b/kteatime/main.cpp
index 5cc06df..6962e4c 100644
--- a/kteatime/main.cpp
+++ b/kteatime/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <twin.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 
diff --git a/kteatime/tealist.cpp b/kteatime/tealist.cpp
index ae32339..e2e064c 100644
--- a/kteatime/tealist.cpp
+++ b/kteatime/tealist.cpp
@@ -6,7 +6,7 @@
 
  ------------------------------------------------------------- */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlistview.h>
 #include "tealist.h"
 
diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp
index 8cd3d60..221029d 100644
--- a/kteatime/timeedit.cpp
+++ b/kteatime/timeedit.cpp
@@ -6,7 +6,7 @@
 
  ------------------------------------------------------------- */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index d9fcd9b..6b43fa4 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -41,8 +41,8 @@
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <knotifyclient.h>
 #include <knuminput.h>
diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp
index 4177973..a59b6f4 100644
--- a/ktux/sprite.cpp
+++ b/ktux/sprite.cpp
@@ -12,7 +12,7 @@
 #include <tqlayout.h>
 #include <tqslider.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
 #include <kbuttonbox.h>
diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index 1e223bd..69ef98c 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -27,8 +27,8 @@
 #include <tqobjectlist.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 dockwidget::dockwidget(const TQString &location, TQWidget *parent,
         const char *name) : TQWidget(parent,name), m_locationCode( location ), m_orientation(Qt::Horizontal )
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index 366a346..9251737 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -30,7 +30,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
 #include <kcolorbutton.h>
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index 8f06982..81639df 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "serviceconfigwidget.h"
 
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 704dbe1..ab176f3 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -20,9 +20,9 @@
 #include <tdeapplication.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <ksettings/dialog.h>
diff --git a/kweather/main.cpp b/kweather/main.cpp
index 864b551..5c8d494 100644
--- a/kweather/main.cpp
+++ b/kweather/main.cpp
@@ -2,7 +2,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "weatherservice.h"
 
diff --git a/kweather/metar_parser.h b/kweather/metar_parser.h
index 3b0b180..772fe11 100644
--- a/kweather/metar_parser.h
+++ b/kweather/metar_parser.h
@@ -18,8 +18,8 @@ email                : jratke@comcast.net
 #ifndef METAR_PARSER_H
 #define METAR_PARSER_H
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <krfcdate.h>
 
 #include <tqdatetime.h>
diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp
index 3e1926f..0055ab4 100644
--- a/kweather/reportmain.cpp
+++ b/kweather/reportmain.cpp
@@ -5,8 +5,8 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 static TDECmdLineOptions options[] =
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index 7434823..5891f82 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -17,11 +17,11 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqvbox.h>
 #include <tqpixmap.h>
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index 7457049..d6f85e2 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -25,9 +25,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 
diff --git a/kweather/stationdatabase.h b/kweather/stationdatabase.h
index f1fabe8..d1f414a 100644
--- a/kweather/stationdatabase.h
+++ b/kweather/stationdatabase.h
@@ -16,7 +16,7 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 /**
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index 5111748..dcc5d37 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -28,11 +28,11 @@
 #include <tqlayout.h>
 #include <tqscrollview.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopref.h>
 
 
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index 2b3bf9f..36ab8c9 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconeffect.h>
 #include <kicontheme.h>
 #include <kipc.h>
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index c4c5128..95e12b3 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -22,15 +22,15 @@ email                : geiseri@msoe.edu
 #include <tqfile.h>
 #include <tqdatetime.h>
 #include <tqtextstream.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <math.h>
 #include <krfcdate.h>
 #include <tdeio/job.h>
 #include <kurl.h>
 #include <knotifyclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <unistd.h>
 #include <tdeapplication.h>
 #include <kpassivepopup.h>
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index 7416976..60ad1b2 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "weatherlib.h"
diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp
index 644fa6d..f358dac 100644
--- a/kworldwatch/applet.cpp
+++ b/kworldwatch/applet.cpp
@@ -29,11 +29,11 @@
 
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <krun.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 #include "mapwidget.h"
diff --git a/kworldwatch/cities.cpp b/kworldwatch/cities.cpp
index a88c3a6..8179ed3 100644
--- a/kworldwatch/cities.cpp
+++ b/kworldwatch/cities.cpp
@@ -31,7 +31,7 @@
 #include <tqpainter.h>
 
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index ce56cb2..e113d3a 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -39,7 +39,7 @@
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/kworldwatch/maploader.cpp b/kworldwatch/maploader.cpp
index 50b6fa0..ce192f2 100644
--- a/kworldwatch/maploader.cpp
+++ b/kworldwatch/maploader.cpp
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kimageeffect.h>
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 4812a97..5acc5ce 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -39,10 +39,10 @@
 #include <tdecmdlineargs.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <tqcursor.h>
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index 541e8b4..a2279c2 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -43,8 +43,8 @@
 #include <tqpopupmenu.h>
 
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>