diff --git a/blinken/src/artsplayer.cpp b/blinken/src/artsplayer.cpp
index ef072e27..a83890f9 100644
--- a/blinken/src/artsplayer.cpp
+++ b/blinken/src/artsplayer.cpp
@@ -12,8 +12,8 @@
 #include <config.h>
 
 #ifdef WITHOUT_ARTS
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #endif
 #include <kstandarddirs.h>
 
diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index d9d5702b..7eb2e180 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -17,8 +17,8 @@
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 66f9c4a5..8e994f0d 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -14,7 +14,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "highscoredialog.h"
 #include "counter.h"
diff --git a/kalzium/src/detailedgraphicaloverview.cpp b/kalzium/src/detailedgraphicaloverview.cpp
index 00424746..c5312439 100644
--- a/kalzium/src/detailedgraphicaloverview.cpp
+++ b/kalzium/src/detailedgraphicaloverview.cpp
@@ -18,9 +18,9 @@ email                : cniehaus@kde.org
 
 //KDE-Includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 
 //QT-Includes
 #include <tqpainter.h>
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index 3c8bb116..97dd76e6 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -19,7 +19,7 @@
 #include "kalziumdataobject.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index b5342952..14dea1a1 100644
--- a/kalzium/src/element.cpp
+++ b/kalzium/src/element.cpp
@@ -33,7 +33,7 @@
 #include <tqfontmetrics.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 
diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp
index e7c6b915..500f9354 100644
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@@ -18,7 +18,7 @@
 #include "plotwidget.h"
 #include "kalziumdataobject.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdebug.h>
diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp
index d6b44922..19d1469a 100644
--- a/kalzium/src/eqchemview.cpp
+++ b/kalzium/src/eqchemview.cpp
@@ -23,11 +23,11 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 
 #include "config.h"
diff --git a/kalzium/src/isotope.cpp b/kalzium/src/isotope.cpp
index 268e99d4..c4b3b30b 100644
--- a/kalzium/src/isotope.cpp
+++ b/kalzium/src/isotope.cpp
@@ -21,7 +21,7 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Isotope::Isotope( int neutrons, int protones,  double percentage, double weight, double halflife, TQString format, double alphadecay, double betaplusdecay, double betaminusdecay, double ecdecay, double alphapercentage, double betapluspercentage, double betaminuspercentage, double ecpercentage, TQString spin, TQString magmoment)
 {
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index e3c6f8c3..e7393ec0 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -41,7 +41,7 @@
 
 #include <tdeconfigdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp
index df8ae11a..1e4f93e3 100644
--- a/kalzium/src/kalziumdataobject.cpp
+++ b/kalzium/src/kalziumdataobject.cpp
@@ -26,9 +26,9 @@
 #include <tqdom.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp
index c7b3ff26..e78cb0ef 100644
--- a/kalzium/src/kalziumtip.cpp
+++ b/kalzium/src/kalziumtip.cpp
@@ -33,9 +33,9 @@
 
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWidget( parent, name, f ) 
diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp
index 8498962b..29a5bc02 100644
--- a/kalzium/src/kalziumutils.cpp
+++ b/kalzium/src/kalziumutils.cpp
@@ -13,8 +13,8 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqfont.h>
 #include <tqrect.h>
 #include <tqpainter.h>
diff --git a/kalzium/src/molcalcwidget.cpp b/kalzium/src/molcalcwidget.cpp
index 435f6d7a..4b58ab2a 100644
--- a/kalzium/src/molcalcwidget.cpp
+++ b/kalzium/src/molcalcwidget.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <tdetoolbar.h>
diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp
index 548974d1..d1e20339 100644
--- a/kalzium/src/periodictableview.cpp
+++ b/kalzium/src/periodictableview.cpp
@@ -24,7 +24,7 @@
 #include "kalziumutils.h"
 #include "kalziumdataobject.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp
index c0b8ef6a..93ae5838 100644
--- a/kalzium/src/somwidget_impl.cpp
+++ b/kalzium/src/somwidget_impl.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <math.h>
 
diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp
index 5fea3d8e..1e486338 100644
--- a/kalzium/src/spectrum.cpp
+++ b/kalzium/src/spectrum.cpp
@@ -21,7 +21,7 @@
 
 #include "element.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <math.h>
 
diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp
index e74c8a59..614dbbd1 100644
--- a/kalzium/src/spectrumviewimpl.cpp
+++ b/kalzium/src/spectrumviewimpl.cpp
@@ -16,8 +16,8 @@
 
 #include <tdefiledialog.h>
 #include <kguiitem.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include "exporter.h"
diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp
index bc0d2af1..88355a1c 100644
--- a/kalzium/src/spectrumwidget.cpp
+++ b/kalzium/src/spectrumwidget.cpp
@@ -24,8 +24,8 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <math.h>
 
 #include <tqcursor.h>
diff --git a/kanagram/src/grammarmanager.cpp b/kanagram/src/grammarmanager.cpp
index 71387b91..64710394 100644
--- a/kanagram/src/grammarmanager.cpp
+++ b/kanagram/src/grammarmanager.cpp
@@ -25,7 +25,7 @@
 
 #include "grammarmanager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Conjugation::conjug_name_t
 Conjugation::names [] =
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 6335d91a..4aaa4d54 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -37,8 +37,8 @@ using namespace std;
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeconfigdialog.h>
diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp
index de318cc6..d8dd96a4 100644
--- a/kanagram/src/kanagramgame.cpp
+++ b/kanagram/src/kanagramgame.cpp
@@ -24,9 +24,9 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kanagramgame.h"
 #include "keduvocdocument.h"
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 7122515c..046ad56e 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -19,9 +19,9 @@
 #include "keduvocdocument.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include <tqfileinfo.h>
diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp
index 88bf7607..34c31ca7 100644
--- a/kanagram/src/keduvockvtmlreader.cpp
+++ b/kanagram/src/keduvockvtmlreader.cpp
@@ -18,8 +18,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqdom.h>
 #include <tqtextstream.h>
diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp
index 07651e56..8307bb1d 100644
--- a/kanagram/src/mainsettings.cpp
+++ b/kanagram/src/mainsettings.cpp
@@ -26,10 +26,10 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfigdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include "mainsettings.h"
diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp
index 7c72f938..84a0743d 100644
--- a/kanagram/src/newstuff.cpp
+++ b/kanagram/src/newstuff.cpp
@@ -6,7 +6,7 @@
 #include <kdebug.h>
 #include <knewstuff/downloaddialog.h>
 #include <knewstuff/knewstuff.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kanagramsettings.h"
 #include "newstuffdialog.h"
diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp
index 1d3ed4b9..572ec03b 100644
--- a/kanagram/src/newstuffdialog.cpp
+++ b/kanagram/src/newstuffdialog.cpp
@@ -2,7 +2,7 @@
 
 #include <knewstuff/knewstuff.h>
 #include <knewstuff/entry.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp
index df3bee35..b36a3454 100644
--- a/kanagram/src/vocabedit.cpp
+++ b/kanagram/src/vocabedit.cpp
@@ -29,11 +29,11 @@
 #include <tqvaluevector.h>
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"
diff --git a/kbruch/src/exercisebase.cpp b/kbruch/src/exercisebase.cpp
index a57aaf91..c53ffe68 100644
--- a/kbruch/src/exercisebase.cpp
+++ b/kbruch/src/exercisebase.cpp
@@ -20,7 +20,7 @@
 
 /* these includes are needed for KDE support */
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* ----- public member functions ----- */
 
diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp
index 68589c07..b98d5c78 100644
--- a/kbruch/src/exercisecompare.cpp
+++ b/kbruch/src/exercisecompare.cpp
@@ -20,7 +20,7 @@
 
 /* these includes are needed for KDE support */
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* these includes are needed for TQt support */
 #include <tqlabel.h>
diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp
index 9654d050..ec7db1e7 100644
--- a/kbruch/src/exerciseconvert.cpp
+++ b/kbruch/src/exerciseconvert.cpp
@@ -20,8 +20,8 @@
 
 /* these includes are needed for KDE support */
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knumvalidator.h>
 
 /* these includes are needed for TQt support */
diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp
index 62eeea54..e971e12f 100644
--- a/kbruch/src/exercisefactorize.cpp
+++ b/kbruch/src/exercisefactorize.cpp
@@ -20,8 +20,8 @@
 
 /* these includes are needed for KDE support */
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knumvalidator.h>
 
 /* these includes are needed for TQt support */
diff --git a/kbruch/src/fractionbasewidget.cpp b/kbruch/src/fractionbasewidget.cpp
index c1fec755..02fd1cfb 100644
--- a/kbruch/src/fractionbasewidget.cpp
+++ b/kbruch/src/fractionbasewidget.cpp
@@ -19,7 +19,7 @@
 #include "fractionbasewidget.moc"
 
 /* these includes are needed for KDE support */
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 /* these includes are needed for TQt support */
 #include <tqpainter.h>
diff --git a/kbruch/src/kbruch.h b/kbruch/src/kbruch.h
index e0f5ca0e..eedbad6d 100644
--- a/kbruch/src/kbruch.h
+++ b/kbruch/src/kbruch.h
@@ -23,7 +23,7 @@
 #include <config.h>
 
 /* for the I18N_NOOP macro */
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "task.h"
 #include "mainqtwidget.h"
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index 5230281c..c03a6f30 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -25,7 +25,7 @@
 #include <kiconloader.h>
 #include <kjanuswidget.h>
 #include <tdeconfigdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqsplitter.h>
 #include <tqlabel.h>
diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp
index 2d51a653..f60b0787 100644
--- a/kbruch/src/statisticsview.cpp
+++ b/kbruch/src/statisticsview.cpp
@@ -25,7 +25,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "settingsclass.h"
diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp
index b4b13476..1c0b1a25 100644
--- a/kbruch/src/taskview.cpp
+++ b/kbruch/src/taskview.cpp
@@ -19,8 +19,8 @@
 #include "taskview.moc"
 
 /* these includes are needed for KDE support */
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <knumvalidator.h>
 
diff --git a/kbruch/src/taskwidget.cpp b/kbruch/src/taskwidget.cpp
index 88a69c3a..3dbe954e 100644
--- a/kbruch/src/taskwidget.cpp
+++ b/kbruch/src/taskwidget.cpp
@@ -19,7 +19,7 @@
 #include "taskwidget.moc"
 
 /* these includes are needed for KDE support */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* these includes are needed for TQt support */
 #include <tqpainter.h>
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index bf3a96d5..ed021225 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -21,7 +21,7 @@
 #include "../libkeduca/kgallerydialog.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp
index c4b8f373..c8f3ce0d 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -18,7 +18,7 @@
 #include "keducaprefs.h"
 #include "keducaprefs.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 
diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp
index 5ba5bda0..a5e5c22b 100644
--- a/keduca/keduca/keducaview.cpp
+++ b/keduca/keduca/keducaview.cpp
@@ -24,9 +24,9 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp
index 3c3482fc..a6637ef6 100644
--- a/keduca/keduca/kgroupeduca.cpp
+++ b/keduca/keduca/kgroupeduca.cpp
@@ -20,7 +20,7 @@
 #include "kcheckeduca.h"
 #include "tderadioeduca.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KGroupEduca::KGroupEduca(TQWidget *parent, const char *name ) : TQVButtonGroup(i18n("Answers"), parent, name)
 {
diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp
index 7b549168..46a8322f 100644
--- a/keduca/keduca/kquestion.cpp
+++ b/keduca/keduca/kquestion.cpp
@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KQuestion::KQuestion( TQWidget *parent, const char *name )
   : TQHBox( parent, name ), _countdownTimer( 0 )
diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp
index 1646e249..190c561a 100644
--- a/keduca/keducabuilder/kcontroladdedit.cpp
+++ b/keduca/keducabuilder/kcontroladdedit.cpp
@@ -19,7 +19,7 @@
 #include "kcontroladdedit.moc"
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index ee9b6e35..197a552f 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -18,7 +18,7 @@
 #include "kcontrolheader.h"
 #include "kcontrolheader.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <klineedit.h>
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index 1d2eb280..3550b9b7 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -24,12 +24,12 @@
 #include "../libkeduca/kgallerydialog.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kedittoolbar.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 
 #include <tqlayout.h>
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp
index 34d6a82c..b75d4f40 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.cpp
+++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp
@@ -19,8 +19,8 @@
 
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 
diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp
index 94d6d95d..8ba07b50 100644
--- a/keduca/libkeduca/fileread.cpp
+++ b/keduca/libkeduca/fileread.cpp
@@ -23,7 +23,7 @@
 #include <kstandarddirs.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfileinfo.h>
 #include <tqpixmap.h>
diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp
index 1ea3180b..f4f8f03d 100644
--- a/keduca/libkeduca/kgallerydialog.cpp
+++ b/keduca/libkeduca/kgallerydialog.cpp
@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include <tqlineedit.h>
diff --git a/kgeography/src/answersdialog.cpp b/kgeography/src/answersdialog.cpp
index 9477c8fc..64d72ba5 100644
--- a/kgeography/src/answersdialog.cpp
+++ b/kgeography/src/answersdialog.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp
index 87d1d09a..ca92ed8b 100644
--- a/kgeography/src/askwidget.cpp
+++ b/kgeography/src/askwidget.cpp
@@ -8,8 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index f3642b19..7becc6c1 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -12,7 +12,7 @@
 
 #include <tdeaccelmanager.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include <tqlabel.h>
diff --git a/kgeography/src/capitaldivisionasker.cpp b/kgeography/src/capitaldivisionasker.cpp
index ffea1407..1e21e9eb 100644
--- a/kgeography/src/capitaldivisionasker.cpp
+++ b/kgeography/src/capitaldivisionasker.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
  
diff --git a/kgeography/src/divisioncapitalasker.cpp b/kgeography/src/divisioncapitalasker.cpp
index b87437a2..c4060137 100644
--- a/kgeography/src/divisioncapitalasker.cpp
+++ b/kgeography/src/divisioncapitalasker.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
  
diff --git a/kgeography/src/divisionflagasker.cpp b/kgeography/src/divisionflagasker.cpp
index 79641b25..789c2740 100644
--- a/kgeography/src/divisionflagasker.cpp
+++ b/kgeography/src/divisionflagasker.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqimage.h>
 #include <tqradiobutton.h>
diff --git a/kgeography/src/flagdivisionasker.cpp b/kgeography/src/flagdivisionasker.cpp
index 125fc64d..171f8ae1 100644
--- a/kgeography/src/flagdivisionasker.cpp
+++ b/kgeography/src/flagdivisionasker.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqimage.h>
 #include <tqlayout.h>
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index 67762cd9..a1387a00 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -10,12 +10,12 @@
 
 #include <tdeaction.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp
index 99861e4a..6c54db69 100644
--- a/kgeography/src/map.cpp
+++ b/kgeography/src/map.cpp
@@ -11,7 +11,7 @@
 #include <stdlib.h> // for RAND_MAX
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index daf4ed6d..12ed0f53 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -8,8 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp
index 09e64bce..50f720d9 100644
--- a/kgeography/src/mapchooser.cpp
+++ b/kgeography/src/mapchooser.cpp
@@ -8,9 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <tqhbox.h>
diff --git a/kgeography/src/mapparser.cpp b/kgeography/src/mapparser.cpp
index f50e1b5d..018bfd18 100644
--- a/kgeography/src/mapparser.cpp
+++ b/kgeography/src/mapparser.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "division.h"
 #include "map.h"
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index 578ef8b4..81f55d82 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcursor.h>
 #include <tqpainter.h>
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 3844c809..8d7d2b20 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -36,9 +36,9 @@
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp
index c9271080..0e2f7b2f 100644
--- a/khangman/khangman/khangmanview.cpp
+++ b/khangman/khangman/khangmanview.cpp
@@ -19,8 +19,8 @@
 #include <kaudioplayer.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp
index b7a0fae5..353b69a5 100644
--- a/khangman/khangman/main.cpp
+++ b/khangman/khangman/main.cpp
@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
diff --git a/khangman/khangman/timer.cpp b/khangman/khangman/timer.cpp
index 69bcf6f7..64fe60a7 100644
--- a/khangman/khangman/timer.cpp
+++ b/khangman/khangman/timer.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqslider.h>
diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc
index b1bf83dd..0a94f140 100644
--- a/kig/filters/cabri-filter.cc
+++ b/kig/filters/cabri-filter.cc
@@ -46,7 +46,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**
  * a line:
diff --git a/kig/filters/drgeo-filter-chooser.cc b/kig/filters/drgeo-filter-chooser.cc
index 81fab837..89250235 100644
--- a/kig/filters/drgeo-filter-chooser.cc
+++ b/kig/filters/drgeo-filter-chooser.cc
@@ -20,8 +20,8 @@
 #include "drgeo-filter-chooser.moc"
 
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc
index 13a3ca0f..2b7673ee 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cc
@@ -54,7 +54,7 @@
 #include <tqfile.h>
 #include <tqnamespace.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #undef DRGEO_DEBUG
 //#define DRGEO_DEBUG
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 8b3799d0..90cef343 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -45,8 +45,8 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 #include <map>
diff --git a/kig/filters/filter.cc b/kig/filters/filter.cc
index 81cd1ef4..6a543430 100644
--- a/kig/filters/filter.cc
+++ b/kig/filters/filter.cc
@@ -26,8 +26,8 @@
 #include "kseg-filter.h"
 #include "drgeo-filter.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 KigFilters* KigFilters::sThis;
 
diff --git a/kig/filters/kgeo-resource.h b/kig/filters/kgeo-resource.h
index f7af0f64..d2108b22 100644
--- a/kig/filters/kgeo-resource.h
+++ b/kig/filters/kgeo-resource.h
@@ -48,7 +48,7 @@
 
 #include <iostream>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ///////////////////////////////////////////////////////////////////
 // resource.h  -- contains macros used for commands
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 286f23cd..2028bf69 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -50,7 +50,7 @@
 #include <tqdatastream.h>
 #include <tqbuffer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KigFilterKSeg::KigFilterKSeg()
 {
diff --git a/kig/filters/latexexporter.cc b/kig/filters/latexexporter.cc
index b6e267bb..3db2870b 100644
--- a/kig/filters/latexexporter.cc
+++ b/kig/filters/latexexporter.cc
@@ -49,8 +49,8 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #ifdef HAVE_TRUNC
 #define KDE_TRUNC(a)	trunc(a)
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index 652e1096..4ffe26a6 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -38,7 +38,7 @@
 
 #include <karchive.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 
diff --git a/kig/filters/svgexporter.cc b/kig/filters/svgexporter.cc
index e2cc41bd..7d724b31 100644
--- a/kig/filters/svgexporter.cc
+++ b/kig/filters/svgexporter.cc
@@ -31,8 +31,8 @@
 #include <tqpicture.h>
 #include <tqrect.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <map>
 
diff --git a/kig/kig/aboutdata.h b/kig/kig/aboutdata.h
index a20371a7..be6af4f4 100644
--- a/kig/kig/aboutdata.h
+++ b/kig/kig/aboutdata.h
@@ -16,7 +16,7 @@
 // 02110-1301, USA.
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "config.h"
 
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index d2073bb3..d6af88b2 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -32,8 +32,8 @@
 #include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <ktip.h>
diff --git a/kig/kig/kig_commands.h b/kig/kig/kig_commands.h
index c21d4692..b7e4ac12 100644
--- a/kig/kig/kig_commands.h
+++ b/kig/kig/kig_commands.h
@@ -23,7 +23,7 @@
 #define KIG_COMMANDS_H
 
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "../objects/object_holder.h"
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 2cbf135a..3d830a70 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -47,12 +47,12 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kprinter.h>
 #include <kstandarddirs.h>
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index 954c96fc..7d988df4 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -38,7 +38,7 @@
 
 #include <kdebug.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
diff --git a/kig/kig/main.cpp b/kig/kig/main.cpp
index 72a92148..9923f9bf 100644
--- a/kig/kig/main.cpp
+++ b/kig/kig/main.cpp
@@ -23,7 +23,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <kdebug.h>
 
diff --git a/kig/misc/builtin_stuff.cc b/kig/misc/builtin_stuff.cc
index 85d0d110..d42ef8ad 100644
--- a/kig/misc/builtin_stuff.cc
+++ b/kig/misc/builtin_stuff.cc
@@ -42,7 +42,7 @@
 #include "../objects/vector_type.h"
 #include "../objects/polygon_type.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 void setupBuiltinStuff()
 {
diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp
index 287bde1f..5e82d564 100644
--- a/kig/misc/common.cpp
+++ b/kig/misc/common.cpp
@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <knumvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
 #include <kinputdialog.h>
 #else
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index 33ec67ce..194a008f 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -32,8 +32,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <knumvalidator.h>
 
 #include <string>
diff --git a/kig/misc/goniometry.cc b/kig/misc/goniometry.cc
index 61e13358..ee4f75fa 100644
--- a/kig/misc/goniometry.cc
+++ b/kig/misc/goniometry.cc
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index 831a4b64..0d7b35d9 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -32,7 +32,7 @@
 #include "../objects/bogus_imp.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 
diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cc
index 2d7ea08f..28d4dc74 100644
--- a/kig/misc/kigfiledialog.cc
+++ b/kig/misc/kigfiledialog.cc
@@ -21,8 +21,8 @@
 #include <tqfile.h>
 #include <tqpoint.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KigFileDialog::KigFileDialog( const TQString& startDir, const TQString& filter,
               const TQString& caption,  TQWidget* parent )
diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc
index ac7f9ac5..a596c87c 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cc
@@ -36,7 +36,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 
 class KigInputDialogPrivate
diff --git a/kig/misc/kigtransform.cpp b/kig/misc/kigtransform.cpp
index bc446403..2bb0e91a 100644
--- a/kig/misc/kigtransform.cpp
+++ b/kig/misc/kigtransform.cpp
@@ -26,7 +26,7 @@
 
 #include <cmath>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // Transformation getProjectiveTransformation ( int argsnum,
diff --git a/kig/misc/lists.cc b/kig/misc/lists.cc
index d3a4fb4d..f0e0c3f7 100644
--- a/kig/misc/lists.cc
+++ b/kig/misc/lists.cc
@@ -24,8 +24,8 @@
 
 #include "config.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqdom.h>
diff --git a/kig/misc/object_constructor.cc b/kig/misc/object_constructor.cc
index f2b9f330..ae2a37d0 100644
--- a/kig/misc/object_constructor.cc
+++ b/kig/misc/object_constructor.cc
@@ -38,7 +38,7 @@
 
 #include <tqpen.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc
index da89b66c..7861c56e 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -26,7 +26,7 @@
 #include "../objects/transform_types.h"
 #include "../objects/object_type.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqdom.h>
 
 class ObjectHierarchy::Node
diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cc
index 51ac346e..9618bc90 100644
--- a/kig/misc/special_constructors.cc
+++ b/kig/misc/special_constructors.cc
@@ -54,7 +54,7 @@
 
 #include <tqpen.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc
index 1dab83d7..00686392 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@@ -26,8 +26,8 @@
 #include <tdeapplication.h>
 #include <kicondialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index 67509396..12f0d57c 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -35,9 +35,9 @@
 #include "../objects/text_type.h"
 
 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtextedit.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kig/modes/macro.cc b/kig/modes/macro.cc
index ba6f98ab..8fe16b4d 100644
--- a/kig/modes/macro.cc
+++ b/kig/modes/macro.cc
@@ -28,9 +28,9 @@
 #include "../objects/object_imp.h"
 
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <functional>
 #include <algorithm>
diff --git a/kig/modes/normal.cc b/kig/modes/normal.cc
index 70123996..9a30c213 100644
--- a/kig/modes/normal.cc
+++ b/kig/modes/normal.cc
@@ -34,7 +34,7 @@
 #include <kcursor.h>
 #include <tdeaction.h>
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index 5c2528a6..eef5b1e3 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -54,9 +54,9 @@
 
 #include <tdeaction.h>
 #include <kcolordialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
 #include <kinputdialog.h>
 #else
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index 8660eaba..8847ee5a 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -32,8 +32,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc
index b7b8f41e..76d724b1 100644
--- a/kig/objects/bogus_imp.cc
+++ b/kig/objects/bogus_imp.cc
@@ -19,7 +19,7 @@
 
 #include <tqcstring.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "../misc/rect.h"
 
diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc
index 38522c22..16b3a5b7 100644
--- a/kig/objects/circle_imp.cc
+++ b/kig/objects/circle_imp.cc
@@ -27,7 +27,7 @@
 #include "../kig/kig_document.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <math.h>
 
diff --git a/kig/objects/circle_type.cc b/kig/objects/circle_type.cc
index 97d2f615..c47677ab 100644
--- a/kig/objects/circle_type.cc
+++ b/kig/objects/circle_type.cc
@@ -24,7 +24,7 @@
 
 #include "../misc/common.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char constructcirclethroughpointstat[] = I18N_NOOP( "Construct a circle through this point" );
 
diff --git a/kig/objects/common.h b/kig/objects/common.h
index f1ea5b8d..f9d4517a 100644
--- a/kig/objects/common.h
+++ b/kig/objects/common.h
@@ -24,7 +24,7 @@
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <cassert>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class Coordinate;
 class KigDocument;
diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc
index 81331522..dcbd23fd 100644
--- a/kig/objects/conic_imp.cc
+++ b/kig/objects/conic_imp.cc
@@ -27,7 +27,7 @@
 #include "../kig/kig_document.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ObjectImp* ConicImp::transform( const Transformation& t ) const
 {
diff --git a/kig/objects/conic_types.cc b/kig/objects/conic_types.cc
index 34396369..be94cf56 100644
--- a/kig/objects/conic_types.cc
+++ b/kig/objects/conic_types.cc
@@ -28,7 +28,7 @@
 #include "../kig/kig_commands.h"
 #include "../kig/kig_part.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char conic_constructstatement[] = I18N_NOOP( "Construct a conic through this point" );
 
diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc
index 9fc8c53c..7fb5ec63 100644
--- a/kig/objects/cubic_imp.cc
+++ b/kig/objects/cubic_imp.cc
@@ -26,7 +26,7 @@
 #include "../kig/kig_view.h"
 
 #include <math.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 CubicImp::CubicImp( const CubicCartesianData& data )
   : CurveImp(), mdata( data )
diff --git a/kig/objects/cubic_type.cc b/kig/objects/cubic_type.cc
index c322b8c3..24bfbda4 100644
--- a/kig/objects/cubic_type.cc
+++ b/kig/objects/cubic_type.cc
@@ -21,7 +21,7 @@
 #include "point_imp.h"
 #include "bogus_imp.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char cubictpstatement[] = I18N_NOOP( "Construct a cubic curve through this point" );
 
diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cc
index 804d498d..0718bc23 100644
--- a/kig/objects/intersection_types.cc
+++ b/kig/objects/intersection_types.cc
@@ -25,7 +25,7 @@
 #include "other_imp.h"
 #include "point_imp.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char intersectlinestat[] = I18N_NOOP( "Intersect with this line" );
 
diff --git a/kig/objects/inversion_type.cc b/kig/objects/inversion_type.cc
index 0ab77780..4f270582 100644
--- a/kig/objects/inversion_type.cc
+++ b/kig/objects/inversion_type.cc
@@ -24,7 +24,7 @@
 
 #include "../misc/common.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char str1[] = I18N_NOOP( "Invert with respect to this circle" );
 static const char str2[] = I18N_NOOP( "Select the circle we want to invert against..." );
diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc
index a49078a1..4223000b 100644
--- a/kig/objects/line_imp.cc
+++ b/kig/objects/line_imp.cc
@@ -26,7 +26,7 @@
 #include "../misc/kigpainter.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 using namespace std;
diff --git a/kig/objects/line_type.cc b/kig/objects/line_type.cc
index a02cc80b..bd9a5f3e 100644
--- a/kig/objects/line_type.cc
+++ b/kig/objects/line_type.cc
@@ -31,7 +31,7 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const ArgsParser::spec argsspecSegmentAB[] =
 {
diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cc
index edbdc88b..fcbfe7a7 100644
--- a/kig/objects/locus_imp.cc
+++ b/kig/objects/locus_imp.cc
@@ -26,7 +26,7 @@
 
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/kig/objects/object_imp.cc b/kig/objects/object_imp.cc
index 9a3ee679..1f7ad798 100644
--- a/kig/objects/object_imp.cc
+++ b/kig/objects/object_imp.cc
@@ -21,7 +21,7 @@
 
 #include "../misc/coordinate.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <map>
 
 class ObjectImpType::StaticPrivate
diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc
index d095c238..dd184295 100644
--- a/kig/objects/object_imp_factory.cc
+++ b/kig/objects/object_imp_factory.cc
@@ -32,7 +32,7 @@
 
 #include <tqdom.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 const ObjectImpFactory* ObjectImpFactory::instance()
 {
diff --git a/kig/objects/object_type.cc b/kig/objects/object_type.cc
index ea85e4f8..3b2fc108 100644
--- a/kig/objects/object_type.cc
+++ b/kig/objects/object_type.cc
@@ -24,7 +24,7 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 const char* ObjectType::fullName() const
 {
diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cc
index 137a3e93..5c063753 100644
--- a/kig/objects/other_imp.cc
+++ b/kig/objects/other_imp.cc
@@ -28,7 +28,7 @@
 #include "../misc/goniometry.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 #include <utility>
diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc
index 539f98b3..4cc4168c 100644
--- a/kig/objects/point_imp.cc
+++ b/kig/objects/point_imp.cc
@@ -24,7 +24,7 @@
 #include "../kig/kig_document.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 PointImp::PointImp( const Coordinate& c )
   : mc( c )
diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc
index 2acd8479..59f495b9 100644
--- a/kig/objects/point_type.cc
+++ b/kig/objects/point_type.cc
@@ -33,7 +33,7 @@
 #include "../kig/kig_view.h"
 #include "../kig/kig_commands.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const ArgsParser::spec argsspecFixedPoint[] =
 {
diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc
index 5c001df6..dd3ffa44 100644
--- a/kig/objects/polygon_imp.cc
+++ b/kig/objects/polygon_imp.cc
@@ -29,7 +29,7 @@
 #include "../kig/kig_document.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/kig/objects/polygon_type.cc b/kig/objects/polygon_type.cc
index bca867da..cd1fb544 100644
--- a/kig/objects/polygon_type.cc
+++ b/kig/objects/polygon_type.cc
@@ -25,7 +25,7 @@
 
 #include "../misc/common.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <cmath>
 #include <vector>
 
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index 6341e469..9cb4d9e2 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -29,7 +29,7 @@
 #include <tdeaction.h>
 //
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdepopupmenu.h>
 #include <ktextedit.h>
 #include <tdetexteditor/clipboardinterface.h>
diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc
index 2eb2da81..e799fac0 100644
--- a/kig/scripting/script-common.cc
+++ b/kig/scripting/script-common.cc
@@ -20,7 +20,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 struct script_prop
 {
diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc
index 380189e6..1fd88405 100644
--- a/kig/scripting/script_mode.cc
+++ b/kig/scripting/script_mode.cc
@@ -35,7 +35,7 @@
 
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 void ScriptModeBase::dragRect( const TQPoint& p, KigWidget& w )
 {
diff --git a/kig/tdefile/tdefile_kig.cpp b/kig/tdefile/tdefile_kig.cpp
index 48042368..a1294641 100644
--- a/kig/tdefile/tdefile_kig.cpp
+++ b/kig/tdefile/tdefile_kig.cpp
@@ -26,8 +26,8 @@
 
 #include <karchive.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 
diff --git a/kiten/asyndeta.cpp b/kiten/asyndeta.cpp
index 07b57c70..e2d8a14a 100644
--- a/kiten/asyndeta.cpp
+++ b/kiten/asyndeta.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp
index a7a19033..7831cfc6 100644
--- a/kiten/deinf.cpp
+++ b/kiten/deinf.cpp
@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tqtextcodec.h>
diff --git a/kiten/dict.cpp b/kiten/dict.cpp
index cab509b4..ec8ceb6a 100644
--- a/kiten/dict.cpp
+++ b/kiten/dict.cpp
@@ -19,8 +19,8 @@
 **/
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index d9521aba..5cb1e1e5 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -29,7 +29,7 @@
 #include <kglobalaccel.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
diff --git a/kiten/kloader.cpp b/kiten/kloader.cpp
index 7d1f202d..95462474 100644
--- a/kiten/kloader.cpp
+++ b/kiten/kloader.cpp
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 
 #include "kloader.h"
diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp
index 59dc49c2..6eda1d32 100644
--- a/kiten/kromajiedit.cpp
+++ b/kiten/kromajiedit.cpp
@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqpopupmenu.h>
 #include <tqtextcodec.h>
diff --git a/kiten/ksaver.cpp b/kiten/ksaver.cpp
index 73ea2768..60ae364d 100644
--- a/kiten/ksaver.cpp
+++ b/kiten/ksaver.cpp
@@ -27,8 +27,8 @@
 #include "config.h"
 #endif
 
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #include "ksaver.h"
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index c4b2c901..94e77b9a 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -24,8 +24,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstatusbar.h>
 #include <kstringhandler.h>
diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp
index 1c79dbaa..877ef3ff 100644
--- a/kiten/optiondialog.cpp
+++ b/kiten/optiondialog.cpp
@@ -24,7 +24,7 @@
 #include <tqvgroupbox.h>
 #include <tdefontdialog.h>
 #include <tqtextcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcombobox.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 36350bcf..fa4e79cf 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -24,8 +24,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index bb420b9c..f572a76c 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -23,8 +23,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index f57b0d82..7788ade5 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -19,7 +19,7 @@
 #include <tdeconfigdialog.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp
index 2bc49bb5..e4f3f2a5 100644
--- a/klatin/klatin/klatingrammar.cpp
+++ b/klatin/klatin/klatingrammar.cpp
@@ -20,8 +20,8 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 
diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp
index 46e5e744..64dd13fa 100644
--- a/klatin/klatin/klatinverbs.cpp
+++ b/klatin/klatin/klatinverbs.cpp
@@ -20,8 +20,8 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index ad5c38c3..b30600eb 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -20,8 +20,8 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
diff --git a/klatin/klatin/settings.kcfgc b/klatin/klatin/settings.kcfgc
index a58324de..b6246990 100644
--- a/klatin/klatin/settings.kcfgc
+++ b/klatin/klatin/settings.kcfgc
@@ -1,5 +1,5 @@
 File=klatin.kcfg
 ClassName=Settings
-IncludeFiles=kstandarddirs.h,tqdir.h,klocale.h,kdebug.h
+IncludeFiles=kstandarddirs.h,tqdir.h,tdelocale.h,kdebug.h
 Singleton=true
 Mutators=true
\ No newline at end of file
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index 3afd5036..9c635795 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -34,9 +34,9 @@
 #include <kcombobox.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
diff --git a/klettres/klettres/klettresview.cpp b/klettres/klettres/klettresview.cpp
index 8c8d8252..69cc6bcc 100644
--- a/klettres/klettres/klettresview.cpp
+++ b/klettres/klettres/klettresview.cpp
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 //Project headers
diff --git a/klettres/klettres/soundfactory.cpp b/klettres/klettres/soundfactory.cpp
index e23bc501..48a29ad0 100644
--- a/klettres/klettres/soundfactory.cpp
+++ b/klettres/klettres/soundfactory.cpp
@@ -21,8 +21,8 @@
  */
 #include <stdlib.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kaudioplayer.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/klettres/klettres/timer.cpp b/klettres/klettres/timer.cpp
index f102d82e..d6fa9a4b 100644
--- a/klettres/klettres/timer.cpp
+++ b/klettres/klettres/timer.cpp
@@ -20,7 +20,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqslider.h>
diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp
index c9f417c3..bf0da759 100644
--- a/kmplot/kmplot/FktDlg.cpp
+++ b/kmplot/kmplot/FktDlg.cpp
@@ -30,8 +30,8 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tqcstring.h>
 #include <tqcursor.h>
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index d7992fae..0c55074d 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -37,9 +37,9 @@
 #include <tdeio/netaccess.h>
 #include <kinstance.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tdetoolbar.h>
 
 
@@ -768,7 +768,7 @@ void MainDlg::resetZoom()
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TDEInstance*  KmPlotPartFactory::s_instance = 0L;
 TDEAboutData* KmPlotPartFactory::s_about = 0L;
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index b580dace..6c60fd50 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -35,10 +35,10 @@
 // KDE includes
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 
diff --git a/kmplot/kmplot/coordsconfigdialog.cpp b/kmplot/kmplot/coordsconfigdialog.cpp
index 4a442080..94dfe465 100644
--- a/kmplot/kmplot/coordsconfigdialog.cpp
+++ b/kmplot/kmplot/coordsconfigdialog.cpp
@@ -23,9 +23,9 @@
 *
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqradiobutton.h>
 
 #include "settings.h"
diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp
index 7e3f9501..2d592676 100644
--- a/kmplot/kmplot/editfunction.cpp
+++ b/kmplot/kmplot/editfunction.cpp
@@ -40,8 +40,8 @@
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 
diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp
index 57e3b1e2..d8af85e8 100644
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@@ -28,8 +28,8 @@
 #include <kinputdialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tqpushbutton.h>
 #include <tqstringlist.h>
diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp
index e32bfcd5..04dfa441 100644
--- a/kmplot/kmplot/keditconstant.cpp
+++ b/kmplot/kmplot/keditconstant.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqpushbutton.h>
 
 
diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp
index 8e38d6f6..0d83b3a7 100644
--- a/kmplot/kmplot/keditparametric.cpp
+++ b/kmplot/kmplot/keditparametric.cpp
@@ -29,8 +29,8 @@
 #include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 #include <kdebug.h>
diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp
index 91c123b0..27334bb6 100644
--- a/kmplot/kmplot/keditpolar.cpp
+++ b/kmplot/kmplot/keditpolar.cpp
@@ -29,8 +29,8 @@
 #include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 
diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp
index 2a6b3df1..3b947f97 100644
--- a/kmplot/kmplot/kminmax.cpp
+++ b/kmplot/kmplot/kminmax.cpp
@@ -25,8 +25,8 @@
 
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index 0b13905f..bbb49a8d 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -31,8 +31,8 @@
 #include <kkeydialog.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kurl.h>
diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp
index a077b6d1..d7812870 100644
--- a/kmplot/kmplot/kmplotio.cpp
+++ b/kmplot/kmplot/kmplotio.cpp
@@ -29,9 +29,9 @@
 
 // KDE includes
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 // ANSI-C includes
 #include <stdlib.h>
diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp
index 6b59b08d..972cd9b4 100644
--- a/kmplot/kmplot/kparametereditor.cpp
+++ b/kmplot/kmplot/kparametereditor.cpp
@@ -29,10 +29,10 @@
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kmplot/kmplot/kprinterdlg.cpp b/kmplot/kmplot/kprinterdlg.cpp
index 6b54ba77..0f9a4cfe 100644
--- a/kmplot/kmplot/kprinterdlg.cpp
+++ b/kmplot/kmplot/kprinterdlg.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // local includes
 #include "kprinterdlg.h"
diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp
index 784afe89..b2921bbd 100644
--- a/kmplot/kmplot/ksliderwindow.cpp
+++ b/kmplot/kmplot/ksliderwindow.cpp
@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <limits.h>
 #include <math.h>
diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp
index ed064b85..eaa741ff 100644
--- a/kmplot/kmplot/parser.cpp
+++ b/kmplot/kmplot/parser.cpp
@@ -30,8 +30,8 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // local includes
 #include "parser.h"
diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp
index d5142d64..acf7ecdb 100644
--- a/kmplot/kmplot/xparser.cpp
+++ b/kmplot/kmplot/xparser.cpp
@@ -26,10 +26,10 @@
 // KDE includes
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // local includes
 #include "xparser.h"
diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp
index 538af052..4177cbe9 100644
--- a/kpercentage/kpercentage/kanswer.cpp
+++ b/kpercentage/kpercentage/kanswer.cpp
@@ -31,7 +31,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp
index d8cd5b21..1ca0419c 100644
--- a/kpercentage/kpercentage/kpercentage.cpp
+++ b/kpercentage/kpercentage/kpercentage.cpp
@@ -31,8 +31,8 @@
 // KDE includes
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 
diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp
index 11018c3e..2c71fb1a 100644
--- a/kpercentage/kpercentage/kpercentmain.cpp
+++ b/kpercentage/kpercentage/kpercentmain.cpp
@@ -32,7 +32,7 @@
 
 // KDE includes
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <knumvalidator.h>
diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp
index 07af36ff..2487a6f3 100644
--- a/kstars/kstars/addcatdialog.cpp
+++ b/kstars/kstars/addcatdialog.cpp
@@ -19,9 +19,9 @@
 #include <tqlayout.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include "kstars.h"
diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp
index 346beec9..a52b6fc5 100644
--- a/kstars/kstars/addlinkdialog.cpp
+++ b/kstars/kstars/addlinkdialog.cpp
@@ -17,7 +17,7 @@
 
 #include <tdeapplication.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tqbuttongroup.h>
 #include <tqlayout.h>
diff --git a/kstars/kstars/addlinkdialog.h b/kstars/kstars/addlinkdialog.h
index 5af4dd4f..64722467 100644
--- a/kstars/kstars/addlinkdialog.h
+++ b/kstars/kstars/addlinkdialog.h
@@ -20,7 +20,7 @@
 
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqradiobutton.h>
 
 #include "addlinkdialogui.h"
diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp
index 77593304..a2b168f3 100644
--- a/kstars/kstars/ccdpreviewwg.cpp
+++ b/kstars/kstars/ccdpreviewwg.cpp
@@ -16,12 +16,12 @@
 #include "indimenu.h"
 #include "Options.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <kcombobox.h>
diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp
index 46aa2de9..f9e01e5e 100644
--- a/kstars/kstars/colorscheme.cpp
+++ b/kstars/kstars/colorscheme.cpp
@@ -18,8 +18,8 @@
 #include <tqfile.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "ksutils.h"
diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp
index ec9aa240..2334d6f1 100644
--- a/kstars/kstars/conbridlg.cpp
+++ b/kstars/kstars/conbridlg.cpp
@@ -16,7 +16,7 @@
  *  									   *
  ***************************************************************************/
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kimageeffect.h> 
  #include <kdebug.h>
  
diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h
index b1c93d8f..03c704ca 100644
--- a/kstars/kstars/conbridlg.h
+++ b/kstars/kstars/conbridlg.h
@@ -20,7 +20,7 @@
  #define CONTRASTBRIGHTNESSDLG_H
  
  #include <kdialogbase.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  
  class ConBriForm;
  class FITSViewer;
diff --git a/kstars/kstars/deepskyobject.cpp b/kstars/kstars/deepskyobject.cpp
index 5d87d01f..cf314651 100644
--- a/kstars/kstars/deepskyobject.cpp
+++ b/kstars/kstars/deepskyobject.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqfile.h>
 #include <tqregexp.h>
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index 6f09eafe..fe105d5b 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp
index 0f95455c..c88e645d 100644
--- a/kstars/kstars/devicemanager.cpp
+++ b/kstars/kstars/devicemanager.cpp
@@ -24,9 +24,9 @@
 #include <tqsocketnotifier.h>
 #include <tqtextedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
  
 #include <sys/socket.h>
diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp
index e8a29fc6..9abdd71b 100644
--- a/kstars/kstars/dms.cpp
+++ b/kstars/kstars/dms.cpp
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 
 #include "dms.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 void dms::setD( const double &x ) {
diff --git a/kstars/kstars/dmsbox.cpp b/kstars/kstars/dmsbox.cpp
index 1857b1bf..32fd2fd2 100644
--- a/kstars/kstars/dmsbox.cpp
+++ b/kstars/kstars/dmsbox.cpp
@@ -20,7 +20,7 @@
 #include "dmsbox.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <tqstring.h>
 #include <tqtooltip.h>
diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp
index f7ea9251..324b0690 100644
--- a/kstars/kstars/draglistbox.cpp
+++ b/kstars/kstars/draglistbox.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqdragobject.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "draglistbox.h"
diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp
index eeeb177c..f73c3b08 100644
--- a/kstars/kstars/finddialog.cpp
+++ b/kstars/kstars/finddialog.cpp
@@ -22,7 +22,7 @@
 #include <tqlistbox.h>
 #include <tqtimer.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "finddialog.h"
 #include "kstars.h"
diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp
index 73010cea..55f634a1 100644
--- a/kstars/kstars/fitshistogram.cpp
+++ b/kstars/kstars/fitshistogram.cpp
@@ -33,7 +33,7 @@
  
  #include <kdebug.h>
  #include <klineedit.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  
  
  
diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp
index 1ca5fc14..7751dd3b 100644
--- a/kstars/kstars/fitsimage.cpp
+++ b/kstars/kstars/fitsimage.cpp
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
 #include <tdeaccel.h>
@@ -27,9 +27,9 @@
 #include <tdetoolbar.h> 
 #include <tdeapplication.h>
 #include <kpixmap.h> 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kimageeffect.h> 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kprogress.h>
 #include <kstatusbar.h>
 
diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp
index 518db5a1..b785050d 100644
--- a/kstars/kstars/fitsprocess.cpp
+++ b/kstars/kstars/fitsprocess.cpp
@@ -19,7 +19,7 @@
  #include <unistd.h>
  
  #include <kdebug.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kprogress.h>
  #include <tdeapplication.h>
  
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index 56cb6157..a5e6143c 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
 #include <tdeaccel.h>
@@ -27,9 +27,9 @@
 #include <tdetoolbar.h>
 #include <tdeapplication.h>
 #include <kpixmap.h> 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kimageeffect.h> 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kprogress.h>
 #include <kstatusbar.h>
 #include <kcommand.h>
diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp
index 8da163c2..997550ee 100644
--- a/kstars/kstars/focusdialog.cpp
+++ b/kstars/kstars/focusdialog.cpp
@@ -19,8 +19,8 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqstring.h>
 #include <knumvalidator.h>
diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp
index 7b01959f..af40388c 100644
--- a/kstars/kstars/fov.cpp
+++ b/kstars/kstars/fov.cpp
@@ -18,7 +18,7 @@
 #include <tqpainter.h>
 #include <tqfile.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "fov.h"
diff --git a/kstars/kstars/fov.h b/kstars/kstars/fov.h
index b04e9099..6b309e9b 100644
--- a/kstars/kstars/fov.h
+++ b/kstars/kstars/fov.h
@@ -19,7 +19,7 @@
 #define FOV_H
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**@class FOV A simple class encapulating a Field-of-View symbol
 	*@author Jason Harris
diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp
index 6021c495..2e1722e9 100644
--- a/kstars/kstars/fovdialog.cpp
+++ b/kstars/kstars/fovdialog.cpp
@@ -21,14 +21,14 @@
 #include <tqpainter.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "fovdialog.h"
diff --git a/kstars/kstars/geolocation.h b/kstars/kstars/geolocation.h
index 79180c65..931d12d8 100644
--- a/kstars/kstars/geolocation.h
+++ b/kstars/kstars/geolocation.h
@@ -20,7 +20,7 @@
 #ifndef GEOLOCATION_H
 #define GEOLOCATION_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dms.h"
 #include "timezonerule.h"
diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp
index 4d5f799e..f5776c8c 100644
--- a/kstars/kstars/imagereductiondlg.cpp
+++ b/kstars/kstars/imagereductiondlg.cpp
@@ -20,7 +20,7 @@
  
  #include <kurl.h>
  #include <tdefiledialog.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  
  #include "imagereductiondlg.h"
  
diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp
index d6f6f9cb..e464f755 100644
--- a/kstars/kstars/imagesequence.cpp
+++ b/kstars/kstars/imagesequence.cpp
@@ -21,8 +21,8 @@
 #include "Options.h"
 
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kprogress.h>
 #include <knuminput.h>
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index 31a58f79..80b14c4b 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -17,8 +17,8 @@
 
 #include <tqfont.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kstatusbar.h>
 #include <tdeio/netaccess.h>
diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h
index 6c10b671..36aacb42 100644
--- a/kstars/kstars/imageviewer.h
+++ b/kstars/kstars/imageviewer.h
@@ -23,7 +23,7 @@
 
 #include <kpixmapio.h>
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdemainwindow.h>
 
 /**@class ImageViewer
diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp
index 4b697237..3d570c69 100644
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@@ -67,8 +67,8 @@
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kcombobox.h>
diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp
index 0baba4e2..c695e69c 100644
--- a/kstars/kstars/indidriver.cpp
+++ b/kstars/kstars/indidriver.cpp
@@ -35,7 +35,7 @@
 #include <tdelistview.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp
index 162e1120..4308de45 100644
--- a/kstars/kstars/indielement.cpp
+++ b/kstars/kstars/indielement.cpp
@@ -30,7 +30,7 @@
 #include <ksqueezedtextlabel.h> 
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <knuminput.h>
diff --git a/kstars/kstars/indigroup.cpp b/kstars/kstars/indigroup.cpp
index b3c9b527..80b38c63 100644
--- a/kstars/kstars/indigroup.cpp
+++ b/kstars/kstars/indigroup.cpp
@@ -16,7 +16,7 @@
  #include "indidevice.h"
  #include "devicemanager.h"
  
- #include <klocale.h>
+ #include <tdelocale.h>
  
  #include <tqlayout.h>
  #include <tqframe.h>
diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp
index fc257575..8a4df6d2 100644
--- a/kstars/kstars/indimenu.cpp
+++ b/kstars/kstars/indimenu.cpp
@@ -44,8 +44,8 @@
 #include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kcombobox.h>
diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp
index 3d3138f2..9eecf874 100644
--- a/kstars/kstars/indiproperty.cpp
+++ b/kstars/kstars/indiproperty.cpp
@@ -27,12 +27,12 @@
  #include <tdepopupmenu.h>
  #include <klineedit.h>
  #include <kled.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kcombobox.h>
  #include <kpushbutton.h>
  #include <knuminput.h> 
  #include <kdebug.h>
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  
  #include <tqbuttongroup.h> 
  #include <tqcheckbox.h>
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index f9cde0eb..274106ec 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -41,12 +41,12 @@
  #include <tqeventloop.h>
  #include <tqsocketnotifier.h>
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kdebug.h>
  #include <kpushbutton.h>
  #include <klineedit.h>
  #include <kstatusbar.h>
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  #include <tdeapplication.h>
  #include <kprogress.h>
  #include <kurl.h>
diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp
index 34ba2175..a7297cc1 100644
--- a/kstars/kstars/infoboxes.cpp
+++ b/kstars/kstars/infoboxes.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 //#include <tqpen.h>
 #include <tqpainter.h>
diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp
index df192c41..d0dc8a24 100644
--- a/kstars/kstars/ksnewstuff.cpp
+++ b/kstars/kstars/ksnewstuff.cpp
@@ -21,7 +21,7 @@
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdirwatch.h>
 #include <kprogress.h>
diff --git a/kstars/kstars/ksnewstuff.h b/kstars/kstars/ksnewstuff.h
index 2b08b1b7..c94bb18a 100644
--- a/kstars/kstars/ksnewstuff.h
+++ b/kstars/kstars/ksnewstuff.h
@@ -32,7 +32,7 @@
 
 #include <tdeversion.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqobject.h>
 
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index 7b852ac8..680f4ede 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -25,8 +25,8 @@
 #include <tdeshortcut.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <ktip.h>
 #include <kstandarddirs.h>
 #include <tdeconfigdialog.h>
diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp
index ceb941b6..95ca0d50 100644
--- a/kstars/kstars/kstarsdata.cpp
+++ b/kstars/kstars/kstarsdata.cpp
@@ -20,9 +20,9 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "kstarsdata.h"
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index 1511d920..7a4af85e 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -22,10 +22,10 @@
 #include <tqradiobutton.h>
 
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <tdeshortcut.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp
index 9b1a4b58..e5493a63 100644
--- a/kstars/kstars/kstarsinit.cpp
+++ b/kstars/kstars/kstarsinit.cpp
@@ -24,7 +24,7 @@
 #include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <ktip.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 
diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp
index 60b9eaae..4867c0fd 100644
--- a/kstars/kstars/kstarssplash.cpp
+++ b/kstars/kstars/kstarssplash.cpp
@@ -18,7 +18,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdeapplication.h>
 
diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp
index 546694c7..0ac2a751 100644
--- a/kstars/kstars/locationdialog.cpp
+++ b/kstars/kstars/locationdialog.cpp
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
 
diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp
index c367c845..8a516860 100644
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@@ -18,7 +18,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kstars.h"
diff --git a/kstars/kstars/opscolors.cpp b/kstars/kstars/opscolors.cpp
index b3699d57..1b7bcbb7 100644
--- a/kstars/kstars/opscolors.cpp
+++ b/kstars/kstars/opscolors.cpp
@@ -17,12 +17,12 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
 #include <kcolordialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
 
diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp
index 54c97b45..25fe72d9 100644
--- a/kstars/kstars/simclock.cpp
+++ b/kstars/kstars/simclock.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "simclock.h"
 #include "kstars.h"
diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp
index fcfa3680..19c27001 100644
--- a/kstars/kstars/skymap.cpp
+++ b/kstars/kstars/skymap.cpp
@@ -19,7 +19,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kstandarddirs.h>
 
diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp
index 02c2ca86..0f4e4d18 100644
--- a/kstars/kstars/skyobject.cpp
+++ b/kstars/kstars/skyobject.cpp
@@ -17,7 +17,7 @@
 
 #include <iostream>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tqpoint.h>
 #include <tqregexp.h>
diff --git a/kstars/kstars/skyobject.h b/kstars/kstars/skyobject.h
index e7de046c..b0742d9f 100644
--- a/kstars/kstars/skyobject.h
+++ b/kstars/kstars/skyobject.h
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "skypoint.h"
 #include "dms.h"
diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h
index 062b9fc3..467d14d3 100644
--- a/kstars/kstars/skyobjectname.h
+++ b/kstars/kstars/skyobjectname.h
@@ -20,7 +20,7 @@
 
 #include <tqstring.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**@class SkyObjectName
 	*Convenience class which contains a SkyObject's name and a pointer to the SkyObject
diff --git a/kstars/kstars/skypoint.cpp b/kstars/kstars/skypoint.cpp
index 8d795d2b..a04bb0dd 100644
--- a/kstars/kstars/skypoint.cpp
+++ b/kstars/kstars/skypoint.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "skypoint.h"
 #include "skyobject.h"
diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp
index 28e1a85f..7235d02c 100644
--- a/kstars/kstars/streamwg.cpp
+++ b/kstars/kstars/streamwg.cpp
@@ -13,12 +13,12 @@
 #include "indistd.h"
 #include "Options.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <kcombobox.h>
diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp
index 12c82a79..93d15861 100644
--- a/kstars/kstars/telescopeprop.cpp
+++ b/kstars/kstars/telescopeprop.cpp
@@ -20,7 +20,7 @@
 #include <tdelistbox.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <vector>
 
diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp
index 388e4bcf..d7eb6bd5 100644
--- a/kstars/kstars/telescopewizardprocess.cpp
+++ b/kstars/kstars/telescopewizardprocess.cpp
@@ -20,7 +20,7 @@
 
 #include <tdelistview.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 
 #include "telescopewizardprocess.h"
diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp
index 4c56788f..cfef5bf4 100644
--- a/kstars/kstars/thumbnaileditor.cpp
+++ b/kstars/kstars/thumbnaileditor.cpp
@@ -21,7 +21,7 @@
 #include <tqpainter.h>
 #include <tqpoint.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index b6d1dbdf..08fd3328 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -29,12 +29,12 @@
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 #include "thumbnailpicker.h"
 #include "thumbnailpickerui.h"
diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp
index 1ceee2d7..aeacb209 100644
--- a/kstars/kstars/timebox.cpp
+++ b/kstars/kstars/timebox.cpp
@@ -19,8 +19,8 @@
 #include "libtdeedu/extdate/extdatetime.h"
 #include <tqdatetime.h>  //needed for TQTime
 #include <tqregexp.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <kdebug.h>
 
diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp
index 27846848..fec1d1c1 100644
--- a/kstars/kstars/timedialog.cpp
+++ b/kstars/kstars/timedialog.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/kstars/kstars/timespinbox.cpp b/kstars/kstars/timespinbox.cpp
index 72549f9b..40e0b94f 100644
--- a/kstars/kstars/timespinbox.cpp
+++ b/kstars/kstars/timespinbox.cpp
@@ -27,7 +27,7 @@
 #include <tqlineedit.h>
 #include <tqfontmetrics.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <math.h>
 
diff --git a/kstars/kstars/timestepbox.cpp b/kstars/kstars/timestepbox.cpp
index 6b661592..4941d56d 100644
--- a/kstars/kstars/timestepbox.cpp
+++ b/kstars/kstars/timestepbox.cpp
@@ -19,7 +19,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "timestepbox.h"
 
diff --git a/kstars/kstars/timezonerule.cpp b/kstars/kstars/timezonerule.cpp
index 0a711f57..bde98482 100644
--- a/kstars/kstars/timezonerule.cpp
+++ b/kstars/kstars/timezonerule.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "timezonerule.h"
 #include "kstarsdatetime.h"
diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp
index 74370a74..9a95e188 100644
--- a/kstars/kstars/tools/altvstime.cpp
+++ b/kstars/kstars/tools/altvstime.cpp
@@ -17,7 +17,7 @@
 
 #include <tqlayout.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
 #include <kpushbutton.h>
diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp
index 3383a1b8..bd9d2037 100644
--- a/kstars/kstars/tools/astrocalc.cpp
+++ b/kstars/kstars/tools/astrocalc.cpp
@@ -33,7 +33,7 @@
 #include "modcalcequinox.h"
 #include "modcalcvlsr.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlistview.h>
 #include <tqtextview.h>
 
diff --git a/kstars/kstars/tools/jmoontool.cpp b/kstars/kstars/tools/jmoontool.cpp
index 7d7add93..5d45fb27 100644
--- a/kstars/kstars/tools/jmoontool.cpp
+++ b/kstars/kstars/tools/jmoontool.cpp
@@ -18,7 +18,7 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jmoontool.h"
 #include "jupitermoons.h"
diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp
index 3e2e2ee6..907f72ff 100644
--- a/kstars/kstars/tools/kstarsplotwidget.cpp
+++ b/kstars/kstars/tools/kstarsplotwidget.cpp
@@ -17,8 +17,8 @@
 
 #include <math.h> //for log10(), pow(), modf()
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index 425a9513..ff86b542 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "lcgenerator.h"
diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp
index cf1c886a..1a13ddf1 100644
--- a/kstars/kstars/tools/modcalcangdist.cpp
+++ b/kstars/kstars/tools/modcalcangdist.cpp
@@ -24,9 +24,9 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include <tdeapplication.h> ..already included in modcalcapcoord.h
 
diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp
index 578f3e56..c50b7b9c 100644
--- a/kstars/kstars/tools/modcalcapcoord.cpp
+++ b/kstars/kstars/tools/modcalcapcoord.cpp
@@ -31,9 +31,9 @@
 #include <tqdatetimeedit.h>  //needed for TQTimeEdit
 #include <klineedit.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include <tdeapplication.h> ..already included in modcalcapcoord.h
 
diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp
index 8cd37816..04a03904 100644
--- a/kstars/kstars/tools/modcalcazel.cpp
+++ b/kstars/kstars/tools/modcalcazel.cpp
@@ -33,7 +33,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcAzel::modCalcAzel(TQWidget *parentSplit, const char *name) : modCalcAzelDlg (parentSplit,name) {
diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp
index d2852dd9..33aa83ae 100644
--- a/kstars/kstars/tools/modcalceclipticcoords.cpp
+++ b/kstars/kstars/tools/modcalceclipticcoords.cpp
@@ -28,11 +28,11 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcEclCoords::modCalcEclCoords(TQWidget *parentSplit, const char *name) : modCalcEclCoordsDlg(parentSplit,name) {
diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp
index 143e3341..50fbd979 100644
--- a/kstars/kstars/tools/modcalcequinox.cpp
+++ b/kstars/kstars/tools/modcalcequinox.cpp
@@ -29,7 +29,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp
index 4d2bee71..8c555b68 100644
--- a/kstars/kstars/tools/modcalcgalcoord.cpp
+++ b/kstars/kstars/tools/modcalcgalcoord.cpp
@@ -27,11 +27,11 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcGalCoord::modCalcGalCoord(TQWidget *parentSplit, const char *name) : modCalcGalCoordDlg(parentSplit,name) {
diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp
index cf4ce051..fb54a23b 100644
--- a/kstars/kstars/tools/modcalcgeodcoord.cpp
+++ b/kstars/kstars/tools/modcalcgeodcoord.cpp
@@ -31,10 +31,10 @@
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <knumvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcGeodCoord::modCalcGeodCoord(TQWidget *parentSplit, const char *name) : modCalcGeodCoordDlg(parentSplit,name) {
diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp
index 9b982664..ec25aff6 100644
--- a/kstars/kstars/tools/modcalcjd.cpp
+++ b/kstars/kstars/tools/modcalcjd.cpp
@@ -25,8 +25,8 @@
 #include <tqdatetimeedit.h>  //need for TQTimeEdit
 #include <tqradiobutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "kstarsdatetime.h"
 
diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp
index 68731825..e1c8b070 100644
--- a/kstars/kstars/tools/modcalcplanets.cpp
+++ b/kstars/kstars/tools/modcalcplanets.cpp
@@ -33,7 +33,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp
index 4f5c7bb3..d489f1b0 100644
--- a/kstars/kstars/tools/modcalcprec.cpp
+++ b/kstars/kstars/tools/modcalcprec.cpp
@@ -25,11 +25,11 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) {
 
diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp
index ad3da401..8d38f257 100644
--- a/kstars/kstars/tools/modcalcsidtime.cpp
+++ b/kstars/kstars/tools/modcalcsidtime.cpp
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dmsbox.h"
 #include "modcalcsidtime.h"
diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp
index 885ce1c2..ffe6ed29 100644
--- a/kstars/kstars/tools/modcalcvlsr.cpp
+++ b/kstars/kstars/tools/modcalcvlsr.cpp
@@ -34,7 +34,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcVlsr::modCalcVlsr(TQWidget *parentSplit, const char *name) : modCalcVlsrDlg (parentSplit,name) {
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index e40ccaa0..be2ec6f4 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -30,9 +30,9 @@
 #include <kicontheme.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <klineedit.h>
 
 #include "observinglist.h"
diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp
index b43c0adc..64ed25b9 100644
--- a/kstars/kstars/tools/planetviewer.cpp
+++ b/kstars/kstars/tools/planetviewer.cpp
@@ -19,8 +19,8 @@
 #include <tqfile.h>
 #include <tqlayout.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "planetviewer.h"
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 088babd2..e4e02fdf 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
@@ -30,9 +30,9 @@
 #include <tdelistview.h>
 #include <kprocess.h>
 #include <ktextedit.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdatewidget.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kstdguiitem.h>
 #include <kstandarddirs.h>
diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp
index 74ad75e7..632f6254 100644
--- a/kstars/kstars/tools/wutdialog.cpp
+++ b/kstars/kstars/tools/wutdialog.cpp
@@ -32,7 +32,7 @@
 #include "ksmoon.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistbox.h>
 #include <kpushbutton.h>
 
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index c25bd26c..a92c0b4e 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -25,12 +25,12 @@
 //#include <tqimevent.h>
 
 // KDE Header
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <tdeconfigdialog.h>
diff --git a/ktouch/src/ktouchchartwidget.cpp b/ktouch/src/ktouchchartwidget.cpp
index 43e3642a..f519616b 100644
--- a/ktouch/src/ktouchchartwidget.cpp
+++ b/ktouch/src/ktouchchartwidget.cpp
@@ -15,7 +15,7 @@
 
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <numeric>  // for mathematical functions
 #include <cmath>
diff --git a/ktouch/src/ktouchcoloreditor.cpp b/ktouch/src/ktouchcoloreditor.cpp
index 26784fa2..8fee8e91 100644
--- a/ktouch/src/ktouchcoloreditor.cpp
+++ b/ktouch/src/ktouchcoloreditor.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KTouchColorEditor::KTouchColorEditor(TQWidget* parent, const char* name, bool modal, WFlags fl)
 : KTouchColorEditorDlg(parent,name, modal,fl)
diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp
index 4a8d38f6..faf47602 100644
--- a/ktouch/src/ktouchcolorscheme.cpp
+++ b/ktouch/src/ktouchcolorscheme.cpp
@@ -16,8 +16,8 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #define WRITE_COLOR(z,x,y) 	e = doc.createElement(x); \
diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp
index 300b3482..9d8a6c9a 100644
--- a/ktouch/src/ktouchkeyboard.cpp
+++ b/ktouch/src/ktouchkeyboard.cpp
@@ -15,9 +15,9 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "prefs.h"
 
diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp
index c0d71736..579f8a69 100644
--- a/ktouch/src/ktouchkeyboardeditor.cpp
+++ b/ktouch/src/ktouchkeyboardeditor.cpp
@@ -16,9 +16,9 @@
 #include <tqlabel.h>
 #include <tqfont.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <klineedit.h>
 #include <ktextedit.h>
diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp
index 75edfb9e..9b29233e 100644
--- a/ktouch/src/ktouchkeyboardwidget.cpp
+++ b/ktouch/src/ktouchkeyboardwidget.cpp
@@ -19,11 +19,11 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "prefs.h"
 #include "ktouchkeyconnector.h"
diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp
index 6285a843..ce834df5 100644
--- a/ktouch/src/ktouchlecture.cpp
+++ b/ktouch/src/ktouchlecture.cpp
@@ -18,8 +18,8 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 bool KTouchLecture::load(TQWidget * window, const KURL& url) {
diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp
index c9eff2eb..513a740a 100644
--- a/ktouch/src/ktouchlectureeditor.cpp
+++ b/ktouch/src/ktouchlectureeditor.cpp
@@ -19,10 +19,10 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ksqueezedtextlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tdefontdialog.h>
 #include <tdefiledialog.h>
diff --git a/ktouch/src/ktouchleveldata.cpp b/ktouch/src/ktouchleveldata.cpp
index de9b1257..913618a4 100644
--- a/ktouch/src/ktouchleveldata.cpp
+++ b/ktouch/src/ktouchleveldata.cpp
@@ -13,7 +13,7 @@
 #include "ktouchleveldata.h"
 #include <tqiodevice.h>
 #include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqstringlist.h>
 
diff --git a/ktouch/src/ktouchopenrequest.cpp b/ktouch/src/ktouchopenrequest.cpp
index 59f7e605..a9100945 100644
--- a/ktouch/src/ktouchopenrequest.cpp
+++ b/ktouch/src/ktouchopenrequest.cpp
@@ -18,10 +18,10 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "ktouchopenrequest.h"
 #include "ktouchopenrequest.moc"
diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp
index 563485c3..0cfdeb2e 100644
--- a/ktouch/src/ktouchstatistics.cpp
+++ b/ktouch/src/ktouchstatistics.cpp
@@ -26,8 +26,8 @@
 #include <kpushbutton.h>
 #include <kcombobox.h>
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ktabwidget.h>
 
diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp
index 67e1dac5..4e9d0ef9 100644
--- a/ktouch/src/ktouchstatisticsdata.cpp
+++ b/ktouch/src/ktouchstatisticsdata.cpp
@@ -18,8 +18,8 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #ifdef HAVE_SSTREAM
diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp
index b13b3a30..568e25c5 100644
--- a/ktouch/src/ktouchtrainer.cpp
+++ b/ktouch/src/ktouchtrainer.cpp
@@ -18,7 +18,7 @@
 
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kaudioplayer.h>
 #include <tqmessagebox.h>
diff --git a/ktouch/src/prefs.kcfgc b/ktouch/src/prefs.kcfgc
index 8589875f..46104570 100644
--- a/ktouch/src/prefs.kcfgc
+++ b/ktouch/src/prefs.kcfgc
@@ -1,6 +1,6 @@
 # Code generation options for tdeconfig_compiler
 File=ktouch.kcfg
-IncludeFiles=kglobalsettings.h
+IncludeFiles=tdeglobalsettings.h
 ClassName=Prefs
 Singleton=true
 Mutators=true
diff --git a/kturtle/src/canvas.cpp b/kturtle/src/canvas.cpp
index c0b3910a..5d14ead3 100644
--- a/kturtle/src/canvas.cpp
+++ b/kturtle/src/canvas.cpp
@@ -56,8 +56,8 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "settings.h"
 #include "canvas.h"
diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp
index b5ea954c..1690ca02 100644
--- a/kturtle/src/dialogs.cpp
+++ b/kturtle/src/dialogs.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeapplication.h>   
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dialogs.h"
 
diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp
index b834f887..9268eab1 100644
--- a/kturtle/src/executer.cpp
+++ b/kturtle/src/executer.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "executer.h"
 
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 9a9b374a..e2080af1 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -34,9 +34,9 @@
 #include <tdefiledialog.h>
 #include <kimageio.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdemenubar.h>
 #include <kprinter.h>
 #include <ksavefile.h>
 #include <kstatusbar.h>
diff --git a/kturtle/src/lexer.cpp b/kturtle/src/lexer.cpp
index ae6f3d61..ab8d5e43 100644
--- a/kturtle/src/lexer.cpp
+++ b/kturtle/src/lexer.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "settings.h"
 
diff --git a/kturtle/src/parser.cpp b/kturtle/src/parser.cpp
index 07a33aea..77de3b04 100644
--- a/kturtle/src/parser.cpp
+++ b/kturtle/src/parser.cpp
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "parser.h"
 
diff --git a/kturtle/src/translate.cpp b/kturtle/src/translate.cpp
index 10ad2b07..6aa3b7da 100644
--- a/kturtle/src/translate.cpp
+++ b/kturtle/src/translate.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "settings.h"
 
diff --git a/kturtle/src/value.cpp b/kturtle/src/value.cpp
index be0e0531..652b4739 100644
--- a/kturtle/src/value.cpp
+++ b/kturtle/src/value.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
  
 #include "value.h"
 
diff --git a/kverbos/kverbos/kerfassen.cpp b/kverbos/kverbos/kerfassen.cpp
index 36037670..af5756ef 100644
--- a/kverbos/kverbos/kerfassen.cpp
+++ b/kverbos/kverbos/kerfassen.cpp
@@ -24,7 +24,7 @@
 #include <tqtabwidget.h>
 //#include <tqvaluelist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include "verbspanish.h"
 
diff --git a/kverbos/kverbos/kerfassen.h b/kverbos/kverbos/kerfassen.h
index b1a3a74f..8e264986 100644
--- a/kverbos/kverbos/kerfassen.h
+++ b/kverbos/kverbos/kerfassen.h
@@ -18,7 +18,7 @@
 #ifndef KERFASSEN_H
 #define KERFASSEN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "qerfassen.h"
 #include "verbspanish.h"
diff --git a/kverbos/kverbos/kresult.cpp b/kverbos/kverbos/kresult.cpp
index 2eb5b6c1..92a85ecf 100644
--- a/kverbos/kverbos/kresult.cpp
+++ b/kverbos/kverbos/kresult.cpp
@@ -21,7 +21,7 @@
 #include <tqlistview.h>
 #include <tqvaluestack.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KResult::KResult(KVerbosUser* pU, TQWidget* parent, const char* name, bool modal, WFlags fl )
 : QResult(parent, name, modal, fl)
diff --git a/kverbos/kverbos/kstartuplogo.cpp b/kverbos/kverbos/kstartuplogo.cpp
index 1a376f54..4b95c3f5 100644
--- a/kverbos/kverbos/kstartuplogo.cpp
+++ b/kverbos/kverbos/kstartuplogo.cpp
@@ -18,7 +18,7 @@
 #include "kstartuplogo.h"
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 TDEStartupLogo::TDEStartupLogo(TQWidget * parent, const char *name)
 : TQWidget(parent,name,WStyle_Customize | WStyle_NoBorder  )
diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp
index 05eb4e25..608f6b33 100644
--- a/kverbos/kverbos/kverbosdoc.cpp
+++ b/kverbos/kverbos/kverbosdoc.cpp
@@ -24,8 +24,8 @@
 #include <tqmessagebox.h>
 
 // include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 // application specific includes
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
index 26834bea..5ca5de2f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
@@ -26,8 +26,8 @@
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "blockoptions.h"
 #include "prefs.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 6cdcbb54..dc18ac4e 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -23,11 +23,11 @@
 #include <tqlistview.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <krestrictedline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index 5def838a..197208d5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -31,12 +31,12 @@
 #include <tqfileinfo.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <dcopclient.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "languageoptions.h"
 #include "kvoctraincore.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
index ca79f2d5..31a5f768 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
@@ -29,7 +29,7 @@
 #include <tqstringlist.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "pasteoptions.h"
 #include "prefs.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
index a782fd00..f898f754 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
@@ -20,9 +20,9 @@
 #include <tqpushbutton.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "profilesdialog.h"
 #include "groupoptions.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
index b54d60f6..271bde65 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
@@ -29,7 +29,7 @@
 #include <tqcombobox.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "thresholdoptions.h"
 #include "QueryManager.h"
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
index e928c578..9fcb088d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
index 0900145d..48692758 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
@@ -33,7 +33,7 @@
 #include <tqtabwidget.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <kvoctraindoc.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
index a9d255e6..646358f1 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
@@ -28,7 +28,7 @@
 
 #include "LangPropPage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index c499bf55..7d90f04b 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 1bd2bb8d..2e6e893c 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -29,8 +29,8 @@
 
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <QueryManager.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
index 6ef9175c..f7a30bf3 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
@@ -27,7 +27,7 @@
 
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqmultilineedit.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index ec15df05..9b126b17 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqpushbutton.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index fb2a5709..7e6dad66 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
index 9b983386..e4ce0679 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@@ -35,7 +35,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 4fa57bad..5fbcc71f 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -34,7 +34,7 @@
 #include <twinmodule.h>
 
 #include <langset.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 EntryDlg::EntryDlg(
   TDEMainWindow   *main,
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
index 5f751d17..a4bb55f1 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
@@ -32,7 +32,7 @@
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <QueryManager.h>
 #include <langset.h>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index 4f086cb2..a7661be0 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define KV_MAX_HORIZ  20
 #define KV_FONTSIZE   14
diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h
index 6f704913..727a970e 100644
--- a/kvoctrain/kvoctrain/kv_resource.h
+++ b/kvoctrain/kvoctrain/kv_resource.h
@@ -32,7 +32,7 @@
 #include <config.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ///////////////////////////////////////////////////////////////////
 // kv_resource.h  -- contains macros used for commands
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
index d441cc2e..881fbed1 100644
--- a/kvoctrain/kvoctrain/kva_clip.cpp
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
@@ -29,7 +29,7 @@
 #include <tqclipboard.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "prefs.h"
 #include <algorithm>
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index 04988b9b..e7e716a8 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -34,7 +34,7 @@
 
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index f016aa73..e8a40734 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -36,7 +36,7 @@
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "prefs.h"
 
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index b3c2fddf..2d11c055 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -32,7 +32,7 @@
 #include <kprogress.h>
 #include <tderecentdocument.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <knewstuff/downloaddialog.h>
diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp
index e181936f..48c024f0 100644
--- a/kvoctrain/kvoctrain/kva_query.cpp
+++ b/kvoctrain/kvoctrain/kva_query.cpp
@@ -25,7 +25,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kvoctrain.h"
 #include "query-dialogs/RandomQueryDlg.h"
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index bc2ff5ba..5bcd011f 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -29,7 +29,7 @@
 #include <kprogress.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kprinter.h>
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index b8b191c1..60e30731 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -38,8 +38,8 @@
 #include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <krandomsequence.h>
 
 // application specific includes
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index cc0e9d17..e9447654 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -28,10 +28,10 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
index b3d54a0b..641a6852 100644
--- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
@@ -26,8 +26,8 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 
 #include "kvoctraintableitem.h"
 
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index bc179283..600f27a7 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -32,7 +32,7 @@
 
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
index 7abb9b80..3baf5d6e 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <iostream>
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
index 9180d6e4..9a6a8591 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
@@ -26,7 +26,7 @@
 
 #include "UsageManager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #include <iostream>
diff --git a/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp b/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
index 1119d011..e2b3a83d 100644
--- a/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
@@ -25,7 +25,7 @@
 
 #include "grammarmanager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Conjugation::conjug_name_t
 Conjugation::names [] =
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index 6684b834..d48a7ebe 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kvoctrain.h"
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
index 30b451b4..aa158466 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@@ -24,8 +24,8 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kvoctraindoc.h"
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index 7a0d5a50..3f33b25f 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -28,8 +28,8 @@
 #include "UsageManager.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 bool kvoctrainDoc::extract_T_DESCR_attr (XmlReader &xml,
                                          XmlElement &elem, int &no)
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
index f4443ca5..91eb36e3 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
@@ -26,7 +26,7 @@
 
 #include "QueryManager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
index 90cb7cb3..11842642 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
@@ -25,7 +25,7 @@
 
 #include "QueryManager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtextcodec.h>
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
index 84c800d3..a3eca8e4 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
@@ -23,9 +23,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kvoctraindoc.h"
 #include "kvoctraincore.h"
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
index 38e773a7..bd916cb9 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@@ -21,9 +21,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "kvoctraindoc.h"
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index ee4eaa14..5d0ec824 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -29,9 +29,9 @@
 #include "kvoctraindoc.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include <tqfileinfo.h>
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
index a22b06e7..42e47edc 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
@@ -26,7 +26,7 @@
 #ifndef KVOCTRAINEXPR_H
 #define KVOCTRAINEXPR_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define KV_MAX_GRADE       7
 #define KV_MIN_GRADE       0
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp
index 83bdd14a..38338e43 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.cpp
+++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp
@@ -13,9 +13,9 @@
 #include <tqdir.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knewstuff/entry.h>
 
 #include "kvoctrain.h"
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index 8ea6b762..11db0aa3 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -27,7 +27,7 @@
 
 # include <tdecmdlineargs.h>
 # include <tdeaboutdata.h>
-# include <klocale.h>
+# include <tdelocale.h>
 
 int main(int argc, char* argv[]) {
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
index 713cce35..0fb0ec89 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 #include <tqtimer.h>
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
index 33df5b81..1912d7b3 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
@@ -29,7 +29,7 @@
 #include <kv_resource.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kprogress.h>
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
index 973f8606..42a578f0 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kprogress.h>
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index d70b92ed..075965d2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -31,7 +31,7 @@
 
 #include <LineList.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *parent, const char *name, bool modal)
   : KDialogBase(Swallow, caption, User1|User2, NoDefault, parent, name, modal, false,
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index 25720d33..42debac2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -29,7 +29,7 @@
 #include <kv_resource.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kprogress.h>
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index a823d638..c5b40d09 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -34,7 +34,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 SimpleQueryDlg::SimpleQueryDlg(
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
index 54a2c865..e7868a9e 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 #include <tqtimer.h>
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index c1d114d5..d5be9e90 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -32,7 +32,7 @@
 using namespace std;
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #define KVD_VERS_PREFIX " v"     //#include "kvoctraindoc.h"
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
index 7fd6bbb0..24eb87bf 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
@@ -29,7 +29,7 @@
 #include "StatistikPage.h"
 #include "GenStatPage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <langset.h>
 #include <kvoctraindoc.h>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index fa4fc59a..ae34d191 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -26,7 +26,7 @@
 #include "StatistikPage.h"
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <kvoctraindoc.h>
diff --git a/kwordquiz/src/dlglanguage.cpp b/kwordquiz/src/dlglanguage.cpp
index bfc033ad..b840760a 100644
--- a/kwordquiz/src/dlglanguage.cpp
+++ b/kwordquiz/src/dlglanguage.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
  
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 
diff --git a/kwordquiz/src/dlgrc.cpp b/kwordquiz/src/dlgrc.cpp
index 9fa996e3..540b910b 100644
--- a/kwordquiz/src/dlgrc.cpp
+++ b/kwordquiz/src/dlgrc.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krestrictedline.h>
 
 #include "dlgrc.h"
diff --git a/kwordquiz/src/dlgsort.cpp b/kwordquiz/src/dlgsort.cpp
index 20221468..b06891ec 100644
--- a/kwordquiz/src/dlgsort.cpp
+++ b/kwordquiz/src/dlgsort.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
 
diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp
index 79dd2da0..da993afc 100644
--- a/kwordquiz/src/dlgspecchar.cpp
+++ b/kwordquiz/src/dlgspecchar.cpp
@@ -18,7 +18,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharselect.h>
 #include <kdebug.h>
 
diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp
index 36640b89..3e150a34 100644
--- a/kwordquiz/src/flashview.cpp
+++ b/kwordquiz/src/flashview.cpp
@@ -17,7 +17,7 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 
 #include "kwordquiz.h"
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 6abf0e02..d876ff38 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -21,10 +21,10 @@
 #include <tqcheckbox.h>
 
 // include files for KDE
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kedittoolbar.h>
 #include <kstandarddirs.h> //locate
 #include <tdefontdialog.h>
diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp
index c024969c..0ac33d27 100644
--- a/kwordquiz/src/kwordquizdoc.cpp
+++ b/kwordquiz/src/kwordquizdoc.cpp
@@ -18,8 +18,8 @@
 // include files for TQt
 
 // include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include "keduvocdata.h"
 
diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp
index 1047a280..0f8a13c7 100644
--- a/kwordquiz/src/kwordquizprefs.cpp
+++ b/kwordquiz/src/kwordquizprefs.cpp
@@ -22,11 +22,11 @@
 #include <tqlistview.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <krestrictedline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp
index 4b1f1cfc..5fbf5be6 100644
--- a/kwordquiz/src/kwordquizview.cpp
+++ b/kwordquiz/src/kwordquizview.cpp
@@ -22,10 +22,10 @@
 #include <tqlineedit.h>
 
 // include files for KDE
-#include <klocale.h> //i18n
-#include <kmessagebox.h> // always useful
+#include <tdelocale.h> //i18n
+#include <tdemessagebox.h> // always useful
 #include <krandomsequence.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <knotifyclient.h>
 
 // application specific includes
diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp
index c2af5aae..c8bd08e1 100644
--- a/kwordquiz/src/kwqnewstuff.cpp
+++ b/kwordquiz/src/kwqnewstuff.cpp
@@ -18,9 +18,9 @@
 #include <tqdir.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knewstuff/entry.h>
 
 #include "kwordquiz.h"
diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp
index 4a8e11b8..d1de930a 100644
--- a/kwordquiz/src/multipleview.cpp
+++ b/kwordquiz/src/multipleview.cpp
@@ -20,7 +20,7 @@
 #include <tqradiobutton.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 
 #include "kwordquiz.h"
diff --git a/kwordquiz/src/prefcardappearance.cpp b/kwordquiz/src/prefcardappearance.cpp
index ae968059..2347d313 100644
--- a/kwordquiz/src/prefcardappearance.cpp
+++ b/kwordquiz/src/prefcardappearance.cpp
@@ -14,7 +14,7 @@
 
 #include <tdefontrequester.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "prefcardappearance.h"
 
diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp
index 6a5af0aa..8b8d7842 100644
--- a/kwordquiz/src/qaview.cpp
+++ b/kwordquiz/src/qaview.cpp
@@ -19,7 +19,7 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <knotifyclient.h>
 
diff --git a/kwordquiz/src/wqlreader.cpp b/kwordquiz/src/wqlreader.cpp
index 7eef97c7..b917913f 100644
--- a/kwordquiz/src/wqlreader.cpp
+++ b/kwordquiz/src/wqlreader.cpp
@@ -17,8 +17,8 @@
 #include <tqtextstream.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "wqlreader.h"
 
diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp
index 997da802..148d298b 100644
--- a/kwordquiz/src/wqprintdialogpage.cpp
+++ b/kwordquiz/src/wqprintdialogpage.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "wqprintdialogpage.h"
 
diff --git a/libtdeedu/extdate/extcalendarsystem.cpp b/libtdeedu/extdate/extcalendarsystem.cpp
index 98bf1818..79679e38 100644
--- a/libtdeedu/extdate/extcalendarsystem.cpp
+++ b/libtdeedu/extdate/extcalendarsystem.cpp
@@ -27,10 +27,10 @@
 // systems.
 // Also default gregorian and factory classes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "extcalendarsystem.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 class ExtCalendarSystemPrivate
 {
diff --git a/libtdeedu/extdate/extcalendarsystemgregorian.cpp b/libtdeedu/extdate/extcalendarsystemgregorian.cpp
index c37b7c6d..469d0151 100644
--- a/libtdeedu/extdate/extcalendarsystemgregorian.cpp
+++ b/libtdeedu/extdate/extcalendarsystemgregorian.cpp
@@ -27,7 +27,7 @@
 // Just a schema.
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "extcalendarsystemgregorian.h"
diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index 720ab775..5a6d13f6 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -27,7 +27,7 @@
 #include <tqpopupmenu.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdetoolbar.h>
 #include <kdebug.h>
diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp
index 3efcfdbd..5d92ebd6 100644
--- a/libtdeedu/extdate/extdatetime.cpp
+++ b/libtdeedu/extdate/extdatetime.cpp
@@ -16,8 +16,8 @@
 #include "extdatetime.h"
 #include <tqregexp.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <assert.h>
 #include <time.h>
diff --git a/libtdeedu/tdeeduplot/kplotaxis.cpp b/libtdeedu/tdeeduplot/kplotaxis.cpp
index 69af4673..ca1b0e0e 100644
--- a/libtdeedu/tdeeduplot/kplotaxis.cpp
+++ b/libtdeedu/tdeeduplot/kplotaxis.cpp
@@ -17,7 +17,7 @@
 
 #include <tqpainter.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kplotaxis.h"
 
 KPlotAxis::KPlotAxis() : m_visible(true), m_labelFieldWidth(0), m_labelFmt('g'),
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp
index 2ea46848..50443f2f 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.cpp
+++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp
@@ -10,11 +10,11 @@
 #include "tdeeduglossary.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
 #include <kstandarddirs.h>