Rename additional header files to avoid conflicts with KDE4

126 files changed, 238 insertions, 238 deletions

diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index e6bef2e02..8bbaa5e43 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -25,8 +25,8 @@
 #include <kmimetype.h>
 #include <kstringhandler.h>
 #include <kinputdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
diff --git a/tdeio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cc
index 30c52bdb8..ee33612a2 100644
--- a/tdeio/bookmarks/kbookmarkexporter.cc
+++ b/tdeio/bookmarks/kbookmarkexporter.cc
@@ -24,7 +24,7 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kbookmarkmanager.h"
 #include "kbookmarkexporter.h"
diff --git a/tdeio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cc
index 366802905..513f89b40 100644
--- a/tdeio/bookmarks/kbookmarkimporter.cc
+++ b/tdeio/bookmarks/kbookmarkimporter.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cc
index 0443b3b1c..9b0cacf25 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cc
@@ -22,7 +22,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cc
index 092ebe596..d588517a3 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
index 6aca22b84..95937f890 100644
--- a/tdeio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
@@ -21,7 +21,7 @@
 #include "kbookmarkimporter_kde1.h"
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cc
index 8ce06a79b..29960ce51 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.cc
@@ -25,7 +25,7 @@
 #include "kbookmarkmanager.h"
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cc
index 57b5d6208..0609c7a3b 100644
--- a/tdeio/bookmarks/kbookmarkimporter_opera.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index 205d879ab..60d4f2932 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -29,9 +29,9 @@
 #include <ksavefile.h>
 #include <dcopref.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqfile.h>
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index 0468bcd5a..e1b00bc40 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -32,8 +32,8 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 0c1ebb27c..aeed441b0 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -30,7 +30,7 @@
 #include <tqlistview.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 #include "kbookmark.h"
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index fc34e9029..b47af8ebf 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -30,7 +30,7 @@
 #include <tqlistview.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 #include "kbookmark.h"
diff --git a/tdeio/httpfilter/httpfilter.cc b/tdeio/httpfilter/httpfilter.cc
index 21086d613..0f6a45790 100644
--- a/tdeio/httpfilter/httpfilter.cc
+++ b/tdeio/httpfilter/httpfilter.cc
@@ -19,7 +19,7 @@
 
 #include <tdeio/global.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "httpfilter.h"
 
diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index 4986eb45a..cf4e0530c 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -30,8 +30,8 @@
 #include <tqtimer.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeio/passdlg.h>
 #include <tdewallet.h>
diff --git a/tdeio/kssl/kssl.cc b/tdeio/kssl/kssl.cc
index 66cc503d5..874da6aa6 100644
--- a/tdeio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cc
@@ -48,7 +48,7 @@
 #include <ksslx509v3.h>
 #include <ksslpkcs12.h>
 #include <ksslsession.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksocks.h>
 
 #define sk_dup d->kossl->sk_dup
diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc
index ea3c29556..26550e715 100644
--- a/tdeio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cc
@@ -30,9 +30,9 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <kseparator.h>
diff --git a/tdeio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cc
index e7310ccdc..1f95c3912 100644
--- a/tdeio/kssl/ksslcertificate.cc
+++ b/tdeio/kssl/ksslcertificate.cc
@@ -37,9 +37,9 @@
 
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <sys/types.h>
 
diff --git a/tdeio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cc
index 03a1300e8..7567b8595 100644
--- a/tdeio/kssl/ksslinfodlg.cc
+++ b/tdeio/kssl/ksslinfodlg.cc
@@ -31,11 +31,11 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksqueezedtextlabel.h>
 #include <kurllabel.h>
 #include <kstdguiitem.h>
diff --git a/tdeio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cc
index 93d6d2da4..654444994 100644
--- a/tdeio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cc
@@ -25,12 +25,12 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kopenssl.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdewallet.h>
 
 #include <tqlineedit.h>
diff --git a/tdeio/kssl/ksslpemcallback.cc b/tdeio/kssl/ksslpemcallback.cc
index 2dfbb9146..207949a0c 100644
--- a/tdeio/kssl/ksslpemcallback.cc
+++ b/tdeio/kssl/ksslpemcallback.cc
@@ -23,7 +23,7 @@
 #endif
 
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ksslpemcallback.h"
 
 int KSSLPemCallback(char *buf, int size, int rwflag, void *userdata) {
diff --git a/tdeio/kssl/ksslpkcs12.cc b/tdeio/kssl/ksslpkcs12.cc
index b8b23cf1c..9521e907b 100644
--- a/tdeio/kssl/ksslpkcs12.cc
+++ b/tdeio/kssl/ksslpkcs12.cc
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <ksslall.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 
 #include <assert.h>
diff --git a/tdeio/kssl/ksslpkcs7.cc b/tdeio/kssl/ksslpkcs7.cc
index 8db0000f0..cb66eb468 100644
--- a/tdeio/kssl/ksslpkcs7.cc
+++ b/tdeio/kssl/ksslpkcs7.cc
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <ksslall.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 
 #include <assert.h>
diff --git a/tdeio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cc
index 9895a702b..fbf10b476 100644
--- a/tdeio/kssl/ksslsettings.cc
+++ b/tdeio/kssl/ksslsettings.cc
@@ -33,7 +33,7 @@
 #include <tqsortedlist.h>
 
 #include "ksslsettings.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/tdeio/kssl/ksslutils.cc b/tdeio/kssl/ksslutils.cc
index 80651757f..444e5dd4a 100644
--- a/tdeio/kssl/ksslutils.cc
+++ b/tdeio/kssl/ksslutils.cc
@@ -22,8 +22,8 @@
 #include "ksslutils.h"
 
 #include <tqstring.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
 
 #include "kopenssl.h"
diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index 4f33d1389..533c4fcca 100644
--- a/tdeio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
@@ -41,7 +41,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <kurl.h>
 
diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index c94cc9b72..483e836cb 100644
--- a/tdeio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -24,8 +24,8 @@
 #include <tqtextcodec.h>
 
 #include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 
 #include "downloader.moc"
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index a010d328e..dfb682005 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -23,9 +23,9 @@
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include "proxyscout.moc"
 #include "discovery.h"
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index d41041636..d47845bbb 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <tqfile.h>
 #include <tqsortedlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tqdatetime.h>
diff --git a/tdeio/misc/tdefile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index df210fa4d..aa6590ef5 100644
--- a/tdeio/misc/tdefile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdefilemetainfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpropertiesdialog.h>
 
 #include "fileprops.h"
diff --git a/tdeio/misc/tdemailservice.cpp b/tdeio/misc/tdemailservice.cpp
index 2d256c5c9..23066d633 100644
--- a/tdeio/misc/tdemailservice.cpp
+++ b/tdeio/misc/tdemailservice.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 static const TDECmdLineOptions options[] =
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index aaffd3b65..32465039d 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -9,8 +9,8 @@
 #include <tqtextstream.h>
 
 #include <tdeapplication.h>
-#include <kemailsettings.h>
-#include <klocale.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp
index 99260d8d0..bf175bdc9 100644
--- a/tdeio/misc/tdetelnetservice.cpp
+++ b/tdeio/misc/tdetelnetservice.cpp
@@ -22,10 +22,10 @@
 // $Id$
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <ksimpleconfig.h>
 
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 364197b72..126f0ce2b 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -32,9 +32,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kstandarddirs.h>
 #include <tdewalletentry.h>
diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index aa3a1c09d..c31062c2a 100644
--- a/tdeio/misc/tdewalletd/tdewalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
@@ -531,7 +531,7 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">tqcheckbox.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 107b57c64..c23628eae 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -31,12 +31,12 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdesu/client.h>
 #include <twin.h>
 #include <kdialog.h>
diff --git a/tdeio/tdefile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt
index a69cad536..ed0350999 100644
--- a/tdeio/tdefile/CMakeLists.txt
+++ b/tdeio/tdefile/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(
 
 install( FILES
     tdefiledialog.h kencodingfiledialog.h
-    kdiroperator.h tdefileview.h tdefilefiltercombo.h
+    tdediroperator.h tdefileview.h tdefilefiltercombo.h
     tdefiledetailview.h kcombiview.h kdiskfreesp.h
     tdefileiconview.h tderecentdocument.h
     kurlrequester.h tdefilepreview.h tdefile.h
@@ -56,7 +56,7 @@ set( target tdefile )
 
 set( ${target}_SRCS
   tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp
-  tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
+  tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp
   tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp
   tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
   kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp
diff --git a/tdeio/tdefile/ChangeLog b/tdeio/tdefile/ChangeLog
index ccfb45ab5..229f9f2f8 100644
--- a/tdeio/tdefile/ChangeLog
+++ b/tdeio/tdefile/ChangeLog
@@ -1,6 +1,6 @@
 Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp:
+	* tdediroperator.cpp:
 	lottsa changes, e.g. action handling more clear now.
 	fixed completed item not clearning the previous selection
 
@@ -17,7 +17,7 @@ Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Feb 20 01:50:44 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.*, tdefiledialog.* (saveConfig): 
+	* tdediroperator.*, tdefiledialog.* (saveConfig): 
 	implemented loading, saving and applying configuration
 
 	* tdefiledialog.cpp (setURL): 
@@ -37,7 +37,7 @@ Thu Feb 17 19:09:54 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	Added KDirComboBox and replaced the directory combobox with it. It
 	even does something now :) Items need to be indented tho.
 
-	* tdefilereader.cpp, kdiroperator.{cpp,h}: 
+	* tdefilereader.cpp, tdediroperator.{cpp,h}: 
 	fixed showHidden default
 
 Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -60,7 +60,7 @@ Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	added static methods for multiselection
 	added getOpenURL(), getOpenURLs and getSaveURL()
 	
-	* kdiroperator.cpp (setSorting): 
+	* tdediroperator.cpp (setSorting): 
 	added setSorting() and sorting() to keep sorting when switching views
 	a few cosmetic and TDEAction changes
 
@@ -86,7 +86,7 @@ Fri Feb 11 12:17:59 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp (connectView): 
+	* tdediroperator.cpp (connectView): 
 	- Now that TDEToggleAction is fixed, I can commit the new stuff:
 	  Offer Actions for all the common functionality, i.e. sorting, setting
 	  the view, home(), cdUp(), back, forward, etc.
@@ -107,7 +107,7 @@ Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Thu Feb 10 12:59:29 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp (insertNewFiles): 
+	* tdediroperator.cpp (insertNewFiles): 
 	aahhh, finally fixed that infinite loop in KFileView::mergeLists
 	clear the view before calling view->addItemList( currentContents );
 
@@ -173,7 +173,7 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* tdefileviewitem.cpp:
 	- added time_t mTime() to enable sorting by modification time
 	
-	* kdiroperator.cpp:
+	* tdediroperator.cpp:
 	- offer sorting options in popupmenu
 	- use checkAccess before creating directories. I guess this will again
 	  change when the new kio will be used, tho. 
diff --git a/tdeio/tdefile/Makefile.am b/tdeio/tdefile/Makefile.am
index 4e6b76ce1..857e843c5 100644
--- a/tdeio/tdefile/Makefile.am
+++ b/tdeio/tdefile/Makefile.am
@@ -27,7 +27,7 @@ METASOURCES = AUTO
 #SUBDIRS = . acl_prop_page
 
 include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
-	kdiroperator.h tdefileview.h tdefilefiltercombo.h \
+	tdediroperator.h tdefileview.h tdefilefiltercombo.h \
 	tdefiledetailview.h kcombiview.h kdiskfreesp.h \
 	tdefileiconview.h tderecentdocument.h \
 	kurlrequester.h tdefilepreview.h tdefile.h \
@@ -44,7 +44,7 @@ noinst_HEADERS = config-tdefile.h tderecentdirs.h kmetaprops.h \
 libtdefile_la_SOURCES = \
 	tdefilefiltercombo.cpp \
 	tdefileview.cpp tdefileiconview.cpp \
-	tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
+	tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp \
 	tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
 	tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
 	kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \
diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 01eb8bcb8..7e8e3dae2 100644
--- a/tdeio/tdefile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -38,7 +38,7 @@
 #include <tqwidgetstack.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index 13830ab01..4c4f0cb06 100644
--- a/tdeio/tdefile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -35,7 +35,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqvaluelist.h>
 
diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index 995b80ffc..af3680571 100644
--- a/tdeio/tdefile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -23,7 +23,7 @@
 #define _KCOMBIVIEW_H
 
 #include <tqsplitter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdefile.h>
 #include <tdefileview.h>
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 65455aef0..b59108071 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -24,8 +24,8 @@
 #include <tqdir.h>
 
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <kservice.h>
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index 1ae03daec..dc44aa8ba 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -38,8 +38,8 @@
 #include <kdialogbase.h>
 #include <kdirlister.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kstdaction.h>
@@ -55,7 +55,7 @@
 
 #include "config-tdefile.h"
 #include "kcombiview.h"
-#include "kdiroperator.h"
+#include "tdediroperator.h"
 #include "tdefiledetailview.h"
 #include "tdefileiconview.h"
 #include "tdefilepreview.h"
@@ -1737,4 +1737,4 @@ TQString KDirOperator::viewConfigGroup() const
 void KDirOperator::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kdiroperator.moc"
+#include "tdediroperator.moc"
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 39959229d..5027f631c 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -29,9 +29,9 @@
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <tdefilespeedbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <tderecentdirs.h>
 #include <kshell.h>
@@ -41,7 +41,7 @@
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/renamedlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "tdefiletreeview.h"
 #include "kdirselectdialog.h"
diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp
index c2ea4079a..b2d48b4bf 100644
--- a/tdeio/tdefile/kdirsize.cpp
+++ b/tdeio/tdefile/kdirsize.cpp
@@ -19,7 +19,7 @@
 
 #include "kdirsize.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqapplication.h>
 #include <tqtimer.h>
 #include <config-tdefile.h>
diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index a49210642..d2d588a4e 100644
--- a/tdeio/tdefile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -24,11 +24,11 @@
 #include "kencodingfiledialog.h"
 #include <kcombobox.h>
 #include <tdetoolbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tderecentdocument.h>
 
 struct KEncodingFileDialogPrivate
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index 9d7975e2b..154f9e89d 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -20,8 +20,8 @@
 #include <kiconviewsearchline.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kprogress.h>
diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index a1ce7d6b3..f96be72fc 100644
--- a/tdeio/tdefile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -16,12 +16,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdefileitem.h>
 #include <tdeio/previewjob.h>
diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp
index ce6201177..21c75e0ce 100644
--- a/tdeio/tdefile/kmetaprops.cpp
+++ b/tdeio/tdefile/kmetaprops.cpp
@@ -23,9 +23,9 @@
 #include <kdebug.h>
 #include <tdefilemetainfowidget.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 
 #include <tqvalidator.h>
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index f23ac78e4..8397a5e74 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kstandarddirs.h>
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index f31815e34..c8b5b21ac 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -22,7 +22,7 @@
 #include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "knotifywidgetbase.h"
 
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 5a855de21..5db8b79d9 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -39,9 +39,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/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp
index a053d5627..c45330893 100644
--- a/tdeio/tdefile/kpreviewprops.cpp
+++ b/tdeio/tdefile/kpreviewprops.cpp
@@ -22,8 +22,8 @@
 #include <tqlayout.h>
 
 #include <tdefilemetapreview.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 class KPreviewPropsPlugin::KPreviewPropsPluginPrivate
 {
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 389115a3c..87d3926b3 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -96,9 +96,9 @@ extern "C" {
 #include <kicondialog.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>
 #include <tdeio/chmodjob.h>
@@ -109,7 +109,7 @@ extern "C" {
 #include <kmimetype.h>
 #include <kmountpoint.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index 46b096c2b..2aa79353f 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -33,12 +33,12 @@
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprotocolinfo.h>
 #include <kstringhandler.h>
diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp
index 150e64b34..66fe8efb8 100644
--- a/tdeio/tdefile/kurlcombobox.cpp
+++ b/tdeio/tdefile/kurlcombobox.cpp
@@ -20,9 +20,9 @@
 #include <tqlistbox.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 
 #include <kurlcombobox.h>
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 9a76a69a6..7ecfd543d 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -30,10 +30,10 @@
 #include <kdialog.h>
 #include <kdirselectdialog.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcompletion.h>
 #include <kurldrag.h>
 #include <kprotocolinfo.h>
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index d1e9ec109..1a040a656 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -28,10 +28,10 @@
 
 #include <tdeaccel.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tderecentdocument.h>
 #include <kurl.h>
 #include <kurlrequester.h>
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index b3c44250e..e267bdb60 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -27,11 +27,11 @@
 
 #include <tdeapplication.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 8db764724..03bc17757 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -50,16 +50,16 @@
 #include <tdecompletionbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
 #include <tdeio/kservicetypefactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
@@ -83,7 +83,7 @@
 #include <tdefileview.h>
 #include <tderecentdocument.h>
 #include <tdefilefiltercombo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kimagefilepreview.h>
 
 #include <tdefilespeedbar.h>
diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp
index cd7bd54d3..ed41f8f82 100644
--- a/tdeio/tdefile/tdefilefiltercombo.cpp
+++ b/tdeio/tdefile/tdefilefiltercombo.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <config-tdefile.h>
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 131485273..92bbeba41 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -31,10 +31,10 @@
 
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 #include <tdeio/previewjob.h>
 
diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index dea9ea353..50fef856b 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -21,7 +21,7 @@
 #include "tdefilemetainfowidget.h"
 
 #include <keditcl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <klineedit.h>
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 57543ea8c..acec61475 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -22,7 +22,7 @@
 #include <tdeaction.h>
 #include <tdefilepreview.h>
 #include <tdefilepreview.moc>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 
diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index 6204fa6bb..a2fb01c2c 100644
--- a/tdeio/tdefile/tdefilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -27,8 +27,8 @@
 #include <tqlineedit.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <stdio.h>
@@ -39,7 +39,7 @@
 #include <tqpushbutton.h>
 #include <tdeapplication.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 class KFileSharePropsPlugin::Private
 {
diff --git a/tdeio/tdefile/tdefilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp
index defcb2157..6f3365a5f 100644
--- a/tdeio/tdefile/tdefilespeedbar.cpp
+++ b/tdeio/tdefile/tdefilespeedbar.cpp
@@ -25,9 +25,9 @@
 #include <tqtextstream.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index 6138b3863..cb7432423 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 #include <kdebug.h>
 #include <kdirnotify_stub.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefileitem.h>
 #include <tdefileview.h>
 #include <kmimetype.h>
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 63c973723..f171975d8 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -25,8 +25,8 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "config-tdefile.h"
diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
index 12c2b6477..0548261dd 100644
--- a/tdeio/tdefile/tderecentdirs.cpp
+++ b/tdeio/tdefile/tderecentdirs.cpp
@@ -28,7 +28,7 @@
 #include <tderecentdirs.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #define MAX_DIR_HISTORY 3
 
diff --git a/tdeio/tdefile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp
index 3d95b6c9f..9e2189406 100644
--- a/tdeio/tdefile/tests/kcustommenueditortest.cpp
+++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp
@@ -1,6 +1,6 @@
 #include "kcustommenueditor.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 int main(int argc, char** argv)
diff --git a/tdeio/tdefile/tests/kdirselectdialogtest.cpp b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
index 0c2209d31..c1178c3bc 100644
--- a/tdeio/tdefile/tests/kdirselectdialogtest.cpp
+++ b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
@@ -1,6 +1,6 @@
 #include <tdeapplication.h>
 #include <kdirselectdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 int main( int argc, char **argv )
diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index baf82725f..ce7127d9e 100644
--- a/tdeio/tdefile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -3,7 +3,7 @@
 #include <tqstringlist.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 
 KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name )
diff --git a/tdeio/tdefile/tests/kfstest.cpp b/tdeio/tdefile/tests/kfstest.cpp
index c57e3678e..ada8d825e 100644
--- a/tdeio/tdefile/tests/kfstest.cpp
+++ b/tdeio/tdefile/tests/kfstest.cpp
@@ -30,12 +30,12 @@
 
 #include <tdefiledialog.h>
 #include <tdefileiconview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <kurlbar.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdefile.h>
 #include <kdebug.h>
 #include <kicondialog.h>
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 529d12dda..9ff0199dc 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -19,7 +19,7 @@
 
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
diff --git a/tdeio/tdeio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt
index 8aaf395b6..e2b96ebb1 100644
--- a/tdeio/tdeio/CMakeLists.txt
+++ b/tdeio/tdeio/CMakeLists.txt
@@ -41,8 +41,8 @@ install( FILES
     kurlcompletion.h kshellcompletion.h tdefileitem.h
     tdefileshare.h ksambashare.h knfsshare.h kdirlister.h
     kservicegroup.h kimageio.h kdirnotify.h kdirnotify_stub.h
-    kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h
-    kfilterbase.h kfilterdev.h kemailsettings.h kscan.h
+    kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h
+    kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h
     kdatatool.h karchive.h tdefilefilter.h tdefilemetainfo.h
     renamedlgplugin.h kmimetyperesolver.h kdcopservicestarter.h
     kremoteencoding.h kmimetypechooser.h
@@ -71,7 +71,7 @@ install( FILES
 set( target tdeiocore )
 
 set( ${target}_SRCS
-  authinfo.cpp kshred.cpp kprotocolmanager.cpp slave.cpp
+  authinfo.cpp kshred.cpp tdeprotocolmanager.cpp slave.cpp
   slaveinterface.cpp observer.stub sessiondata.cpp
   scheduler.cpp connection.cpp job.cpp global.cpp
   slaveconfig.cpp kurlpixmapprovider.cpp netaccess.cpp
@@ -79,7 +79,7 @@ set( ${target}_SRCS
   slavebase.cpp passdlg.cpp forwardingslavebase.cpp
   progressbase.cpp defaultprogress.cpp statusbarprogress.cpp
   kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp
-  observer.cpp ../misc/uiserver.stub observer.skel kemailsettings.cpp
+  observer.cpp ../misc/uiserver.stub observer.skel tdeemailsettings.cpp
   kprotocolinfo.cpp renamedlg.cpp skipdlg.cpp kremoteencoding.cpp
   kmimetypechooser.cpp
 )
diff --git a/tdeio/tdeio/Makefile.am b/tdeio/tdeio/Makefile.am
index f0766f5c8..587cfe511 100644
--- a/tdeio/tdeio/Makefile.am
+++ b/tdeio/tdeio/Makefile.am
@@ -53,8 +53,8 @@ include_HEADERS = \
 	kshellcompletion.h tdefileitem.h tdefileshare.h ksambashare.h knfsshare.h \
     kdirlister.h kservicegroup.h \
 	kimageio.h kdirnotify.h kdirnotify_stub.h \
-	kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h \
-	kfilterbase.h kfilterdev.h kemailsettings.h kscan.h kdatatool.h \
+	kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h \
+	kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h kdatatool.h \
 	karchive.h tdefilefilter.h tdefilemetainfo.h renamedlgplugin.h \
 	kmimetyperesolver.h kdcopservicestarter.h kremoteencoding.h \
 	kmimetypechooser.h 
@@ -67,7 +67,7 @@ include_HEADERS += kacl.h
 
 libtdeiocore_la_SOURCES = authinfo.cpp \
 	kshred.cpp \
-	kprotocolmanager.cpp \
+	tdeprotocolmanager.cpp \
 	slave.cpp slaveinterface.cpp observer.stub \
 	sessiondata.cpp	scheduler.cpp \
 	connection.cpp \
@@ -81,7 +81,7 @@ libtdeiocore_la_SOURCES = authinfo.cpp \
 	statusbarprogress.cpp \
 	kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp \
 	observer.cpp uiserver.stub observer.skel \
-	kemailsettings.cpp  \
+	tdeemailsettings.cpp  \
 	kprotocolinfo.cpp \
 	renamedlg.cpp skipdlg.cpp kremoteencoding.cpp \
 	kmimetypechooser.cpp
diff --git a/tdeio/tdeio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp
index 434466d77..24a5c247d 100644
--- a/tdeio/tdeio/chmodjob.cpp
+++ b/tdeio/tdeio/chmodjob.cpp
@@ -29,9 +29,9 @@
 
 #include <tqtimer.h>
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "tdeio/job.h"
 #include "tdeio/chmodjob.h"
diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp
index 528368ba5..a5b6bdf69 100644
--- a/tdeio/tdeio/dataslave.cpp
+++ b/tdeio/tdeio/dataslave.cpp
@@ -23,7 +23,7 @@
 #include "dataslave.h"
 #include "dataprotocol.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 4293e752e..5db9c5a0c 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -26,8 +26,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kstringhandler.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kprocess.h>
 #include <kpushbutton.h>
diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp
index e4bfec5f6..8dce8a5f4 100644
--- a/tdeio/tdeio/global.cpp
+++ b/tdeio/tdeio/global.cpp
@@ -33,9 +33,9 @@
 #include "tdeio/job.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeprotocolmanager.h>
 #include <kde_file.h>
 
 #ifdef HAVE_VOLMGT
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index a4e731451..7f8b9bda3 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -42,12 +42,12 @@ extern "C" {
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdatastream.h>
 #include <tdemainwindow.h>
 #include <kde_file.h>
@@ -60,14 +60,14 @@ extern "C" {
 #include "kdirwatch.h"
 #include "kmimemagic.h"
 #include "kprotocolinfo.h"
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
 #include "tdeio/observer.h"
 
 #include "kssl/ksslcsessioncache.h"
 
 #include <kdirnotify_stub.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <dcopclient.h>
 
 #ifdef Q_OS_UNIX
diff --git a/tdeio/tdeio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp
index c859cce2b..8a7a67632 100644
--- a/tdeio/tdeio/kdcopservicestarter.cpp
+++ b/tdeio/tdeio/kdcopservicestarter.cpp
@@ -22,7 +22,7 @@
 #include "kservice.h"
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 static KStaticDeleter<KDCOPServiceStarter> dss_sd;
diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp
index 669766ab5..b0027588d 100644
--- a/tdeio/tdeio/kdirlister.cpp
+++ b/tdeio/tdeio/kdirlister.cpp
@@ -28,11 +28,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstaticdeleter.h>
 #include <kprotocolinfo.h>
 
diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp
index 63c89b9d7..01b4e0876 100644
--- a/tdeio/tdeio/kdirwatch.cpp
+++ b/tdeio/tdeio/kdirwatch.cpp
@@ -57,7 +57,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
 
diff --git a/tdeio/tdeio/kemailsettings.cpp b/tdeio/tdeio/kemailsettings.cpp
index 296455253..bd46d8708 100644
--- a/tdeio/tdeio/kemailsettings.cpp
+++ b/tdeio/tdeio/kemailsettings.cpp
@@ -26,10 +26,10 @@
  *	$Id$
  */
 
-#include "kemailsettings.h"
+#include "tdeemailsettings.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 class KEMailSettingsPrivate {
diff --git a/tdeio/tdeio/kimageio.cpp b/tdeio/tdeio/kimageio.cpp
index f9de08376..d3768d297 100644
--- a/tdeio/tdeio/kimageio.cpp
+++ b/tdeio/tdeio/kimageio.cpp
@@ -20,9 +20,9 @@
 #include <ltdl.h>
 #include "kimageio.h"
 #include "kimageiofactory.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmimetype.h>
 #include <tdesycocaentry.h>
 #include <tdesycoca.h>
diff --git a/tdeio/tdeio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h
index c55060549..524eafa74 100644
--- a/tdeio/tdeio/kmessageboxwrapper.h
+++ b/tdeio/tdeio/kmessageboxwrapper.h
@@ -18,7 +18,7 @@
 
 #ifndef KMESSAGEBOXWRAPPER_H
 #define KMESSAGEBOXWRAPPER_H
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 8129b31f9..636c04eea 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -52,7 +52,7 @@
 #include <kdesktopfile.h>
 #include <kdirwatch.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 95dfada9c..ffc9a4c78 100644
--- a/tdeio/tdeio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -21,7 +21,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <krun.h>
diff --git a/tdeio/tdeio/kprotocolinfo.cpp b/tdeio/tdeio/kprotocolinfo.cpp
index 9523b70cb..bf11060e4 100644
--- a/tdeio/tdeio/kprotocolinfo.cpp
+++ b/tdeio/tdeio/kprotocolinfo.cpp
@@ -24,7 +24,7 @@
 
 #include "kprotocolinfo.h"
 #include "kprotocolinfofactory.h"
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
 // Most of this class is implemented in tdecore/kprotocolinfo_tdecore.cpp
 // This file only contains a few static class-functions that depend on
diff --git a/tdeio/tdeio/kprotocolmanager.cpp b/tdeio/tdeio/kprotocolmanager.cpp
index 7ed06376b..65ad393a3 100644
--- a/tdeio/tdeio/kprotocolmanager.cpp
+++ b/tdeio/tdeio/kprotocolmanager.cpp
@@ -23,8 +23,8 @@
 
 #include <dcopref.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
@@ -34,7 +34,7 @@
 #include <tdeio/ioslave_defaults.h>
 #include <tdeio/http_slave_defaults.h>
 
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
 class
 KProtocolManagerPrivate
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 8547802d6..d92e3ca11 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -44,7 +44,7 @@
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
@@ -55,7 +55,7 @@
 #include <tqdatetime.h>
 #include <tqregexp.h>
 #include <kdesktopfile.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <kmacroexpander.h>
 #include <kshell.h>
 #include <kde_file.h>
diff --git a/tdeio/tdeio/krun.h b/tdeio/tdeio/krun.h
index 40fd36416..6e5604f7a 100644
--- a/tdeio/tdeio/krun.h
+++ b/tdeio/tdeio/krun.h
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tqstring.h>
 #include <kurl.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 class TDEProcess;
 class KService;
diff --git a/tdeio/tdeio/kscan.cpp b/tdeio/tdeio/kscan.cpp
index 7b00f08a9..b49459771 100644
--- a/tdeio/tdeio/kscan.cpp
+++ b/tdeio/tdeio/kscan.cpp
@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 
 #include "kscan.h"
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 13be78bea..c9a6fdae2 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -40,9 +40,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfigbase.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
diff --git a/tdeio/tdeio/kservicefactory.cpp b/tdeio/tdeio/kservicefactory.cpp
index f4646fa75..abd6ec61e 100644
--- a/tdeio/tdeio/kservicefactory.cpp
+++ b/tdeio/tdeio/kservicefactory.cpp
@@ -24,9 +24,9 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 
diff --git a/tdeio/tdeio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp
index 2e27c99b0..4cb3b8dac 100644
--- a/tdeio/tdeio/kservicegroup.cpp
+++ b/tdeio/tdeio/kservicegroup.cpp
@@ -19,9 +19,9 @@
 #include <tqdir.h>
 
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ksortablevaluelist.h>
 
diff --git a/tdeio/tdeio/kservicegroupfactory.cpp b/tdeio/tdeio/kservicegroupfactory.cpp
index 56ec0c07f..3caf9c027 100644
--- a/tdeio/tdeio/kservicegroupfactory.cpp
+++ b/tdeio/tdeio/kservicegroupfactory.cpp
@@ -24,9 +24,9 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 KServiceGroupFactory::KServiceGroupFactory()
diff --git a/tdeio/tdeio/kshred.cpp b/tdeio/tdeio/kshred.cpp
index 470f9a03e..0bc01c20a 100644
--- a/tdeio/tdeio/kshred.cpp
+++ b/tdeio/tdeio/kshred.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "kshred.h"
 #include <time.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <stdlib.h>
 #include <tdeapplication.h>
diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp
index 9bde2873a..cb5bba1fa 100644
--- a/tdeio/tdeio/ktar.cpp
+++ b/tdeio/tdeio/ktar.cpp
@@ -30,7 +30,7 @@
 #include <tqfile.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <kfilterdev.h>
 #include <kfilterbase.h>
diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index e9ce26908..441d453ac 100644
--- a/tdeio/tdeio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -47,8 +47,8 @@
 #include <tdeio/job.h>
 #include <kprotocolinfo.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kde_file.h>
 
 #include <sys/types.h>
diff --git a/tdeio/tdeio/kuserprofile.cpp b/tdeio/tdeio/kuserprofile.cpp
index 124f7f8f8..a9bdc40c1 100644
--- a/tdeio/tdeio/kuserprofile.cpp
+++ b/tdeio/tdeio/kuserprofile.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp
index dd3a1bdc8..cbab6684e 100644
--- a/tdeio/tdeio/netaccess.cpp
+++ b/tdeio/tdeio/netaccess.cpp
@@ -34,8 +34,8 @@
 #include <tqmetaobject.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/job.h>
diff --git a/tdeio/tdeio/observer.cpp b/tdeio/tdeio/observer.cpp
index dfd847b04..2309c2142 100644
--- a/tdeio/tdeio/observer.cpp
+++ b/tdeio/tdeio/observer.cpp
@@ -34,12 +34,12 @@
 #include "passdlg.h"
 #include "slavebase.h"
 #include "observer_stub.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksslinfodlg.h>
 #include <ksslcertdlg.h>
 #include <ksslcertificate.h>
 #include <ksslcertchain.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace TDEIO;
 
diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp
index 942d16c64..91fba050d 100644
--- a/tdeio/tdeio/passdlg.cpp
+++ b/tdeio/tdeio/passdlg.cpp
@@ -30,7 +30,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 using namespace TDEIO;
diff --git a/tdeio/tdeio/paste.cpp b/tdeio/tdeio/paste.cpp
index fd24f9a0d..42fff5ba2 100644
--- a/tdeio/tdeio/paste.cpp
+++ b/tdeio/tdeio/paste.cpp
@@ -24,16 +24,16 @@
 #include "tdeio/netaccess.h"
 #include "tdeio/observer.h"
 #include "tdeio/renamedlg.h"
-#include "tdeio/kprotocolmanager.h"
+#include "tdeio/tdeprotocolmanager.h"
 
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqapplication.h>
 #include <tqclipboard.h>
diff --git a/tdeio/tdeio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp
index 0252baff1..d95cc7e88 100644
--- a/tdeio/tdeio/pastedialog.cpp
+++ b/tdeio/tdeio/pastedialog.cpp
@@ -20,7 +20,7 @@
 
 #include <klineedit.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp
index c51ba154d..5e3148619 100644
--- a/tdeio/tdeio/previewjob.cpp
+++ b/tdeio/tdeio/previewjob.cpp
@@ -43,10 +43,10 @@
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
 #include <tdefileitem.h>
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <kmdcodec.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <tdeio/kservice.h>
diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index 06b12d129..715f73c42 100644
--- a/tdeio/tdeio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -30,15 +30,15 @@
 #include <tqlineedit.h>
 #include <tqdir.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tdeapplication.h>
 #include <tdeio/global.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>
diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp
index 01bcde298..3935a91cf 100644
--- a/tdeio/tdeio/scheduler.cpp
+++ b/tdeio/tdeio/scheduler.cpp
@@ -28,8 +28,8 @@
 #include <dcopclient.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kprotocolmanager.h>
+#include <tdeglobal.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <assert.h>
 #include <kstaticdeleter.h>
diff --git a/tdeio/tdeio/sessiondata.cpp b/tdeio/tdeio/sessiondata.cpp
index 99c6a26f3..4e4dd14ac 100644
--- a/tdeio/tdeio/sessiondata.cpp
+++ b/tdeio/tdeio/sessiondata.cpp
@@ -23,11 +23,11 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <dcopclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kstandarddirs.h>
 
 #include <tdesu/client.h>
diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp
index 6cd924136..5871bbd09 100644
--- a/tdeio/tdeio/skipdlg.cpp
+++ b/tdeio/tdeio/skipdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp
index e66a719df..b4a7c8f2a 100644
--- a/tdeio/tdeio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -35,11 +35,11 @@
 
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksock.h>
 #include <kprocess.h>
 #include <klibloader.h>
@@ -48,7 +48,7 @@
 #include "tdeio/slave.h"
 #include "tdeio/kservice.h"
 #include <tdeio/global.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 
 #ifdef HAVE_PATHS_H
diff --git a/tdeio/tdeio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp
index 29a8e0c48..76bbc232d 100644
--- a/tdeio/tdeio/slavebase.cpp
+++ b/tdeio/tdeio/slavebase.cpp
@@ -48,7 +48,7 @@
 #include <ksock.h>
 #include <kcrash.h>
 #include <tdesu/client.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksocks.h>
 
 #include "kremoteencoding.h"
diff --git a/tdeio/tdeio/slaveconfig.cpp b/tdeio/tdeio/slaveconfig.cpp
index e81146e76..af1b7b793 100644
--- a/tdeio/tdeio/slaveconfig.cpp
+++ b/tdeio/tdeio/slaveconfig.cpp
@@ -27,7 +27,7 @@
 #include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include "slaveconfig.h"
 
diff --git a/tdeio/tdeio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp
index e0497e391..d7ef698c4 100644
--- a/tdeio/tdeio/statusbarprogress.cpp
+++ b/tdeio/tdeio/statusbarprogress.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kprogress.h>
 
diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index 2a4aff68e..a0d9c86cb 100644
--- a/tdeio/tdeio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -43,19 +43,19 @@
 #include <kdebug.h>
 #include <ksslall.h>
 #include <ksslcertdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #ifndef Q_WS_WIN //temporary
 #include <kresolver.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 
 #include <tdeapplication.h>
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kde_file.h>
 
 #include "tdeio/tcpslavebase.h"
diff --git a/tdeio/tdeio/tdefilefilter.cpp b/tdeio/tdeio/tdefilefilter.cpp
index 310b86221..c1663c2e8 100644
--- a/tdeio/tdeio/tdefilefilter.cpp
+++ b/tdeio/tdeio/tdefilefilter.cpp
@@ -21,7 +21,7 @@
 #include <tqregexp.h>
 
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "tdefilefilter.h"
 
diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index 3d09e6877..378cd5f0a 100644
--- a/tdeio/tdeio/tdefileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -41,11 +41,11 @@
 #include <tdefilemetainfo.h>
 #include <ksambashare.h>
 #include <knfsshare.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <klargefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <krun.h>
 
diff --git a/tdeio/tdeio/tdefilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp
index 796a48305..c1389695d 100644
--- a/tdeio/tdeio/tdefilemetainfo.cpp
+++ b/tdeio/tdeio/tdefilemetainfo.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kdatastream.h> // needed for serialization of bool
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 
 #include "tdefilemetainfo.h"
diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp
index 16e281c16..dc3f8c05a 100644
--- a/tdeio/tdeio/tdefileshare.cpp
+++ b/tdeio/tdeio/tdefileshare.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index eb615344b..f6324afa5 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -29,16 +29,16 @@
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <krun.h>
 #include <tdeio/netaccess.h>
 #include <kprocess.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <kshell.h>
 #include <kde_file.h>
 
diff --git a/tdeio/tests/kiopassdlgtest.cpp b/tdeio/tests/kiopassdlgtest.cpp
index 3dd4d7294..ba429e67a 100644
--- a/tdeio/tests/kiopassdlgtest.cpp
+++ b/tdeio/tests/kiopassdlgtest.cpp
@@ -1,7 +1,7 @@
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 
 #include "passdlg.h"
diff --git a/tdeio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp
index 638a60ec2..527077eb0 100644
--- a/tdeio/tests/kpropsdlgtest.cpp
+++ b/tdeio/tests/kpropsdlgtest.cpp
@@ -1,5 +1,5 @@
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kpropertiesdialog.h>
 #include <tdecmdlineargs.h>
diff --git a/tdeio/tests/kprotocolinfotest.cpp b/tdeio/tests/kprotocolinfotest.cpp
index 646249678..9b5242d65 100644
--- a/tdeio/tests/kprotocolinfotest.cpp
+++ b/tdeio/tests/kprotocolinfotest.cpp
@@ -17,9 +17,9 @@
  */
 
 #include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index ecc5e4af5..3cc22d8e2 100644
--- a/tdeio/tests/tdeioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -17,7 +17,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstatusbar.h>
 #include <tdeio/job.h>