diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp
index 6aa1152..ae24773 100644
--- a/plugin/smb4k_konqplugin.cpp
+++ b/plugin/smb4k_konqplugin.cpp
@@ -37,9 +37,9 @@
 // KDE includes
 #include <klibloader.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <kcombobox.h>
 #include <tdetoolbarbutton.h>
diff --git a/smb4k.kdevses b/smb4k.kdevses
index b577c59..db3b452 100644
--- a/smb4k.kdevses
+++ b/smb4k.kdevses
@@ -20,7 +20,7 @@
   <Doc5 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/core/smb4kauthinfo.h" >
    <View0 Encoding="" line="64" Type="Source" />
   </Doc5>
-  <Doc6 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/core/smb4kglobal.h" >
+  <Doc6 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/core/smb4tdeglobal.h" >
    <View0 Encoding="" line="82" Type="Source" />
   </Doc6>
  </DocsAndViews>
diff --git a/smb4k/browser/smb4knetworkbrowser.cpp b/smb4k/browser/smb4knetworkbrowser.cpp
index 21ab903..d6fdfde 100644
--- a/smb4k/browser/smb4knetworkbrowser.cpp
+++ b/smb4k/browser/smb4knetworkbrowser.cpp
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // application specific includes
 #include "smb4knetworkbrowser.h"
diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp
index a47fce6..6d59ecf 100644
--- a/smb4k/browser/smb4knetworkbrowser_part.cpp
+++ b/smb4k/browser/smb4knetworkbrowser_part.cpp
@@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -49,7 +49,7 @@
 #include "../core/smb4kcore.h"
 #include "../core/smb4knetworkitems.h"
 #include "../core/smb4kshare.h"
-#include "../core/smb4kglobal.h"
+#include "../core/smb4tdeglobal.h"
 #include "../core/smb4kpasswordhandler.h"
 #include "../core/smb4ksettings.h"
 #include "../core/smb4kbookmark.h"
diff --git a/smb4k/browser/smb4knetworkbrowsertooltip.cpp b/smb4k/browser/smb4knetworkbrowsertooltip.cpp
index 5efd25b..c4c359c 100644
--- a/smb4k/browser/smb4knetworkbrowsertooltip.cpp
+++ b/smb4k/browser/smb4knetworkbrowsertooltip.cpp
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // application specific includes
 #include "smb4knetworkbrowsertooltip.h"
diff --git a/smb4k/configdlg/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp
index ac9c918..6a25740 100644
--- a/smb4k/configdlg/smb4kauthoptions.cpp
+++ b/smb4k/configdlg/smb4kauthoptions.cpp
@@ -33,7 +33,7 @@
 #include <tqwhatsthis.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 // application specific includes
diff --git a/smb4k/configdlg/smb4knetworkoptions.cpp b/smb4k/configdlg/smb4knetworkoptions.cpp
index eab4640..18de2fc 100644
--- a/smb4k/configdlg/smb4knetworkoptions.cpp
+++ b/smb4k/configdlg/smb4knetworkoptions.cpp
@@ -31,7 +31,7 @@
 #include <tqlabel.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 
diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp
index 73cef83..79ef628 100644
--- a/smb4k/configdlg/smb4ksambaoptions.cpp
+++ b/smb4k/configdlg/smb4ksambaoptions.cpp
@@ -34,7 +34,7 @@
 #include <tqmap.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kcombobox.h>
@@ -48,7 +48,7 @@
 
 // application specific includes
 #include "smb4ksambaoptions.h"
-#include "../core/smb4kglobal.h"
+#include "../core/smb4tdeglobal.h"
 #include "../core/smb4ksettings.h"
 
 using namespace Smb4TDEGlobal;
diff --git a/smb4k/configdlg/smb4kshareoptions.cpp b/smb4k/configdlg/smb4kshareoptions.cpp
index 6627b51..26f8b28 100644
--- a/smb4k/configdlg/smb4kshareoptions.cpp
+++ b/smb4k/configdlg/smb4kshareoptions.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbuttonbox.h>
 #include <kurlrequester.h>
 #include <knuminput.h>
diff --git a/smb4k/configdlg/smb4ksuperuseroptions.cpp b/smb4k/configdlg/smb4ksuperuseroptions.cpp
index a3e422e..924a8c0 100644
--- a/smb4k/configdlg/smb4ksuperuseroptions.cpp
+++ b/smb4k/configdlg/smb4ksuperuseroptions.cpp
@@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
 
diff --git a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp
index 5f7f465..11226a1 100644
--- a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp
+++ b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp
@@ -31,7 +31,7 @@
 #include <tqradiobutton.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // application specific includes
 #include "smb4kuserinterfaceoptions.h"
diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp
index cb3f3bf..d61dec4 100644
--- a/smb4k/configdlg/smb4tdeconfigdialog.cpp
+++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp
@@ -31,7 +31,7 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 // system specific includes
@@ -48,7 +48,7 @@
 #include "smb4ksambaoptions.h"
 #include "smb4tdersyncoptions.h"
 #include "../core/smb4ksettings.h"
-#include "../core/smb4kglobal.h"
+#include "../core/smb4tdeglobal.h"
 #include "../core/smb4ksambaoptionsinfo.h"
 #include "../core/smb4ksambaoptionshandler.h"
 #include "../core/smb4kcore.h"
diff --git a/smb4k/configdlg/smb4tdersyncoptions.cpp b/smb4k/configdlg/smb4tdersyncoptions.cpp
index 2fbbe8a..a34bf8b 100644
--- a/smb4k/configdlg/smb4tdersyncoptions.cpp
+++ b/smb4k/configdlg/smb4tdersyncoptions.cpp
@@ -31,7 +31,7 @@
 #include <tqradiobutton.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <knuminput.h>
diff --git a/smb4k/core/Makefile.am b/smb4k/core/Makefile.am
index 3d426b5..821daba 100644
--- a/smb4k/core/Makefile.am
+++ b/smb4k/core/Makefile.am
@@ -5,14 +5,14 @@ lib_LTLIBRARIES = libsmb4kcore.la
 libsmb4kcore_la_LDFLAGS = -no-undefined $(all_libraries) -ltdewalletclient \
 	-version-info 2:0:0
 include_HEADERS = smb4kauthinfo.h smb4kbookmark.h smb4kbookmarkhandler.h \
-	smb4kcore.h smb4kdefs.h smb4kerror.h smb4tdefileio.h smb4kglobal.h \
+	smb4kcore.h smb4kdefs.h smb4kerror.h smb4tdefileio.h smb4tdeglobal.h \
 	smb4khomesshareshandler.h smb4kmounter.h smb4knetworkitems.h \
 	smb4kpasswordhandler.h smb4kpreviewer.h smb4kpreviewitem.h \
 	smb4kprint.h smb4kprintinfo.h smb4ksambaoptionshandler.h \
 	smb4ksambaoptionsinfo.h smb4kscanner.h smb4kshare.h \
 	smb4ksynchronizationinfo.h smb4ksynchronizer.h
 libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \
-	smb4kbookmarkhandler.cpp smb4kcore.cpp smb4kerror.cpp smb4tdefileio.cpp smb4kglobal.cpp \
+	smb4kbookmarkhandler.cpp smb4kcore.cpp smb4kerror.cpp smb4tdefileio.cpp smb4tdeglobal.cpp \
 	smb4kglobal_p.cpp smb4khomesshareshandler.cpp smb4kmounter.cpp smb4kmounter_p.cpp \
 	smb4knetworkitems.cpp smb4kpasswordhandler.cpp smb4kpreviewer.cpp smb4kpreviewitem.cpp \
 	smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \
diff --git a/smb4k/core/smb4kbookmarkhandler.cpp b/smb4k/core/smb4kbookmarkhandler.cpp
index 080d3b6..4661835 100644
--- a/smb4k/core/smb4kbookmarkhandler.cpp
+++ b/smb4k/core/smb4kbookmarkhandler.cpp
@@ -40,7 +40,7 @@
 #include "smb4kbookmarkhandler.h"
 #include "smb4kdefs.h"
 #include "smb4kerror.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4knetworkitems.h"
 #include "smb4kbookmark.h"
 
diff --git a/smb4k/core/smb4kcore.cpp b/smb4k/core/smb4kcore.cpp
index f07d1fc..91e92ab 100644
--- a/smb4k/core/smb4kcore.cpp
+++ b/smb4k/core/smb4kcore.cpp
@@ -30,8 +30,8 @@
 
 // KDE includes
 #include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <krun.h>
 #include <tdeapplication.h>
@@ -47,7 +47,7 @@
 #include "smb4kcore.h"
 #include "smb4kdefs.h"
 #include "smb4kerror.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4knetworkitems.h"
 #include "smb4kshare.h"
 #include "smb4ksambaoptionshandler.h"
diff --git a/smb4k/core/smb4kerror.cpp b/smb4k/core/smb4kerror.cpp
index 6beff4d..3fc0ce4 100644
--- a/smb4k/core/smb4kerror.cpp
+++ b/smb4k/core/smb4kerror.cpp
@@ -24,8 +24,8 @@
  ***************************************************************************/
 
 // KDE includes
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 // application specific includes
 #include "smb4kerror.h"
diff --git a/smb4k/core/smb4kglobal.cpp b/smb4k/core/smb4kglobal.cpp
index a1d09c8..8c8d98a 100644
--- a/smb4k/core/smb4kglobal.cpp
+++ b/smb4k/core/smb4kglobal.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 
 // application specific includes
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4kglobal_p.h"
 #include "smb4kdefs.h"
 
diff --git a/smb4k/core/smb4khomesshareshandler.cpp b/smb4k/core/smb4khomesshareshandler.cpp
index 499ed16..5148dbf 100644
--- a/smb4k/core/smb4khomesshareshandler.cpp
+++ b/smb4k/core/smb4khomesshareshandler.cpp
@@ -32,7 +32,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
 
diff --git a/smb4k/core/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp
index d098268..68eccaf 100644
--- a/smb4k/core/smb4kmounter.cpp
+++ b/smb4k/core/smb4kmounter.cpp
@@ -32,8 +32,8 @@
 
 // KDE includes
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 // system includes
@@ -64,7 +64,7 @@
 #include "smb4kauthinfo.h"
 #include "smb4ksambaoptionsinfo.h"
 #include "smb4kerror.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4ksambaoptionshandler.h"
 #include "smb4kpasswordhandler.h"
 #include "smb4kshare.h"
diff --git a/smb4k/core/smb4knetworkitems.cpp b/smb4k/core/smb4knetworkitems.cpp
index 16bba68..2e9982d 100644
--- a/smb4k/core/smb4knetworkitems.cpp
+++ b/smb4k/core/smb4knetworkitems.cpp
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdesocketaddress.h>
 
 // application specific includes
diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp
index 747a6d3..b6e2f15 100644
--- a/smb4k/core/smb4kpasswordhandler.cpp
+++ b/smb4k/core/smb4kpasswordhandler.cpp
@@ -35,9 +35,9 @@
 #include <tqstringlist.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kcombobox.h>
diff --git a/smb4k/core/smb4kpreviewer.cpp b/smb4k/core/smb4kpreviewer.cpp
index 2f97c0b..ee7cc75 100644
--- a/smb4k/core/smb4kpreviewer.cpp
+++ b/smb4k/core/smb4kpreviewer.cpp
@@ -34,7 +34,7 @@
 #include "smb4kpreviewer.h"
 #include "smb4kpreviewitem.h"
 #include "smb4kdefs.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4kpasswordhandler.h"
 #include "smb4kauthinfo.h"
 #include "smb4ksambaoptionshandler.h"
diff --git a/smb4k/core/smb4kprint.cpp b/smb4k/core/smb4kprint.cpp
index ae7655c..09d042e 100644
--- a/smb4k/core/smb4kprint.cpp
+++ b/smb4k/core/smb4kprint.cpp
@@ -40,7 +40,7 @@
 #include "smb4kprint.h"
 #include "smb4kdefs.h"
 #include "smb4kerror.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4kauthinfo.h"
 #include "smb4kpasswordhandler.h"
 #include "smb4kprintinfo.h"
diff --git a/smb4k/core/smb4ksambaoptionshandler.cpp b/smb4k/core/smb4ksambaoptionshandler.cpp
index 6ec5490..6188542 100644
--- a/smb4k/core/smb4ksambaoptionshandler.cpp
+++ b/smb4k/core/smb4ksambaoptionshandler.cpp
@@ -32,7 +32,7 @@
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // system specific includes
 #include <unistd.h>
@@ -43,7 +43,7 @@
 #include "smb4ksambaoptionshandler.h"
 #include "smb4kdefs.h"
 #include "smb4kerror.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4ksambaoptionsinfo.h"
 #include "smb4kshare.h"
 #include "smb4ksettings.h"
diff --git a/smb4k/core/smb4kscanner.cpp b/smb4k/core/smb4kscanner.cpp
index 0a24419..8998d68 100644
--- a/smb4k/core/smb4kscanner.cpp
+++ b/smb4k/core/smb4kscanner.cpp
@@ -29,7 +29,7 @@
 #include <tqdeepcopy.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdesocketaddress.h>
@@ -42,7 +42,7 @@
 #include "smb4kscanner_p.h"
 #include "smb4kauthinfo.h"
 #include "smb4kerror.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4ksambaoptionshandler.h"
 #include "smb4kpasswordhandler.h"
 #include "smb4knetworkitems.h"
diff --git a/smb4k/core/smb4ksettings.cpp b/smb4k/core/smb4ksettings.cpp
index 3aa8240..8af3e91 100644
--- a/smb4k/core/smb4ksettings.cpp
+++ b/smb4k/core/smb4ksettings.cpp
@@ -3,7 +3,7 @@
 
 #include "smb4ksettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kstaticdeleter.h>
 
diff --git a/smb4k/core/smb4ksynchronizer.cpp b/smb4k/core/smb4ksynchronizer.cpp
index 44525bd..67e682b 100644
--- a/smb4k/core/smb4ksynchronizer.cpp
+++ b/smb4k/core/smb4ksynchronizer.cpp
@@ -30,11 +30,11 @@
 #include <tqregexp.h>
 
 // KDE includes
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kurlrequester.h>
 #include <kguiitem.h>
@@ -44,7 +44,7 @@
 #include "smb4ksynchronizer.h"
 #include "smb4kdefs.h"
 #include "smb4kerror.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4kshare.h"
 #include "smb4ksynchronizationinfo.h"
 #include "smb4ksettings.h"
diff --git a/smb4k/core/smb4tdefileio.cpp b/smb4k/core/smb4tdefileio.cpp
index 560b78b..8513e82 100644
--- a/smb4k/core/smb4tdefileio.cpp
+++ b/smb4k/core/smb4tdefileio.cpp
@@ -31,7 +31,7 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // system specific includes
 #include <errno.h>
@@ -47,7 +47,7 @@
 #include "smb4tdefileio.h"
 #include "smb4kdefs.h"
 #include "smb4kerror.h"
-#include "smb4kglobal.h"
+#include "smb4tdeglobal.h"
 #include "smb4ksettings.h"
 
 using namespace Smb4TDEGlobal;
diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp
index a61dd64..7a5ecbf 100644
--- a/smb4k/dialogs/smb4kbookmarkeditor.cpp
+++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp
@@ -28,13 +28,13 @@
 #include <tqvaluelist.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <tdeaccel.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 
@@ -42,7 +42,7 @@
 #include "smb4kbookmarkeditor.h"
 #include "../core/smb4kbookmark.h"
 #include "../core/smb4kcore.h"
-#include "../core/smb4kglobal.h"
+#include "../core/smb4tdeglobal.h"
 #include "../core/smb4ksettings.h"
 
 using namespace Smb4TDEGlobal;
diff --git a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
index a72d016..7f9528e 100644
--- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
+++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
@@ -30,14 +30,14 @@
 #include <tqframe.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <klineedit.h>
 #include <kdebug.h>
 
 // application specific includes
 #include "smb4kcustomoptionsdialog.h"
-#include "../core/smb4kglobal.h"
+#include "../core/smb4tdeglobal.h"
 #include "../core/smb4kcore.h"
 #include "../core/smb4ksambaoptionsinfo.h"
 #include "../core/smb4ksambaoptionshandler.h"
diff --git a/smb4k/dialogs/smb4kmountdialog.cpp b/smb4k/dialogs/smb4kmountdialog.cpp
index b3849da..597215d 100644
--- a/smb4k/dialogs/smb4kmountdialog.cpp
+++ b/smb4k/dialogs/smb4kmountdialog.cpp
@@ -31,8 +31,8 @@
 #include <tqlabel.h>
 
 // KDE includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/smb4k/dialogs/smb4kpreviewdialog.cpp b/smb4k/dialogs/smb4kpreviewdialog.cpp
index 3cee3ba..7607956 100644
--- a/smb4k/dialogs/smb4kpreviewdialog.cpp
+++ b/smb4k/dialogs/smb4kpreviewdialog.cpp
@@ -29,7 +29,7 @@
 #include <tqiconset.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/smb4k/dialogs/smb4kprintdialog.cpp b/smb4k/dialogs/smb4kprintdialog.cpp
index b869174..e16f831 100644
--- a/smb4k/dialogs/smb4kprintdialog.cpp
+++ b/smb4k/dialogs/smb4kprintdialog.cpp
@@ -29,8 +29,8 @@
 #include <tqframe.h>
 
 // KDE includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <knuminput.h>
 #include <kdebug.h>
diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
index f91c587..5850a76 100644
--- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp
+++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kguiitem.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp
index 5f3deda..3ad60df 100644
--- a/smb4k/iconview/smb4ksharesiconview_part.cpp
+++ b/smb4k/iconview/smb4ksharesiconview_part.cpp
@@ -25,11 +25,11 @@
  ***************************************************************************/
 
 // KDE includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeshortcut.h>
 #include <kdebug.h>
diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
index 235b198..1784393 100644
--- a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
+++ b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/smb4k/listview/smb4kshareslistview.cpp b/smb4k/listview/smb4kshareslistview.cpp
index 08d2e4c..dd29a7b 100644
--- a/smb4k/listview/smb4kshareslistview.cpp
+++ b/smb4k/listview/smb4kshareslistview.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/job.h>
 #include <tdeversion.h>
diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp
index be4bce2..c1acd6d 100644
--- a/smb4k/listview/smb4kshareslistview_part.cpp
+++ b/smb4k/listview/smb4kshareslistview_part.cpp
@@ -28,11 +28,11 @@
 #include <tqheader.h>
 
 // KDE includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeshortcut.h>
 #include <kdebug.h>
diff --git a/smb4k/listview/smb4kshareslistviewtooltip.cpp b/smb4k/listview/smb4kshareslistviewtooltip.cpp
index 9381be7..5851e18 100644
--- a/smb4k/listview/smb4kshareslistviewtooltip.cpp
+++ b/smb4k/listview/smb4kshareslistviewtooltip.cpp
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/smb4k/main.cpp b/smb4k/main.cpp
index 22a95c0..fd0e51f 100644
--- a/smb4k/main.cpp
+++ b/smb4k/main.cpp
@@ -30,12 +30,12 @@
 // KDE includes
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <kuniqueapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 // system includes
diff --git a/smb4k/searchdlg/smb4ksearchdialog.cpp b/smb4k/searchdlg/smb4ksearchdialog.cpp
index f93cc31..d789ad7 100644
--- a/smb4k/searchdlg/smb4ksearchdialog.cpp
+++ b/smb4k/searchdlg/smb4ksearchdialog.cpp
@@ -29,7 +29,7 @@
 #include <tqheader.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 
diff --git a/smb4k/searchdlg/smb4ksearchdialogitem.cpp b/smb4k/searchdlg/smb4ksearchdialogitem.cpp
index a1b1b43..96ba3ac 100644
--- a/smb4k/searchdlg/smb4ksearchdialogitem.cpp
+++ b/smb4k/searchdlg/smb4ksearchdialogitem.cpp
@@ -30,7 +30,7 @@
 // KDE includes
 #include <kiconloader.h>
 #include <kiconeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // application specific includes
 #include "smb4ksearchdialogitem.h"
diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp
index 1fd6761..0ee4413 100644
--- a/smb4k/smb4k.cpp
+++ b/smb4k/smb4k.cpp
@@ -31,11 +31,11 @@
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kuniqueapplication.h>
 #include <kiconloader.h>
 #include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <tdeconfigdialog.h>
 #include <tdeaccel.h>
@@ -46,7 +46,7 @@
 #include "dialogs/smb4kbookmarkeditor.h"
 #include "core/smb4ksettings.h"
 #include "core/smb4kcore.h"
-#include "core/smb4kglobal.h"
+#include "core/smb4tdeglobal.h"
 #include "core/smb4kbookmark.h"
 #include "core/smb4kshare.h"
 #include "core/smb4kdefs.h"
diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp
index c7efea1..3c6bd59 100644
--- a/smb4k/smb4ksystemtray.cpp
+++ b/smb4k/smb4ksystemtray.cpp
@@ -31,12 +31,12 @@
 
 // KDE specific includes
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfigdialog.h>
 #include <kiconeffect.h>