Rename additional header files to avoid conflicts with KDE4

87 files changed, 159 insertions, 159 deletions

diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp
index 7853a25e..8efd135f 100644
--- a/kbabel/addons/preview/pothumbcreator.cpp
+++ b/kbabel/addons/preview/pothumbcreator.cpp
@@ -38,7 +38,7 @@
 #include <tqimage.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kpixmapsplitter.h>
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index b9ff166b..c38dc427 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -58,11 +58,11 @@
 #include <kdialogbase.h>
 //#include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <tdestdaccel.h>
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index daba1fc8..9dc0691c 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -57,13 +57,13 @@
 
 #include <kcmenumngr.h>
 #include <kcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kdatatool.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
@@ -71,7 +71,7 @@
 #include <kprogress.h>
 #include <twin.h>
 #include <tdeversion.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfileinfo.h>
 #include <tqdir.h>
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index 52f248e2..c2d03d53 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -40,7 +40,7 @@
 
 #include "resources.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfileinfo.h>
 #include <tqdir.h>
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index be293012..66926de2 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -39,8 +39,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index ce4c4985..9568eff3 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -48,11 +48,11 @@
 // KDE include files
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <kcombobox.h>
 #include <kcharsets.h>
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index 45131583..0d6be57a 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -45,9 +45,9 @@
 #include <tqstringlist.h>
 // KDE include files
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 // project specific include files
 #include "cvshandler.h"
 
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index cd859d21..c0b82771 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -47,11 +47,11 @@
 // KDE include files
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 // Project specific include files
 #include "svndialog.h"
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index b7e0fd4e..4587f0ed 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -46,9 +46,9 @@
 #include <tqdom.h>
 // KDE include files
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kprocess.h>
 // project specific include files
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index 306fecec..ef64c451 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -46,9 +46,9 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <twin.h>
 #include <tdemainwindow.h>
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index ee86ead5..d4ff458d 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -39,8 +39,8 @@
 #include <kcombobox.h>
 #include <kcompletion.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 6f3b750c..841f8bbc 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -39,9 +39,9 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kurl.h>
 
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 76728e04..02c97738 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -37,8 +37,8 @@
 
 #include <kdebug.h>
 #include <kdatatool.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index e58ffd87..aaf844ae 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -42,10 +42,10 @@
 
 #include <tdeconfig.h>
 #include <kdatatool.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
@@ -67,7 +67,7 @@
 #include "version.h"
 #include "stringdistance.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 using namespace KBabel;
 
 Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile)
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index b217d9c2..d7236b80 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -35,11 +35,11 @@
 #include "kbprojectsettings.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kemailsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeemailsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <stdlib.h>
 
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 418c1dea..a85fb990 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -41,8 +41,8 @@
 
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp
index 9700c08f..35ce08a5 100644
--- a/kbabel/common/kbproject.cpp
+++ b/kbabel/common/kbproject.cpp
@@ -39,8 +39,8 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdespell.h>
 
diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp
index 98df4924..8ac63cd4 100644
--- a/kbabel/common/projectsettings.cpp
+++ b/kbabel/common/projectsettings.cpp
@@ -36,8 +36,8 @@
 #include "resources.h"
 
 #include <tqstring.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tdespell.h>
diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp
index bbf9ee1d..ef89fa3e 100644
--- a/kbabel/common/tagextractor.cpp
+++ b/kbabel/common/tagextractor.cpp
@@ -35,7 +35,7 @@
 #include "catalogsettings.h"
 #include "tagextractor.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 using namespace KBabel;
diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp
index 8d3658f4..e6db0b5b 100644
--- a/kbabel/commonui/cmdedit.cpp
+++ b/kbabel/commonui/cmdedit.cpp
@@ -38,7 +38,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 0ae00003..bd05078b 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -49,8 +49,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeversion.h>
 #include <tdeio/netaccess.h>
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 0fe463fd..b58cf7bf 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -45,8 +45,8 @@
 
 #include <kcombobox.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp
index 34f5223b..e2d3ced0 100644
--- a/kbabel/commonui/projectpref.cpp
+++ b/kbabel/commonui/projectpref.cpp
@@ -42,7 +42,7 @@
 #include <tqvbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index f07ba99f..8ecc12db 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -43,11 +43,11 @@
 
 #include <kcombobox.h>
 #include <kdatatool.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdefiledialog.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h> 
 #include <kurlcompletion.h>
 #include <tdefontdialog.h>
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index 8365d038..79266489 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -40,9 +40,9 @@
 #include <tqcombobox.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 using namespace KBabel;
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 7ed5d604..677b68ee 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -53,9 +53,9 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 
 
diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp
index fd497a4b..8b56ae47 100644
--- a/kbabel/commonui/tdeactionselector.cpp
+++ b/kbabel/commonui/tdeactionselector.cpp
@@ -30,7 +30,7 @@
 #include "tdeactionselector.h"
 #include <resources.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h> // for spacingHint()
 #include <kdebug.h>
diff --git a/kbabel/datatools/accelerators/main.cc b/kbabel/datatools/accelerators/main.cc
index 275a6289..0c7cae3a 100644
--- a/kbabel/datatools/accelerators/main.cc
+++ b/kbabel/datatools/accelerators/main.cc
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cc
index e125d792..b6c3fa5a 100644
--- a/kbabel/datatools/arguments/main.cc
+++ b/kbabel/datatools/arguments/main.cc
@@ -38,8 +38,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/context/main.cc b/kbabel/datatools/context/main.cc
index 3288aa96..0fb989d2 100644
--- a/kbabel/datatools/context/main.cc
+++ b/kbabel/datatools/context/main.cc
@@ -39,8 +39,8 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/equations/main.cc b/kbabel/datatools/equations/main.cc
index a5c9688c..c0dbbba2 100644
--- a/kbabel/datatools/equations/main.cc
+++ b/kbabel/datatools/equations/main.cc
@@ -39,8 +39,8 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/length/main.cc b/kbabel/datatools/length/main.cc
index ec4bab17..f1c295eb 100644
--- a/kbabel/datatools/length/main.cc
+++ b/kbabel/datatools/length/main.cc
@@ -42,8 +42,8 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cc
index 4bcdd416..68093191 100644
--- a/kbabel/datatools/not-translated/main.cc
+++ b/kbabel/datatools/not-translated/main.cc
@@ -41,8 +41,8 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/pluralforms/main.cc b/kbabel/datatools/pluralforms/main.cc
index cdc6e990..693a843b 100644
--- a/kbabel/datatools/pluralforms/main.cc
+++ b/kbabel/datatools/pluralforms/main.cc
@@ -40,8 +40,8 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/punctuation/main.cc b/kbabel/datatools/punctuation/main.cc
index 7a05aabe..6d779518 100644
--- a/kbabel/datatools/punctuation/main.cc
+++ b/kbabel/datatools/punctuation/main.cc
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc
index 9f948e03..e500728e 100644
--- a/kbabel/datatools/regexp/main.cc
+++ b/kbabel/datatools/regexp/main.cc
@@ -36,8 +36,8 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/setfuzzy/main.cc b/kbabel/datatools/setfuzzy/main.cc
index 86dc332d..7bc0ed16 100644
--- a/kbabel/datatools/setfuzzy/main.cc
+++ b/kbabel/datatools/setfuzzy/main.cc
@@ -37,7 +37,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/whitespace/main.cc b/kbabel/datatools/whitespace/main.cc
index e838770f..06558211 100644
--- a/kbabel/datatools/whitespace/main.cc
+++ b/kbabel/datatools/whitespace/main.cc
@@ -41,8 +41,8 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/datatools/xml/main.cc b/kbabel/datatools/xml/main.cc
index 2f32db9a..59342c0d 100644
--- a/kbabel/datatools/xml/main.cc
+++ b/kbabel/datatools/xml/main.cc
@@ -41,8 +41,8 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /***************************************************
  *
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index 4adf1eb2..6678306b 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -47,7 +47,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 K_EXPORT_COMPONENT_FACTORY( kbabel_gettextimport, KGenericFactory<GettextImportPlugin> ( "kbabelgettextimportfilter" ) )
 
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index d4a7c473..4522201e 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -42,7 +42,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharselect.h>
 
 #include "kbcatalog.h"
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index e003ff57..0ca858d3 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -45,7 +45,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 0eba0506..de5263a9 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -40,7 +40,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resources.h"
 #include "kbcatalog.h"
diff --git a/kbabel/kbabel/editorpreferences.ui.h b/kbabel/kbabel/editorpreferences.ui.h
index 99819cde..ab2bbc31 100644
--- a/kbabel/kbabel/editorpreferences.ui.h
+++ b/kbabel/kbabel/editorpreferences.ui.h
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "toolselectionwidget.h"
 
 void EditorPreferences::ledWarning( bool show )
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 044b1078..cd1cc6c6 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -40,7 +40,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resources.h"
 #include "kbcatalog.h"
diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp
index a6fca91e..ff5d1df5 100644
--- a/kbabel/kbabel/gotodialog.cpp
+++ b/kbabel/kbabel/gotodialog.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "gotodialog.h"
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 38b11920..4a7624cb 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -33,11 +33,11 @@
 
 **************************************************************************** */
 #include <kcursor.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktextedit.h>
 #include <kurl.h>
 
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index a3dcb3c3..11bf219c 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -37,7 +37,7 @@
 #include <tqtabwidget.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 9be4ec13..2f6cd4e9 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -64,9 +64,9 @@
 #include <kstatusbar.h>
 #include <tdestdaccel.h>
 #include <kedittoolbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kled.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdetoolbar.h>
 #include <tdefiledialog.h>
@@ -75,7 +75,7 @@
 #include <kdialogbase.h>
 #include <kprogress.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <twin.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp
index a3841c81..a3f3abb7 100644
--- a/kbabel/kbabel/kbabelpref.cpp
+++ b/kbabel/kbabel/kbabelpref.cpp
@@ -44,7 +44,7 @@
 #include "toolselectionwidget.h"
 #include "tqcombobox.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 using namespace KBabel;
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index e415f06a..001b1489 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -61,9 +61,9 @@
 #include <kcmenumngr.h>
 #include <tdeconfigdialog.h>
 #include <kdatatool.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
@@ -72,12 +72,12 @@
 #include <tdelistbox.h>
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdespell.h>
 #include <twin.h>
 #include <tdestdaccel.h>
 #include <kurldrag.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "resources.h"
 
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index 02462e19..5089f563 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -37,8 +37,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index 9b7d7538..40822862 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -26,11 +26,11 @@
 #include "kbabel.h"
 #include "editcmd.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tqcolor.h>
 #include <tqlayout.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp
index 0f50f630..70977aaa 100644
--- a/kbabel/kbabel/kbcharselect.cpp
+++ b/kbabel/kbabel/kbcharselect.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kcharselect.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqspinbox.h>
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index d75de27f..3f9df538 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -41,8 +41,8 @@
 
 #include "tdeapplication.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kbabelsettings.h>
 #include <tdespell.h>
 
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index 15dd9320..a6282e83 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -44,8 +44,8 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kcursor.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kuniqueapplication.h>
 #include <twin.h>
 
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index 1e75f78b..ea46b9ac 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -53,9 +53,9 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 
 #include "kbhighlighting.h"
diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp
index d60bf351..58013eac 100644
--- a/kbabel/kbabel/sourceview.cpp
+++ b/kbabel/kbabel/sourceview.cpp
@@ -38,7 +38,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resources.h"
 #include "kbcatalog.h"
diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp
index 7bb43851..62a88c8c 100644
--- a/kbabel/kbabel/spelldlg.cpp
+++ b/kbabel/kbabel/spelldlg.cpp
@@ -37,8 +37,8 @@
 #include <tqradiobutton.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name)
 		: KDialogBase(parent,name,true,i18n("Caption of dialog","Spelling")
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index d1adb648..3233ab57 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -38,7 +38,7 @@
 
 #include <kcursor.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kbcatalog.h"
 
diff --git a/kbabel/kbabeldict/aboutmoduledlg.cpp b/kbabel/kbabeldict/aboutmoduledlg.cpp
index 693a3ac6..bb34fc25 100644
--- a/kbabel/kbabeldict/aboutmoduledlg.cpp
+++ b/kbabel/kbabeldict/aboutmoduledlg.cpp
@@ -33,7 +33,7 @@
 #include "aboutmoduledlg.h"
 
 #include <kbugreport.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 AboutModuleDlg::AboutModuleDlg(const TDEAboutData *aboutData, TQWidget *parent)
             : TDEAboutApplication(aboutData, parent)
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index 796cf51f..ae3f506a 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -40,9 +40,9 @@
 #include <tqpushbutton.h>
 #include <tdeconfig.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
                     , TQWidget *parent, const char *name)
diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp
index 09a98fb6..03d08e38 100644
--- a/kbabel/kbabeldict/kbabeldict.cpp
+++ b/kbabel/kbabeldict/kbabeldict.cpp
@@ -34,8 +34,8 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include "kbabeldict.h"
 #include "kbabeldictview.h"
 
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index e0e631a3..4b158ef8 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -50,10 +50,10 @@
 #include <kdialogbase.h>
 #include <klibloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <ktrader.h>
 #include <twin.h>
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 7ed294c9..7964c65a 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -52,9 +52,9 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kseparator.h>
 #include <kdebug.h>
diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp
index f863a4c5..98d00d05 100644
--- a/kbabel/kbabeldict/main.cpp
+++ b/kbabel/kbabeldict/main.cpp
@@ -37,7 +37,7 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <twin.h>
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index a560ae45..5423bca9 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -33,10 +33,10 @@
 
 #include <tqinputdialog.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <kstandarddirs.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 8d48df58..50880dcc 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -38,7 +38,7 @@
 
 #include <tqfile.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 WordItem::WordItem (char *data, TQString w)
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
index 71b8e1a8..2273a9c4 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
@@ -1,5 +1,5 @@
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
index 7833bef3..e1f1db77 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
@@ -1029,7 +1029,7 @@ Finally you can set the maximum number of entries in the list.</string>
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in declaration">klocale.h</include>
+    <include location="local" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index ed2c5065..e87294e4 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -4,7 +4,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <tqtoolbutton.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
index a3309a26..2d564267 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
@@ -40,7 +40,7 @@
 #include <tqcheckbox.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqmap.h>
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
index b880cd50..0abd3dc5 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
@@ -12,7 +12,7 @@ License: GPLv2
 #include <tqdict.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #define i18n (const char*)
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
index c4091e41..ad2aa0dd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
@@ -1,5 +1,5 @@
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
index e3ef3776..5bf22ced 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
@@ -1032,7 +1032,7 @@ Finally you can set the maximum number of entries in the list.</string>
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in declaration">klocale.h</include>
+    <include location="local" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index d70ae697..0b332eef 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -4,7 +4,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <tqtoolbutton.h>
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
index 436dced6..8d706b99 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index 7972b0b5..815e025f 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -30,11 +30,11 @@
   your version.
 		  
 **************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 
 #include <tqregexp.h>
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
index 116d3c69..378b1830 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
@@ -37,7 +37,7 @@
 #include <tdefiledialog.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include "preferenceswidget.h"
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index eaa0a93b..22598cbf 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -38,7 +38,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
index 0d604c85..936a5a5a 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 3c202429..10e92cad 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -32,12 +32,12 @@
   your version.
 	    
 **************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeio/netaccess.h>
 
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 893a1f1b..a33270df 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -38,7 +38,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include "preferenceswidget.h"
diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
index 3e3a0d9c..6a522d4c 100644
--- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
+++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index eeeb53c0..163f48e2 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -40,7 +40,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include "preferenceswidget.h"
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 46232e43..1a056c55 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -32,12 +32,12 @@
   your version.
 
 **************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeio/netaccess.h>
 
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 11596183..17a9ec15 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -42,7 +42,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 
 using namespace KBabel;