diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index ba77c3d3..32833dfd 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -16,12 +16,12 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 #include <kprocess.h>
 #include <kservice.h>
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index 436316f6..28549efc 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -9,8 +9,8 @@
 #include <kurlrequester.h>
 #include <kservice.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>
diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp
index d7c6e3e6..ce8fe262 100644
--- a/buildtools/autotools/addapplicationdlg.cpp
+++ b/buildtools/autotools/addapplicationdlg.cpp
@@ -21,8 +21,8 @@
 #include <klineedit.h>
 #include <kdebug.h>
 #include <kicondialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 
 #include "autolistviewitems.h"
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 1fe346aa..6af3be99 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kprocess.h>
 
diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp
index 5e6be576..20dbf41b 100644
--- a/buildtools/autotools/addexistingfilesdlg.cpp
+++ b/buildtools/autotools/addexistingfilesdlg.cpp
@@ -32,7 +32,7 @@
 #include <kprogress.h>
 #include <kprocess.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kiconview.h>
 #include <ksqueezedtextlabel.h>
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index 34108fb3..926fa370 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksqueezedtextlabel.h>
 #include <kurl.h>
 
diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp
index 965d3b4e..7491c70e 100644
--- a/buildtools/autotools/addicondlg.cpp
+++ b/buildtools/autotools/addicondlg.cpp
@@ -15,7 +15,7 @@
 #include <tqlabel.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kicontheme.h>
diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp
index f37b6626..807abb41 100644
--- a/buildtools/autotools/addprefixdlg.cpp
+++ b/buildtools/autotools/addprefixdlg.cpp
@@ -16,7 +16,7 @@
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index e8e47c98..c5a36dfc 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include <kicondialog.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservicetype.h>
 
 #include "autolistviewitems.h"
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index 373a3861..ef61cd3a 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -21,7 +21,7 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "autolistviewitems.h"
 
diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp
index d2a832c1..21de4bd0 100644
--- a/buildtools/autotools/addtargetdlg.cpp
+++ b/buildtools/autotools/addtargetdlg.cpp
@@ -17,8 +17,8 @@
 #include <tqvalidator.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksqueezedtextlabel.h>
 
 #include "autolistviewitems.h"
diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp
index 2498a73e..c1a10eb9 100644
--- a/buildtools/autotools/addtranslationdlg.cpp
+++ b/buildtools/autotools/addtranslationdlg.cpp
@@ -22,8 +22,8 @@
 #include <tqstrlist.h>
 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 82c7a22c..91b6d75c 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -27,7 +27,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdepopupmenu.h>
 
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 1606873e..940c9924 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -37,9 +37,9 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdeversion.h>
 #include <kprocess.h>
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index a6341b0b..b8e1b700 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kregexp.h>
 #include <kurl.h>
 #include <tdefile.h>
diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h
index 8ad8bf7e..f827d93b 100644
--- a/buildtools/autotools/autoprojectwidget.h
+++ b/buildtools/autotools/autoprojectwidget.h
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "makefilehandler.h"
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 0015f688..8353e2ea 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -24,9 +24,9 @@
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index ef33ae14..8b59545f 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -30,7 +30,7 @@
 #include <kdialog.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
 #include <kurl.h>
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 53f3cb3c..944c8aab 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -24,8 +24,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <ktrader.h>
 
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index 842358e4..c10db050 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -28,13 +28,13 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 #include <kdebug.h>
 
 #include "fileselectorwidget.h"
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kcombiview.h>
 #include <tdefilepreview.h>
 #include <tdefileview.h>
diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h
index 67becdc7..a03ad906 100644
--- a/buildtools/autotools/fileselectorwidget.h
+++ b/buildtools/autotools/fileselectorwidget.h
@@ -31,7 +31,7 @@
 #include <tdefileview.h>
 #include <tdefileitem.h>
 
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class AutoProjectPart;
 class SubprojectItem;
diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp
index bf5296cd..d696ab2e 100644
--- a/buildtools/autotools/kimporticonview.cpp
+++ b/buildtools/autotools/kimporticonview.cpp
@@ -19,8 +19,8 @@
 #include <tqrect.h>
 #include <tqwidget.h>
 
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kwordwrap.h>
 
 #include "kimporticonview.h"
diff --git a/buildtools/autotools/managecustomcommand.cpp b/buildtools/autotools/managecustomcommand.cpp
index af0f0e93..6ee60cb7 100644
--- a/buildtools/autotools/managecustomcommand.cpp
+++ b/buildtools/autotools/managecustomcommand.cpp
@@ -20,7 +20,7 @@
 
 #include <tqtable.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name)
     :ManageCustomBuildCommandsBase(parent, name)
diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp
index 6bf6da27..dd501818 100644
--- a/buildtools/autotools/removetargetdlg.cpp
+++ b/buildtools/autotools/removetargetdlg.cpp
@@ -31,7 +31,7 @@
 #include <tdelistbox.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "autolistviewitems.h"
 
diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp
index f25a3958..a7871b7d 100644
--- a/buildtools/autotools/subprojectoptionsdlg.cpp
+++ b/buildtools/autotools/subprojectoptionsdlg.cpp
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <keditlistbox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kservice.h>
 #include <kurlrequesterdlg.h>
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index bc81ef30..e8e0c248 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -23,7 +23,7 @@
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <tdefiledialog.h>
 #include "autolistviewitems.h"
diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp
index 354e8777..6a12cdfb 100644
--- a/buildtools/custommakefiles/custommakeconfigwidget.cpp
+++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp
@@ -24,7 +24,7 @@
 #include <tqvalidator.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <environmentvariableswidget.h>
 
diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp
index 6c09541b..85f77d52 100644
--- a/buildtools/custommakefiles/custommanagerwidget.cpp
+++ b/buildtools/custommakefiles/custommanagerwidget.cpp
@@ -22,7 +22,7 @@
 #include <kurlcompletion.h>
 #include <tdefiledialog.h>
 #include <keditlistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "customprojectpart.h"
diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp
index 67f168c2..945d7c91 100644
--- a/buildtools/custommakefiles/customotherconfigwidget.cpp
+++ b/buildtools/custommakefiles/customotherconfigwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqgroupbox.h>
 #include <tqvalidator.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <environmentvariableswidget.h>
 
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 889e68b3..92f2fe24 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -33,9 +33,9 @@
 #include <keditlistbox.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp
index ce418ad4..a223c87a 100644
--- a/buildtools/custommakefiles/selectnewfilesdialog.cpp
+++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp
@@ -16,7 +16,7 @@
 #include <tdelistview.h>
 #include <tqheader.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "selectnewfilesdialogbase.h"
 
diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp
index 23cc9b57..b395a375 100644
--- a/buildtools/lib/widgets/addenvvardlg.cpp
+++ b/buildtools/lib/widgets/addenvvardlg.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp
index b3f31ce9..f02d5b56 100644
--- a/buildtools/lib/widgets/addfilesdialog.cpp
+++ b/buildtools/lib/widgets/addfilesdialog.cpp
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <tqcombobox.h>
diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp
index 079f436e..19b072d1 100644
--- a/buildtools/lib/widgets/runoptionswidget.cpp
+++ b/buildtools/lib/widgets/runoptionswidget.cpp
@@ -19,7 +19,7 @@
 
 #include "runoptionswidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 3c5cddcd..01b0734a 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -19,12 +19,12 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 #include <kservice.h>
 #include <tdeconfig.h>
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index e878eec5..9c7c2518 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -11,8 +11,8 @@
 #include <kurlrequester.h>
 #include <kservice.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>
diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp
index 267bd471..dfb8683a 100644
--- a/buildtools/qmake/createscopedlg.cpp
+++ b/buildtools/qmake/createscopedlg.cpp
@@ -16,8 +16,8 @@
 #include <tqcheckbox.h>
 #include <tdefile.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurlcompletion.h>
 
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp
index a74b0793..e2ebe9a2 100644
--- a/buildtools/qmake/projectconfigurationdlg.cpp
+++ b/buildtools/qmake/projectconfigurationdlg.cpp
@@ -42,8 +42,8 @@
 #include <tqtabwidget.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "trollprojectwidget.h"
 #include "trollprojectpart.h"
diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp
index e0e7fa63..8c34c34b 100644
--- a/buildtools/qmake/qmakedefaultopts.cpp
+++ b/buildtools/qmake/qmakedefaultopts.cpp
@@ -12,7 +12,7 @@
 #include "qmakedefaultopts.h"
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqregexp.h>
 #include <kprocess.h>
 
diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp
index 36c3d5e2..70e9a6ba 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -18,7 +18,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 
diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index 2c862fb3..6cf86bf8 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -23,8 +23,8 @@
 
 #include <kdirwatch.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 #include "urlutil.h"
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 50e12595..bd3b5c1a 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdirwatch.h>
 #include <kstatusbar.h>
 #include <tqmessagebox.h>
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 0e0ca572..c7d21796 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -43,7 +43,7 @@
 #include <tqtooltip.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kregexp.h>
 #include <kurl.h>
diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h
index fdc6ce74..a3ced6a1 100644
--- a/buildtools/qmake/trollprojectwidget.h
+++ b/buildtools/qmake/trollprojectwidget.h
@@ -27,7 +27,7 @@
 #include <tqvbox.h>
 #include <tqtoolbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <tqbutton.h>
 #include <tqfileinfo.h>
diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp
index da17fda1..3ac3fc9f 100644
--- a/buildtools/script/scriptnewfiledlg.cpp
+++ b/buildtools/script/scriptnewfiledlg.cpp
@@ -20,8 +20,8 @@
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
index 89c38abb..dd5a4f25 100644
--- a/buildtools/script/scriptprojectpart.cpp
+++ b/buildtools/script/scriptprojectpart.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdevgenericfactory.h>
 #include <kdevcreatefile.h>
 #include <kdirwatch.h>
diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp
index 0ebe4136..a9a4339a 100644
--- a/editors/editor-chooser/editorchooser_part.cpp
+++ b/editors/editor-chooser/editorchooser_part.cpp
@@ -2,7 +2,7 @@
 
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
 
diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
index c9565118..873cd01d 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@@ -6,7 +6,7 @@
 #include <tdeaction.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"
diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 51593ca0..33f0c4bf 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -47,7 +47,7 @@
 #include <tqstyle.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQAction *ActionDrag::the_action = 0;
 
diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp
index 84514875..294507a9 100644
--- a/kdevdesigner/designer/actioneditorimpl.cpp
+++ b/kdevdesigner/designer/actioneditorimpl.cpp
@@ -43,7 +43,7 @@
 #include <tqpopupmenu.h>
 #include <tqobjectlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ActionEditor::ActionEditor( TQWidget* parent,  const char* name, WFlags fl )
     : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ),
diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp
index 3bce8872..3e8c95c2 100644
--- a/kdevdesigner/designer/actionlistview.cpp
+++ b/kdevdesigner/designer/actionlistview.cpp
@@ -28,7 +28,7 @@
 #include "actionlistview.h"
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ActionListView::ActionListView( TQWidget *parent, const char *name )
     : TQListView( parent, name )
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index 71707900..b9b97827 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -58,7 +58,7 @@
 
 #include "kdevdesigner_part.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CommandHistory::CommandHistory( int s )
     : current( -1 ), steps( s ), savedAt( -1 )
diff --git a/kdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp
index 2448f92d..834fdc96 100644
--- a/kdevdesigner/designer/connectiontable.cpp
+++ b/kdevdesigner/designer/connectiontable.cpp
@@ -26,7 +26,7 @@
 
 #include "connectiontable.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConnectionTable::ConnectionTable( TQWidget *parent, const char *name )
     : TQTable( 0, 4, parent, name )
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index f923f604..f417f6f2 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp
@@ -53,7 +53,7 @@
 #include <tqtextcodec.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
     : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw )
diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp
index b5b4409f..e589679b 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionsimpl.cpp
@@ -40,7 +40,7 @@
 #include "mainwindow.h"
 #include "asciivalidator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static bool blockChanges = FALSE;
 
diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp
index 1f39da2c..5681f00b 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/kdevdesigner/designer/editfunctionsimpl.cpp
@@ -47,7 +47,7 @@
 #include <tqheader.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
     : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw )
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index c893b42f..4ba5b7c7 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -44,7 +44,7 @@
 #include <tqapplication.h>
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevdesigner_part.h"
 
 static TQString make_func_pretty( const TQString &s )
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index b4e681da..4e5bc09d 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevdesigner_part.h"
 
 #include <tqevent.h>
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index a5357072..c6433cd0 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/kdevdesigner/designer/hierarchyview.cpp
@@ -44,7 +44,7 @@
 
 #include <kiconloader.h>
 #include "kdevdesigner_part.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpalette.h>
 #include <tqobjectlist.h>
diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp
index a5781e89..32a81412 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.cpp
+++ b/kdevdesigner/designer/iconvieweditorimpl.cpp
@@ -35,7 +35,7 @@
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
     : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw )
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 758dd1f4..ac966d00 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -26,7 +26,7 @@
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tqfile.h>
@@ -238,7 +238,7 @@ void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act
 // 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*  KDevDesignerPartFactory::s_instance = 0L;
 TDEAboutData* KDevDesignerPartFactory::s_about = 0L;
diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp
index db3ddcc8..01dfa64e 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/kdevdesigner/designer/listboxeditorimpl.cpp
@@ -38,7 +38,7 @@
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
     : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw )
diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp
index bd6c0e64..c5ec7498 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/kdevdesigner/designer/listvieweditorimpl.cpp
@@ -44,7 +44,7 @@
 #include <tqpushbutton.h>
 #include <tqptrstack.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw )
     : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw )
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 062ef52b..3d900532 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -82,7 +82,7 @@
 #include "designeraction.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqinputdialog.h>
 #include <tqtoolbar.h>
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index 17583ecf..7fa1d1f7 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -28,7 +28,7 @@
 
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include <stdlib.h>
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 0618b078..f62e15e0 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -37,7 +37,7 @@
 #include "menubareditor.h"
 #include "popupmenueditor.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w );
 
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index c883da66..ef06f77b 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/kdevdesigner/designer/multilineeditorimpl.cpp
@@ -44,7 +44,7 @@
 #include <tqaction.h>
 #include <tqmetaobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar,
 			  const TQString &label, const TQString &tagstr,
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index e6bfbfec..0cdc738b 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -39,7 +39,7 @@
 
 #include <kiconloader.h>
 #include "kdevdesigner_part.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqiconview.h>
 #include <tqlabel.h>
diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp
index c38483a8..a23c14a7 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/kdevdesigner/designer/outputwindow.cpp
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static TQTextEdit *debugoutput = 0;
 bool debugToStderr = FALSE;
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h
index c999d539..82bd7929 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /**********************************************************************
 ** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index ab6e6d97..da6289dd 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -47,7 +47,7 @@
 #include "popupmenueditor.h"
 #include "menubareditor.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Drag Object Declaration -------------------------------------------
 
diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp
index 23bcbfe2..0ab26894 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -59,7 +59,7 @@
 # include <unistd.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifndef TQT_NO_SQL
 DatabaseConnection::~DatabaseConnection()
diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp
index ca6c34ea..99bb800d 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/kdevdesigner/designer/projectsettingsimpl.cpp
@@ -35,7 +35,7 @@
 #include "workspace.h"
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include <tqtextedit.h>
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 2f2d1221..e7a5d387 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -46,7 +46,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevdesigner_part.h"
 
 #include <tqpainter.h>
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 02b50684..a6285db5 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -83,7 +83,7 @@
 
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevdesigner_part.h"
 
diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp
index f9daaefc..d60f223b 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/kdevdesigner/designer/sizehandle.cpp
@@ -33,7 +33,7 @@
 #include <tqwidget.h>
 #include <tqapplication.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
     : TQWidget( parent )
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index 9713fed9..3d848bbf 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SourceFile::SourceFile( const TQString &fn, bool temp, Project *p )
     : filename( fn ), ed( 0 ), fileNameTemp( temp ),
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index b6f62ad2..adff44fd 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -24,7 +24,7 @@
 #include "startdialogimpl.h"
 #include "designerapp.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FileDialog::FileDialog( const TQString &dir, TQWidget *parent )
     : TQFileDialog( dir, TQString(), parent )
diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp
index 0013398c..060611f6 100644
--- a/kdevdesigner/designer/tableeditorimpl.cpp
+++ b/kdevdesigner/designer/tableeditorimpl.cpp
@@ -44,7 +44,7 @@
 #include "metadatabase.h"
 #include "mainwindow.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
     : TableEditorBase( parent, name, modal, fl ),
diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp
index 82461e91..d2d7ef67 100644
--- a/kdevdesigner/designer/variabledialogimpl.cpp
+++ b/kdevdesigner/designer/variabledialogimpl.cpp
@@ -37,7 +37,7 @@
 #include "command.h"
 #include "variabledialogimpl.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent )
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index d27cfc30..9d04535a 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -100,7 +100,7 @@
 #include <globaldefs.h>
 #include <tqobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FormWindow *find_formwindow( TQWidget *w )
 {
diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp
index d791d783..c4c4f83d 100644
--- a/kdevdesigner/designer/wizardeditorimpl.cpp
+++ b/kdevdesigner/designer/wizardeditorimpl.cpp
@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqinputdialog.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
     : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )
diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp
index 5845e516..b806cc6c 100644
--- a/kdevdesigner/designer/workspace.cpp
+++ b/kdevdesigner/designer/workspace.cpp
@@ -51,7 +51,7 @@
 #include <tqtextstream.h>
 #include "qcompletionedit.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
     : TQListViewItem( parent )
diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp
index a8c7803b..be4b6091 100644
--- a/kdevdesigner/shared/widgetdatabase.cpp
+++ b/kdevdesigner/shared/widgetdatabase.cpp
@@ -44,7 +44,7 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 const int dbsize = 300;
 const int dbcustom = 200;
diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp
index fb90e0e0..f846e99b 100644
--- a/kdevdesigner/src/kdevdesigner.cpp
+++ b/kdevdesigner/src/kdevdesigner.cpp
@@ -33,9 +33,9 @@
 #include <kstdaction.h>
 
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KDevDesigner::KDevDesigner()
     : KParts::MainWindow( 0L, "KDevDesigner" )
diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp
index b26498a6..fa850cf6 100644
--- a/kdevdesigner/src/main.cpp
+++ b/kdevdesigner/src/main.cpp
@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 static const char description[] =
diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index a215a89b..aac02610 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -10,7 +10,7 @@
 #include <kgenericfactory.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 15a87ef3..1f2d984e 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -35,7 +35,7 @@
 #include <tdetexteditor/markinterfaceextension.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 848623c8..9f1be201 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -13,7 +13,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index 3faf0e97..e004d0f3 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -27,7 +27,7 @@
 #include <kdevpartcontroller.h>
 #include <kdevcreatefile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp
index 5bdeec39..cf1d3ae6 100644
--- a/languages/cpp/app_templates/dcopservice/main.cpp
+++ b/languages/cpp/app_templates/dcopservice/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "%{APPNAMELC}.h"
 
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index 9daebf13..774efe8e 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -8,8 +8,8 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>
diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp
index c700800b..16c05a3f 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/kapp/appview.cpp
@@ -9,9 +9,9 @@
 
 #include <ktrader.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 %{APPNAME}View::%{APPNAME}View(TQWidget *parent)
     : TQWidget(parent),
diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp
index 294a7490..8c2cc07f 100644
--- a/languages/cpp/app_templates/kapp/main.cpp
+++ b/languages/cpp/app_templates/kapp/main.cpp
@@ -5,7 +5,7 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp
index ff83190f..669f591c 100644
--- a/languages/cpp/app_templates/kapp/pref.cpp
+++ b/languages/cpp/app_templates/kapp/pref.cpp
@@ -2,7 +2,7 @@
 
 #include "pref.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index a1cb79d7..4d80a74c 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -3,7 +3,7 @@
 #include "plugin_%{APPNAMELC}.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 class PluginView : public KXMLGUIClient
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h
index 2e715e4e..847e6175 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.h
@@ -12,7 +12,7 @@
 #include <kate/viewmanager.h>
 
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KatePluginFactory : public KLibFactory
 {
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 888e76ab..8845fae3 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -3,7 +3,7 @@
 #include "plugin_%{APPNAMELC}.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index f47140bf..80fb0103 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -14,7 +14,7 @@
 #include <kate/pluginconfiginterfaceextension.h>
 
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class %{APPNAME}ConfigPage;
 
diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp
index 9d9e482a..af95aa15 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4view.cpp
@@ -2,7 +2,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <TQtGui/TQLabel>
 
 %{APPNAME}View::%{APPNAME}View(TQWidget *)
diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp
index d6508e90..5c2fa627 100644
--- a/languages/cpp/app_templates/kdedcop/app.cpp
+++ b/languages/cpp/app_templates/kdedcop/app.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 %{APPNAME}::%{APPNAME}()
     : TDEMainWindow( 0, "%{APPNAME}" )
diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp
index aed5e904..283ab5cf 100644
--- a/languages/cpp/app_templates/kdedcop/main.cpp
+++ b/languages/cpp/app_templates/kdedcop/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index 0d6a5775..559a931b 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -4,7 +4,7 @@
 #include <tqtimer.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdevcore.h>
 #include <kdevpartcontroller.h>
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index e9843bd8..aa950c8a 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -5,11 +5,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index e9843bd8..aa950c8a 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -5,11 +5,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 
diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp
index 01373881..3a9f51ef 100644
--- a/languages/cpp/app_templates/khello/app.cpp
+++ b/languages/cpp/app_templates/khello/app.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 %{APPNAME}::%{APPNAME}()
     : TDEMainWindow( 0, "%{APPNAME}" )
diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp
index f141c87f..45936529 100644
--- a/languages/cpp/app_templates/khello/main.cpp
+++ b/languages/cpp/app_templates/khello/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");
diff --git a/languages/cpp/app_templates/khello2/app.cpp b/languages/cpp/app_templates/khello2/app.cpp
index a952bfb6..b5f24d3e 100644
--- a/languages/cpp/app_templates/khello2/app.cpp
+++ b/languages/cpp/app_templates/khello2/app.cpp
@@ -1,7 +1,7 @@
 %{CPP_TEMPLATE}
 
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}widget.h"
diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp
index f9e68a34..ba30a9dd 100644
--- a/languages/cpp/app_templates/khello2/main.cpp
+++ b/languages/cpp/app_templates/khello2/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");
diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp
index cb7b4ecd..f0b6fc1b 100644
--- a/languages/cpp/app_templates/kicker/applet.cpp
+++ b/languages/cpp/app_templates/kicker/applet.cpp
@@ -1,11 +1,11 @@
 %{CPP_TEMPLATE}
 
 #include <tqlcdnumber.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "%{APPNAMELC}.h"
 
diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp
index 5c0d534f..f62a1c23 100644
--- a/languages/cpp/app_templates/kmake/app.cpp
+++ b/languages/cpp/app_templates/kmake/app.cpp
@@ -2,7 +2,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "mainviewimp.h"
 
 static const char description[] =    I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp
index 8a0de706..02a4682f 100644
--- a/languages/cpp/app_templates/kmake/mainviewimp.cpp
+++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp
@@ -1,7 +1,7 @@
 
 #include "mainviewimp.h"
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl)
 : MainView(parent,name,fl)
diff --git a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
index 8a141a5e..b1ac0f5a 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
@@ -7,7 +7,7 @@
 #define %{APPNAME}_ABOUTDATA
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program");
 static const char version[]     = "%{VERSION}";
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
index f0173476..db665500 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
@@ -7,9 +7,9 @@
 #include <%{APPNAMELC}_aboutdata.h>
 #include <kinstance.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 extern "C"
 {
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index 50633e04..6e2c943c 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -10,7 +10,7 @@
 #include <tqiconset.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 %{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name )
diff --git a/languages/cpp/app_templates/kofficepart/main.cpp b/languages/cpp/app_templates/kofficepart/main.cpp
index 98369dde..52bd02ff 100644
--- a/languages/cpp/app_templates/kofficepart/main.cpp
+++ b/languages/cpp/app_templates/kofficepart/main.cpp
@@ -7,7 +7,7 @@
 #include <koDocument.h>
 #include <koMainWindow.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "%{APPNAMELC}_aboutdata.h"
 
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 7c5154a6..759cbf5a 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -12,9 +12,9 @@
 #include <kstdaction.h>
 
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 %{APPNAME}::%{APPNAME}()
     : KParts::MainWindow( 0L, "%{APPNAME}" )
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 937a7702..adf210b3 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -5,8 +5,8 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
@@ -146,7 +146,7 @@ void %{APPNAME}Part::fileSaveAs()
 // 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*  %{APPNAME}PartFactory::s_instance = 0L;
 TDEAboutData* %{APPNAME}PartFactory::s_about = 0L;
diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp
index 755813f0..83266630 100644
--- a/languages/cpp/app_templates/kpartapp/main.cpp
+++ b/languages/cpp/app_templates/kpartapp/main.cpp
@@ -3,7 +3,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index 25e8861a..c395d983 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -4,9 +4,9 @@
 #include <tdehtml_part.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name )
     : Plugin( parent, name )
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index dfd6024d..00e1adea 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -10,11 +10,11 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <ktip.h>
diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp
index 2bcc9c6a..ba4d91d6 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp
@@ -3,7 +3,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 
 %{APPNAME}View::%{APPNAME}View(TQWidget *parent)
diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp
index b257c85f..34ccd79e 100644
--- a/languages/cpp/app_templates/kscons_kxt/main.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 73e1492d..cde31592 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -7,8 +7,8 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 20f5f3fb..c63cb223 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -8,7 +8,7 @@
 #include <tqtoolbutton.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ktip.h>
 #include <tdeparts/part.h>
 #include <tdeparts/partmanager.h>
@@ -23,14 +23,14 @@
 #include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 #include <tdeactionclasses.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktabwidget.h>
 #include <kedittoolbar.h>
 #include <tdeversion.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
index a9b9845e..1feb1b8b 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
@@ -4,11 +4,11 @@
 #include <tqlayout.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemdichildview.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "%{APPNAMELC}tdemdiView.h"
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
index 253f45dc..32a00043 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "%{APPNAMELC}tdemdi.h"
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
index 0eab6525..229c28a8 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
@@ -6,7 +6,7 @@
 #include <tdeparts/part.h>
 #include <kate/document.h>
 #include <kate/view.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <kurl.h>
 
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index 85df8854..ecdd5127 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -10,11 +10,11 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 
diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp
index 30d627fe..dd770ad0 100644
--- a/languages/cpp/app_templates/kxt/appview.cpp
+++ b/languages/cpp/app_templates/kxt/appview.cpp
@@ -3,7 +3,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 
 %{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp
index 928ddc33..4fc87301 100644
--- a/languages/cpp/app_templates/kxt/main.cpp
+++ b/languages/cpp/app_templates/kxt/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/noatunui/plugin_app.cpp b/languages/cpp/app_templates/noatunui/plugin_app.cpp
index a98ab7a6..5f46e83e 100644
--- a/languages/cpp/app_templates/noatunui/plugin_app.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_app.cpp
@@ -1,8 +1,8 @@
 
 #include "plugin_%{APPNAMELC}_impl.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 7bb93d70..150e829d 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -18,8 +18,8 @@
 
 #include <tdepopupmenu.h>
 #include <kstatusbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
 //#include <tdefiledialog.h>
diff --git a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
index ae60d277..cb98499c 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
+++ b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
@@ -5,8 +5,8 @@
 #include "plugin_%{APPNAMELC}.h"
 #include "plugin_%{APPNAMELC}_impl.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/languages/cpp/app_templates/tdecmodule/module.cpp b/languages/cpp/app_templates/tdecmodule/module.cpp
index 52203d1a..00426cad 100644
--- a/languages/cpp/app_templates/tdecmodule/module.cpp
+++ b/languages/cpp/app_templates/tdecmodule/module.cpp
@@ -2,8 +2,8 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeparts/genericfactory.h>
 
 #include "%{APPNAMELC}.h"
diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp
index d9313146..1aab14b5 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/app.cpp
@@ -8,8 +8,8 @@
 
 #include <tdeaction.h>
 #include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kstatusbar.h>
 
diff --git a/languages/cpp/app_templates/tdeconfig35/appview.cpp b/languages/cpp/app_templates/tdeconfig35/appview.cpp
index 30d627fe..dd770ad0 100644
--- a/languages/cpp/app_templates/tdeconfig35/appview.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/appview.cpp
@@ -3,7 +3,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 
 %{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
diff --git a/languages/cpp/app_templates/tdeconfig35/main.cpp b/languages/cpp/app_templates/tdeconfig35/main.cpp
index 928ddc33..4fc87301 100644
--- a/languages/cpp/app_templates/tdeconfig35/main.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/tdeioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp
index d8c7fcb4..8bf85fee 100644
--- a/languages/cpp/app_templates/tdeioslave/slave.cpp
+++ b/languages/cpp/app_templates/tdeioslave/slave.cpp
@@ -13,11 +13,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ksock.h>
 
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
index f1e4fb3e..0d2bf1ff 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
@@ -4,10 +4,10 @@
 #include <tqcheckbox.h>
 #include <tqcolor.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}ui.h"
 
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index 8bfc3bba..caa167f4 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -15,7 +15,7 @@
 #include <tqstringlist.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index 31e06204..99a6db12 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -27,8 +27,8 @@
 // kde includes
 #include <kdevproject.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdefileitem.h>
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index cf090adf..23e8a551 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "flagboxes.h"
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index 2b42ce89..97cc66e1 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -12,7 +12,7 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 3b867dc8..09ad4bd8 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -41,9 +41,9 @@ email                : david.nolden.tdevelop@art-master.de
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <kstatusbar.h>
 #include <tdetexteditor/document.h>
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index f0986c2b..de747571 100644
--- a/languages/cpp/cppimplementationwidget.cpp
+++ b/languages/cpp/cppimplementationwidget.cpp
@@ -26,8 +26,8 @@
 #include <tqregexp.h>
 #include <tqdom.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index 8cd37938..e22d1d66 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -29,8 +29,8 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqcombobox.h>
 #include <tqlistview.h>
 #include <tqpopupmenu.h>
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 3d435843..7c126fc2 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -70,14 +70,14 @@
 #include <tqregexp.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp
index 7190e796..ace72d14 100644
--- a/languages/cpp/creategettersetterconfiguration.cpp
+++ b/languages/cpp/creategettersetterconfiguration.cpp
@@ -16,7 +16,7 @@
 #include <domutil.h>
 
 #include <tqdom.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" );
 
 CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part ) 
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 6349971c..6cebf32d 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -31,7 +31,7 @@
 #include <tdeapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 #include <klineedit.h>
 
diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp
index 1b6efdaf..f0bfb48d 100644
--- a/languages/cpp/debugger/breakpoint.cpp
+++ b/languages/cpp/debugger/breakpoint.cpp
@@ -17,7 +17,7 @@
 #include "gdbcontroller.h"
 #include "gdbcommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfileinfo.h>
diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h
index 4927d9b9..32ba84a2 100644
--- a/languages/cpp/debugger/breakpoint.h
+++ b/languages/cpp/debugger/breakpoint.h
@@ -16,7 +16,7 @@
 #ifndef _BREAKPOINT_H_
 #define _BREAKPOINT_H_
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqobject.h>
 #include <tqstring.h>
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index fd85999f..385b0c39 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -17,14 +17,14 @@
 
 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqframe.h>
 #include <tqlabel.h>
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index cee864c1..42c1857f 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -19,7 +19,7 @@
 
 #include <kdockwindow.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <twin.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 3ff54246..d57b6d6f 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -25,12 +25,12 @@
 #include <tdefiledialog.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>
diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp
index 6bf70f3b..90657b29 100644
--- a/languages/cpp/debugger/debuggertracingdialog.cpp
+++ b/languages/cpp/debugger/debuggertracingdialog.cpp
@@ -7,7 +7,7 @@
 #include <tqcheckbox.h>
 #include <klineedit.h>
 #include <keditlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace GDBDebugger
 {
diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp
index 9f6bc185..83dd9cb5 100644
--- a/languages/cpp/debugger/disassemblewidget.cpp
+++ b/languages/cpp/debugger/disassemblewidget.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <ktextedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqdict.h>
 #include <tqheader.h>
diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp
index 773e6a4a..ea0fa552 100644
--- a/languages/cpp/debugger/framestackwidget.cpp
+++ b/languages/cpp/debugger/framestackwidget.cpp
@@ -17,9 +17,9 @@
 #include "gdbparser.h"
 #include "gdbcommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqheader.h>
 #include <tqlistbox.h>
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index ab54deb0..2e002a7a 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -24,10 +24,10 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqvbuttongroup.h>
 #include <tqfileinfo.h>
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index 2588892c..d5207a24 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -27,9 +27,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <twin.h>
 
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index 4a8b30d3..9bfc96dd 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqlabel.h>
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 81340ea5..e76d2820 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -19,8 +19,8 @@
 
 #include <kbuttonbox.h>
 #include <klineedit.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 #include <kdebug.h>
@@ -36,7 +36,7 @@
 #include <tqtoolbox.h>
 #include <tqtextedit.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <khexedit/byteseditinterface.h>
 
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index bc36f191..23635bdd 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -64,7 +64,7 @@
 #include <tqstring.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 7df6b64c..7906ceb5 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -33,12 +33,12 @@
 #include <tqregexp.h>
 #include <tqcursor.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpoint.h>
 #include <tqclipboard.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <cctype>
 #include <set>
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index 79a119df..10a289de 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -182,7 +182,7 @@
     <tocsect3 name="GtkList" url="gtk/gttdelist.html"/>
     <tocsect3 name="GtkListItem" url="gtk/gttdelistitem.html"/>
     <tocsect3 name="GtkMenu" url="gtk/gtkmenu.html"/>
-    <tocsect3 name="GtkMenuBar" url="gtk/gtkmenubar.html"/>
+    <tocsect3 name="GtkMenuBar" url="gtk/gttdemenubar.html"/>
     <tocsect3 name="GtkMenuItem" url="gtk/gtkmenuitem.html"/>
     <tocsect3 name="GtkMenuShell" url="gtk/gtkmenushell.html"/>
     <tocsect3 name="GtkMisc" url="gtk/gtkmisc.html"/>
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index fd29416c..089b57ec 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -30,7 +30,7 @@
 #include "kurl.h" /* defines KURL */
 #include "tqdir.h" /* defines TQDir */
 #include "tqregexp.h" /* defines TQRegExp */
-#include "klocale.h" /* defines [function] i18n */
+#include "tdelocale.h" /* defines [function] i18n */
 #include "blockingkprocess.h" /* defines BlockingTDEProcess */
 #include "includepathresolver.h"
 #include <sys/stat.h>
diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp
index 4ea75fca..4a6c45ec 100644
--- a/languages/cpp/kdevdriver.cpp
+++ b/languages/cpp/kdevdriver.cpp
@@ -1,4 +1,4 @@
-#include "klocale.h" /* defines [function] i18n */
+#include "tdelocale.h" /* defines [function] i18n */
 #include <lexer.h>
 
 #include "kdevdriver.h"
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index 84583e81..68f0678e 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -18,8 +18,8 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include <keditlistbox.h>
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index 97066fcc..7880b8e4 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -14,7 +14,7 @@
 #include "settingsdialog.h"
 
 #include <kgenericfactory.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kdebug.h>
 
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
index 1aa90dc0..ff786557 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
@@ -17,8 +17,8 @@
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqdir.h>
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index 1c05d5e8..6839c93b 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -17,8 +17,8 @@
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqdir.h>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
index 7ce54167..b1d84440 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
@@ -19,8 +19,8 @@
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqdir.h>
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index bc26f64a..8696f891 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -35,7 +35,7 @@
 #include <tdetexteditor/view.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index c87d0266..2354b67d 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -23,9 +23,9 @@
 #include <tqpair.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/view.h>
diff --git a/languages/cpp/setuphelper.cpp b/languages/cpp/setuphelper.cpp
index d91c508f..3d868c61 100644
--- a/languages/cpp/setuphelper.cpp
+++ b/languages/cpp/setuphelper.cpp
@@ -14,7 +14,7 @@
 #include "blockingkprocess.h"
 #include "driver.h"
 #include <kdebug.h>
-#include "ktempfile.h" /* defines [function] KTempDir */
+#include "tdetempfile.h" /* defines [function] KTempDir */
 #include "kstandarddirs.h" /* defines [function] locateLocal */
 #include "tqdir.h" /* defines TQDir */
 #include <stdio.h>
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index b1d9087c..db3f9c79 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -15,7 +15,7 @@
 #include "simpletype.h"
 #include "safetycounter.h"
 #include "simpletypefunction.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQMap<TQString, TQString> BuiltinTypes::m_types;
 BuiltinTypes builtin; //Needed so BuiltinTypes::BuiltinTypes is called and the types are initialized
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index 5d3ed2be..0982226c 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -33,7 +33,7 @@
 #include <tqdom.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tdeconfig.h>
diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp
index 146beb08..c4b90f51 100644
--- a/languages/cpp/typedesc.cpp
+++ b/languages/cpp/typedesc.cpp
@@ -23,7 +23,7 @@
 #include "parser.h"
 #include <tqtextstream.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 const char* TypeDesc::functionMark = "[function] ";
 
diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp
index d9d2e548..3b1c9450 100644
--- a/languages/csharp/csharpdoc.cpp
+++ b/languages/csharp/csharpdoc.cpp
@@ -7,12 +7,12 @@
 
 #include <tqtextstream.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace TDEIO;
 
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 110d8005..9c124167 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <codemodel.h>
 #include <tqprogressbar.h>
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
index b4a72a94..7d87387f 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
@@ -17,7 +17,7 @@
 #include <tqvbox.h>
 #include <tqvbuttongroup.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "pgioptionsplugin.h"
 
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index 66774f06..13c21b52 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -27,8 +27,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kregexp.h>
 #include <kdevgenericfactory.h>
diff --git a/languages/fortran/ftnchetdeconfigwidget.cpp b/languages/fortran/ftnchetdeconfigwidget.cpp
index 6fa68605..de42014b 100644
--- a/languages/fortran/ftnchetdeconfigwidget.cpp
+++ b/languages/fortran/ftnchetdeconfigwidget.cpp
@@ -17,7 +17,7 @@
 #include <tqlistview.h>
 #include <tqradiobutton.h>
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index dd2325d1..ef0510d3 100644
--- a/languages/java/configproblemreporter.ui.h
+++ b/languages/java/configproblemreporter.ui.h
@@ -7,7 +7,7 @@
 *****************************************************************************/
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 void ConfigureProblemReporter::init()
 {
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 7217e3fd..2b5daf11 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -40,13 +40,13 @@
 #include <tqregexp.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 42a044ff..72e1f83f 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -34,7 +34,7 @@
 #include <tdetexteditor/view.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index c2314350..436e0a95 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -20,7 +20,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeaction.h>
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index a6f3f916..4a3dbc25 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -24,7 +24,7 @@
 #include <tqpopupmenu.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdevcore.h>
 #include <kdevpartcontroller.h>
diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp
index 12ec0179..513e0180 100644
--- a/languages/kjssupport/subclassingdlg.cpp
+++ b/languages/kjssupport/subclassingdlg.cpp
@@ -32,7 +32,7 @@
 #include <tqdom.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tdeconfig.h>
diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp
index 69b7a128..bc8356b7 100644
--- a/languages/lib/debugger/debugger.cpp
+++ b/languages/lib/debugger/debugger.cpp
@@ -2,7 +2,7 @@
 #include "debugger.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetexteditor/document.h>
 
 // #include "editorproxy.h"
diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp
index 4e8344a6..be228352 100644
--- a/languages/lib/designer_integration/implementationwidget.cpp
+++ b/languages/lib/designer_integration/implementationwidget.cpp
@@ -28,8 +28,8 @@
 #include <tqradiobutton.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 
 #include <kdevproject.h>
diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp
index d798ba77..c7495949 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.cpp
+++ b/languages/lib/designer_integration/qtdesignerintegration.cpp
@@ -23,9 +23,9 @@
 #include <tqregexp.h>
 #include <tqfileinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 #include <rurl.h>
diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
index 9738e3c9..8a8ffc54 100644
--- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
+++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
@@ -12,7 +12,7 @@
 #include <tqdialog.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "dccoptionsplugin.h"
diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp
index 94c8b35c..306fe5a0 100644
--- a/languages/pascal/compiler/dccoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqspinbox.h>
 #include <tqlabel.h>
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
index 567d5c86..0b01fb01 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 #include <tqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "optiontabs.h"
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
index 445ab826..86c77cda 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqspinbox.h>
 #include <tqlabel.h>
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index 14f58b35..69cbebf8 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index c3feb684..89638cec 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -32,7 +32,7 @@
 #include <tdetexteditor/markinterfaceextension.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>
diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp
index 85aee7b3..4255d633 100644
--- a/languages/perl/perldoc.cpp
+++ b/languages/perl/perldoc.cpp
@@ -7,12 +7,12 @@
 
 #include <tqtextstream.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace TDEIO;
 
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index 4b670d81..a5ee0c0f 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <codemodel.h>
 #include <tqprogressbar.h>
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 704afb0d..156595c7 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -34,7 +34,7 @@
 #include <tdetexteditor/view.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index 4e5b7c43..e97147cc 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <tqregexp.h>
 #include <tqtextedit.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kdebug.h>
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 48d9e5f2..d25afffd 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -36,8 +36,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kregexp.h>
 #include <kstatusbar.h>
diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp
index c021b368..bcb38b1e 100644
--- a/languages/python/pydoc.cpp
+++ b/languages/python/pydoc.cpp
@@ -10,8 +10,8 @@
 #include <kinstance.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace TDEIO;
 
diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp
index 94835226..ad8d0157 100644
--- a/languages/python/pythonimplementationwidget.cpp
+++ b/languages/python/pythonimplementationwidget.cpp
@@ -26,8 +26,8 @@
 #include <tqtextstream.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <filetemplate.h>
 #include <kdevlanguagesupport.h>
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index 9cb0257a..4301a3f4 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -32,7 +32,7 @@
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 #include "qtdesignerpythonintegration.h"
diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp
index 4d7b28a5..cb905f29 100644
--- a/languages/python/qtdesignerpythonintegration.cpp
+++ b/languages/python/qtdesignerpythonintegration.cpp
@@ -22,9 +22,9 @@
 #include <tqpair.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/view.h>
diff --git a/languages/ruby/debugger/breakpoint.cpp b/languages/ruby/debugger/breakpoint.cpp
index 8504ce93..cdffc0cf 100644
--- a/languages/ruby/debugger/breakpoint.cpp
+++ b/languages/ruby/debugger/breakpoint.cpp
@@ -21,7 +21,7 @@
 
 #include "breakpoint.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfileinfo.h>
 #include <tqfontmetrics.h>
diff --git a/languages/ruby/debugger/breakpoint.h b/languages/ruby/debugger/breakpoint.h
index a184f33b..77daf5b7 100644
--- a/languages/ruby/debugger/breakpoint.h
+++ b/languages/ruby/debugger/breakpoint.h
@@ -22,7 +22,7 @@
 #ifndef _BREAKPOINT_H_
 #define _BREAKPOINT_H_
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 
diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp
index e5fb76d0..bfe27c8f 100644
--- a/languages/ruby/debugger/dbgpsdlg.cpp
+++ b/languages/ruby/debugger/dbgpsdlg.cpp
@@ -23,8 +23,8 @@
 
 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index de750ba0..c9283d98 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -25,7 +25,7 @@
 
 #include <kdockwindow.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <twin.h>
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 2994387a..9a47fc8b 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -28,12 +28,12 @@
 #include <tdefiledialog.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>
diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp
index 5d3a606e..9cbce258 100644
--- a/languages/ruby/debugger/framestackwidget.cpp
+++ b/languages/ruby/debugger/framestackwidget.cpp
@@ -22,7 +22,7 @@
 #include "framestackwidget.h"
 #include "rdbparser.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqheader.h>
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index f28ea1de..d7e73c82 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurl.h>
 
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index 3bb6392b..9abc42ae 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -40,9 +40,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 #include <tqdatetime.h>
diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp
index 5e67752d..7f2d58aa 100644
--- a/languages/ruby/debugger/rdboutputwidget.cpp
+++ b/languages/ruby/debugger/rdboutputwidget.cpp
@@ -27,7 +27,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp
index 28fc9b95..e2ed413c 100644
--- a/languages/ruby/debugger/stty.cpp
+++ b/languages/ruby/debugger/stty.cpp
@@ -63,7 +63,7 @@
 #include <tqstring.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 83945d3e..f03007ec 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqregexp.h>
 #include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpoint.h>
 #include <tqclipboard.h>
diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp
index f2412739..a7759f12 100644
--- a/languages/ruby/qtdesignerrubyintegration.cpp
+++ b/languages/ruby/qtdesignerrubyintegration.cpp
@@ -23,9 +23,9 @@
 #include <tqpair.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/view.h>
diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp
index 9b11be96..44355c45 100644
--- a/languages/ruby/rubyimplementationwidget.cpp
+++ b/languages/ruby/rubyimplementationwidget.cpp
@@ -26,8 +26,8 @@
 #include <tqtextstream.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <filetemplate.h>
 #include <kdevlanguagesupport.h>
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index c3bfff85..e1745a02 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index 37aa6862..f4c74249 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -16,7 +16,7 @@
 #include <tqsqldatabase.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h
index 808ca504..c06413e7 100644
--- a/languages/sql/sqlconfigwidget.ui.h
+++ b/languages/sql/sqlconfigwidget.ui.h
@@ -13,9 +13,9 @@
 #include <tqdom.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <domutil.h>
 
diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp
index 0a3756d8..9185fc17 100644
--- a/languages/sql/sqloutputwidget.cpp
+++ b/languages/sql/sqloutputwidget.cpp
@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 #include <tqstylesheet.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "sqloutputwidget.h"
 
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 087aedba..2ecb2ec4 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -7,14 +7,14 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
 #include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kdevcore.h"
 #include "kdevmainwindow.h"
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp
index 0f5174a0..9dda06d2 100644
--- a/lib/cppparser/driver.cpp
+++ b/lib/cppparser/driver.cpp
@@ -24,7 +24,7 @@
 #include "lexer.h"
 #include "parser.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/lib/cppparser/errors.cpp b/lib/cppparser/errors.cpp
index 3fc2e697..81c15660 100644
--- a/lib/cppparser/errors.cpp
+++ b/lib/cppparser/errors.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "errors.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") );
 QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") );
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index 4863a4a1..82d43aa9 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -21,7 +21,7 @@
 #include "lookup.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 #include <tqmap.h>
diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp
index 6934675e..fb1cdac1 100644
--- a/lib/cppparser/parser.cpp
+++ b/lib/cppparser/parser.cpp
@@ -29,7 +29,7 @@
 #include <tqasciidict.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace std;
 
diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp
index b7bf4f6c..7c978d50 100644
--- a/lib/interfaces/kdevplugin.cpp
+++ b/lib/interfaces/kdevplugin.cpp
@@ -33,7 +33,7 @@
 #include "kdevplugincontroller.h"
 
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <tqdom.h>
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp
index d62cb2e7..fea82215 100644
--- a/lib/util/execcommand.cpp
+++ b/lib/util/execcommand.cpp
@@ -21,8 +21,8 @@
 
 #include <kprocess.h>
 #include <kprogress.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, 
                           const TQString& workingDir, const TQStringList& env,
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index 0b05d445..8673b58d 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "settings.h"
diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index 20242f1a..c4b44894 100644
--- a/lib/util/tdescriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -24,8 +24,8 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <scriptinterface.h>
 #include <tdeaction.h>
diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp
index d0f002be..20fc45be 100644
--- a/lib/widgets/flagboxes.cpp
+++ b/lib/widgets/flagboxes.cpp
@@ -17,7 +17,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 494764fe..76697cfa 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -6,7 +6,7 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp
index ec749bd2..33c9f733 100644
--- a/lib/widgets/kdevtabwidget.cpp
+++ b/lib/widgets/kdevtabwidget.cpp
@@ -11,8 +11,8 @@
 
 #include <tqpopupmenu.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 
diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp
index e82788de..be5b658f 100644
--- a/lib/widgets/ksavealldialog.cpp
+++ b/lib/widgets/ksavealldialog.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index 5bb0bc4e..4f1e6e83 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -23,7 +23,7 @@
 #include <tdeversion.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tqpainter.h>
 #include <tqapplication.h>
diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp
index f3bd2673..6e9c06b7 100644
--- a/lib/widgets/propeditor/pcheckbox.cpp
+++ b/lib/widgets/propeditor/pcheckbox.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index de850890..8932c4ae 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -26,7 +26,7 @@
 #include <tdefontrequester.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif
diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp
index e7980d66..452b9637 100644
--- a/lib/widgets/propeditor/ppixmapedit.cpp
+++ b/lib/widgets/propeditor/ppixmapedit.cpp
@@ -27,7 +27,7 @@
 #include <tqcursor.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index 1bf3adc9..e9bd4786 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -20,7 +20,7 @@
 #include "propertyeditor.h"
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #else
diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp
index e8390e18..882964bc 100644
--- a/lib/widgets/propeditor/propertymachinefactory.cpp
+++ b/lib/widgets/propeditor/propertymachinefactory.cpp
@@ -20,7 +20,7 @@
 #include "propertymachinefactory.h"
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #define i18n TQObject::tr
 #endif
diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp
index f4f947f5..ee91ea48 100644
--- a/lib/widgets/propeditor/psymbolcombo.cpp
+++ b/lib/widgets/propeditor/psymbolcombo.cpp
@@ -25,7 +25,7 @@
 
 #ifndef PURE_QT
 #include <kcharselect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <tqdialog.h>
diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp
index 308570be..dae82868 100644
--- a/lib/widgets/propeditor/pyesnobutton.cpp
+++ b/lib/widgets/propeditor/pyesnobutton.cpp
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif
diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp
index aba2f658..ef96e724 100644
--- a/lib/widgets/resizablecombo.cpp
+++ b/lib/widgets/resizablecombo.cpp
@@ -26,7 +26,7 @@
 #include <tqapplication.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char * resize_xpm[] = {
 "9 18 2 1",
diff --git a/lib/widgets/tdelistviewaction.cpp b/lib/widgets/tdelistviewaction.cpp
index bfd73887..978eb220 100644
--- a/lib/widgets/tdelistviewaction.cpp
+++ b/lib/widgets/tdelistviewaction.cpp
@@ -24,7 +24,7 @@
 #include <tqwhatsthis.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 TDEListViewAction::~TDEListViewAction()
 {
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 2b69c7d5..1bb9851e 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -21,7 +21,7 @@
 #include <tqvbox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kstandarddirs.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index ec876712..83247cf6 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -37,13 +37,13 @@
 #include <kiconview.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <tdefile.h>
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index 6cec2631..09c3ea17 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -16,8 +16,8 @@
 #include "appwizardpart.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kdevcore.h>
 #include <kgenericfactory.h>
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 579e0447..953a86e3 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -423,7 +423,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 
 	## ui file processing
 	def uic_processing(target, source, env):
-		inc_kde  = '#include <klocale.h>\n#include <kdialog.h>\n'
+		inc_kde  = '#include <tdelocale.h>\n#include <kdialog.h>\n'
 		inc_moc  = '#include "%s"\n' % target[2].name
 		comp_h   = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path)
 		comp_c   = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path)
diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp
index 3e946abf..a084db13 100644
--- a/parts/appwizard/filepropspage.cpp
+++ b/parts/appwizard/filepropspage.cpp
@@ -2,7 +2,7 @@
 #include <tqlistbox.h>
 #include <klineedit.h>
 #include <tqtextview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqmultilineedit.h>
 
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 9c38ccef..bd08198d 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -27,8 +27,8 @@
 #include <kdialog.h>
 #include <tdefiledialog.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <tdefile.h>
diff --git a/parts/appwizard/misc.cpp b/parts/appwizard/misc.cpp
index 5546b404..0a993345 100644
--- a/parts/appwizard/misc.cpp
+++ b/parts/appwizard/misc.cpp
@@ -12,12 +12,12 @@
 #include "misc.h"
 
 #include <tqstring.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 26a8e151..16d590ab 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -9,7 +9,7 @@
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdeparts/partmanager.h>
 #include <tdetexteditor/editinterface.h>
@@ -25,8 +25,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqlineedit.h>
 #include <tqregexp.h>
 
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index b12289c9..f7ac78cb 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdetexteditor/markinterface.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index fef9405a..cc7316c8 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevcore.h>
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index 845352fb..f803c6c1 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevlanguagesupport.h"
 #include "classstore.h"
diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp
index 56301edd..cb7d259b 100644
--- a/parts/classview/classtoolwidget.cpp
+++ b/parts/classview/classtoolwidget.cpp
@@ -14,8 +14,8 @@
 #include "classtoolwidget.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
 #include "classstore.h"
 
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index d6d75974..7fb7397f 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include "kdevcore.h"
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 3bff2daf..59d0163d 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 89c0db1e..851e8739 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -38,7 +38,7 @@
 #include <codemodel.h>
 #include <codemodel_utils.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqheader.h>
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index 6c9eeb88..68b10a2f 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -17,13 +17,13 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqtextstream.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <ktempfile.h>
+#include <tdeglobalsettings.h>
+#include <tdetempfile.h>
 #include <tdeversion.h>
 #include <kdebug.h>
 
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index bda529d5..d19f13cb 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -12,14 +12,14 @@
 #include "hierarchydlg.h"
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <tdefile.h>
 #include <tdefiledialog.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqlayout.h>
diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp
index 52afd26f..cdb5c368 100644
--- a/parts/classview/viewcombos.cpp
+++ b/parts/classview/viewcombos.cpp
@@ -18,7 +18,7 @@
  *
  */
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "tdelistviewaction.h"
diff --git a/parts/classview/viewcombos.h b/parts/classview/viewcombos.h
index 14a44eaf..ea288b1d 100644
--- a/parts/classview/viewcombos.h
+++ b/parts/classview/viewcombos.h
@@ -20,7 +20,7 @@
 #ifndef VIEWCOMBOS_H
 #define VIEWCOMBOS_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlistview.h>
 
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 95c710c4..324ded8a 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -18,7 +18,7 @@
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index 1715402b..bd1b138d 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -17,7 +17,7 @@
 
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeapplication.h>
diff --git a/parts/ctags2/ctagskinds.cpp b/parts/ctags2/ctagskinds.cpp
index 526baa31..3ea2dee5 100644
--- a/parts/ctags2/ctagskinds.cpp
+++ b/parts/ctags2/ctagskinds.cpp
@@ -11,7 +11,7 @@
 
 #include "ctagskinds.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 struct CTagsKindMapping {
     char abbrev;
diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp
index 1974f39e..3fd4b666 100644
--- a/parts/diff/diffdlg.cpp
+++ b/parts/diff/diffdlg.cpp
@@ -11,7 +11,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
  
 #include "diffdlg.h"
 #include "diffwidget.h"
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 3861f202..70e676c8 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -15,7 +15,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
@@ -24,7 +24,7 @@
 #include <tdeio/job.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index a7ab3077..b766b064 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -17,13 +17,13 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>
diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp
index b6e86da0..e8a3e11a 100644
--- a/parts/distpart/distpart_part.cpp
+++ b/parts/distpart/distpart_part.cpp
@@ -22,7 +22,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index b29b4d6c..c628fe26 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -26,11 +26,11 @@
 #include <kprocess.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevproject.h"
 #include "domutil.h"
 #include <ktar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kdevcore.h>
 #include <tqgroupbox.h>
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index a942d69e..f6cb69f2 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tqfile.h>
 #include <tqdir.h>
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 7b2945f4..f626e246 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -25,7 +25,7 @@
 
 #include <klineedit.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index 2d1c8230..532feefd 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevdocumentationplugin.h>
diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp
index 055daeb5..d2753653 100644
--- a/parts/documentation/docconfiglistview.cpp
+++ b/parts/documentation/docconfiglistview.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "docconfiglistview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevdocumentationplugin.h"
 
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index ce93d565..624236e8 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -32,7 +32,7 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 #include <kdebug.h>
 #include <tdeparts/componentfactory.h>
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index e0fb4065..b1ab69ca 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -26,7 +26,7 @@
 #include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index 879177db..5360a73f 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -24,7 +24,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 91f94af8..ebddcd4c 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -39,7 +39,7 @@
 #include "docutils.h"
 #include "contentsview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* name)
     :FindDocumentationBase(parent, name),
diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp
index 4772f27b..ef0deaca 100644
--- a/parts/documentation/find_documentation_options.cpp
+++ b/parts/documentation/find_documentation_options.cpp
@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index ad61b4f3..cae33db5 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -26,7 +26,7 @@
 
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index 5aee560e..afc9abad 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //class DocumentationItem
 
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index c23784a3..5acecce3 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdeio/netaccess.h>
 #include <iostream>
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index c187b462..dd141eba 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index 1c151777..4f2d50d6 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -29,7 +29,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index 2a06f76c..7851a516 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index c4ae9306..9a5a6912 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index 7cc7e47c..fa17549b 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -29,7 +29,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
 
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index 7d9ef39c..fc647d34 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 639232d2..65bddd1b 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 8736a549..10271524 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <urlutil.h>
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 1d208ca5..787a8f32 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -27,10 +27,10 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <kmimemagic.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "chm.h"
 
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index f985bf43..952228c4 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -18,9 +18,9 @@
 #include <tqstring.h>
 
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 8c45aea6..0beeab40 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -34,13 +34,13 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index a416fdc5..f59e29da 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -29,9 +29,9 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <tdeversion.h>
diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp
index d9e138e8..be0b2145 100644
--- a/parts/doxygen/doxygenconfigwidget.cpp
+++ b/parts/doxygen/doxygenconfigwidget.cpp
@@ -18,9 +18,9 @@
 #include <tqwhatsthis.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "config.h"
 #include "input.h"
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index 04233e25..e37774cc 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -26,10 +26,10 @@
 #include <domutil.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemainwindow.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index f9ec69a8..6059bc10 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -18,9 +18,9 @@
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "input.h"
diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp
index 8819b109..76e932cd 100644
--- a/parts/doxygen/messages.cpp
+++ b/parts/doxygen/messages.cpp
@@ -2,7 +2,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 static TQMap<TQCString,TQString> sMessages;
diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp
index 90897630..c8c1676b 100644
--- a/parts/filecreate/addglobaldlg.cpp
+++ b/parts/filecreate/addglobaldlg.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './addglobaldlg.ui'
 **
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*
  *  Constructs a AddGlobalDlg as a child of 'parent', with the
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index dc818db1..7c6fabc4 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -24,8 +24,8 @@
 #include <tdeio/netaccess.h>
 #include <kurlrequester.h>
 #include <kicondialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 
diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp
index 6dd1e35a..e82f0f99 100644
--- a/parts/filecreate/filecreate_listitem.cpp
+++ b/parts/filecreate/filecreate_listitem.cpp
@@ -12,7 +12,7 @@
 
 #include "filecreate_listitem.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <tqsimplerichtext.h>
diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp
index b4b84de1..f1a69059 100644
--- a/parts/filecreate/filecreate_newfile.cpp
+++ b/parts/filecreate/filecreate_newfile.cpp
@@ -22,9 +22,9 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 namespace FileCreate {
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 192a22f5..19deeb66 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeversion.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kdevcore.h"
 #include "kdevmainwindow.h"
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index 57fbe8f3..4638725c 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -17,7 +17,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevcore.h>
 
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index 9226edf4..377d440b 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -16,7 +16,7 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdevcore.h>
 
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 2e5a240e..965e7ef1 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -18,7 +18,7 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <kdevcore.h>
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 86998619..45b5833b 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -38,11 +38,11 @@
 
 #include <tdemainwindow.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/encodinginterface.h>
 #include <tdeparts/part.h>
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index 3e8d1f6b..a6b4a6bb 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -7,16 +7,16 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <tdeconfig.h>
 #include <tdefileitem.h>
 #include <kdevgenericfactory.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kdevapi.h>
 #include <kdevcore.h>
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index df40ab2a..fa637c43 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -57,10 +57,10 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetoolbarbutton.h>
 #include <tqtoolbar.h>
 #include <tdepopupmenu.h>
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index e47f00c9..5ff80ed9 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tdetoolbar.h>
 #include <tqframe.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class KDevMainWindow;
 class KDevPartController;
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 004411ff..935b9d86 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -28,7 +28,7 @@
 #include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdeaction.h>
 
 #include "kbookmarkhandler.h"
diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp
index a4c75543..f6fd628d 100644
--- a/parts/fileselector/tdeactionselector.cpp
+++ b/parts/fileselector/tdeactionselector.cpp
@@ -19,7 +19,7 @@
 
 #include "tdeactionselector.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h> // for spacingHint()
 #include <kdebug.h>
diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp
index 6d020332..9c1cdb03 100644
--- a/parts/fileview/addfilegroupdlg.cpp
+++ b/parts/fileview/addfilegroupdlg.cpp
@@ -13,7 +13,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp
index 17f58f9a..75682040 100644
--- a/parts/fileview/filegroupsconfigwidget.cpp
+++ b/parts/fileview/filegroupsconfigwidget.cpp
@@ -13,7 +13,7 @@
 
 #include <tqlistview.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "addfilegroupdlg.h"
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
index f0f61e51..06023d73 100644
--- a/parts/fileview/filegroupspart.cpp
+++ b/parts/fileview/filegroupspart.cpp
@@ -18,7 +18,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdialogbase.h>
 
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 31ccc10f..42978c8e 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 759b3204..af6f9e1f 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -13,7 +13,7 @@
 #include <kxmlguiclient.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 
 #include <kdevproject.h>
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index 13c5080f..07c88689 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -20,7 +20,7 @@
 #include <tqcolor.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdefileitem.h>
 #include <kurl.h>
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index a49dddf7..ae4093e1 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -22,7 +22,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdialogbase.h>
 
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index f03b3101..bf68de83 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -20,7 +20,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevversioncontrol.h"
 #include "kdevcore.h"
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index aac3fb38..450a6a58 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -14,7 +14,7 @@
 #include <tqpopupmenu.h>
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index b21cea0a..85b8494d 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -13,7 +13,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/selectioninterface.h>
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index a381098e..f3aab949 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -17,8 +17,8 @@
 #include <kbuttonbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index 7b46ff7d..d05c9a0a 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -17,8 +17,8 @@
 #include <tdeconfig.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
index fcf2a771..b60530a2 100644
--- a/parts/fullscreen/fullscreen_part.cpp
+++ b/parts/fullscreen/fullscreen_part.cpp
@@ -10,11 +10,11 @@
  ***************************************************************************/
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kstdaction.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <kdevcore.h>
 #include <kdevmainwindow.h>
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 7bd26a0f..93c1305f 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -23,9 +23,9 @@
 #include <kpushbutton.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqlabel.h>
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 2e7b63e0..fea07907 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -15,7 +15,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index f4cb34aa..a088f92c 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -15,7 +15,7 @@
 #include <tqpainter.h>
 #include <tqtoolbutton.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/selectioninterface.h>
@@ -24,7 +24,7 @@
 #include <ktabwidget.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 using namespace KTextEditor;
 
 #include "kdevcore.h"
diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp
index f7dc8956..873ab790 100644
--- a/parts/konsole/konsoleviewpart.cpp
+++ b/parts/konsole/konsoleviewpart.cpp
@@ -15,7 +15,7 @@
 
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index cabc11f4..9de22794 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdeparts/part.h>
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index b2dba9d6..ab51c6a8 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqtextstream.h>
 #include <tqclipboard.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <tdeapplication.h>
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index cfc42904..51eeb8ee 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -16,7 +16,7 @@
 #include "makeactionfilter.moc"
 #include "makeitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 //#define DEBUG
 
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index e9d53ab1..b6d618c6 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -14,7 +14,7 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdetexteditor/cursorinterface.h"
 
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 8937fa5d..c1df6522 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 4b247eed..543f97e1 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -23,10 +23,10 @@
 #include "urlutil.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kstatusbar.h>
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index 63fd15dc..d5240edb 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -12,7 +12,7 @@
 #include "partexplorer_plugin.h"
 
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index 3284a69a..76e4fc50 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -18,8 +18,8 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kservicetype.h> 
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 60bd2044..27dae954 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index 2248dfcc..f6f70701 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -23,7 +23,7 @@
 #include <kdevlanguagesupport.h>
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp
index ba2a674b..88f4ea41 100644
--- a/parts/quickopen/quickopenfiledialog.cpp
+++ b/parts/quickopen/quickopenfiledialog.cpp
@@ -23,7 +23,7 @@
 
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp
index b18da8b7..590b988f 100644
--- a/parts/quickopen/quickopenfunctionchooseform.cpp
+++ b/parts/quickopen/quickopenfunctionchooseform.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <ksqueezedtextlabel.h>
diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp
index 4a3a0888..bbcab7e4 100644
--- a/parts/quickopen/quickopenfunctiondialog.cpp
+++ b/parts/quickopen/quickopenfunctiondialog.cpp
@@ -18,14 +18,14 @@
  *
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqvaluelist.h>
 
 #include <kcompletion.h>
 #include <kdebug.h>
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include <kdevplugin.h>
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index 95988bde..eddaa84d 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -24,8 +24,8 @@
 #include <tdeversion.h>
 #include <kregexp.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index 49d8b702..12cf860c 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -11,7 +11,7 @@
 
 #include "regexptestpart.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <tdeaction.h>
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index 7dfaaaf0..447548ef 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -14,7 +14,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kdebug.h>
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index fd7da41d..6b1bcbda 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -32,7 +32,7 @@
 #include <kdevproject.h>
 #include <kdevpartcontroller.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 #include <tqlayout.h>
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index a2b8d1a3..80a33c9e 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -24,11 +24,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index ba30761f..82969151 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -11,7 +11,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tqvbox.h>
 #include <kdialogbase.h>
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 279dc18b..9cd4ae4b 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -10,14 +10,14 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <tqheader.h>
 #include <klineedit.h>
 #include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqsplitter.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/editor.h>
diff --git a/parts/snippet/snippetdlg.ui.h b/parts/snippet/snippetdlg.ui.h
index 103a49b0..a62c722e 100644
--- a/parts/snippet/snippetdlg.ui.h
+++ b/parts/snippet/snippetdlg.ui.h
@@ -13,7 +13,7 @@
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 void SnippetDlg::slotHelp()
 {
diff --git a/parts/snippet/snippetitem.h b/parts/snippet/snippetitem.h
index f534987c..0bf4e6a9 100644
--- a/parts/snippet/snippetitem.h
+++ b/parts/snippet/snippetitem.h
@@ -10,7 +10,7 @@
 #define SNIPPETITEM_H
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TQString;
 
diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
index 0450782f..c500322d 100644
--- a/parts/texttools/texttoolspart.cpp
+++ b/parts/texttools/texttoolspart.cpp
@@ -13,7 +13,7 @@
 
 #include <tqwhatsthis.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index d1f5def4..82b9ac32 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -15,7 +15,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index cb66d60e..6cd63deb 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -11,7 +11,7 @@
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <ktip.h>
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 4affd6dc..8c13a4ea 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -38,9 +38,9 @@
 #include <kcombobox.h>
 #include <kdesktopfile.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimemagic.h>
 #include <krun.h>
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index 1d1b4505..8734eadc 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -14,7 +14,7 @@
 #include <kdesktopfile.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
 #include <tdetexteditor/document.h>
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index 9d6e0f95..f21713e9 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -11,7 +11,7 @@
 #include <kdesktopfile.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tools_part.h"
 #include "kapplicationtree.h"
diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp
index f6cec15a..11b352af 100644
--- a/parts/tools/toolsconfigwidget.cpp
+++ b/parts/tools/toolsconfigwidget.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
index 855f4daf..fdc9fa6a 100644
--- a/parts/uimode/uichooser_part.cpp
+++ b/parts/uimode/uichooser_part.cpp
@@ -5,7 +5,7 @@
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevcore.h>
 #include <configwidgetproxy.h>
 #include <kdevplugininfo.h>
diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp
index 6e0690b7..d32a74e4 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -4,11 +4,11 @@
 #include <tqwidgetstack.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dialog_widget.h"
 #include "valgrind_dialog.h"
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 85a392fd..1b262175 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -5,11 +5,11 @@
 #include <tqfile.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index a1e17396..70484704 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -7,7 +7,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 
 #include <kdevcore.h>
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index f2d27387..ec176c47 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -24,11 +24,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index 2fe41c9c..8bb84aeb 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 
diff --git a/src/Mainpage.dox b/src/Mainpage.dox
index 3fcece64..2f055d1b 100644
--- a/src/Mainpage.dox
+++ b/src/Mainpage.dox
@@ -20,7 +20,7 @@ Example:
     #include <tdeaboutdata.h>
     #include <tdeapplication.h>
     #include <tdecmdlineargs.h>
-    #include <klocale.h>
+    #include <tdelocale.h>
     #include <dcopclient.h>
     
     #include <splashscreen.h>
diff --git a/src/core.cpp b/src/core.cpp
index bdac9e49..ccdd0ace 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -8,7 +8,7 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeactioncollection.h>
 
 #include "toplevel.h"
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index 82c5260b..73ff852b 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -20,7 +20,7 @@
 #include <kxmlguifactory.h>
 #include <tdemainwindow.h>
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 
 #include "toplevel.h"
diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp
index d84bc1e8..794ab8cd 100644
--- a/src/generalinfowidget.cpp
+++ b/src/generalinfowidget.cpp
@@ -16,11 +16,11 @@
 #include <tqdir.h>
 
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcharsets.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "generalinfowidget.h"
 #include "generalinfowidget.moc"
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index 91548490..b669d717 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -26,7 +26,7 @@
 #include <tqcombobox.h>
 #include <klineedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index 6ba3ecd1..38b72e2a 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -21,8 +21,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdeapplication.h>
diff --git a/src/main.cpp b/src/main.cpp
index 37f178df..ef11d967 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index 334aa8f1..f6b27273 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 6370dfdf..c77f05ac 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -27,13 +27,13 @@
 #include <tdeaboutdata.h>
 #include <kstdaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <tdeparts/mainwindow.h>
 #include <kdialogbase.h>
 #include <tdeconfig.h>
 #include <kkeydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kedittoolbar.h>
 #include <kbugreport.h>
 #include <kurlrequester.h>
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 332147e3..83fa358d 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -31,7 +31,7 @@
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index 13afb6c0..0218a2dc 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "button.h"
 
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 6e90e6b3..11e917e1 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -28,10 +28,10 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index cc3c699e..21b78a8c 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -17,8 +17,8 @@
 #include <tdeapplication.h>
 #include <krun.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdeparts/factory.h>
 #include <tdeparts/partmanager.h>
@@ -26,7 +26,7 @@
 #include <tdefiledialog.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdehtml_part.h>
 #include <tdepopupmenu.h>
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 8a3da03f..30aa9171 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -6,9 +6,9 @@
 #include <klibloader.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <tdeparts/componentfactory.h>
 #include <assert.h>
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index bb887f39..0fa5d5fe 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -28,10 +28,10 @@
 #include <tdelistbox.h>
 #include <tdelistview.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeversion.h>
 
 #include <profile.h>
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index e811740c..51131566 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -22,7 +22,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <kdevplugin.h>
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 5190fb7c..c0380ffb 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -10,9 +10,9 @@
 
 class TQDomDocument;
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdefiledialog.h>
@@ -22,11 +22,11 @@ class TQDomDocument;
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <kmenubar.h>
+#include <tdetempfile.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
 
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index 0448521c..4db00f06 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -22,8 +22,8 @@
 
 #include <tdeparts/part.h>
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/document.h>
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index fae441a7..45545089 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -25,9 +25,9 @@
 #include <kstdaction.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
 #include <tdetexteditor/view.h>
diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp
index 4ec02322..205656bd 100644
--- a/src/splashscreen.cpp
+++ b/src/splashscreen.cpp
@@ -7,8 +7,8 @@
 #include <tqtimer.h>
 #include <tqfont.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 
 KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f)
 {
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index 08a5cab2..65c6c819 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -16,8 +16,8 @@
 #include <tqfontmetrics.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdeversion.h>
diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index 9bc186a5..aeb1eea9 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -18,9 +18,9 @@
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 
 #include "kdevcore.h"
diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp
index 02f3a904..2f93ab49 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -16,8 +16,8 @@
 #include <tqpushbutton.h>
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 
 CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp
index 2937b2bb..ac9f293d 100644
--- a/vcs/cvsservice/annotatedialog.cpp
+++ b/vcs/cvsservice/annotatedialog.cpp
@@ -13,8 +13,8 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>
diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp
index 11c9c835..e044db54 100644
--- a/vcs/cvsservice/annotatepage.cpp
+++ b/vcs/cvsservice/annotatepage.cpp
@@ -15,15 +15,15 @@
 #include <tqdatetime.h>
 #include <tqlabel.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <krfcdate.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <dcopref.h>
 #include <cvsjob_stub.h>
diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index 32a1ef40..89aa7f01 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -18,9 +18,9 @@
 #include <tqheader.h>
 #include <tqdatetime.h>
 #include <tqpainter.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "annotatepage.h"
diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp
index 1e676f43..78528307 100644
--- a/vcs/cvsservice/changelog.cpp
+++ b/vcs/cvsservice/changelog.cpp
@@ -13,7 +13,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 
 #include "changelog.h"
 
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index c34c5083..e6bcbd05 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -17,8 +17,8 @@
 
 #include <tdelistview.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kcursor.h>
 #include <kdebug.h>
diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp
index 575396b5..d5ccd014 100644
--- a/vcs/cvsservice/commitdlg.cpp
+++ b/vcs/cvsservice/commitdlg.cpp
@@ -19,8 +19,8 @@
 
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include "commitdlg.h"
diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp
index 7777760a..e58e7497 100644
--- a/vcs/cvsservice/cvsdiffpage.cpp
+++ b/vcs/cvsservice/cvsdiffpage.cpp
@@ -15,9 +15,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>
diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp
index ff36c19d..21169346 100644
--- a/vcs/cvsservice/cvslogdialog.cpp
+++ b/vcs/cvsservice/cvslogdialog.cpp
@@ -14,9 +14,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>
diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp
index c0ade68e..4b2d7fb4 100644
--- a/vcs/cvsservice/cvslogpage.cpp
+++ b/vcs/cvsservice/cvslogpage.cpp
@@ -15,9 +15,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <dcopref.h>
 
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index f1b45c30..2cdf5c92 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -14,7 +14,7 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "kdevproject.h"
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 75fda6f6..88cd870d 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -19,8 +19,8 @@
 
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index 05de2c19..01c85df3 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -15,10 +15,10 @@
 #include<tqcheckbox.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdemainwindow.h>
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index d4de15c1..bb8fb459 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -15,8 +15,8 @@
 #include <dcopref.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kdevpartcontroller.h"
 #include "kdevmainwindow.h"
diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp
index c86ae0ce..ebcb354b 100644
--- a/vcs/cvsservice/diffdialog.cpp
+++ b/vcs/cvsservice/diffdialog.cpp
@@ -13,7 +13,7 @@
 #include <tqradiobutton.h>
 
 #include "diffdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbuttongroup.h>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index bb9aa69c..56bb5b2c 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -17,13 +17,13 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>
diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp
index 47e1b0ac..199ffdc6 100644
--- a/vcs/cvsservice/editorsdialog.cpp
+++ b/vcs/cvsservice/editorsdialog.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <dcopref.h>
 
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index 6f741bf4..5b0b593f 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -31,8 +31,8 @@
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kprocess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp
index 0d2f91a9..5329df9f 100644
--- a/vcs/perforce/commitdlg.cpp
+++ b/vcs/perforce/commitdlg.cpp
@@ -19,9 +19,9 @@
 #include <tqregexp.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <stdlib.h>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index d6b9c98b..59bd5448 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kurl.h>
diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h
index 81a94e1c..4f233820 100644
--- a/vcs/perforce/perforcepart.h
+++ b/vcs/perforce/perforcepart.h
@@ -14,7 +14,7 @@
 #define _PERFORCEPART_H_
 
 #include <kdevversioncontrol.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class Context;
 class TQPopupMenu;
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index bdba679f..da54b09b 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -30,8 +30,8 @@
 #include <tdeio/scheduler.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tdeio/netaccess.h>
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index 61c814de..c1faf65e 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -19,9 +19,9 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <ktextedit.h>
 #include <kpassdlg.h>
diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp
index 8fd05950..0fd2c20b 100644
--- a/vcs/subversion/kdevsvnd_widgets.cpp
+++ b/vcs/subversion/kdevsvnd_widgets.cpp
@@ -16,7 +16,7 @@
 #include <tqpushbutton.h>
 #include <tqlistview.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f )
 	:SvnSSLTrustPromptBase( parent, name, modal, f )
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index f9344172..e9c89ece 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -37,14 +37,14 @@
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 #include <tqtextbrowser.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 #include <tdeapplication.h>
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index 9d5ef406..45d44d1e 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -30,7 +30,7 @@
 #include <tqregexp.h>
 
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name)
     : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ),
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index 32a17b9f..f3f43cd9 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -20,7 +20,7 @@
 
 #include <tqwhatsthis.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
@@ -52,7 +52,7 @@
 #include <tqwidget.h>
 #include <kdevplugininfo.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 using namespace SvnGlobal;
 
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index e635d600..95b31f6b 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -25,7 +25,7 @@
 #include "subversion_part.h"
 #include "subversion_widget.h"
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
 
diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp
index b4095389..87647525 100644
--- a/vcs/subversion/svn_blamewidget.cpp
+++ b/vcs/subversion/svn_blamewidget.cpp
@@ -21,8 +21,8 @@
 #include <tqstringlist.h>
 #include <tqfont.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f )
 	:TQWidget( parent )
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index a37577bd..e042df84 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -28,9 +28,9 @@
 #include <tqfileinfo.h>
 #include <tqcheckbox.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "kdevmainwindow.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevproject.h>
 
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index eaed9c12..10e55a9f 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -24,9 +24,9 @@
 #include "subversion_global.h"
 #include <kdevproject.h>
 #include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqradiobutton.h>
 #include <tqcombobox.h>
 #include <knuminput.h>
diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp
index ce6b08be..23f1d2ff 100644
--- a/vcs/subversion/svn_tdeio.cpp
+++ b/vcs/subversion/svn_tdeio.cpp
@@ -31,11 +31,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ksock.h>
 #include <dcopclient.h>