diff --git a/acinclude.m4 b/acinclude.m4
index 235078b..657f827 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
@@ -1812,7 +1812,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
@@ -2118,7 +2118,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")
@@ -2128,7 +2128,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/aclocal.m4 b/aclocal.m4
index 91fc07e..2b5e01e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -614,7 +614,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; 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 "$kde33ornewer"; then
@@ -1824,7 +1824,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2130,7 +2130,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")
@@ -2140,7 +2140,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/apps/ktorrent/README b/apps/ktorrent/README
index f7d3506..39de8b2 100644
--- a/apps/ktorrent/README
+++ b/apps/ktorrent/README
@@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 them more maintainable.
 
 For more details, consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
index 6df556b..708cb17 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/apps/ktorrent/filterbar.cpp
@@ -29,7 +29,7 @@
 #include <ktoolbarbutton.h>
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <interfaces/torrentinterface.h>
 
 
diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp
index 7421cd1..a8e2af6 100644
--- a/apps/ktorrent/ipfilterwidget.cpp
+++ b/apps/ktorrent/ipfilterwidget.cpp
@@ -32,7 +32,7 @@
 #include <klistview.h>
 #include <klineedit.h>
 #include <tdesocketaddress.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index 651f9c6..c60f616 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -38,9 +38,9 @@
 #include <kkeydialog.h>
 #include <kaccel.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kprogress.h>
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index c7c9c81..5216f86 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -22,13 +22,13 @@
 #include <tqdir.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <tqregexp.h>
 
 #include <util/log.h>
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
index 6dd7c67..aa3cd26 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/apps/ktorrent/ktorrentview.cpp
@@ -27,7 +27,7 @@
 #include <kurldrag.h>
 #include <kmessagebox.h>
 #include <kstdguiitem.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <interfaces/torrentinterface.h>
 #include <torrent/globals.h>
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index 28dd724..4fcf150 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -33,7 +33,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "buttonbar.h"
 
diff --git a/apps/ktorrent/newui/buttonbar.cpp b/apps/ktorrent/newui/buttonbar.cpp
index 071b779..5bf3be2 100644
--- a/apps/ktorrent/newui/buttonbar.cpp
+++ b/apps/ktorrent/newui/buttonbar.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index ec53feb..b2ac81d 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -29,7 +29,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
index 125f083..9073d76 100644
--- a/apps/ktorrent/newui/dmainwindow.cpp
+++ b/apps/ktorrent/newui/dmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 #include <tqtoolbutton.h>
diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp
index 7cf36a5..e2f67b8 100644
--- a/apps/ktorrent/newui/dtabwidget.cpp
+++ b/apps/ktorrent/newui/dtabwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqtoolbutton.h>
 #include <tqtabbar.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp
index 5acc667..e7461f0 100644
--- a/apps/ktorrent/pref.cpp
+++ b/apps/ktorrent/pref.cpp
@@ -28,7 +28,7 @@
 #include <knuminput.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
 #include <tqlistview.h>
diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp
index 8518de3..02e0132 100644
--- a/apps/ktorrent/torrentcreatordlg.cpp
+++ b/apps/ktorrent/torrentcreatordlg.cpp
@@ -19,7 +19,7 @@
 #include <kurlrequester.h>
 #include <keditlistbox.h>
 #include <kpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <klistview.h>
 #include <knuminput.h>
diff --git a/apps/ktorrent/viewmanager.cpp b/apps/ktorrent/viewmanager.cpp
index 45a99a0..ea767f4 100644
--- a/apps/ktorrent/viewmanager.cpp
+++ b/apps/ktorrent/viewmanager.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <ktabwidget.h>
 #include <interfaces/torrentinterface.h>
diff --git a/libktorrent/interfaces/exitoperation.h b/libktorrent/interfaces/exitoperation.h
index e45dab4..2a33f24 100644
--- a/libktorrent/interfaces/exitoperation.h
+++ b/libktorrent/interfaces/exitoperation.h
@@ -21,7 +21,7 @@
 #define KTEXITOPERATION_H
 
 #include <tqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace kt
 {
diff --git a/libktorrent/settings.kcfgc b/libktorrent/settings.kcfgc
index f5a6064..f6817f5 100644
--- a/libktorrent/settings.kcfgc
+++ b/libktorrent/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktorrent.kcfg
 ClassName=Settings
 Singleton=true
diff --git a/libktorrent/torrent/cache.h b/libktorrent/torrent/cache.h
index 1aff44b..0b3cc4d 100644
--- a/libktorrent/torrent/cache.h
+++ b/libktorrent/torrent/cache.h
@@ -20,7 +20,7 @@
 #ifndef BTCACHE_H
 #define BTCACHE_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TQStringList;
 
diff --git a/libktorrent/torrent/cachefile.cpp b/libktorrent/torrent/cachefile.cpp
index 7f02b6b..dc5c640 100644
--- a/libktorrent/torrent/cachefile.cpp
+++ b/libktorrent/torrent/cachefile.cpp
@@ -29,9 +29,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <tqfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <util/array.h>
 #include <util/fileops.h>
 #include <torrent/globals.h>
diff --git a/libktorrent/torrent/httptracker.cpp b/libktorrent/torrent/httptracker.cpp
index 5bbaae8..249a60e 100644
--- a/libktorrent/torrent/httptracker.cpp
+++ b/libktorrent/torrent/httptracker.cpp
@@ -27,9 +27,9 @@
 #include <util/error.h>
 #include <util/waitjob.h>
 #include <interfaces/exitoperation.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
 #include "bnode.h"
 #include "httptracker.h"
 #include "torrentcontrol.h"
diff --git a/libktorrent/torrent/movedatafilesjob.h b/libktorrent/torrent/movedatafilesjob.h
index e64a62f..ff5d0bc 100644
--- a/libktorrent/torrent/movedatafilesjob.h
+++ b/libktorrent/torrent/movedatafilesjob.h
@@ -20,7 +20,7 @@
 #ifndef BTMOVEDATAFILESJOB_H
 #define BTMOVEDATAFILESJOB_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace bt
 {
diff --git a/libktorrent/torrent/multifilecache.cpp b/libktorrent/torrent/multifilecache.cpp
index c6cd8b7..ff5c8a9 100644
--- a/libktorrent/torrent/multifilecache.cpp
+++ b/libktorrent/torrent/multifilecache.cpp
@@ -22,7 +22,7 @@
 #include <tqstringlist.h>
 #include <tqfileinfo.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <util/file.h>
 #include <util/fileops.h>
 #include <util/functions.h>
diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
index 4ac512b..207b709 100644
--- a/libktorrent/torrent/torrentcontrol.cpp
+++ b/libktorrent/torrent/torrentcontrol.cpp
@@ -22,7 +22,7 @@
 #include <tqfile.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqtextstream.h>
 #include <util/log.h>
 #include <util/error.h>
diff --git a/libktorrent/util/autorotatelogjob.h b/libktorrent/util/autorotatelogjob.h
index b1e4af1..bde477a 100644
--- a/libktorrent/util/autorotatelogjob.h
+++ b/libktorrent/util/autorotatelogjob.h
@@ -20,7 +20,7 @@
 #ifndef BTAUTOROTATELOGJOB_H
 #define BTAUTOROTATELOGJOB_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <cstdlib>
 
 namespace bt
diff --git a/libktorrent/util/fileops.cpp b/libktorrent/util/fileops.cpp
index 5aadae3..a3e2bf1 100644
--- a/libktorrent/util/fileops.cpp
+++ b/libktorrent/util/fileops.cpp
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/libktorrent/util/functions.cpp b/libktorrent/util/functions.cpp
index 3c73f36..b53a88e 100644
--- a/libktorrent/util/functions.cpp
+++ b/libktorrent/util/functions.cpp
@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <kglobal.h>
diff --git a/libktorrent/util/mmapfile.cpp b/libktorrent/util/mmapfile.cpp
index 811acd7..398ce34 100644
--- a/libktorrent/util/mmapfile.cpp
+++ b/libktorrent/util/mmapfile.cpp
@@ -30,8 +30,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <tqfile.h>
-#include <kfileitem.h>
-#include <kio/netaccess.h>
+#include <tdefileitem.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <util/error.h>
 #include <util/log.h>
diff --git a/libktorrent/util/waitjob.cpp b/libktorrent/util/waitjob.cpp
index ed00f89..e04369e 100644
--- a/libktorrent/util/waitjob.cpp
+++ b/libktorrent/util/waitjob.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <torrent/globals.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include "waitjob.h"
 #include "log.h"
 
diff --git a/libktorrent/util/waitjob.h b/libktorrent/util/waitjob.h
index 232546a..b4c44bc 100644
--- a/libktorrent/util/waitjob.h
+++ b/libktorrent/util/waitjob.h
@@ -21,7 +21,7 @@
 #define BTWAITJOB_H
 
 #include <tqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqvaluelist.h>
 #include <interfaces/exitoperation.h>
 #include "constants.h"
diff --git a/plugins/infowidget/infowidgetpluginsettings.kcfgc b/plugins/infowidget/infowidgetpluginsettings.kcfgc
index 39b3109..a6d8cb9 100644
--- a/plugins/infowidget/infowidgetpluginsettings.kcfgc
+++ b/plugins/infowidget/infowidgetpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktinfowidgetplugin.kcfg
 ClassName=InfoWidgetPluginSettings
 Namespace=kt
diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp
index a6cf3c7..3cd627a 100644
--- a/plugins/ipfilter/convertdialog.cpp
+++ b/plugins/ipfilter/convertdialog.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <kmimetype.h>
 
diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp
index fb1cd9d..9bcbe3d 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/plugins/ipfilter/ipblockingprefpage.cpp
@@ -32,7 +32,7 @@
 #include <kurlrequester.h>
 #include <kurl.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <kmimetype.h>
 
diff --git a/plugins/ipfilter/ipfilterpluginsettings.kcfgc b/plugins/ipfilter/ipfilterpluginsettings.kcfgc
index b9aeaeb..29f74c4 100644
--- a/plugins/ipfilter/ipfilterpluginsettings.kcfgc
+++ b/plugins/ipfilter/ipfilterpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktipfilterplugin.kcfg
 ClassName=IPBlockingPluginSettings
 Namespace=kt
diff --git a/plugins/logviewer/logviewer.cpp b/plugins/logviewer/logviewer.cpp
index 4ab3ab1..343080f 100644
--- a/plugins/logviewer/logviewer.cpp
+++ b/plugins/logviewer/logviewer.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqapplication.h>
 #include "logviewer.h"
 #include "logflags.h"
diff --git a/plugins/logviewer/logviewerpluginsettings.kcfgc b/plugins/logviewer/logviewerpluginsettings.kcfgc
index c10fa1c..dfd7768 100644
--- a/plugins/logviewer/logviewerpluginsettings.kcfgc
+++ b/plugins/logviewer/logviewerpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktlogviewerplugin.kcfg
 ClassName=LogViewerPluginSettings
 Namespace=kt
diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp
index 23b383f..6c227f7 100644
--- a/plugins/partfileimport/importdialog.cpp
+++ b/plugins/partfileimport/importdialog.cpp
@@ -23,8 +23,8 @@
 #include <kurlrequester.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <util/log.h>
 #include <util/error.h>
 #include <util/file.h>
diff --git a/plugins/rssfeed/rss/image.cpp b/plugins/rssfeed/rss/image.cpp
index 4dff982..383d76b 100644
--- a/plugins/rssfeed/rss/image.cpp
+++ b/plugins/rssfeed/rss/image.cpp
@@ -11,7 +11,7 @@
 #include "image.h"
 #include "tools_p.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 #include <tqbuffer.h>
diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp
index d9766d4..97ae2a5 100644
--- a/plugins/rssfeed/rss/loader.cpp
+++ b/plugins/rssfeed/rss/loader.cpp
@@ -11,7 +11,7 @@
 #include "loader.h"
 #include "document.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h
index f563782..2e2ccbb 100644
--- a/plugins/rssfeed/rss/loader.h
+++ b/plugins/rssfeed/rss/loader.h
@@ -114,7 +114,7 @@ namespace RSS
 			/**
 			 * @return The error code for the last process of retrieving data.
 			 * The returned numbers correspond directly to the error codes
-			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/kio/KIO.html#Error">as
+			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
 			 * defined by KIO</a>.
 			 */
 			virtual int errorCode() const;
diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index dea28b3..22289f1 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -22,7 +22,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <krfcdate.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqfile.h>
 #include <tqapplication.h>
 #include <tqdir.h>
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index 65d1d6b..97c5b9c 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -20,9 +20,9 @@
 #include "rssfeedmanager.h"
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <keditlistbox.h>
 // #include <kmimetype.h>
diff --git a/plugins/rssfeed/rssfeedmanager.h b/plugins/rssfeed/rssfeedmanager.h
index 67ac436..939c460 100644
--- a/plugins/rssfeed/rssfeedmanager.h
+++ b/plugins/rssfeed/rssfeedmanager.h
@@ -21,7 +21,7 @@
 #define RSSFEEDMANAGER_H
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqstring.h>
 #include <tqobject.h>
 #include <tqdir.h>
diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h
index 7fb6d85..6badd61 100644
--- a/plugins/rssfeed/rsslinkdownloader.h
+++ b/plugins/rssfeed/rsslinkdownloader.h
@@ -20,7 +20,7 @@
 #ifndef RSSLINKDOWNLOADER_H
 #define RSSLINKDOWNLOADER_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <ktempfile.h>
 
 #include <interfaces/coreinterface.h>
diff --git a/plugins/scanfolder/scanfolder.cpp b/plugins/scanfolder/scanfolder.cpp
index b5872f1..1180f4b 100644
--- a/plugins/scanfolder/scanfolder.cpp
+++ b/plugins/scanfolder/scanfolder.cpp
@@ -20,9 +20,9 @@
 #include "scanfolder.h"
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqstring.h>
 #include <tqobject.h>
diff --git a/plugins/scanfolder/scanfolder.h b/plugins/scanfolder/scanfolder.h
index f5b54b7..680f74c 100644
--- a/plugins/scanfolder/scanfolder.h
+++ b/plugins/scanfolder/scanfolder.h
@@ -21,7 +21,7 @@
 #define SCANFOLDER_H
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqstring.h>
 #include <tqobject.h>
 #include <tqdir.h>
diff --git a/plugins/scanfolder/scanfolderpluginsettings.kcfgc b/plugins/scanfolder/scanfolderpluginsettings.kcfgc
index af1ebbc..7550c9d 100644
--- a/plugins/scanfolder/scanfolderpluginsettings.kcfgc
+++ b/plugins/scanfolder/scanfolderpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktscanfolderplugin.kcfg
 ClassName=ScanFolderPluginSettings
 Namespace=kt
diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp
index 648afe7..f0e68e8 100644
--- a/plugins/scheduler/bwsprefpagewidget.cpp
+++ b/plugins/scheduler/bwsprefpagewidget.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kstdguiitem.h>
diff --git a/plugins/scheduler/schedulerpluginsettings.kcfgc b/plugins/scheduler/schedulerpluginsettings.kcfgc
index f38f816..5c66442 100644
--- a/plugins/scheduler/schedulerpluginsettings.kcfgc
+++ b/plugins/scheduler/schedulerpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktschedulerplugin.kcfg
 ClassName=SchedulerPluginSettings
 Namespace=kt
diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp
index 2b63048..1ce0d5d 100644
--- a/plugins/search/htmlpart.cpp
+++ b/plugins/search/htmlpart.cpp
@@ -18,14 +18,14 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kmessagebox.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 //#include <tqfile.h>
 #include <tqclipboard.h>
 #include <tqapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/browserextension.h>
 #include <util/constants.h>
 #include <tdehtmlview.h>
diff --git a/plugins/search/searchpluginsettings.kcfgc b/plugins/search/searchpluginsettings.kcfgc
index 8b3488b..09cfd64 100644
--- a/plugins/search/searchpluginsettings.kcfgc
+++ b/plugins/search/searchpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktsearchplugin.kcfg
 ClassName=SearchPluginSettings
 Namespace=kt
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index d31a037..8eea5ba 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -30,7 +30,7 @@
 #include <klistview.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klineedit.h>
 
 #include <tqlabel.h>
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index b5008b8..6ae19a9 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -35,9 +35,9 @@
 #include <kcombobox.h>
 #include <kpopupmenu.h>
 #include <tdeparts/partmanager.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <util/log.h>
 #include <torrent/globals.h>
diff --git a/plugins/stats/statspluginsettings.kcfgc b/plugins/stats/statspluginsettings.kcfgc
index d809d30..034322e 100644
--- a/plugins/stats/statspluginsettings.kcfgc
+++ b/plugins/stats/statspluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktstatsplugin.kcfg
 ClassName=StatsPluginSettings
 Namespace=kt
diff --git a/plugins/upnp/upnppluginsettings.kcfgc b/plugins/upnp/upnppluginsettings.kcfgc
index 6cab465..8917f80 100644
--- a/plugins/upnp/upnppluginsettings.kcfgc
+++ b/plugins/upnp/upnppluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktupnpplugin.kcfg
 ClassName=UPnPPluginSettings
 Namespace=kt
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index d924526..d88995a 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -22,8 +22,8 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <tqstringlist.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <torrent/globals.h>
 #include <util/log.h>
 #include <util/array.h>
diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
index 4df085d..bffc1fc 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/plugins/webinterface/php_interface.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/plugins/webinterface/webinterfacepluginsettings.kcfgc b/plugins/webinterface/webinterfacepluginsettings.kcfgc
index fd5aebf..1306161 100644
--- a/plugins/webinterface/webinterfacepluginsettings.kcfgc
+++ b/plugins/webinterface/webinterfacepluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktwebinterfaceplugin.kcfg
 ClassName=WebInterfacePluginSettings
 Namespace=kt