diff --git a/keep/app/advancedbackupconfigdialog.cpp b/keep/app/advancedbackupconfigdialog.cpp
index 609d096..810b1e4 100644
--- a/keep/app/advancedbackupconfigdialog.cpp
+++ b/keep/app/advancedbackupconfigdialog.cpp
@@ -18,7 +18,7 @@
 
 #include "advancedbackupconfigdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kurl.h>
 #include <dcopref.h>
diff --git a/keep/app/backupconfigdialog.cpp b/keep/app/backupconfigdialog.cpp
index 5776c07..7496632 100644
--- a/keep/app/backupconfigdialog.cpp
+++ b/keep/app/backupconfigdialog.cpp
@@ -18,7 +18,7 @@
 
 #include "backupconfigdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kurl.h>
 #include <dcopref.h>
@@ -33,7 +33,7 @@
 #include <tqgroupbox.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqvaluelist.h>
diff --git a/keep/app/forcebackupdialog.cpp b/keep/app/forcebackupdialog.cpp
index 07460e9..b98c329 100644
--- a/keep/app/forcebackupdialog.cpp
+++ b/keep/app/forcebackupdialog.cpp
@@ -18,7 +18,7 @@
 
 #include "forcebackupdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kurl.h>
 #include <dcopref.h>
@@ -33,11 +33,11 @@
 #include <tqgroupbox.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqvaluelist.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "backupconfig.h"
 #include "backuplistviewitem.h"
diff --git a/keep/app/includeexcludedialog.cpp b/keep/app/includeexcludedialog.cpp
index 633ad58..c55eb6c 100644
--- a/keep/app/includeexcludedialog.cpp
+++ b/keep/app/includeexcludedialog.cpp
@@ -18,7 +18,7 @@
 
 #include "includeexcludedialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kurl.h>
 #include <dcopref.h>
diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp
index e135421..c034485 100644
--- a/keep/app/keepmainwindow.cpp
+++ b/keep/app/keepmainwindow.cpp
@@ -25,12 +25,12 @@
 #include <tdeactioncollection.h>
 #include <kstdaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kactivelabel.h>
 #include <kapp.h>
 #include <kled.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdeconfigdialog.h>
 
diff --git a/keep/app/logdialog.cpp b/keep/app/logdialog.cpp
index 8e4c27f..01ab691 100644
--- a/keep/app/logdialog.cpp
+++ b/keep/app/logdialog.cpp
@@ -18,7 +18,7 @@
 
 #include "logdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kstandarddirs.h>
 #include <dcopref.h>
@@ -32,7 +32,7 @@
 #include <tqgroupbox.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqstringlist.h>
diff --git a/keep/app/main.cpp b/keep/app/main.cpp
index 39c4b9b..d436d1d 100644
--- a/keep/app/main.cpp
+++ b/keep/app/main.cpp
@@ -16,7 +16,7 @@
    Free Software Foundation, Inc.,
    51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.           */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <twin.h>
 #include <tdeaboutdata.h>
diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp
index d01f40d..a29ecb3 100644
--- a/keep/app/restorebackupwizard.cpp
+++ b/keep/app/restorebackupwizard.cpp
@@ -21,15 +21,15 @@
 #include <tqpushbutton.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kactivelabel.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <kurlrequester.h>
 #include <tqvaluelist.h>
 #include <tqdir.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "backuplistviewitem.h"
 #include "backupconfig.h"
diff --git a/keep/common/backup.cpp b/keep/common/backup.cpp
index 98bb4a6..95b842f 100644
--- a/keep/common/backup.cpp
+++ b/keep/common/backup.cpp
@@ -16,7 +16,7 @@
    Free Software Foundation, Inc.,
    51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.           */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "backup.h"
diff --git a/keep/common/backuplistviewitem.cpp b/keep/common/backuplistviewitem.cpp
index 3c7ef91..5618e72 100644
--- a/keep/common/backuplistviewitem.cpp
+++ b/keep/common/backuplistviewitem.cpp
@@ -18,7 +18,7 @@
 
 #include "backuplistviewitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <tdelistview.h>
 
diff --git a/keep/common/includeexcludeitem.cpp b/keep/common/includeexcludeitem.cpp
index a75229a..535da2d 100644
--- a/keep/common/includeexcludeitem.cpp
+++ b/keep/common/includeexcludeitem.cpp
@@ -18,7 +18,7 @@
 
 #include "includeexcludeitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <tdelistview.h>
 
diff --git a/keep/common/incrementlistviewitem.cpp b/keep/common/incrementlistviewitem.cpp
index 1ca9249..49af95f 100644
--- a/keep/common/incrementlistviewitem.cpp
+++ b/keep/common/incrementlistviewitem.cpp
@@ -18,7 +18,7 @@
 
 #include "incrementlistviewitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <tdelistview.h>
 
diff --git a/keep/kded/keepkded.cpp b/keep/kded/keepkded.cpp
index c7e517e..6e99712 100644
--- a/keep/kded/keepkded.cpp
+++ b/keep/kded/keepkded.cpp
@@ -25,11 +25,11 @@
 #include <kdebug.h>
 #include <kprocess.h>
 #include <krun.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <kstandarddirs.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <keepsettings.h>
 
 KeepKded::KeepKded(const TQCString &name): KDEDModule(name)