diff --git a/src/askpass/tdesvn-askpass.cpp b/src/askpass/tdesvn-askpass.cpp
index 3c32c33..a744c81 100644
--- a/src/askpass/tdesvn-askpass.cpp
+++ b/src/askpass/tdesvn-askpass.cpp
@@ -21,7 +21,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 #include <iostream>
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 974e140..1095590 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -24,7 +24,7 @@
 #include <kdialogbase.h>
 #include <ktextbrowser.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqlayout.h>
 #include <tqvbox.h>
diff --git a/src/helpers/ktranslateurl.cpp b/src/helpers/ktranslateurl.cpp
index 4fc4d1c..ab863a4 100644
--- a/src/helpers/ktranslateurl.cpp
+++ b/src/helpers/ktranslateurl.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "ktranslateurl.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdefileitem.h>
diff --git a/src/helpers/sub2qt.cpp b/src/helpers/sub2qt.cpp
index cc18b4e..35cf248 100644
--- a/src/helpers/sub2qt.cpp
+++ b/src/helpers/sub2qt.cpp
@@ -20,8 +20,8 @@
 #include "sub2qt.h"
 
 #include "datetime.hpp"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 #include <tqmap.h>
 
 namespace helpers {
diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp
index 879e49d..fc9ab46 100644
--- a/src/ksvnwidgets/authdialogimpl.cpp
+++ b/src/ksvnwidgets/authdialogimpl.cpp
@@ -22,7 +22,7 @@
 
 #include <kpassdlg.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp
index 331edc4..6840ec9 100644
--- a/src/ksvnwidgets/depthselector.cpp
+++ b/src/ksvnwidgets/depthselector.cpp
@@ -20,7 +20,7 @@
 #include "depthselector.h"
 #include "version_check.hpp"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp
index bfbe346..a77e77f 100644
--- a/src/ksvnwidgets/diffbrowser.cpp
+++ b/src/ksvnwidgets/diffbrowser.cpp
@@ -22,13 +22,13 @@
 #include "diffbrowserdata.h"
 #include "tdesvnsettings.h"
 
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfont.h>
 #include <tqtooltip.h>
diff --git a/src/ksvnwidgets/diffsyntax.cpp b/src/ksvnwidgets/diffsyntax.cpp
index 60a95de..d35ec96 100644
--- a/src/ksvnwidgets/diffsyntax.cpp
+++ b/src/ksvnwidgets/diffsyntax.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 #include "diffsyntax.h"
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqregexp.h>
diff --git a/src/ksvnwidgets/encodingselector_impl.cpp b/src/ksvnwidgets/encodingselector_impl.cpp
index 265b1eb..83f7fbe 100644
--- a/src/ksvnwidgets/encodingselector_impl.cpp
+++ b/src/ksvnwidgets/encodingselector_impl.cpp
@@ -20,7 +20,7 @@
 #include "encodingselector_impl.h"
 #include <kdebug.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqcombobox.h>
 
diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp
index 41a197b..aae4d0f 100644
--- a/src/ksvnwidgets/logmsg_impl.cpp
+++ b/src/ksvnwidgets/logmsg_impl.cpp
@@ -24,15 +24,15 @@
 #include <ktextedit.h>
 #include <kcombobox.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kapp.h>
 #include <tdeconfigbase.h>
 #include <tdeconfig.h>
 #include <kurlrequesterdlg.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefile.h>
 #include <kurlrequester.h>
 
diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp
index d55080b..7b4d5b6 100644
--- a/src/ksvnwidgets/ssltrustprompt_impl.cpp
+++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp
@@ -20,12 +20,12 @@
 #include "ssltrustprompt_impl.h"
 #include "tdesvnsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqtable.h>
 #include <tqvbox.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kapp.h>
 #include <tdeconfigbase.h>
 #include <tdeconfig.h>
diff --git a/src/main.cpp b/src/main.cpp
index f3ddfae..08fe514 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 static const char description[] =
diff --git a/src/settings/cmdexecsettings_impl.cpp b/src/settings/cmdexecsettings_impl.cpp
index 0955641..4c912b0 100644
--- a/src/settings/cmdexecsettings_impl.cpp
+++ b/src/settings/cmdexecsettings_impl.cpp
@@ -21,7 +21,7 @@
 
 #include "cmdexecsettings_impl.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <tqcheckbox.h>
 #include <klineedit.h>
diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index 0c6fc69..0acc9bc 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -26,12 +26,12 @@
 #include "encodingselector_impl.h"
 
 #include <tdelistview.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <kapp.h>
 #include <ktextbrowser.h>
diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp
index ab0090c..572b2a4 100644
--- a/src/svnfrontend/ccontextlistener.cpp
+++ b/src/svnfrontend/ccontextlistener.cpp
@@ -24,7 +24,7 @@
 #include "ssltrustprompt_impl.h"
 #include "pwstorage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kapp.h>
 #include <kinputdialog.h>
 #include <kpassdlg.h>
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index 7fc9bb1..953f33a 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/src/svnfrontend/commandexec.cpp
@@ -31,11 +31,11 @@
 #include "copymoveview_impl.h"
 
 #include <kapp.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <ktextbrowser.h>
 
diff --git a/src/svnfrontend/copymoveview_impl.cpp b/src/svnfrontend/copymoveview_impl.cpp
index f635cf8..6ece8d0 100644
--- a/src/svnfrontend/copymoveview_impl.cpp
+++ b/src/svnfrontend/copymoveview_impl.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tqvbox.h>
 
diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp
index dad19a8..c87ff8b 100644
--- a/src/svnfrontend/editproperty_impl.cpp
+++ b/src/svnfrontend/editproperty_impl.cpp
@@ -23,9 +23,9 @@
 
 #include <ktextedit.h>
 #include <kcombobox.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "editproperty_impl.h"
 
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index 3de0b26..615ea4c 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -27,7 +27,7 @@
 #include "url.hpp"
 #include "widgetblockstack.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefileitem.h>
 #include <kdebug.h>
diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp
index e6904ac..f7619fe 100644
--- a/src/svnfrontend/fillcachethread.cpp
+++ b/src/svnfrontend/fillcachethread.cpp
@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 FillCacheThread::FillCacheThread(TQObject*_parent,const TQString&reposRoot)
     : TQThread(),mutex(),m_SvnContextListener(0)
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp
index 85f8891..3dad68d 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp
+++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp
@@ -28,7 +28,7 @@
 
 #include <klineedit.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 CheckoutInfo_impl::CheckoutInfo_impl(TQWidget *parent, const char *name)
diff --git a/src/svnfrontend/fronthelpers/propertyitem.cpp b/src/svnfrontend/fronthelpers/propertyitem.cpp
index 55bb0be..9e7aa76 100644
--- a/src/svnfrontend/fronthelpers/propertyitem.cpp
+++ b/src/svnfrontend/fronthelpers/propertyitem.cpp
@@ -1,5 +1,5 @@
 #include "propertyitem.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 PropertyListViewItem::PropertyListViewItem(TDEListView *parent,const TQString&aName,const TQString&aValue)
diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp
index 49fdb36..1f46571 100644
--- a/src/svnfrontend/fronthelpers/propertylist.cpp
+++ b/src/svnfrontend/fronthelpers/propertylist.cpp
@@ -20,9 +20,9 @@
 #include "propertylist.h"
 #include "propertyitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 Propertylist::Propertylist(TQWidget *parent, const char *name)
diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
index 7ad1d37..861baa1 100644
--- a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
+++ b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
@@ -26,7 +26,7 @@
 #include <knuminput.h>
 #include <kdatetimewidget.h>
 #include <tqbuttongroup.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 Rangeinput_impl::Rangeinput_impl(TQWidget *parent, const char *name)
diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
index 3172df1..66e299a 100644
--- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
+++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
@@ -25,7 +25,7 @@
 #include <kdialog.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvbox.h>
 
diff --git a/src/svnfrontend/graphtree/drawparams.cpp b/src/svnfrontend/graphtree/drawparams.cpp
index afa9cb3..5dc6f6e 100644
--- a/src/svnfrontend/graphtree/drawparams.cpp
+++ b/src/svnfrontend/graphtree/drawparams.cpp
@@ -30,7 +30,7 @@
 #include <tqstyle.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index a9fb8f5..416b6e9 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -27,12 +27,12 @@
 
 #include <kapp.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktempdir.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqtooltip.h>
 #include <tqwmatrix.h>
diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp
index da7cf59..be11aa2 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -32,11 +32,11 @@
 
 #include <kdebug.h>
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kapp.h>
 #include <tdelistview.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqwidget.h>
 #include <tqdatetime.h>
diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp
index c3e5eee..8dfd03e 100644
--- a/src/svnfrontend/importdir_logmsg.cpp
+++ b/src/svnfrontend/importdir_logmsg.cpp
@@ -21,7 +21,7 @@
 
 #include "version_check.hpp"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp
index b0c1d87..c8efc54 100644
--- a/src/svnfrontend/mergedlg_impl.cpp
+++ b/src/svnfrontend/mergedlg_impl.cpp
@@ -25,7 +25,7 @@
 
 #include <kurlrequester.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp
index a6f131c..aa9d090 100644
--- a/src/svnfrontend/opencontextmenu.cpp
+++ b/src/svnfrontend/opencontextmenu.cpp
@@ -20,7 +20,7 @@
 #include "opencontextmenu.h"
 
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 OpenContextmenu::OpenContextmenu(const KURL&aPath,const TDETrader::OfferList&aList,TQWidget* parent, const char* name)
     : TQPopupMenu(parent, name),m_Path(aPath),m_List(aList)
diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp
index cd5281b..b4f8b7e 100644
--- a/src/svnfrontend/propertiesdlg.cpp
+++ b/src/svnfrontend/propertiesdlg.cpp
@@ -32,8 +32,8 @@
 #include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index 9e7663e..8c6077d 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -23,7 +23,7 @@
 #include "stringhelper.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 #include <tqtimer.h>
 #include <tqpushbutton.h>
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index c60df43..9171a00 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -55,13 +55,13 @@
 
 #include <kdialog.h>
 #include <ktextbrowser.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <kprocess.h>
 #include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdialogbase.h>
 #include <tdeapplication.h>
 #include <tdeio/jobclasses.h>
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index e44b057..462a32e 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -21,7 +21,7 @@
 #include "svnitem.h"
 
 #include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index 4fd207e..0e70cbf 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -28,8 +28,8 @@
 #include "sub2qt.h"
 #include "ktranslateurl.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kiconeffect.h>
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index e7ce9d8..5f8b69a 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -27,8 +27,8 @@
 #include <tdelistview.h>
 #include <ktextbrowser.h>
 #include <kpushbutton.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kapp.h>
 #include <tdeconfigbase.h>
 #include <tdeconfig.h>
diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp
index 3947712..eaa4d14 100644
--- a/src/svnfrontend/tcontextlistener.cpp
+++ b/src/svnfrontend/tcontextlistener.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ThreadContextListener::ThreadContextListener(TQObject* parent, const char* name)
     : CContextListener(parent, name)
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index ed40235..83c0467 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -44,10 +44,10 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdirwatch.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <tdeshortcut.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdirselectdialog.h>
 #include <klineedit.h>
 #include <tdefileitem.h>
@@ -55,7 +55,7 @@
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kurldrag.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/job.h>
 #include <krun.h>
 #include <kurldrag.h>
diff --git a/src/tdeiosvn/tdeiolistener.cpp b/src/tdeiosvn/tdeiolistener.cpp
index d8d3210..087008c 100644
--- a/src/tdeiosvn/tdeiolistener.cpp
+++ b/src/tdeiosvn/tdeiolistener.cpp
@@ -21,7 +21,7 @@
 #include "tdeiosvn.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 namespace TDEIO {
diff --git a/src/tdeiosvn/tdeiosvn.cpp b/src/tdeiosvn/tdeiosvn.cpp
index 11c89d0..97c293a 100644
--- a/src/tdeiosvn/tdeiosvn.cpp
+++ b/src/tdeiosvn/tdeiosvn.cpp
@@ -41,11 +41,11 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdemacros.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ktempdir.h>
 #include <ksock.h>
diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp
index e7f282f..4de0574 100644
--- a/src/tdesvn.cpp
+++ b/src/tdesvn.cpp
@@ -29,8 +29,8 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqcursor.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>
@@ -42,10 +42,10 @@
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
 #include <khelpmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <tdeactionclasses.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index 0894dcd..794bf0e 100644
--- a/src/tdesvn_part.cpp
+++ b/src/tdesvn_part.cpp
@@ -44,7 +44,7 @@
 #include <kapp.h>
 #include <tdeconfigdialog.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcursor.h>
 #include <tqpopupmenu.h>
diff --git a/src/tdesvnd/main.cpp b/src/tdesvnd/main.cpp
index 998632d..ab864a6 100644
--- a/src/tdesvnd/main.cpp
+++ b/src/tdesvnd/main.cpp
@@ -24,7 +24,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "tdesvnd_dcop.h"
 
diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp
index 70913e6..442dfae 100644
--- a/src/tdesvnd/tdesvnd_dcop.cpp
+++ b/src/tdesvnd/tdesvnd_dcop.cpp
@@ -34,9 +34,9 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdefiledialog.h>
 #include <kpassdlg.h>
 
diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp
index 257c779..cfa690a 100644
--- a/src/tdesvnview.cpp
+++ b/src/tdesvnview.cpp
@@ -47,9 +47,9 @@
 #include <ktrader.h>
 #include <tdeapplication.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
 #include <tdeactioncollection.h>
diff --git a/src/urldlg.cpp b/src/urldlg.cpp
index 537a634..4a6571d 100644
--- a/src/urldlg.cpp
+++ b/src/urldlg.cpp
@@ -22,8 +22,8 @@
 #include <kurlrequester.h>
 #include <tqlayout.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
 #include <kurl.h>
 #include <kdebug.h>