diff --git a/kontact_plugin/basket_plugin.cpp b/kontact_plugin/basket_plugin.cpp
index 8260062..95a6601 100644
--- a/kontact_plugin/basket_plugin.cpp
+++ b/kontact_plugin/basket_plugin.cpp
@@ -21,7 +21,7 @@
 #include <kgenericfactory.h>
 #include <tdeparts/componentfactory.h>
 #include <kontact/core.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <dcopref.h>
 #include "basketdcopiface_stub.h"
diff --git a/kontact_plugin/basket_plugin.h b/kontact_plugin/basket_plugin.h
index 4980318..b45d389 100644
--- a/kontact_plugin/basket_plugin.h
+++ b/kontact_plugin/basket_plugin.h
@@ -21,7 +21,7 @@
 #ifndef BASKET_PLUGIN_H
 #define BASKET_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kontact/plugin.h>
 #include "uniqueapphandler.h"
diff --git a/kontact_plugin/uniqueapphandler.cpp b/kontact_plugin/uniqueapphandler.cpp
index 7f92d18..77d5bdf 100644
--- a/kontact_plugin/uniqueapphandler.cpp
+++ b/kontact_plugin/uniqueapphandler.cpp
@@ -20,7 +20,7 @@
 */
 
 #include "uniqueapphandler.h"
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kontact/core.h>
diff --git a/src/archive.cpp b/src/archive.cpp
index 71700d9..1849810 100644
--- a/src/archive.cpp
+++ b/src/archive.cpp
@@ -25,7 +25,7 @@
 #include <tqdir.h>
 #include <ktar.h>
 #include <tqdom.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <kstandarddirs.h>
diff --git a/src/backgroundmanager.cpp b/src/backgroundmanager.cpp
index a3b56e4..15aea00 100644
--- a/src/backgroundmanager.cpp
+++ b/src/backgroundmanager.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <tqpainter.h>
diff --git a/src/backup.cpp b/src/backup.cpp
index bc644bd..75e68c9 100644
--- a/src/backup.cpp
+++ b/src/backup.cpp
@@ -31,7 +31,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
@@ -42,7 +42,7 @@
 #include <ktar.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cstdlib>
 #include <unistd.h> // usleep()
 
diff --git a/src/basket.cpp b/src/basket.cpp
index e4f6a50..b7327be 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -32,10 +32,10 @@
 #include <tqpoint.h>
 #include <tqstringlist.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kopenwith.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kglobalaccel.h>
 #include <tqdir.h>
 #include <tqfile.h>
@@ -56,7 +56,7 @@
 #include <tqtoolbar.h>
 #include <tqclipboard.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqinputdialog.h>
 
 #include <tqlayout.h>
@@ -5492,7 +5492,7 @@ void Basket::lock()
 #include <tqcursor.h>
 #include <tqaction.h>
 #include <tdestdaccel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqevent.h>
 
 #include <tdeapplication.h>
@@ -5501,7 +5501,7 @@ void Basket::lock()
 #include <tqdragobject.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <tdefiledialog.h>
 #include <tqdir.h>
@@ -5513,7 +5513,7 @@ void Basket::lock()
 #include <tqdir.h>
 #include <kurl.h>
 #include <krun.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeversion.h>
 
 #include "kdirwatch.h"
diff --git a/src/basket_options.h b/src/basket_options.h
index 9f87c92..a8bee89 100644
--- a/src/basket_options.h
+++ b/src/basket_options.h
@@ -22,7 +22,7 @@
 #define BASKET_OPTIONS_H
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TDECmdLineOptions basket_options[] =
 {
diff --git a/src/basket_part.cpp b/src/basket_part.cpp
index 30f3453..2b454c8 100644
--- a/src/basket_part.cpp
+++ b/src/basket_part.cpp
@@ -24,8 +24,8 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <bnpview.h>
 #include <aboutdata.h>
 #include <tdeparts/genericfactory.h>
diff --git a/src/basketfactory.cpp b/src/basketfactory.cpp
index 5c54fd3..ca072d1 100644
--- a/src/basketfactory.cpp
+++ b/src/basketfactory.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 #include <tqdir.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "basketfactory.h"
 #include "global.h"
diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp
index 093336d..5c46688 100644
--- a/src/basketlistview.cpp
+++ b/src/basketlistview.cpp
@@ -20,9 +20,9 @@
 
 #include "basketlistview.h"
 #include <tqregexp.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 #include <tqpainter.h>
 #include <tqbitmap.h>
diff --git a/src/basketproperties.cpp b/src/basketproperties.cpp
index cc6b28d..88d94a8 100644
--- a/src/basketproperties.cpp
+++ b/src/basketproperties.cpp
@@ -29,11 +29,11 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstyle.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "basketproperties.h"
 #include "basket.h"
diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp
index 9554e70..89da7d7 100644
--- a/src/basketstatusbar.cpp
+++ b/src/basketstatusbar.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeparts/statusbarextension.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqlabel.h>
 #include <tqobjectlist.h>
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index 755b61a..0da4ef3 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -32,9 +32,9 @@
 #include <tqdir.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp
index 822dc38..e13ca27 100644
--- a/src/crashhandler.cpp
+++ b/src/crashhandler.cpp
@@ -19,8 +19,8 @@
 #include <tdeapplication.h> //invokeMailer()
 #include <tdeaboutdata.h>
 #include <tdeversion.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 #include <tqfile.h>
 #include <tqregexp.h>
diff --git a/src/debugwindow.cpp b/src/debugwindow.cpp
index 5f1b80a..8e8f188 100644
--- a/src/debugwindow.cpp
+++ b/src/debugwindow.cpp
@@ -22,7 +22,7 @@
 #include <tqtextbrowser.h>
 #include <tqstring.h>
 #include <tqevent.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "global.h"
 #include "debugwindow.h"
diff --git a/src/exporterdialog.cpp b/src/exporterdialog.cpp
index c90a001..97ff0e4 100644
--- a/src/exporterdialog.cpp
+++ b/src/exporterdialog.cpp
@@ -27,7 +27,7 @@
 #include <tqvbox.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include "exporterdialog.h"
diff --git a/src/filter.cpp b/src/filter.cpp
index 1b97264..db9afbc 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -25,8 +25,8 @@
 //#include <tqcombobox.h>
 //#include <klineedit.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
diff --git a/src/focusedwidgets.cpp b/src/focusedwidgets.cpp
index f4e14d9..ec8f84e 100644
--- a/src/focusedwidgets.cpp
+++ b/src/focusedwidgets.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <iostream>
 
diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp
index fd9e87c..66e4bf9 100644
--- a/src/formatimporter.cpp
+++ b/src/formatimporter.cpp
@@ -23,9 +23,9 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqdom.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <iostream>
diff --git a/src/global.cpp b/src/global.cpp
index 077d287..5c75bfb 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tqstring.h>
 #include <tdeaction.h>
diff --git a/src/htmlexporter.cpp b/src/htmlexporter.cpp
index b3b16c6..58aa19e 100644
--- a/src/htmlexporter.cpp
+++ b/src/htmlexporter.cpp
@@ -28,15 +28,15 @@
 #include "tag.h"
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqpainter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kprogress.h>
 
 HTMLExporter::HTMLExporter(Basket *basket)
diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp
index 80c9dae..54a8b98 100644
--- a/src/kcolorcombo2.cpp
+++ b/src/kcolorcombo2.cpp
@@ -23,8 +23,8 @@
 #include <tqbitmap.h>
 #include <tqpainter.h>
 #include <tqlistbox.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kcolordialog.h>
 #include <tqclipboard.h>
 #include <tdestdaccel.h>
diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp
index cef755a..18a5e01 100644
--- a/src/kgpgme.cpp
+++ b/src/kgpgme.cpp
@@ -23,7 +23,7 @@
 #ifdef HAVE_LIBGPGME
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <locale.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp
index f9299db..1afa67c 100644
--- a/src/kiconcanvas.cpp
+++ b/src/kiconcanvas.cpp
@@ -22,8 +22,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kimagefilepreview.h>
diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp
index e5786d1..a32f5ce 100644
--- a/src/kicondialog.cpp
+++ b/src/kicondialog.cpp
@@ -23,8 +23,8 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kprogress.h>
@@ -32,7 +32,7 @@
 #include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/src/likeback.cpp b/src/likeback.cpp
index 53ad0dd..0c7f45f 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -24,8 +24,8 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <kpushbutton.h>
diff --git a/src/linklabel.cpp b/src/linklabel.cpp
index bd2157b..2dca82f 100644
--- a/src/linklabel.cpp
+++ b/src/linklabel.cpp
@@ -23,13 +23,13 @@
 #include <tqlayout.h>
 #include <kiconloader.h>
 #include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqhgroupbox.h>
 #include <tqpainter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqstyle.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
diff --git a/src/main.cpp b/src/main.cpp
index 5173d31..dfdb1a6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,9 +24,9 @@
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kglobalaccel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tqfile.h>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7ad7994..1331ce0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -38,8 +38,8 @@
 #include <tqiconset.h>
 #include <tdeaction.h>
 #include <kapp.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include <kedittoolbar.h>
 #include <kdebug.h>
 #include <tqsignalmapper.h>
@@ -47,11 +47,11 @@
 
 #include <tqpainter.h>
 #include <tqstyle.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <tqdir.h>
 #include <tqstringlist.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tqtimer.h>
 #include <tqaction.h>
diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp
index 2fa28dd..96a277d 100644
--- a/src/newbasketdialog.cpp
+++ b/src/newbasketdialog.cpp
@@ -23,11 +23,11 @@
 #include <kiconview.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqsize.h>
 #include <tqpainter.h>
 #include <tdeapplication.h>
diff --git a/src/note.cpp b/src/note.cpp
index dfffe8f..227df8a 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <tqpainter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqstyle.h>
 #include <tdeapplication.h>
 #include <tdestyle.h>
@@ -27,8 +27,8 @@
 #include <kiconloader.h>
 #include <kpixmapeffect.h>
 #include <kpixmap.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurifilter.h>
 #include <tqfile.h>
 
diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index defbe47..c22743e 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -31,9 +31,9 @@
 #include <ktextedit.h>
 #include <kservice.h>
 #include <kcolordialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kpixmapeffect.h>
 #include <tqbitmap.h>
 #include <kurifilter.h>
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 1aa5d6a..677da57 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -27,15 +27,15 @@
 #include <kcolordialog.h>
 #include <kservice.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <tdetoolbar.h>
 #include <tdeaction.h>
 #include <kurifilter.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "noteedit.h"
 #include "notecontent.h"
diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index 675b34d..aa608c3 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -28,8 +28,8 @@
 #include <tqstylesheet.h>
 #include <tqdir.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdesktopfile.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
diff --git a/src/password.cpp b/src/password.cpp
index b2f8abe..55e5c21 100644
--- a/src/password.cpp
+++ b/src/password.cpp
@@ -26,9 +26,9 @@
 #include <tqtoolbutton.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgpgme.h>
 #include <basket.h>
 
diff --git a/src/regiongrabber.cpp b/src/regiongrabber.cpp
index 57e9e05..83da41c 100644
--- a/src/regiongrabber.cpp
+++ b/src/regiongrabber.cpp
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 SizeTip::SizeTip( TQWidget *parent, const char *name )
     : TQLabel( parent, name, WStyle_Customize | WX11BypassWM |
diff --git a/src/settings.cpp b/src/settings.cpp
index 6a989ee..bed37de 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -31,8 +31,8 @@
 #include <kcolorcombo.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqwhatsthis.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
diff --git a/src/softwareimporters.cpp b/src/softwareimporters.cpp
index df3647c..77248e1 100644
--- a/src/softwareimporters.cpp
+++ b/src/softwareimporters.cpp
@@ -21,13 +21,13 @@
 #include <tqstring.h>
 #include <tqdir.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tqptrstack.h>
 #include <tqlayout.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtextedit.h>
 
 #include "softwareimporters.h"
diff --git a/src/systemtray.cpp b/src/systemtray.cpp
index a011ac6..b8a3280 100644
--- a/src/systemtray.cpp
+++ b/src/systemtray.cpp
@@ -33,12 +33,12 @@
 #include <tqpoint.h>
 #include <tqpixmap.h>
 // To know the program name:
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kiconeffect.h>
 // Others:
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmanagerselection.h>
 #include <tdeversion.h>
 #include <tdeapplication.h>
diff --git a/src/tag.cpp b/src/tag.cpp
index 1206cda..213e44d 100644
--- a/src/tag.cpp
+++ b/src/tag.cpp
@@ -25,8 +25,8 @@
 #include <tqfont.h>
 #include <tqdom.h>
 #include <tqdir.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include "tag.h"
 #include "xmlwork.h"
@@ -703,7 +703,7 @@ void Tag::createDefaultTagsSet(const TQString &fullPath)
 #include <tqstyle.h>
 #include <tqcheckbox.h>
 #include <tqbitmap.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqimage.h>
 #include <tqradiobutton.h>
 #include <kiconeffect.h>
diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
index 4af3c4d..c0bdce8 100644
--- a/src/tagsedit.cpp
+++ b/src/tagsedit.cpp
@@ -27,19 +27,19 @@
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqcheckbox.h>
 #include <kpushbutton.h>
 #include <tqgroupbox.h>
 #include <tqheader.h>
 #include <tqvaluelist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kseparator.h>
 #include <kstringhandler.h>
 #include <tqpainter.h>
 #include <tqaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 
 #include <iostream>
diff --git a/src/variouswidgets.cpp b/src/variouswidgets.cpp
index c09475e..3fd2ff4 100644
--- a/src/variouswidgets.cpp
+++ b/src/variouswidgets.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqsizepolicy.h>
 #include <kopenwith.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqwhatsthis.h>
 #include <kiconview.h>
 #include <kiconloader.h>