From ce48246cc195efc2819745839e6472f488b24c48 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:49:58 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 krArc/krarc.cpp                                | 6 +++---
 krusader/ActionMan/actionman.cpp               | 4 ++--
 krusader/ActionMan/actionproperty.cpp          | 4 ++--
 krusader/ActionMan/actionpropertybase.cpp      | 2 +-
 krusader/ActionMan/addplaceholderpopup.cpp     | 4 ++--
 krusader/ActionMan/useractionlistview.cpp      | 2 +-
 krusader/ActionMan/useractionpage.cpp          | 4 ++--
 krusader/BookMan/kraddbookmarkdlg.cpp          | 2 +-
 krusader/BookMan/krbookmark.cpp                | 2 +-
 krusader/BookMan/krbookmarkbutton.cpp          | 2 +-
 krusader/BookMan/krbookmarkhandler.cpp         | 4 ++--
 krusader/Dialogs/checksumdlg.cpp               | 6 +++---
 krusader/Dialogs/krdialogs.cpp                 | 2 +-
 krusader/Dialogs/krkeydialog.cpp               | 6 +++---
 krusader/Dialogs/krmaskchoice.cpp              | 2 +-
 krusader/Dialogs/krpleasewait.cpp              | 2 +-
 krusader/Dialogs/krprogress.cpp                | 4 ++--
 krusader/Dialogs/krspecialwidgets.cpp          | 2 +-
 krusader/Dialogs/krspwidgets.cpp               | 2 +-
 krusader/Dialogs/kurllistrequester.cpp         | 4 ++--
 krusader/Dialogs/newftpgui.cpp                 | 2 +-
 krusader/Dialogs/packguibase.cpp               | 4 ++--
 krusader/Dialogs/packguibase.h                 | 2 +-
 krusader/Dialogs/popularurls.cpp               | 4 ++--
 krusader/DiskUsage/diskusage.cpp               | 6 +++---
 krusader/DiskUsage/diskusagegui.cpp            | 2 +-
 krusader/DiskUsage/dufilelight.cpp             | 2 +-
 krusader/DiskUsage/dulines.cpp                 | 2 +-
 krusader/DiskUsage/dulistview.cpp              | 4 ++--
 krusader/DiskUsage/filelightParts/Config.cpp   | 2 +-
 krusader/DiskUsage/filelightParts/fileTree.cpp | 4 ++--
 krusader/DiskUsage/radialMap/builder.cpp       | 4 ++--
 krusader/DiskUsage/radialMap/map.cpp           | 2 +-
 krusader/DiskUsage/radialMap/segmentTip.cpp    | 6 +++---
 krusader/DiskUsage/radialMap/widget.cpp        | 2 +-
 krusader/DiskUsage/radialMap/widgetEvents.cpp  | 4 ++--
 krusader/Filter/advancedfilter.cpp             | 4 ++--
 krusader/Filter/filterdialog.cpp               | 2 +-
 krusader/Filter/filtertabs.cpp                 | 2 +-
 krusader/Filter/generalfilter.cpp              | 4 ++--
 krusader/GUI/dirhistorybutton.cpp              | 2 +-
 krusader/GUI/kcmdline.cpp                      | 6 +++---
 krusader/GUI/kcmdmodebutton.cpp                | 2 +-
 krusader/GUI/kfnkeys.cpp                       | 4 ++--
 krusader/GUI/krusaderstatus.h                  | 2 +-
 krusader/GUI/mediabutton.cpp                   | 4 ++--
 krusader/GUI/profilemanager.cpp                | 2 +-
 krusader/GUI/syncbrowsebutton.cpp              | 2 +-
 krusader/KViewer/kimagefilepreview.cpp         | 4 ++--
 krusader/KViewer/krviewer.cpp                  | 6 +++---
 krusader/KViewer/krviewer.h                    | 2 +-
 krusader/KViewer/panelviewer.cpp               | 6 +++---
 krusader/KViewer/panelviewer.h                 | 2 +-
 krusader/Konfigurator/kgadvanced.cpp           | 2 +-
 krusader/Konfigurator/kgcolors.cpp             | 6 +++---
 krusader/Konfigurator/kgdependencies.cpp       | 4 ++--
 krusader/Konfigurator/kggeneral.cpp            | 4 ++--
 krusader/Konfigurator/kglookfeel.cpp           | 6 +++---
 krusader/Konfigurator/kgprotocols.cpp          | 2 +-
 krusader/Konfigurator/kgstartup.cpp            | 2 +-
 krusader/Konfigurator/kguseractions.cpp        | 2 +-
 krusader/Konfigurator/konfigurator.cpp         | 6 +++---
 krusader/Konfigurator/konfiguratoritems.cpp    | 2 +-
 krusader/Konfigurator/krresulttable.h          | 6 +++---
 krusader/Konfigurator/krresulttabledialog.h    | 4 ++--
 krusader/KrJS/krjs.cpp                         | 2 +-
 krusader/Locate/locate.cpp                     | 4 ++--
 krusader/MountMan/kmountman.cpp                | 4 ++--
 krusader/MountMan/kmountmangui.cpp             | 4 ++--
 krusader/Panel/krcalcspacedialog.cpp           | 2 +-
 krusader/Panel/krcolorcache.cpp                | 2 +-
 krusader/Panel/krdetailedview.cpp              | 4 ++--
 krusader/Panel/krdetailedview.h                | 2 +-
 krusader/Panel/krpopupmenu.cpp                 | 4 ++--
 krusader/Panel/krpreviewpopup.cpp              | 2 +-
 krusader/Panel/krview.cpp                      | 2 +-
 krusader/Panel/krviewitem.cpp                  | 2 +-
 krusader/Panel/listpanel.cpp                   | 8 ++++----
 krusader/Panel/panelfunc.cpp                   | 6 +++---
 krusader/Panel/panelpopup.cpp                  | 2 +-
 krusader/RemoteMan/remoteman.cpp               | 2 +-
 krusader/RemoteMan/remotemanbase.cpp           | 2 +-
 krusader/Search/krsearchdialog.cpp             | 2 +-
 krusader/Search/krsearchdialog.h               | 4 ++--
 krusader/Search/krsearchmod.cpp                | 2 +-
 krusader/Splitter/combiner.cpp                 | 4 ++--
 krusader/Splitter/splitter.cpp                 | 4 ++--
 krusader/Splitter/splittergui.cpp              | 4 ++--
 krusader/Synchronizer/feedtolistboxdialog.cpp  | 4 ++--
 krusader/Synchronizer/synchronizedialog.cpp    | 2 +-
 krusader/Synchronizer/synchronizer.cpp         | 4 ++--
 krusader/Synchronizer/synchronizerdirlist.cpp  | 4 ++--
 krusader/Synchronizer/synchronizergui.cpp      | 4 ++--
 krusader/Synchronizer/synchronizertask.cpp     | 4 ++--
 krusader/UserAction/expander.cpp               | 4 ++--
 krusader/UserAction/kraction.cpp               | 4 ++--
 krusader/UserAction/kractionbase.cpp           | 2 +-
 krusader/UserAction/useraction.cpp             | 2 +-
 krusader/UserMenu/usermenu.cpp                 | 2 +-
 krusader/VFS/arc_vfs.cpp                       | 6 +++---
 krusader/VFS/ftp_vfs.cpp                       | 4 ++--
 krusader/VFS/krarchandler.cpp                  | 6 +++---
 krusader/VFS/krpermhandler.cpp                 | 4 ++--
 krusader/VFS/krquery.cpp                       | 2 +-
 krusader/VFS/normal_vfs.cpp                    | 6 +++---
 krusader/VFS/temp_vfs.cpp                      | 2 +-
 krusader/VFS/virt_vfs.cpp                      | 6 +++---
 krusader/defaults.h                            | 2 +-
 krusader/krslots.cpp                           | 4 ++--
 krusader/krusader.cpp                          | 8 ++++----
 krusader/krusaderview.cpp                      | 2 +-
 krusader/krusaderview.h                        | 2 +-
 krusader/main.cpp                              | 4 ++--
 krusader/panelmanager.cpp                      | 2 +-
 krusader/paneltabbar.cpp                       | 2 +-
 tar/tar.cc                                     | 2 +-
 virt/virt.cc                                   | 4 ++--
 117 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp
index aa48121..b07029c 100644
--- a/krArc/krarc.cpp
+++ b/krArc/krarc.cpp
@@ -28,11 +28,11 @@
 
 #include <tdefileitem.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <klargefile.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>
diff --git a/krusader/ActionMan/actionman.cpp b/krusader/ActionMan/actionman.cpp
index 9d33750..1509802 100644
--- a/krusader/ActionMan/actionman.cpp
+++ b/krusader/ActionMan/actionman.cpp
@@ -12,8 +12,8 @@
 
 #include "actionman.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "useractionpage.h"
 #include "../krusader.h"
diff --git a/krusader/ActionMan/actionproperty.cpp b/krusader/ActionMan/actionproperty.cpp
index bd9561e..5761c84 100644
--- a/krusader/ActionMan/actionproperty.cpp
+++ b/krusader/ActionMan/actionproperty.cpp
@@ -21,11 +21,11 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <kkeybutton.h>
 #include <kcombobox.h>
diff --git a/krusader/ActionMan/actionpropertybase.cpp b/krusader/ActionMan/actionpropertybase.cpp
index 8772048..afd66b7 100644
--- a/krusader/ActionMan/actionpropertybase.cpp
+++ b/krusader/ActionMan/actionpropertybase.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './actionpropertybase.ui'
 **
diff --git a/krusader/ActionMan/addplaceholderpopup.cpp b/krusader/ActionMan/addplaceholderpopup.cpp
index 4ea8e50..ef58895 100644
--- a/krusader/ActionMan/addplaceholderpopup.cpp
+++ b/krusader/ActionMan/addplaceholderpopup.cpp
@@ -14,9 +14,9 @@
 
 #include "../UserAction/expander.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // for ParameterDialog
 #include "../krusader.h" // for konfig-access
diff --git a/krusader/ActionMan/useractionlistview.cpp b/krusader/ActionMan/useractionlistview.cpp
index c0d29d6..fe078e5 100644
--- a/krusader/ActionMan/useractionlistview.cpp
+++ b/krusader/ActionMan/useractionlistview.cpp
@@ -11,7 +11,7 @@
 //
 #include "useractionlistview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqptrlist.h>
 #include <tqdom.h>
diff --git a/krusader/ActionMan/useractionpage.cpp b/krusader/ActionMan/useractionpage.cpp
index 732ae8e..c7beede 100644
--- a/krusader/ActionMan/useractionpage.cpp
+++ b/krusader/ActionMan/useractionpage.cpp
@@ -16,10 +16,10 @@
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kclipboard.h>
 
 #include "actionproperty.h"
diff --git a/krusader/BookMan/kraddbookmarkdlg.cpp b/krusader/BookMan/kraddbookmarkdlg.cpp
index 8ac404a..7f685a3 100644
--- a/krusader/BookMan/kraddbookmarkdlg.cpp
+++ b/krusader/BookMan/kraddbookmarkdlg.cpp
@@ -1,7 +1,7 @@
 #include "kraddbookmarkdlg.h"
 #include "../krusader.h"
 #include "krbookmarkhandler.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/krusader/BookMan/krbookmark.cpp b/krusader/BookMan/krbookmark.cpp
index ba83b57..4f35eaf 100644
--- a/krusader/BookMan/krbookmark.cpp
+++ b/krusader/BookMan/krbookmark.cpp
@@ -3,7 +3,7 @@
 #include "../VFS/krarchandler.h"
 #include <tdeactioncollection.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #define BM_NAME(X)		(TQString("Bookmark:")+X)
diff --git a/krusader/BookMan/krbookmarkbutton.cpp b/krusader/BookMan/krbookmarkbutton.cpp
index ffda2bf..c4c94da 100644
--- a/krusader/BookMan/krbookmarkbutton.cpp
+++ b/krusader/BookMan/krbookmarkbutton.cpp
@@ -4,7 +4,7 @@
 #include <tqpixmap.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 
diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp
index d91b6f4..573cb47 100644
--- a/krusader/BookMan/krbookmarkhandler.cpp
+++ b/krusader/BookMan/krbookmarkhandler.cpp
@@ -5,10 +5,10 @@
 #include "../Dialogs/popularurls.h"
 #include "../VFS/vfs.h"
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqptrlist.h>
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kbookmarkmanager.h>
 #include <kstandarddirs.h>
diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp
index 3087741..69ff288 100644
--- a/krusader/Dialogs/checksumdlg.cpp
+++ b/krusader/Dialogs/checksumdlg.cpp
@@ -1,6 +1,6 @@
 #include "checksumdlg.h"
 #include "../krusader.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -8,7 +8,7 @@
 #include <tdelistview.h>
 #include <tqpixmap.h>
 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
@@ -20,7 +20,7 @@
 #include "../krservices.h"
 #include <tqptrlist.h>
 #include <tqmap.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 class CS_Tool; // forward
diff --git a/krusader/Dialogs/krdialogs.cpp b/krusader/Dialogs/krdialogs.cpp
index a9dd0f5..88a41d4 100644
--- a/krusader/Dialogs/krdialogs.cpp
+++ b/krusader/Dialogs/krdialogs.cpp
@@ -38,7 +38,7 @@
 #include <tqfontmetrics.h>
 #include <tqtooltip.h>
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcompletion.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp
index 6e9a480..4989a2b 100644
--- a/krusader/Dialogs/krkeydialog.cpp
+++ b/krusader/Dialogs/krkeydialog.cpp
@@ -13,11 +13,11 @@
 
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeactionshortcutlist.h>
diff --git a/krusader/Dialogs/krmaskchoice.cpp b/krusader/Dialogs/krmaskchoice.cpp
index a817d1f..4f2a9a3 100644
--- a/krusader/Dialogs/krmaskchoice.cpp
+++ b/krusader/Dialogs/krmaskchoice.cpp
@@ -39,7 +39,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 
 /*
diff --git a/krusader/Dialogs/krpleasewait.cpp b/krusader/Dialogs/krpleasewait.cpp
index 1b062b4..e6df81b 100644
--- a/krusader/Dialogs/krpleasewait.cpp
+++ b/krusader/Dialogs/krpleasewait.cpp
@@ -35,7 +35,7 @@
 #include <tqpushbutton.h>
 #include <unistd.h>
 #include "../krusader.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include <kcursor.h>
 
 KRPleaseWait::KRPleaseWait( TQString msg, int count, bool cancel ):
diff --git a/krusader/Dialogs/krprogress.cpp b/krusader/Dialogs/krprogress.cpp
index 6ef8b87..ddbdf25 100644
--- a/krusader/Dialogs/krprogress.cpp
+++ b/krusader/Dialogs/krprogress.cpp
@@ -24,8 +24,8 @@
 #include <tdeapplication.h>
 #include <kdialog.h>
 #include <kstringhandler.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/krusader/Dialogs/krspecialwidgets.cpp b/krusader/Dialogs/krspecialwidgets.cpp
index 09eb3ff..ecc5e28 100644
--- a/krusader/Dialogs/krspecialwidgets.cpp
+++ b/krusader/Dialogs/krspecialwidgets.cpp
@@ -37,7 +37,7 @@ A
 #include "../MountMan/kmountman.h"
 #include <math.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kdebug.h>
 
diff --git a/krusader/Dialogs/krspwidgets.cpp b/krusader/Dialogs/krspwidgets.cpp
index 5641ffc..b0fcf5d 100644
--- a/krusader/Dialogs/krspwidgets.cpp
+++ b/krusader/Dialogs/krspwidgets.cpp
@@ -40,7 +40,7 @@
 #include <tqcheckbox.h>
 #include <tqlistbox.h>
 #include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kcursor.h>
diff --git a/krusader/Dialogs/kurllistrequester.cpp b/krusader/Dialogs/kurllistrequester.cpp
index aa74ece..432f91d 100644
--- a/krusader/Dialogs/kurllistrequester.cpp
+++ b/krusader/Dialogs/kurllistrequester.cpp
@@ -36,8 +36,8 @@
 #include <tdefiledialog.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #define DELETE_ITEM_ID    100
 
diff --git a/krusader/Dialogs/newftpgui.cpp b/krusader/Dialogs/newftpgui.cpp
index 79ef77c..2186adc 100644
--- a/krusader/Dialogs/newftpgui.cpp
+++ b/krusader/Dialogs/newftpgui.cpp
@@ -20,7 +20,7 @@
 #include <tqwhatsthis.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp
index 3ed263f..699b987 100644
--- a/krusader/Dialogs/packguibase.cpp
+++ b/krusader/Dialogs/packguibase.cpp
@@ -46,9 +46,9 @@
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include "../krusader.h"
 
diff --git a/krusader/Dialogs/packguibase.h b/krusader/Dialogs/packguibase.h
index bf32c99..82c4966 100644
--- a/krusader/Dialogs/packguibase.h
+++ b/krusader/Dialogs/packguibase.h
@@ -30,7 +30,7 @@
 #ifndef PACKGUIBASE_H
 #define PACKGUIBASE_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdialog.h>
 #include <tqmap.h>
 
diff --git a/krusader/Dialogs/popularurls.cpp b/krusader/Dialogs/popularurls.cpp
index 77fe00e..e991a06 100644
--- a/krusader/Dialogs/popularurls.cpp
+++ b/krusader/Dialogs/popularurls.cpp
@@ -1,5 +1,5 @@
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp
index 5d2ff5d..a72dc63 100644
--- a/krusader/DiskUsage/diskusage.cpp
+++ b/krusader/DiskUsage/diskusage.cpp
@@ -30,11 +30,11 @@
 
 #include <time.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 #include <tdeio/job.h>
 #include <tqpushbutton.h>
 #include <tqhbox.h>
diff --git a/krusader/DiskUsage/diskusagegui.cpp b/krusader/DiskUsage/diskusagegui.cpp
index d8ac5d5..f588ea8 100644
--- a/krusader/DiskUsage/diskusagegui.cpp
+++ b/krusader/DiskUsage/diskusagegui.cpp
@@ -36,7 +36,7 @@
 
 #include <tqtimer.h>
 #include <tqhbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtooltip.h>
 
 DiskUsageGUI::DiskUsageGUI( KURL openDir, TQWidget* parent, const char *name ) 
diff --git a/krusader/DiskUsage/dufilelight.cpp b/krusader/DiskUsage/dufilelight.cpp
index 1cef747..5fbacef 100644
--- a/krusader/DiskUsage/dufilelight.cpp
+++ b/krusader/DiskUsage/dufilelight.cpp
@@ -31,7 +31,7 @@
 #include "dufilelight.h"
 #include "radialMap/radialMap.h"
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 
 #define SCHEME_POPUP_ID    6730
diff --git a/krusader/DiskUsage/dulines.cpp b/krusader/DiskUsage/dulines.cpp
index 65527ec..ec0ebc0 100644
--- a/krusader/DiskUsage/dulines.cpp
+++ b/krusader/DiskUsage/dulines.cpp
@@ -33,7 +33,7 @@
 #include "../krusader.h"
 #include "../VFS/krpermhandler.h"
 #include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpen.h>
 #include <tqpainter.h>
 #include <tqfontmetrics.h>
diff --git a/krusader/DiskUsage/dulistview.cpp b/krusader/DiskUsage/dulistview.cpp
index 3639ce9..ef88139 100644
--- a/krusader/DiskUsage/dulistview.cpp
+++ b/krusader/DiskUsage/dulistview.cpp
@@ -33,9 +33,9 @@
 #include "../kicons.h"
 #include "../VFS/krpermhandler.h"
 #include <tqfontmetrics.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqheader.h>
 #include <time.h>
 
diff --git a/krusader/DiskUsage/filelightParts/Config.cpp b/krusader/DiskUsage/filelightParts/Config.cpp
index 48d5065..bf25a29 100644
--- a/krusader/DiskUsage/filelightParts/Config.cpp
+++ b/krusader/DiskUsage/filelightParts/Config.cpp
@@ -1,7 +1,7 @@
 
 #include "Config.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 bool Config::varyLabelFontSizes = true;
diff --git a/krusader/DiskUsage/filelightParts/fileTree.cpp b/krusader/DiskUsage/filelightParts/fileTree.cpp
index 60943fe..0afd4d4 100644
--- a/krusader/DiskUsage/filelightParts/fileTree.cpp
+++ b/krusader/DiskUsage/filelightParts/fileTree.cpp
@@ -2,8 +2,8 @@
 //Copyright: See COPYING file that comes with this distribution
 
 #include "fileTree.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 
 //static definitions
diff --git a/krusader/DiskUsage/radialMap/builder.cpp b/krusader/DiskUsage/radialMap/builder.cpp
index fdbf967..8edb70c 100644
--- a/krusader/DiskUsage/radialMap/builder.cpp
+++ b/krusader/DiskUsage/radialMap/builder.cpp
@@ -4,8 +4,8 @@
 #include "builder.h"
 #include "Config.h"
 #include "fileTree.h"
-#include <kglobal.h> //locale object
-#include <klocale.h>
+#include <tdeglobal.h> //locale object
+#include <tdelocale.h>
 #include "widget.h"
 
 
diff --git a/krusader/DiskUsage/radialMap/map.cpp b/krusader/DiskUsage/radialMap/map.cpp
index e5005b3..fefa701 100644
--- a/krusader/DiskUsage/radialMap/map.cpp
+++ b/krusader/DiskUsage/radialMap/map.cpp
@@ -2,7 +2,7 @@
 //Copyright: See COPYING file that comes with this distribution
 
 #include <kcursor.h>         //make()
-#include <kglobalsettings.h> //kdeColours
+#include <tdeglobalsettings.h> //kdeColours
 #include <kimageeffect.h>    //desaturate()
 #include <tqapplication.h>    //make()
 #include <tqimage.h>          //make() & paint()
diff --git a/krusader/DiskUsage/radialMap/segmentTip.cpp b/krusader/DiskUsage/radialMap/segmentTip.cpp
index 939cf0e..2f2b31c 100644
--- a/krusader/DiskUsage/radialMap/segmentTip.cpp
+++ b/krusader/DiskUsage/radialMap/segmentTip.cpp
@@ -5,9 +5,9 @@
 #include "segmentTip.h"
 
 #include <tdeapplication.h>    //installing eventFilters
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>        //for its palette
diff --git a/krusader/DiskUsage/radialMap/widget.cpp b/krusader/DiskUsage/radialMap/widget.cpp
index ded5c58..3f56fc9 100644
--- a/krusader/DiskUsage/radialMap/widget.cpp
+++ b/krusader/DiskUsage/radialMap/widget.cpp
@@ -2,7 +2,7 @@
 //Copyright: See COPYING file that comes with this distribution
 
 #include <kcursor.h>        //ctor
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tqapplication.h>   //sendEvent
 #include <tqbitmap.h>        //ctor - finding cursor size
diff --git a/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp
index fd53781..129581f 100644
--- a/krusader/DiskUsage/radialMap/widgetEvents.cpp
+++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp
@@ -9,8 +9,8 @@
 #include <kiconeffect.h> //::mousePressEvent()
 #include <kiconloader.h> //::mousePressEvent()
 #include <tdeio/job.h>     //::mousePressEvent()
-#include <klocale.h>
-#include <kmessagebox.h> //::mousePressEvent()
+#include <tdelocale.h>
+#include <tdemessagebox.h> //::mousePressEvent()
 #include <tdepopupmenu.h>  //::mousePressEvent()
 #include <krun.h>        //::mousePressEvent()
 #include <math.h>        //::segmentAt()
diff --git a/krusader/Filter/advancedfilter.cpp b/krusader/Filter/advancedfilter.cpp
index e22a6aa..fcd7c29 100644
--- a/krusader/Filter/advancedfilter.cpp
+++ b/krusader/Filter/advancedfilter.cpp
@@ -33,13 +33,13 @@
 #include "../Dialogs/krdialogs.h"
 
 #include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqfile.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <time.h>
 #include <kiconloader.h>
 
diff --git a/krusader/Filter/filterdialog.cpp b/krusader/Filter/filterdialog.cpp
index 10c43c8..b715621 100644
--- a/krusader/Filter/filterdialog.cpp
+++ b/krusader/Filter/filterdialog.cpp
@@ -32,7 +32,7 @@
 #include "filtertabs.h"
 #include "generalfilter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FilterDialog::FilterDialog(  TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n("Krusader::Choose Files"), Ok|Cancel )
diff --git a/krusader/Filter/filtertabs.cpp b/krusader/Filter/filtertabs.cpp
index 10ea72b..01ede00 100644
--- a/krusader/Filter/filtertabs.cpp
+++ b/krusader/Filter/filtertabs.cpp
@@ -33,7 +33,7 @@
 #include "generalfilter.h"
 #include "advancedfilter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FilterTabs::FilterTabs( int properties, TQTabWidget *tabWidget, TQObject *parent ) :
     TQObject( parent, 0 )
diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp
index 135f353..67f317b 100644
--- a/krusader/Filter/generalfilter.cpp
+++ b/krusader/Filter/generalfilter.cpp
@@ -33,9 +33,9 @@
 #include "../krusader.h"
 #include "../VFS/vfs.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tqwhatsthis.h>
 #include <tqpushbutton.h>
diff --git a/krusader/GUI/dirhistorybutton.cpp b/krusader/GUI/dirhistorybutton.cpp
index 6f2b0f1..21aaeb2 100644
--- a/krusader/GUI/dirhistorybutton.cpp
+++ b/krusader/GUI/dirhistorybutton.cpp
@@ -21,7 +21,7 @@
 #include "../VFS/vfs.h"
 #include <tqpopupmenu.h>
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <kdebug.h>
diff --git a/krusader/GUI/kcmdline.cpp b/krusader/GUI/kcmdline.cpp
index 4148026..150961d 100644
--- a/krusader/GUI/kcmdline.cpp
+++ b/krusader/GUI/kcmdline.cpp
@@ -49,13 +49,13 @@
 #include "kcmdmodebutton.h"
 #include <tqdir.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tqfontmetrics.h>
 #include <tqimage.h>
 #include <tqstringlist.h>
 #include <tqsizepolicy.h>
-#include <ktempfile.h> 
+#include <tdetempfile.h> 
 
 KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, name ) {
   TQGridLayout * layout = new TQGridLayout( this, 1, 4 );
diff --git a/krusader/GUI/kcmdmodebutton.cpp b/krusader/GUI/kcmdmodebutton.cpp
index 21247d3..b1e4a72 100644
--- a/krusader/GUI/kcmdmodebutton.cpp
+++ b/krusader/GUI/kcmdmodebutton.cpp
@@ -26,7 +26,7 @@
 #include "../krusaderview.h"
 
 #include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 
diff --git a/krusader/GUI/kfnkeys.cpp b/krusader/GUI/kfnkeys.cpp
index 134e9cd..2c58619 100644
--- a/krusader/GUI/kfnkeys.cpp
+++ b/krusader/GUI/kfnkeys.cpp
@@ -29,8 +29,8 @@
  ***************************************************************************/
 
 #include <tqtooltip.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tqfontmetrics.h>
 #include <tqwhatsthis.h>
 #include "kfnkeys.h"
diff --git a/krusader/GUI/krusaderstatus.h b/krusader/GUI/krusaderstatus.h
index cbeea19..e513928 100644
--- a/krusader/GUI/krusaderstatus.h
+++ b/krusader/GUI/krusaderstatus.h
@@ -40,7 +40,7 @@
 
 // KDE includes
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KrusaderStatus : public KStatusBar {
    Q_OBJECT
diff --git a/krusader/GUI/mediabutton.cpp b/krusader/GUI/mediabutton.cpp
index 30400ee..a77a4de 100644
--- a/krusader/GUI/mediabutton.cpp
+++ b/krusader/GUI/mediabutton.cpp
@@ -40,12 +40,12 @@
 #include <tqfile.h>
 #include <tqfontmetrics.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tdeversion.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kprotocolinfo.h>
 #include <tdefileitem.h>
diff --git a/krusader/GUI/profilemanager.cpp b/krusader/GUI/profilemanager.cpp
index e25afab..18ac042 100644
--- a/krusader/GUI/profilemanager.cpp
+++ b/krusader/GUI/profilemanager.cpp
@@ -31,7 +31,7 @@
 #include "../krusader.h"
 #include "profilemanager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtooltip.h>
 #include <tdepopupmenu.h>
 #include <tqcursor.h>
diff --git a/krusader/GUI/syncbrowsebutton.cpp b/krusader/GUI/syncbrowsebutton.cpp
index 99a3397..f0a18e5 100644
--- a/krusader/GUI/syncbrowsebutton.cpp
+++ b/krusader/GUI/syncbrowsebutton.cpp
@@ -27,7 +27,7 @@ The current version only manages sync-browse and got no mode-switch options.
 
 #include "syncbrowsebutton.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 //#include <kdebug.h>
diff --git a/krusader/KViewer/kimagefilepreview.cpp b/krusader/KViewer/kimagefilepreview.cpp
index 84da5b5..44e5d5e 100644
--- a/krusader/KViewer/kimagefilepreview.cpp
+++ b/krusader/KViewer/kimagefilepreview.cpp
@@ -15,12 +15,12 @@
 #include <tqtimer.h>
 
 #include <tdeapplication.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/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp
index 77418a8..5301ce3 100644
--- a/krusader/KViewer/krviewer.cpp
+++ b/krusader/KViewer/krviewer.cpp
@@ -20,12 +20,12 @@
 #include <tqpopupmenu.h> 
 #include <tqtimer.h>
 // KDE includes
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 #include <ktrader.h>
 #include <tdeio/netaccess.h>
diff --git a/krusader/KViewer/krviewer.h b/krusader/KViewer/krviewer.h
index 83144f3..20dd718 100644
--- a/krusader/KViewer/krviewer.h
+++ b/krusader/KViewer/krviewer.h
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqptrlist.h>
 #include <tdeparts/mainwindow.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeparts/partmanager.h>
 #include <tdeparts/browserextension.h>
 #include <tqguardedptr.h>
diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp
index 8d64399..6fefc51 100644
--- a/krusader/KViewer/panelviewer.cpp
+++ b/krusader/KViewer/panelviewer.cpp
@@ -4,12 +4,12 @@
 #include <tqapplication.h>
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqdict.h>
 #include <tqlabel.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <kuserprofile.h>
 #include <kdebug.h>
diff --git a/krusader/KViewer/panelviewer.h b/krusader/KViewer/panelviewer.h
index b9431af..6d55fcd 100644
--- a/krusader/KViewer/panelviewer.h
+++ b/krusader/KViewer/panelviewer.h
@@ -6,7 +6,7 @@
 #include <tqwidgetstack.h>
 #include <tdeparts/part.h>
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqdict.h>
 #include <tqlabel.h>
 
diff --git a/krusader/Konfigurator/kgadvanced.cpp b/krusader/Konfigurator/kgadvanced.cpp
index 2b9e2fd..e6b753b 100644
--- a/krusader/Konfigurator/kgadvanced.cpp
+++ b/krusader/Konfigurator/kgadvanced.cpp
@@ -30,7 +30,7 @@
 
 #include "kgadvanced.h"
 #include "../defaults.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 #include <sys/param.h>
diff --git a/krusader/Konfigurator/kgcolors.cpp b/krusader/Konfigurator/kgcolors.cpp
index fdceb2b..b4b9234 100644
--- a/krusader/Konfigurator/kgcolors.cpp
+++ b/krusader/Konfigurator/kgcolors.cpp
@@ -31,10 +31,10 @@
 #include "kgcolors.h"
 #include "../defaults.h"
 #include "../Panel/krcolorcache.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <tqhbox.h>
 #include <tqheader.h>
diff --git a/krusader/Konfigurator/kgdependencies.cpp b/krusader/Konfigurator/kgdependencies.cpp
index 76366a2..839b721 100644
--- a/krusader/Konfigurator/kgdependencies.cpp
+++ b/krusader/Konfigurator/kgdependencies.cpp
@@ -32,9 +32,9 @@
 #include "../krservices.h"
 #include "../krusader.h"
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqhbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #define PAGE_GENERAL   0
 #define PAGE_PACKERS   1
diff --git a/krusader/Konfigurator/kggeneral.cpp b/krusader/Konfigurator/kggeneral.cpp
index f11c59b..ba0429c 100644
--- a/krusader/Konfigurator/kggeneral.cpp
+++ b/krusader/Konfigurator/kggeneral.cpp
@@ -32,8 +32,8 @@
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqfontmetrics.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include "krresulttabledialog.h"
 #include "kggeneral.h"
diff --git a/krusader/Konfigurator/kglookfeel.cpp b/krusader/Konfigurator/kglookfeel.cpp
index 115ac00..ffef8fa 100644
--- a/krusader/Konfigurator/kglookfeel.cpp
+++ b/krusader/Konfigurator/kglookfeel.cpp
@@ -33,13 +33,13 @@
 #include "../defaults.h"
 #include "../Dialogs/krdialogs.h"
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqwhatsthis.h>
 #include <tqvalidator.h>
 #include <tqlistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include "../Panel/krselectionmode.h"
 #include "../Panel/listpanel.h"
diff --git a/krusader/Konfigurator/kgprotocols.cpp b/krusader/Konfigurator/kgprotocols.cpp
index a6b512c..b05d43b 100644
--- a/krusader/Konfigurator/kgprotocols.cpp
+++ b/krusader/Konfigurator/kgprotocols.cpp
@@ -31,7 +31,7 @@
 #include "kgprotocols.h"
 #include "../krusader.h"
 #include "../krservices.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kmimetype.h>
 #include <tqvbox.h>
diff --git a/krusader/Konfigurator/kgstartup.cpp b/krusader/Konfigurator/kgstartup.cpp
index 6af61bc..0f46fc9 100644
--- a/krusader/Konfigurator/kgstartup.cpp
+++ b/krusader/Konfigurator/kgstartup.cpp
@@ -32,7 +32,7 @@
 #include "../defaults.h"
 #include "../GUI/profilemanager.h"
 #include "../krusader.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tqwhatsthis.h>
 
diff --git a/krusader/Konfigurator/kguseractions.cpp b/krusader/Konfigurator/kguseractions.cpp
index ebb18fd..c91a591 100644
--- a/krusader/Konfigurator/kguseractions.cpp
+++ b/krusader/Konfigurator/kguseractions.cpp
@@ -33,7 +33,7 @@
 #include "../krusader.h"
 #include "../ActionMan/actionman.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 
diff --git a/krusader/Konfigurator/konfigurator.cpp b/krusader/Konfigurator/konfigurator.cpp
index 55815fa..9bbfe34 100644
--- a/krusader/Konfigurator/konfigurator.cpp
+++ b/krusader/Konfigurator/konfigurator.cpp
@@ -37,10 +37,10 @@
 
 #include <tdefiledialog.h>
 #include <tqwidget.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "../defaults.h"
 #include "../krusaderview.h"
 #include "../GUI/kfnkeys.h"
diff --git a/krusader/Konfigurator/konfiguratoritems.cpp b/krusader/Konfigurator/konfiguratoritems.cpp
index c6cf45d..e83315a 100644
--- a/krusader/Konfigurator/konfiguratoritems.cpp
+++ b/krusader/Konfigurator/konfiguratoritems.cpp
@@ -30,7 +30,7 @@
 
 #include "konfiguratoritems.h"
 #include "../krusader.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqpen.h>
 #include <tqcolordialog.h>
diff --git a/krusader/Konfigurator/krresulttable.h b/krusader/Konfigurator/krresulttable.h
index ee9bb1e..b592825 100644
--- a/krusader/Konfigurator/krresulttable.h
+++ b/krusader/Konfigurator/krresulttable.h
@@ -41,9 +41,9 @@
 #include <tqvaluevector.h>
 
 #include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kseparator.h>
 #include <kurllabel.h>
diff --git a/krusader/Konfigurator/krresulttabledialog.h b/krusader/Konfigurator/krresulttabledialog.h
index 28bbe65..152e184 100644
--- a/krusader/Konfigurator/krresulttabledialog.h
+++ b/krusader/Konfigurator/krresulttabledialog.h
@@ -40,8 +40,8 @@
 
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include "../krusader.h"
 #include "../Konfigurator/krresulttable.h"
diff --git a/krusader/KrJS/krjs.cpp b/krusader/KrJS/krjs.cpp
index 3113967..8d1cffb 100644
--- a/krusader/KrJS/krjs.cpp
+++ b/krusader/KrJS/krjs.cpp
@@ -11,7 +11,7 @@
 #include "../krusaderview.h"
 #include "../panelmanager.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KrJS::KrJS() : KJSEmbed::KJSEmbedPart() {
 
diff --git a/krusader/Locate/locate.cpp b/krusader/Locate/locate.cpp
index 070e8b9..7172cbb 100755
--- a/krusader/Locate/locate.cpp
+++ b/krusader/Locate/locate.cpp
@@ -39,12 +39,12 @@
 #include "../VFS/virt_vfs.h"
 #include "../KViewer/krviewer.h"
 #include "../panelmanager.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqfontmetrics.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tqcursor.h>
 #include <tqeventloop.h>
diff --git a/krusader/MountMan/kmountman.cpp b/krusader/MountMan/kmountman.cpp
index bbe500b..5b891bf 100644
--- a/krusader/MountMan/kmountman.cpp
+++ b/krusader/MountMan/kmountman.cpp
@@ -31,9 +31,9 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include <time.h>
 #include "kmountman.h" 
 // KDE includes
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 
diff --git a/krusader/MountMan/kmountmangui.cpp b/krusader/MountMan/kmountmangui.cpp
index 49181d5..9107808 100644
--- a/krusader/MountMan/kmountmangui.cpp
+++ b/krusader/MountMan/kmountmangui.cpp
@@ -37,11 +37,11 @@ A
 #include "../kicons.h"
 #include "../defaults.h"
 #include "../VFS/vfs.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpixmap.h>
 #include <tdepopupmenu.h>
 #include <tqbitmap.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <kprocess.h>
diff --git a/krusader/Panel/krcalcspacedialog.cpp b/krusader/Panel/krcalcspacedialog.cpp
index 802c5ec..bccf1b0 100644
--- a/krusader/Panel/krcalcspacedialog.cpp
+++ b/krusader/Panel/krcalcspacedialog.cpp
@@ -34,7 +34,7 @@ A
 #include <tqlayout.h>
 #include <tqlabel.h>
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 // Krusader Includes
 #include "krcalcspacedialog.h"
diff --git a/krusader/Panel/krcolorcache.cpp b/krusader/Panel/krcolorcache.cpp
index 27468ea..494966f 100644
--- a/krusader/Panel/krcolorcache.cpp
+++ b/krusader/Panel/krcolorcache.cpp
@@ -30,7 +30,7 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include "krcolorcache.h"
 #include "../krusader.h"
 #include "../defaults.h"
-#include <kglobalsettings.h> 
+#include <tdeglobalsettings.h> 
 #include <tqfile.h> 
 
 
diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp
index eaeb42c..59dd1d8 100644
--- a/krusader/Panel/krdetailedview.cpp
+++ b/krusader/Panel/krdetailedview.cpp
@@ -49,8 +49,8 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include <kprogress.h>
 #include <kstatusbar.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tqdict.h>
 
diff --git a/krusader/Panel/krdetailedview.h b/krusader/Panel/krdetailedview.h
index c15d7f9..9811355 100644
--- a/krusader/Panel/krdetailedview.h
+++ b/krusader/Panel/krdetailedview.h
@@ -32,7 +32,7 @@ A
 
 #include <tdelistview.h>
 #include <ksqueezedtextlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <tqdatetime.h>
diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp
index 6e4a1af..e3ad8f3 100644
--- a/krusader/Panel/krpopupmenu.cpp
+++ b/krusader/Panel/krpopupmenu.cpp
@@ -15,12 +15,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kshred.h>
 #include <krun.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "../krservices.h"
 #include "../defaults.h"
 #include "../MountMan/kmountman.h"
diff --git a/krusader/Panel/krpreviewpopup.cpp b/krusader/Panel/krpreviewpopup.cpp
index 0604325..0bec3be 100644
--- a/krusader/Panel/krpreviewpopup.cpp
+++ b/krusader/Panel/krpreviewpopup.cpp
@@ -18,7 +18,7 @@
 #include <tdeio/previewjob.h>
 #include "krpreviewpopup.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <keditcl.h>
 #include "../KViewer/krviewer.h"
 #include "../krusader.h"
diff --git a/krusader/Panel/krview.cpp b/krusader/Panel/krview.cpp
index b567f1d..d86a761 100644
--- a/krusader/Panel/krview.cpp
+++ b/krusader/Panel/krview.cpp
@@ -37,7 +37,7 @@
 #include <tqdir.h>
 #include <tqbitmap.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 
 
diff --git a/krusader/Panel/krviewitem.cpp b/krusader/Panel/krviewitem.cpp
index c983f99..42d4562 100644
--- a/krusader/Panel/krviewitem.cpp
+++ b/krusader/Panel/krviewitem.cpp
@@ -1,6 +1,6 @@
 #include "krviewitem.h"
 #include "../VFS/krpermhandler.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <sys/types.h>
 #include <time.h>
diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp
index 9d54bea..e0ee969 100644
--- a/krusader/Panel/listpanel.cpp
+++ b/krusader/Panel/listpanel.cpp
@@ -43,8 +43,8 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 // KDE includes
 #include <tdepopupmenu.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <ktrader.h>
@@ -52,9 +52,9 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include <kuserprofile.h>
 #include <kiconloader.h>
 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqtooltip.h>
 #include <tdeversion.h>
 #include <tqimage.h>
diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp
index 0c8f02a..3448b56 100755
--- a/krusader/Panel/panelfunc.cpp
+++ b/krusader/Panel/panelfunc.cpp
@@ -34,14 +34,14 @@ A
 #include <tqeventloop.h>
 #include <tqclipboard.h> 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kpropertiesdialog.h>
 #include <kopenwith.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <krun.h>
 #include <kinputdialog.h>
diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp
index 0c10850..ff393b2 100644
--- a/krusader/Panel/panelpopup.cpp
+++ b/krusader/Panel/panelpopup.cpp
@@ -9,7 +9,7 @@
 #include <tqbuttongroup.h>
 #include <tqtoolbutton.h>
 #include <tdefiletreeview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcursor.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/krusader/RemoteMan/remoteman.cpp b/krusader/RemoteMan/remoteman.cpp
index 877ad54..1f1e8c1 100644
--- a/krusader/RemoteMan/remoteman.cpp
+++ b/krusader/RemoteMan/remoteman.cpp
@@ -35,7 +35,7 @@
 #include "../resources.h"
 #include "../krusader.h"
 #include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpixmap.h>
 #include <tqspinbox.h>
 #include <tqmultilineedit.h>
diff --git a/krusader/RemoteMan/remotemanbase.cpp b/krusader/RemoteMan/remotemanbase.cpp
index bc4aaac..2187948 100644
--- a/krusader/RemoteMan/remotemanbase.cpp
+++ b/krusader/RemoteMan/remotemanbase.cpp
@@ -8,7 +8,7 @@
 ****************************************************************************/
 #include "remotemanbase.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqheader.h>
diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp
index e4cab4d..0ede90d 100644
--- a/krusader/Search/krsearchdialog.cpp
+++ b/krusader/Search/krsearchdialog.cpp
@@ -44,7 +44,7 @@
 #include <kinputdialog.h>
 #include <tqregexp.h>
 #include <tqfontmetrics.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tqcursor.h>
 #include <tqclipboard.h>
diff --git a/krusader/Search/krsearchdialog.h b/krusader/Search/krsearchdialog.h
index 0e1fea5..8295e8d 100644
--- a/krusader/Search/krsearchdialog.h
+++ b/krusader/Search/krsearchdialog.h
@@ -49,8 +49,8 @@
 #include <tqtabwidget.h>
 #include <tqlistview.h>
 #include <tqstringlist.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 class KrSearchDialog : public TQDialog  {
    Q_OBJECT
diff --git a/krusader/Search/krsearchmod.cpp b/krusader/Search/krsearchmod.cpp
index 67592f8..1ce477b 100644
--- a/krusader/Search/krsearchmod.cpp
+++ b/krusader/Search/krsearchmod.cpp
@@ -36,7 +36,7 @@
 #include "../VFS/krpermhandler.h"
 #include "../VFS/krarchandler.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/krusader/Splitter/combiner.cpp b/krusader/Splitter/combiner.cpp
index a4cad65..6f738b3 100644
--- a/krusader/Splitter/combiner.cpp
+++ b/krusader/Splitter/combiner.cpp
@@ -30,8 +30,8 @@
 
 #include "combiner.h"
 #include "../VFS/vfs.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefileitem.h>
 #include <tdeio/job.h>
 #include <tqfileinfo.h>
diff --git a/krusader/Splitter/splitter.cpp b/krusader/Splitter/splitter.cpp
index 2d6a6d1..03acc8c 100644
--- a/krusader/Splitter/splitter.cpp
+++ b/krusader/Splitter/splitter.cpp
@@ -31,8 +31,8 @@
 #include "splitter.h"
 #include "../VFS/vfs.h"
 #include <tqlayout.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <tdefileitem.h>
 #include <tqfileinfo.h>
diff --git a/krusader/Splitter/splittergui.cpp b/krusader/Splitter/splittergui.cpp
index 1256a0a..3f0520d 100644
--- a/krusader/Splitter/splittergui.cpp
+++ b/krusader/Splitter/splittergui.cpp
@@ -30,10 +30,10 @@
 
 #include "splittergui.h"
 #include "../VFS/vfs.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 PredefinedDevice SplitterGUI::predefinedDevices[] = {
   {i18n( "1.44 MB (3.5\")" ),   1457664},
diff --git a/krusader/Synchronizer/feedtolistboxdialog.cpp b/krusader/Synchronizer/feedtolistboxdialog.cpp
index 9711a69..b69503f 100644
--- a/krusader/Synchronizer/feedtolistboxdialog.cpp
+++ b/krusader/Synchronizer/feedtolistboxdialog.cpp
@@ -36,8 +36,8 @@
 #include "../krusader.h"
 #include "../krusaderview.h"
 #include "../panelmanager.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
diff --git a/krusader/Synchronizer/synchronizedialog.cpp b/krusader/Synchronizer/synchronizedialog.cpp
index 454cdef..05208fc 100755
--- a/krusader/Synchronizer/synchronizedialog.cpp
+++ b/krusader/Synchronizer/synchronizedialog.cpp
@@ -34,7 +34,7 @@
 #include "../defaults.h"
 #include <tqlayout.h>
 #include <tqhbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SynchronizeDialog::SynchronizeDialog( TQWidget* parent,  const char* name, bool modal, WFlags fl,
                                       Synchronizer *sync, int pleftCopyNr, TDEIO::filesize_t pleftCopySize,
diff --git a/krusader/Synchronizer/synchronizer.cpp b/krusader/Synchronizer/synchronizer.cpp
index 2ceb0a5..7876c65 100755
--- a/krusader/Synchronizer/synchronizer.cpp
+++ b/krusader/Synchronizer/synchronizer.cpp
@@ -36,8 +36,8 @@
 #include "../VFS/krquery.h"
 #include "config.h"
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqapplication.h>
 #include <tqregexp.h>
 #include <tqdir.h>
diff --git a/krusader/Synchronizer/synchronizerdirlist.cpp b/krusader/Synchronizer/synchronizerdirlist.cpp
index f2109bf..7b66a01 100644
--- a/krusader/Synchronizer/synchronizerdirlist.cpp
+++ b/krusader/Synchronizer/synchronizerdirlist.cpp
@@ -32,8 +32,8 @@
 #include "../VFS/vfs.h"
 #include "../VFS/krpermhandler.h"
 #include <dirent.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefileitem.h>
 #include <klargefile.h>
 #include <tqapplication.h>
diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp
index 2e0f63e..670864f 100755
--- a/krusader/Synchronizer/synchronizergui.cpp
+++ b/krusader/Synchronizer/synchronizergui.cpp
@@ -42,12 +42,12 @@
 #include "feedtolistboxdialog.h"
 #include <tqlayout.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqgrid.h>
 #include <tdepopupmenu.h>
 #include <tqcursor.h>
 #include <time.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <tqeventloop.h>
 #include <tqwhatsthis.h>
diff --git a/krusader/Synchronizer/synchronizertask.cpp b/krusader/Synchronizer/synchronizertask.cpp
index 51787e9..dc8d7b7 100644
--- a/krusader/Synchronizer/synchronizertask.cpp
+++ b/krusader/Synchronizer/synchronizertask.cpp
@@ -34,8 +34,8 @@
 #include "synchronizerdirlist.h"
 #include <tqtimer.h>
 #include <tqfile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include "../VFS/vfs.h"
 
 CompareTask::CompareTask( SynchronizerFileItem *parentIn, const TQString &leftURL,
diff --git a/krusader/UserAction/expander.cpp b/krusader/UserAction/expander.cpp
index 6911f13..a037901 100644
--- a/krusader/UserAction/expander.cpp
+++ b/krusader/UserAction/expander.cpp
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tqstringlist.h>
 #include <tqclipboard.h>
 
diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp
index 409e069..205ec97 100644
--- a/krusader/UserAction/kraction.cpp
+++ b/krusader/UserAction/kraction.cpp
@@ -12,7 +12,7 @@
 
 #include <kdialogbase.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 #include <tqtextedit.h>
 #include <tqvbox.h>
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tdeaction.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include "kraction.h"
 #include "expander.h"
diff --git a/krusader/UserAction/kractionbase.cpp b/krusader/UserAction/kractionbase.cpp
index 873fb59..6eb520d 100644
--- a/krusader/UserAction/kractionbase.cpp
+++ b/krusader/UserAction/kractionbase.cpp
@@ -11,7 +11,7 @@
 //
 
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqerrormessage.h>
 
diff --git a/krusader/UserAction/useraction.cpp b/krusader/UserAction/useraction.cpp
index 938bbb0..2313a94 100644
--- a/krusader/UserAction/useraction.cpp
+++ b/krusader/UserAction/useraction.cpp
@@ -14,7 +14,7 @@
 #include <kurl.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqstring.h>
 #include <tqdom.h>
diff --git a/krusader/UserMenu/usermenu.cpp b/krusader/UserMenu/usermenu.cpp
index d4957e2..5f9241a 100644
--- a/krusader/UserMenu/usermenu.cpp
+++ b/krusader/UserMenu/usermenu.cpp
@@ -16,7 +16,7 @@ email                :
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "../krusader.h"
 #include "../Konfigurator/konfigurator.h"
diff --git a/krusader/VFS/arc_vfs.cpp b/krusader/VFS/arc_vfs.cpp
index ffabdd5..cd0f168 100755
--- a/krusader/VFS/arc_vfs.cpp
+++ b/krusader/VFS/arc_vfs.cpp
@@ -39,12 +39,12 @@
 #include <tqdatetime.h>
 #include <tqfileinfo.h>
 // KDE includes
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeio/jobclasses.h>
 #include <tqprogressdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kmimetype.h>
 #include <kcursor.h>
 #include <klargefile.h>
diff --git a/krusader/VFS/ftp_vfs.cpp b/krusader/VFS/ftp_vfs.cpp
index fc76029..1a02380 100644
--- a/krusader/VFS/ftp_vfs.cpp
+++ b/krusader/VFS/ftp_vfs.cpp
@@ -42,9 +42,9 @@
 #include <tqeventloop.h>
 // KDE includes
 #include <tdeio/jobclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprotocolinfo.h>
 #include <kdebug.h> 
 // Krusader includes
diff --git a/krusader/VFS/krarchandler.cpp b/krusader/VFS/krarchandler.cpp
index 23d48d9..4d5952a 100644
--- a/krusader/VFS/krarchandler.cpp
+++ b/krusader/VFS/krarchandler.cpp
@@ -31,9 +31,9 @@
 #include <tqtextstream.h> 
 // KDE includes
 #include <kprocess.h>
-#include <ktempfile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/passdlg.h> 
 #include <tqfile.h>
 #include <kstandarddirs.h>
diff --git a/krusader/VFS/krpermhandler.cpp b/krusader/VFS/krpermhandler.cpp
index e9e7f24..aa955aa 100644
--- a/krusader/VFS/krpermhandler.cpp
+++ b/krusader/VFS/krpermhandler.cpp
@@ -38,8 +38,8 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <time.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <klargefile.h> 
 // TQt includes
 #include <tqdatetime.h>
diff --git a/krusader/VFS/krquery.cpp b/krusader/VFS/krquery.cpp
index 9898d7e..6dce91e 100644
--- a/krusader/VFS/krquery.cpp
+++ b/krusader/VFS/krquery.cpp
@@ -41,7 +41,7 @@
 #include <tqtextcodec.h>
 #include <tqregexp.h>
 #include <klargefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <tqfile.h>
 #include <kurlcompletion.h>
diff --git a/krusader/VFS/normal_vfs.cpp b/krusader/VFS/normal_vfs.cpp
index d04f243..d01d8d6 100644
--- a/krusader/VFS/normal_vfs.cpp
+++ b/krusader/VFS/normal_vfs.cpp
@@ -36,11 +36,11 @@
 #include <tqdir.h>
 #include <tqtimer.h>
 // KDE includes
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdeio/jobclasses.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <klargefile.h>
 #include <tdefileitem.h>
diff --git a/krusader/VFS/temp_vfs.cpp b/krusader/VFS/temp_vfs.cpp
index f4f6d84..25f3a15 100644
--- a/krusader/VFS/temp_vfs.cpp
+++ b/krusader/VFS/temp_vfs.cpp
@@ -30,7 +30,7 @@
 // TQt includes
 #include <tqdir.h>
 // KDE includes
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 // Krusader includes
 #include "temp_vfs.h"
diff --git a/krusader/VFS/virt_vfs.cpp b/krusader/VFS/virt_vfs.cpp
index a3d1f5c..b55fb3c 100644
--- a/krusader/VFS/virt_vfs.cpp
+++ b/krusader/VFS/virt_vfs.cpp
@@ -19,10 +19,10 @@
 #include <time.h>
  
 #include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdirsize.h>
 #include <kstandarddirs.h>
 
diff --git a/krusader/defaults.h b/krusader/defaults.h
index 6779dc8..82cf1db 100644
--- a/krusader/defaults.h
+++ b/krusader/defaults.h
@@ -29,7 +29,7 @@
 *                                                                         *
 ***************************************************************************/
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 ///////////////////////   [Startup]
 // UI Save Settings
diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp
index 8c6b67d..41c81ea 100644
--- a/krusader/krslots.cpp
+++ b/krusader/krslots.cpp
@@ -35,9 +35,9 @@
 #include <tqlistview.h>
 #include <tqpixmapcache.h>
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineeditdlg.h>
 #include <kdirnotify_stub.h>
 #include <tdeio/netaccess.h>
diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp
index 3d1b120..836526c 100644
--- a/krusader/krusader.cpp
+++ b/krusader/krusader.cpp
@@ -35,15 +35,15 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include <sys/types.h>
 #endif
 // KDE includes
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kcursor.h>
 #include <ksystemtray.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeaccelmanager.h>
 #include <twin.h>
 
diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp
index ef1e915..46a67e0 100644
--- a/krusader/krusaderview.cpp
+++ b/krusader/krusaderview.cpp
@@ -31,7 +31,7 @@
 // TQt includes
 #include <tqwhatsthis.h> 
 #include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeshortcut.h>
 // Krusader includes
 #include "krusaderview.h"
diff --git a/krusader/krusaderview.h b/krusader/krusaderview.h
index 56a9b9e..8b960f5 100644
--- a/krusader/krusaderview.h
+++ b/krusader/krusaderview.h
@@ -34,7 +34,7 @@
 
 // KDE includes
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 #include <tdeapplication.h>
 #include <tdeparts/part.h>
diff --git a/krusader/main.cpp b/krusader/main.cpp
index f3d8e81..00577bc 100644
--- a/krusader/main.cpp
+++ b/krusader/main.cpp
@@ -31,7 +31,7 @@
 // KDE includes
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksplashscreen.h>
 #include <unistd.h>
@@ -44,7 +44,7 @@
 #include "krusaderapp.h"
 #include "defaults.h"
 #include <dcopclient.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <stdlib.h>
 
 static const char *description =
diff --git a/krusader/panelmanager.cpp b/krusader/panelmanager.cpp
index a46adbb..4b8de0f 100644
--- a/krusader/panelmanager.cpp
+++ b/krusader/panelmanager.cpp
@@ -1,6 +1,6 @@
 #include <tqwidgetstack.h>
 #include <tqtoolbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqimage.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/krusader/paneltabbar.cpp b/krusader/paneltabbar.cpp
index 731b4e4..0578e1b 100644
--- a/krusader/paneltabbar.cpp
+++ b/krusader/paneltabbar.cpp
@@ -21,7 +21,7 @@
 #include "krslots.h"
 #include "defaults.h"
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeshortcut.h>
 #include <tqevent.h>
 #include <tqwidgetstack.h>
diff --git a/tar/tar.cc b/tar/tar.cc
index cd47156..bb83b14 100644
--- a/tar/tar.cc
+++ b/tar/tar.cc
@@ -14,7 +14,7 @@
 #include <kzip.h>
 #include <kar.h>
 #include <kmimemagic.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 
 #include <errno.h> // to be removed
diff --git a/virt/virt.cc b/virt/virt.cc
index 426fc63..74f5e61 100644
--- a/virt/virt.cc
+++ b/virt/virt.cc
@@ -23,10 +23,10 @@
 #include <tqfile.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "virt.h"