diff --git a/src/app/bookmarkdialog.cpp b/src/app/bookmarkdialog.cpp
index d3646e4..33271be 100644
--- a/src/app/bookmarkdialog.cpp
+++ b/src/app/bookmarkdialog.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdefile.h>
 #include <kicondialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 // Local
diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
index 18f21cb..f6e4b32 100644
--- a/src/app/bookmarkviewcontroller.cpp
+++ b/src/app/bookmarkviewcontroller.cpp
@@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdetoolbar.h>
 #include <kurl.h>
diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index 39e7153..792a7a2 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -37,9 +37,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdirsize.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>
 
diff --git a/src/app/dirviewcontroller.cpp b/src/app/dirviewcontroller.cpp
index 0775279..805391c 100644
--- a/src/app/dirviewcontroller.cpp
+++ b/src/app/dirviewcontroller.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpropsdlg.h>
 
 // Local
diff --git a/src/app/history.cpp b/src/app/history.cpp
index 1bfe115..d88e8a0 100644
--- a/src/app/history.cpp
+++ b/src/app/history.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
 #include <tdestdaccel.h>
diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
index e5feecf..73c0453 100644
--- a/src/app/kipiinterface.cpp
+++ b/src/app/kipiinterface.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kdebug.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 // KIPI
diff --git a/src/app/main.cpp b/src/app/main.cpp
index b304e5c..041b9cb 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "gvcore/cache.h"
 #include "gvcore/fileviewcontroller.h"
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index d5f013d..f61d799 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -41,16 +41,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klargefile.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kpropsdlg.h>
 #include <kprotocolinfo.h>
diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp
index 7aa3ced..1a3a006 100644
--- a/src/app/metaedit.cpp
+++ b/src/app/metaedit.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "gvcore/document.h"
diff --git a/src/gvcore/bcgdialog.cpp b/src/gvcore/bcgdialog.cpp
index dad8555..8f3ec36 100644
--- a/src/gvcore/bcgdialog.cpp
+++ b/src/gvcore/bcgdialog.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqvbox.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "imageview.h"
diff --git a/src/gvcore/captionformatter.cpp b/src/gvcore/captionformatter.cpp
index 8cca43b..63f5692 100644
--- a/src/gvcore/captionformatter.cpp
+++ b/src/gvcore/captionformatter.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "captionformatter.h"
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Gwenview {
diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp
index e5e443f..b1e97eb 100644
--- a/src/gvcore/deletedialog.cpp
+++ b/src/gvcore/deletedialog.cpp
@@ -17,10 +17,10 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
 
diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index 23bf4b6..9908a95 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -32,11 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefilemetainfo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kimageio.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kstringhandler.h>
 
diff --git a/src/gvcore/documentanimatedloadedimpl.cpp b/src/gvcore/documentanimatedloadedimpl.cpp
index f813764..a02e828 100644
--- a/src/gvcore/documentanimatedloadedimpl.cpp
+++ b/src/gvcore/documentanimatedloadedimpl.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 namespace Gwenview {
 
 // Local
diff --git a/src/gvcore/documentimpl.cpp b/src/gvcore/documentimpl.cpp
index 6f13eec..bc2f105 100644
--- a/src/gvcore/documentimpl.cpp
+++ b/src/gvcore/documentimpl.cpp
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  
 */
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "document.h"
diff --git a/src/gvcore/documentjpegloadedimpl.cpp b/src/gvcore/documentjpegloadedimpl.cpp
index 1fed17a..2aa6438 100644
--- a/src/gvcore/documentjpegloadedimpl.cpp
+++ b/src/gvcore/documentjpegloadedimpl.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "miscconfig.h"
diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp
index 5069174..ab0271b 100644
--- a/src/gvcore/documentloadedimpl.cpp
+++ b/src/gvcore/documentloadedimpl.cpp
@@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <klargefile.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 // Local
 #include "imageutils/imageutils.h"
diff --git a/src/gvcore/dragpixmapgenerator.h b/src/gvcore/dragpixmapgenerator.h
index 6c3094f..237f4d8 100644
--- a/src/gvcore/dragpixmapgenerator.h
+++ b/src/gvcore/dragpixmapgenerator.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqvaluevector.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Gwenview {
 
diff --git a/src/gvcore/externaltoolcontext.cpp b/src/gvcore/externaltoolcontext.cpp
index 2c86b99..1d473f3 100644
--- a/src/gvcore/externaltoolcontext.cpp
+++ b/src/gvcore/externaltoolcontext.cpp
@@ -24,7 +24,7 @@ Copyright 2000-2004 Aur
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <kservice.h>
diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp
index b891bcc..47ca826 100644
--- a/src/gvcore/externaltooldialog.cpp
+++ b/src/gvcore/externaltooldialog.cpp
@@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kimageio.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>
diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp
index dc2f705..279befc 100644
--- a/src/gvcore/externaltoolmanager.cpp
+++ b/src/gvcore/externaltoolmanager.cpp
@@ -27,7 +27,7 @@ Copyright 2000-2004 Aur
 // KDE
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
index a3cab86..9dc47bd 100644
--- a/src/gvcore/filedetailview.cpp
+++ b/src/gvcore/filedetailview.cpp
@@ -34,9 +34,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <kwordwrap.h>
 
diff --git a/src/gvcore/filedetailviewitem.cpp b/src/gvcore/filedetailviewitem.cpp
index 98e6148..800b852 100644
--- a/src/gvcore/filedetailviewitem.cpp
+++ b/src/gvcore/filedetailviewitem.cpp
@@ -23,8 +23,8 @@
 */
 
 // KDE includes
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // Our includes
 #include "filedetailviewitem.h"
diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp
index 5d5ede0..3a814cd 100644
--- a/src/gvcore/fileoperation.cpp
+++ b/src/gvcore/fileoperation.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "fileopobject.h"
diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
index f0881f4..938ea3f 100644
--- a/src/gvcore/fileopobject.cpp
+++ b/src/gvcore/fileopobject.cpp
@@ -28,10 +28,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <tdefilefiltercombo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurlcombobox.h>
 
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index 654de68..5e9601c 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index b5bde04..c6a325e 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
 #include <kstdaction.h>
diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp
index 8d9027d..78bae30 100644
--- a/src/gvcore/imagesavedialog.cpp
+++ b/src/gvcore/imagesavedialog.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeversion.h>
 #include <tdefilefiltercombo.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcombobox.h>
 
 // Our includes
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index a3d36f3..ec8f490 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <kurldrag.h>
diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index b86a3fe..74ffe0c 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemediaplayer/player.h>
 #include <kmimetype.h>
 #include <tdetoolbar.h>
diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp
index eabbfa7..fdc87a1 100644
--- a/src/gvcore/imageviewtools.cpp
+++ b/src/gvcore/imageviewtools.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // Local
diff --git a/src/gvcore/jpegformattype.cpp b/src/gvcore/jpegformattype.cpp
index c401090..81f9edb 100644
--- a/src/gvcore/jpegformattype.cpp
+++ b/src/gvcore/jpegformattype.cpp
@@ -40,7 +40,7 @@ extern "C" {
 
 // KDE
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // Local
 #include "jpegformattype.h"
diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp
index 3b013b3..574ddb7 100644
--- a/src/gvcore/printdialog.cpp
+++ b/src/gvcore/printdialog.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kprinter.h>
 
diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp
index a651292..6d1f609 100644
--- a/src/gvcore/thumbnailloadjob.cpp
+++ b/src/gvcore/thumbnailloadjob.cpp
@@ -45,7 +45,7 @@
 #include <klargefile.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // libjpeg 
 #include <setjmp.h>
diff --git a/src/gvcore/timeutils.cpp b/src/gvcore/timeutils.cpp
index e493ed2..a00e241 100644
--- a/src/gvcore/timeutils.cpp
+++ b/src/gvcore/timeutils.cpp
@@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdebug.h>
 #include <tdefileitem.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 	
 namespace Gwenview {
 namespace TimeUtils {
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index f5678bb..26578a0 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeaction.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <tdeparts/browserextension.h>
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 4c16991..4dd45bf 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdirlister.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdeparts/genericfactory.h>
 
diff --git a/src/gvimagepart/gvimagepart.h b/src/gvimagepart/gvimagepart.h
index 2fd6961..82a423d 100644
--- a/src/gvimagepart/gvimagepart.h
+++ b/src/gvimagepart/gvimagepart.h
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // Forward declarations
 class TQFile;
diff --git a/src/imageutils/imageutils.cpp b/src/imageutils/imageutils.cpp
index 1610b82..ae9a560 100644
--- a/src/imageutils/imageutils.cpp
+++ b/src/imageutils/imageutils.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // Local
 #include "imageutils/orientation.h"