diff --git a/acinclude.m4 b/acinclude.m4
index 2ce29ad..b3e5f8d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
@@ -1779,7 +1779,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2085,7 +2085,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2095,7 +2095,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/src/app/bookmarkdialog.cpp b/src/app/bookmarkdialog.cpp
index 3fe5aa8..d3646e4 100644
--- a/src/app/bookmarkdialog.cpp
+++ b/src/app/bookmarkdialog.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqlabel.h>
 
 // KDE
-#include <kfile.h>
+#include <tdefile.h>
 #include <kicondialog.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index f482cc7..39e7153 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -32,13 +32,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kcolorbutton.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <tdeversion.h>
 #include <kdirsize.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>
diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
index e6484f6..e5feecf 100644
--- a/src/app/kipiinterface.cpp
+++ b/src/app/kipiinterface.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 #include <kurl.h>
 
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 75a9d42..c159dd2 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -34,17 +34,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kbookmarkmanager.h>
 #include <kbookmarkmenu.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klargefile.h>
 #include <klistview.h>
@@ -1068,9 +1068,9 @@ void MainWindow::createObjectInteractions() {
 		TQT_TQOBJECT(this), TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
 
 	// Bookmarks
-	TQString file = locate( "data", "kfile/bookmarks.xml" );
+	TQString file = locate( "data", "tdefile/bookmarks.xml" );
 	if (file.isEmpty()) {
-		file = locateLocal( "data", "kfile/bookmarks.xml" );
+		file = locateLocal( "data", "tdefile/bookmarks.xml" );
 	}
 
 	KBookmarkManager* manager=KBookmarkManager::managerForFile(file,false);
diff --git a/src/app/metaedit.h b/src/app/metaedit.h
index 1b08f40..3ef6d50 100644
--- a/src/app/metaedit.h
+++ b/src/app/metaedit.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqvbox.h>
 
 // KDE
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 class TQTextEdit;
 
 namespace Gwenview {
diff --git a/src/app/treeview.h b/src/app/treeview.h
index 99dcf5f..5609d11 100644
--- a/src/app/treeview.h
+++ b/src/app/treeview.h
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define TREEVIEW_H
 
 // KDE
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 
 class KURL;
 class TQShowEvent;
diff --git a/src/doc/gwenview.1 b/src/doc/gwenview.1
index db45edb..decd628 100644
--- a/src/doc/gwenview.1
+++ b/src/doc/gwenview.1
@@ -9,7 +9,7 @@ Gwenview is an image viewer for TDE. It features a folder tree window and a file
 .PP
 Image loading is handled by the Qt library, so Gwenview supports all image formats your Qt installation supports. Gwenview correctly displays images with an alpha channel.
 .PP
-Gwenview supports the displaying and editing of EXIF comments, if the necessary JPEG kfile\-plugin is installed. This comes as part of the tdegraphics package. Lossless JPEG transforms are also supported.
+Gwenview supports the displaying and editing of EXIF comments, if the necessary JPEG tdefile\-plugin is installed. This comes as part of the tdegraphics package. Lossless JPEG transforms are also supported.
 .SH OPTIONS
 .SS Arguments:
 .TP
diff --git a/src/gvcore/archive.cpp b/src/gvcore/archive.cpp
index aa5edb7..798fb77 100644
--- a/src/gvcore/archive.cpp
+++ b/src/gvcore/archive.cpp
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 // KDE includes
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // Our includes
 #include "archive.h"
diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp
index 7f074c2..046c105 100644
--- a/src/gvcore/cache.cpp
+++ b/src/gvcore/cache.cpp
@@ -24,12 +24,12 @@ Copyright 2000-2004 Aur
 // TQt
 
 // KDE
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <ksharedptr.h>
 #include <kstaticdeleter.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include "cache.moc"
 
diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp
index 0507cb3..f2faca6 100644
--- a/src/gvcore/deletedialog.cpp
+++ b/src/gvcore/deletedialog.cpp
@@ -14,12 +14,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index b7d3ca8..5fc5070 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -31,10 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kglobalsettings.h>
 #include <kimageio.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
diff --git a/src/gvcore/documentjpegloadedimpl.cpp b/src/gvcore/documentjpegloadedimpl.cpp
index f40c6da..1fed17a 100644
--- a/src/gvcore/documentjpegloadedimpl.cpp
+++ b/src/gvcore/documentjpegloadedimpl.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 
 // Local
diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp
index f3f7611..a8eaac5 100644
--- a/src/gvcore/documentloadedimpl.cpp
+++ b/src/gvcore/documentloadedimpl.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klargefile.h>
 #include <klocale.h>
 #include <ktempfile.h>
diff --git a/src/gvcore/documentotherloadedimpl.cpp b/src/gvcore/documentotherloadedimpl.cpp
index e7afc40..c6b9177 100644
--- a/src/gvcore/documentotherloadedimpl.cpp
+++ b/src/gvcore/documentotherloadedimpl.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #undef ENABLE_LOG
 #undef LOG
diff --git a/src/gvcore/externaltoolmanager.h b/src/gvcore/externaltoolmanager.h
index bfc2d27..00fe169 100644
--- a/src/gvcore/externaltoolmanager.h
+++ b/src/gvcore/externaltoolmanager.h
@@ -26,7 +26,7 @@ Copyright 2000-2004 Aur
 #include <tqptrlist.h>
 
 // KDE
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // Local
 #include "libgwenview_export.h"
diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
index 28ac233..1328100 100644
--- a/src/gvcore/filedetailview.cpp
+++ b/src/gvcore/filedetailview.cpp
@@ -1,5 +1,5 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* This file is based on kfiledetailview.cpp v1.43 from the KDE libs. Original
+/* This file is based on tdefiledetailview.cpp v1.43 from the KDE libs. Original
    copyright follows.
 */
 /* This file is part of the KDE libraries
@@ -33,7 +33,7 @@
 // KDE 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/src/gvcore/filedetailview.h b/src/gvcore/filedetailview.h
index 7a21f25..7b77b26 100644
--- a/src/gvcore/filedetailview.h
+++ b/src/gvcore/filedetailview.h
@@ -1,5 +1,5 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* This file is based on kfiledetailview.h v1.30 from the KDE libs. Original
+/* This file is based on tdefiledetailview.h v1.30 from the KDE libs. Original
    copyright follows.
 */
 /* This file is part of the KDE libraries
diff --git a/src/gvcore/filedetailviewitem.cpp b/src/gvcore/filedetailviewitem.cpp
index 2115386..e841459 100644
--- a/src/gvcore/filedetailviewitem.cpp
+++ b/src/gvcore/filedetailviewitem.cpp
@@ -1,5 +1,5 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* This file is based on kfiledetailview.cpp from the KDE libs. Original
+/* This file is based on tdefiledetailview.cpp from the KDE libs. Original
    copyright follows.
 */
 /* This file is part of the KDE libraries
diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h
index a0ad5df..d374ae0 100644
--- a/src/gvcore/filedetailviewitem.h
+++ b/src/gvcore/filedetailviewitem.h
@@ -1,5 +1,5 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* This file is based on kfiledetailview.h from the KDE libs. Original
+/* This file is based on tdefiledetailview.h from the KDE libs. Original
    copyright follows.
 */
 /* This file is part of the KDE libraries
@@ -26,7 +26,7 @@
 
 // KDE includes
 #include <klistview.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 namespace Gwenview {
 
 #define COL_NAME 0
diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp
index 6c0b07f..5d5ede0 100644
--- a/src/gvcore/fileoperation.cpp
+++ b/src/gvcore/fileoperation.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqobject.h>
 
 // KDE
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
diff --git a/src/gvcore/fileoperation.h b/src/gvcore/fileoperation.h
index 79f7495..7b5f78c 100644
--- a/src/gvcore/fileoperation.h
+++ b/src/gvcore/fileoperation.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "libgwenview_export.h"
 
diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
index 4eb2df8..f0881f4 100644
--- a/src/gvcore/fileopobject.cpp
+++ b/src/gvcore/fileopobject.cpp
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <tdeversion.h>
-#include <kfiledialog.h>
-#include <kfilefiltercombo.h>
+#include <tdefiledialog.h>
+#include <tdefilefiltercombo.h>
 #include <kglobalsettings.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/src/gvcore/fileopobject.h b/src/gvcore/fileopobject.h
index 74c0c77..584c5ff 100644
--- a/src/gvcore/fileopobject.h
+++ b/src/gvcore/fileopobject.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqstring.h>
 
 // KDE includes
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class TQWidget;
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index c9705df..387c497 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/src/gvcore/fileviewbase.h b/src/gvcore/fileviewbase.h
index 7bc4481..755e2f7 100644
--- a/src/gvcore/fileviewbase.h
+++ b/src/gvcore/fileviewbase.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqcolor.h>
 
 // KDE includes
-#include <kfileview.h>
+#include <tdefileview.h>
 namespace Gwenview {
 
 class FileViewBase : public KFileView {
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index 47f3d5c..bf49201 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -47,8 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <ktoolbar.h>
 #include <ktoolbarlabelaction.h>
 #include <kurldrag.h>
-#include <kio/job.h>
-#include <kio/file.h>
+#include <tdeio/job.h>
+#include <tdeio/file.h>
 
 // Local
 #include "archive.h"
diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h
index 38c914e..f1ae23a 100644
--- a/src/gvcore/fileviewcontroller.h
+++ b/src/gvcore/fileviewcontroller.h
@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdirlister.h>
-#include <kfileitem.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 #include "libgwenview_export.h"
diff --git a/src/gvcore/imageloader.h b/src/gvcore/imageloader.h
index b82f79b..1d1e0f5 100644
--- a/src/gvcore/imageloader.h
+++ b/src/gvcore/imageloader.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqcstring.h>
 
 // KDE
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 // Local 
 #include "tsthread/tsthread.h"
diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp
index 8d71e26..8d9027d 100644
--- a/src/gvcore/imagesavedialog.cpp
+++ b/src/gvcore/imagesavedialog.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE includes
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kurlcombobox.h>
diff --git a/src/gvcore/imagesavedialog.h b/src/gvcore/imagesavedialog.h
index 053a768..35114d2 100644
--- a/src/gvcore/imagesavedialog.h
+++ b/src/gvcore/imagesavedialog.h
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define IMAGESAVEDIALOG_H
 
 // KDE includes
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class TQString;
 class TQWidget;
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index 36d8db4..e61ef8c 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE 
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <klocale.h>
diff --git a/src/gvcore/mimetypeutils.cpp b/src/gvcore/mimetypeutils.cpp
index 814f599..d2514d0 100644
--- a/src/gvcore/mimetypeutils.cpp
+++ b/src/gvcore/mimetypeutils.cpp
@@ -25,9 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kapplication.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kimageio.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kurl.h>
 
diff --git a/src/gvcore/slideshow.cpp b/src/gvcore/slideshow.cpp
index 06c7b25..0665733 100644
--- a/src/gvcore/slideshow.cpp
+++ b/src/gvcore/slideshow.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqtimer.h>
 
 // KDE
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 // Local
diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp
index 4670709..54f624f 100644
--- a/src/gvcore/thumbnailloadjob.cpp
+++ b/src/gvcore/thumbnailloadjob.cpp
@@ -39,9 +39,9 @@
 // KDE 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <klargefile.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
diff --git a/src/gvcore/thumbnailloadjob.h b/src/gvcore/thumbnailloadjob.h
index ab39085..29bb4b8 100644
--- a/src/gvcore/thumbnailloadjob.h
+++ b/src/gvcore/thumbnailloadjob.h
@@ -32,7 +32,7 @@
 #include <tqvaluevector.h>
 
 // KDE
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 // Local
 #include "tsthread/tsthread.h"
diff --git a/src/gvcore/timeutils.cpp b/src/gvcore/timeutils.cpp
index 32f3a4f..e493ed2 100644
--- a/src/gvcore/timeutils.cpp
+++ b/src/gvcore/timeutils.cpp
@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kfileitem.h>
-#include <kfilemetainfo.h>
+#include <tdefileitem.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <klocale.h>
 	
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index 3ff3f71..1fd7630 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kstandarddirs.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/genericfactory.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <gvcore/fileoperation.h>
 #include <gvcore/archive.h>
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index e7b7a09..131c14f 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -25,10 +25,10 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirlister.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/src/imageutils/testjpegcontent.cpp b/src/imageutils/testjpegcontent.cpp
index 98de63b..c4ba73f 100644
--- a/src/imageutils/testjpegcontent.cpp
+++ b/src/imageutils/testjpegcontent.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 // Local
 #include "imageutils/imageutils.h"
diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec
index 805dbf0..24a73e4 100644
--- a/src/spec/gwenview-mdk.spec
+++ b/src/spec/gwenview-mdk.spec
@@ -147,7 +147,7 @@ ln -s %_datadir/icons/hicolor/16x16/apps/%{gvname}.png %buildroot/%_miconsdir
 %_datadir/services/%{gvimagepartname}.desktop
 %_menudir/*
 %_datadir/apps/konqueror/servicemenus/*
-%_datadir/apps/kconf_update/%{gvname}*
+%_datadir/apps/tdeconf_update/%{gvname}*
 %dir %_datadir/apps/%{gvname}/
 %_datadir/apps/%{gvname}/*
 %_datadir/icons/crystalsvg/16x16/apps/*
diff --git a/src/updates/Makefile.am b/src/updates/Makefile.am
index c246428..2641d8c 100644
--- a/src/updates/Makefile.am
+++ b/src/updates/Makefile.am
@@ -6,4 +6,4 @@ update_SCRIPTS = \
 	gwenview_thumbnail_size.sh \
 	gwenview_1.4_osdformat.sh
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update