diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h
index ae0194c..506dc8e 100644
--- a/configdialog/kbfxconfigapp.h
+++ b/configdialog/kbfxconfigapp.h
@@ -52,14 +52,14 @@
 #include <kicondialog.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktextedit.h>
 #include <kurl.h>
 #include <kurlrequester.h>
diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui
index 1673f35..366d414 100644
--- a/configdialog/kbfxconfigdlgbutton.ui
+++ b/configdialog/kbfxconfigdlgbutton.ui
@@ -1229,7 +1229,7 @@
     <tabstop>KbfxResizeKicker</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">kbfxpushbutton.h</include>
     <include location="global" impldecl="in declaration">tqstring.h</include>
     <include location="global" impldecl="in declaration">tqpainter.h</include>
diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui
index 95b1a0d..f969308 100644
--- a/configdialog/kbfxconfigdlgfonts-old.ui
+++ b/configdialog/kbfxconfigdlgfonts-old.ui
@@ -1136,7 +1136,7 @@
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="global" impldecl="in declaration">tdeio/netaccess.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdeconfig.h</include>
     <include location="global" impldecl="in declaration">kbfxfontchooser.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgfonts-old.ui.h</include>
diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui
index 7c0060f..5f04159 100644
--- a/configdialog/kbfxconfigdlglayout.ui
+++ b/configdialog/kbfxconfigdlglayout.ui
@@ -1052,7 +1052,7 @@
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlglayout.ui.h</include>
 </includes>
diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui
index 78e7c52..6c9a1eb 100644
--- a/configdialog/kbfxconfigdlgmain.ui
+++ b/configdialog/kbfxconfigdlgmain.ui
@@ -644,7 +644,7 @@
     <include location="global" impldecl="in declaration">tqpainter.h</include>
     <include location="global" impldecl="in declaration">tqimage.h</include>
     <include location="global" impldecl="in declaration">tqpixmap.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgmain.ui.h</include>
 </includes>
 <variables>
diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui
index d262944..1bd2038 100644
--- a/configdialog/kbfxconfigdlgplugins.ui
+++ b/configdialog/kbfxconfigdlgplugins.ui
@@ -361,7 +361,7 @@
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tqlistbox.h</include>
     <include location="global" impldecl="in declaration">kbfxplasmapluginloader.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgplugins.ui.h</include>
diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui
index 25d7499..660c80b 100644
--- a/configdialog/kbfxconfigdlgthemes.ui
+++ b/configdialog/kbfxconfigdlgthemes.ui
@@ -982,7 +982,7 @@
     <include location="global" impldecl="in declaration">kbfxconfig.h</include>
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdeio/netaccess.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="global" impldecl="in declaration">ktar.h</include>
diff --git a/configdialog/main.cpp b/configdialog/main.cpp
index 0f5842b..f980748 100644
--- a/configdialog/main.cpp
+++ b/configdialog/main.cpp
@@ -27,8 +27,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kuniqueapplication.h>
 
 #include "kbfxconfigapp.h"
diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h
index 3214b1e..dd60620 100644
--- a/kbfxlib/common/kbfxconfig.h
+++ b/kbfxlib/common/kbfxconfig.h
@@ -35,9 +35,9 @@
 #include <tdeconfig.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
 
diff --git a/kbfxlib/common/kbfxfontchooser.h b/kbfxlib/common/kbfxfontchooser.h
index 9ad1e80..790d801 100644
--- a/kbfxlib/common/kbfxfontchooser.h
+++ b/kbfxlib/common/kbfxfontchooser.h
@@ -22,7 +22,7 @@
 
 #include <kdialog.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h
index 3e9df44..2878678 100644
--- a/kbfxlib/common/kbfxkiodownload.h
+++ b/kbfxlib/common/kbfxkiodownload.h
@@ -23,7 +23,7 @@
 #define KBFX_KIO_DOWNLOAD_H
 
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 /**
diff --git a/plugins/applications/kbfxplasmadataplugin.cpp b/plugins/applications/kbfxplasmadataplugin.cpp
index c751ce3..c811053 100644
--- a/plugins/applications/kbfxplasmadataplugin.cpp
+++ b/plugins/applications/kbfxplasmadataplugin.cpp
@@ -22,8 +22,8 @@
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kservice.h>
 #include <kservicegroup.h>
diff --git a/plugins/settings/kbfxplasmadatapluginsettings.cpp b/plugins/settings/kbfxplasmadatapluginsettings.cpp
index 5322458..4600e5d 100644
--- a/plugins/settings/kbfxplasmadatapluginsettings.cpp
+++ b/plugins/settings/kbfxplasmadatapluginsettings.cpp
@@ -22,8 +22,8 @@
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kservice.h>
 #include <kservicegroup.h>
diff --git a/src/kbfxbutton.h b/src/kbfxbutton.h
index e59280e..ee4c18a 100644
--- a/src/kbfxbutton.h
+++ b/src/kbfxbutton.h
@@ -33,8 +33,8 @@
 #include <dcopref.h>
 #include <kdebug.h>
 #include <kimageeffect.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 
diff --git a/src/kbfxspinx.h b/src/kbfxspinx.h
index a069a19..4cc8130 100644
--- a/src/kbfxspinx.h
+++ b/src/kbfxspinx.h
@@ -41,9 +41,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpanelapplet.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
diff --git a/src/kbfxspinxmenu.h b/src/kbfxspinxmenu.h
index 57d8262..78f463d 100644
--- a/src/kbfxspinxmenu.h
+++ b/src/kbfxspinxmenu.h
@@ -37,7 +37,7 @@
 #include <tqwidget.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //#include <kbfxdatasource.h>
 #include <kbfxconfig.h>