diff --git a/kerry/src/beaglesearch.cpp b/kerry/src/beaglesearch.cpp
index e73529c..fcfffee 100644
--- a/kerry/src/beaglesearch.cpp
+++ b/kerry/src/beaglesearch.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 
 #include "beaglesearch.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqapplication.h>
 #include <kurl.h>
 
diff --git a/kerry/src/hitwidget.cpp b/kerry/src/hitwidget.cpp
index 077eb84..2b26813 100644
--- a/kerry/src/hitwidget.cpp
+++ b/kerry/src/hitwidget.cpp
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tqtoolbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqlayout.h>
 #include <konq_filetip.h>
 #include <tqscrollview.h>
diff --git a/kerry/src/kcm/backends.cpp b/kerry/src/kcm/backends.cpp
index 0174792..60fc6ae 100644
--- a/kerry/src/kcm/backends.cpp
+++ b/kerry/src/kcm/backends.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KCMBeagleBackends::KCMBeagleBackends(TQWidget *parent, const char * )
     : TDECModule(parent, "kcmbeaglebackends")
diff --git a/kerry/src/kcm/beagle.cpp b/kerry/src/kcm/beagle.cpp
index 9196044..b37940a 100644
--- a/kerry/src/kcm/beagle.cpp
+++ b/kerry/src/kcm/beagle.cpp
@@ -23,7 +23,7 @@
 #include <tqtabwidget.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 
 #include "beagle.h"
diff --git a/kerry/src/kcm/indexing.cpp b/kerry/src/kcm/indexing.cpp
index 3c3c35b..7c4e0a1 100644
--- a/kerry/src/kcm/indexing.cpp
+++ b/kerry/src/kcm/indexing.cpp
@@ -31,10 +31,10 @@
 #include <kdialog.h>
 #include <kdirselectdialog.h>
 #include <tdefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
diff --git a/kerry/src/kcm/kerry.cpp b/kerry/src/kcm/kerry.cpp
index d5551c0..84fd2d0 100644
--- a/kerry/src/kcm/kerry.cpp
+++ b/kerry/src/kcm/kerry.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 
 #include "kerry.h"
diff --git a/kerry/src/kcm/main.cpp b/kerry/src/kcm/main.cpp
index acd7fff..e80acd7 100644
--- a/kerry/src/kcm/main.cpp
+++ b/kerry/src/kcm/main.cpp
@@ -22,8 +22,8 @@
 #include "beagle.h"
 #include "kerry.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/kerry/src/kcm/search.h b/kerry/src/kcm/search.h
index 04d7dff..89b2134 100644
--- a/kerry/src/kcm/search.h
+++ b/kerry/src/kcm/search.h
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KCMKerrySearch : public TDECModule
 {
diff --git a/kerry/src/kcm/status.cpp b/kerry/src/kcm/status.cpp
index 7e74a22..0e4ba9a 100644
--- a/kerry/src/kcm/status.cpp
+++ b/kerry/src/kcm/status.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassivepopup.h>
 #include <kprocess.h>
 
diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp
index 2a293a8..f231f8b 100644
--- a/kerry/src/kerryapp.cpp
+++ b/kerry/src/kerryapp.cpp
@@ -24,8 +24,8 @@
 #include <tdefiledialog.h>
 #include <tdecmdlineargs.h>
 #include <fcntl.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
diff --git a/kerry/src/kerrylabel.cpp b/kerry/src/kerrylabel.cpp
index 9a10144..872235a 100644
--- a/kerry/src/kerrylabel.cpp
+++ b/kerry/src/kerrylabel.cpp
@@ -22,7 +22,7 @@
 #include "hitwidget.h"
 
 #include <tqdragobject.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurl.h>
 #include <krun.h>
 #include <konq_popupmenu.h>
diff --git a/kerry/src/kwidgetlistbox.cpp b/kerry/src/kwidgetlistbox.cpp
index f5a2711..edc3012 100644
--- a/kerry/src/kwidgetlistbox.cpp
+++ b/kerry/src/kwidgetlistbox.cpp
@@ -19,7 +19,7 @@
 
 #include "kwidgetlistbox.h"
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <hitwidget.h>
 
 KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
diff --git a/kerry/src/main.cpp b/kerry/src/main.cpp
index ece9319..a9e9725 100644
--- a/kerry/src/main.cpp
+++ b/kerry/src/main.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp
index 50d7a74..13473cb 100644
--- a/kerry/src/searchdlg.cpp
+++ b/kerry/src/searchdlg.cpp
@@ -28,12 +28,12 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <tdefileitem.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kurllabel.h>
 #include <krun.h>
diff --git a/kerry/src/searchdlg.h b/kerry/src/searchdlg.h
index e6cc037..839e0c7 100644
--- a/kerry/src/searchdlg.h
+++ b/kerry/src/searchdlg.h
@@ -27,8 +27,8 @@
 #include <tdeio/previewjob.h>
 #include <tdefileitem.h>
 #include <dcopinterface.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 class KFileItem;
 class TQCheckBox;