diff --git a/acinclude.m4 b/acinclude.m4
index f7ddb78..13a4e01 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
@@ -1803,7 +1803,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
@@ -2109,7 +2109,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")
@@ -2119,7 +2119,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/konversation/src/Makefile.am b/konversation/src/Makefile.am
index aab2be9..c9a0736 100644
--- a/konversation/src/Makefile.am
+++ b/konversation/src/Makefile.am
@@ -49,7 +49,7 @@ rc_DATA = konversationui.rc eventsrc
 kdelnk_DATA = konvirc.protocol konvirc6.protocol
 kdelnkdir = $(kde_servicesdir)
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = konversation.upd
 update_SCRIPTS = konversation-0.19-colors.pl konversation-0.19-sortorder.pl konversation-0.19-appearance.pl \
 				 konversation-0.19-tabplacement.pl konversation-0.19-custombrowser.pl \
diff --git a/konversation/src/alias_preferences.cpp b/konversation/src/alias_preferences.cpp
index e51bb63..3f6289d 100644
--- a/konversation/src/alias_preferences.cpp
+++ b/konversation/src/alias_preferences.cpp
@@ -19,7 +19,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <klistview.h>
diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp
index 2c870d4..88ed31c 100644
--- a/konversation/src/autoreplace_preferences.cpp
+++ b/konversation/src/autoreplace_preferences.cpp
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <klistview.h>
diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp
index 165a177..1e19f01 100644
--- a/konversation/src/channellistpanel.cpp
+++ b/konversation/src/channellistpanel.cpp
@@ -35,7 +35,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
 #include <tdeversion.h>
diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg
index 61f171a..03ce962 100644
--- a/konversation/src/config/konversation.kcfg
+++ b/konversation/src/config/konversation.kcfg
@@ -964,7 +964,7 @@
   </group>
   <group name="QueueRates">
     <entry name="queueRate$(QueueIndex)" type="IntList" key="EmptyingRate $(QueueIndex)">
-        <!-- kconfig_compiler really should do this for me... -->
+        <!-- tdeconfig_compiler really should do this for me... -->
         <code>  TQValueList&lt; TQValueList&lt;int&gt; &gt; defaultRate;
   TQValueList&lt; TQValueList&lt;int&gt; &gt;::iterator defaultRateInitIter;
 
@@ -983,7 +983,7 @@
   (*defaultRateInitIter).append( 1 );
   (*defaultRateInitIter).append( 0 );
 
-  if (0) //kconfig_compiler generates invalid code for int lists</code>
+  if (0) //tdeconfig_compiler generates invalid code for int lists</code>
         <parameter name="QueueIndex" type="Int" max="2"/>
         <default param="0" code="true">defaultRate[0]</default>
         <default param="1" code="true">defaultRate[1]</default>
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
index 8a2a942..06d1fd8 100644
--- a/konversation/src/config/preferences.cpp
+++ b/konversation/src/config/preferences.cpp
@@ -25,7 +25,7 @@
 #include <kstaticdeleter.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kuser.h>
diff --git a/konversation/src/config/preferences.h b/konversation/src/config/preferences.h
index b7ae8ed..267c73d 100644
--- a/konversation/src/config/preferences.h
+++ b/konversation/src/config/preferences.h
@@ -74,7 +74,7 @@ class Preferences : public TQObject, public PreferencesBase
         /** Returns a list of alias set up by default.  This is a set of aliases for the scripts found. */
         static TQStringList defaultAliasList();
 
-        //notifylist is in kconfigxt - FIXME
+        //notifylist is in tdeconfigxt - FIXME
         static const TQMap<int, TQStringList> notifyList();
         static const TQStringList notifyListByGroupName(const TQString& groupName);
         static const TQString notifyStringByGroupName(const TQString& groupName);
diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h
index 3da2a55..25385bc 100644
--- a/konversation/src/dcctransfer.h
+++ b/konversation/src/dcctransfer.h
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 typedef double transferspeed_t;
 
diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp
index 9e24fb2..6c2a4b4 100644
--- a/konversation/src/dcctransferpanelitem.cpp
+++ b/konversation/src/dcctransferpanelitem.cpp
@@ -24,10 +24,10 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h
index 7ca27ad..e6a0a63 100644
--- a/konversation/src/dcctransferpanelitem.h
+++ b/konversation/src/dcctransferpanelitem.h
@@ -22,7 +22,7 @@
 
 #include <klistview.h>
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 
 class TQStringList;
diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp
index 8b83de0..d11b0a2 100644
--- a/konversation/src/dcctransferrecv.cpp
+++ b/konversation/src/dcctransferrecv.cpp
@@ -23,7 +23,7 @@
 #include "server.h"
 
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -33,9 +33,9 @@
 #include <kdirselectdialog.h>
 #include <kuser.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 
 
 class DccResumeDialog;
diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp
index 2e4b417..15b45fd 100644
--- a/konversation/src/dcctransfersend.cpp
+++ b/konversation/src/dcctransfersend.cpp
@@ -38,8 +38,8 @@
 #include <kserversocket.h>
 #include <tdesocketaddress.h>
 #include <kstreamsocket.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 
 // TODO: remove the dependence
 #include <kinputdialog.h>
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index 936ff2d..99a8df8 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -25,7 +25,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klistview.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>
diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp
index 26a5a0a..8c705bc 100644
--- a/konversation/src/ignore_preferences.cpp
+++ b/konversation/src/ignore_preferences.cpp
@@ -22,7 +22,7 @@
 #include <tqheader.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <tqcheckbox.h>
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
index d7b71da..6c010ca 100644
--- a/konversation/src/ircview.cpp
+++ b/konversation/src/ircview.cpp
@@ -62,8 +62,8 @@
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <kmenubar.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 #include <kstdaccel.h>
 #include <kglobal.h>
 
diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
index 69c7f70..e2529c8 100644
--- a/konversation/src/konversationapplication.cpp
+++ b/konversation/src/konversationapplication.cpp
@@ -37,7 +37,7 @@
 
 #include <kdebug.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
diff --git a/konversation/src/konviconfigdialog.cpp b/konversation/src/konviconfigdialog.cpp
index 4610144..5fee076 100644
--- a/konversation/src/konviconfigdialog.cpp
+++ b/konversation/src/konviconfigdialog.cpp
@@ -38,8 +38,8 @@
 
 #include "konviconfigdialog.h"
 
-#include <kconfigskeleton.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigskeleton.h>
+#include <tdeconfigdialogmanager.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp
index e6fe29e..1a452a9 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui.cpp
+++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp
@@ -33,7 +33,7 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 #include <tqwhatsthis.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp
index 2196e5f..53cc3a0 100644
--- a/konversation/src/logfilereader.cpp
+++ b/konversation/src/logfilereader.cpp
@@ -31,10 +31,10 @@
 #include <kdialog.h>
 #include <ktoolbar.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 
 LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow(parent)
diff --git a/konversation/src/logfilereader.h b/konversation/src/logfilereader.h
index 5b5ffd8..46bc7a5 100644
--- a/konversation/src/logfilereader.h
+++ b/konversation/src/logfilereader.h
@@ -17,7 +17,7 @@
 
 #include "chatwindow.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 class KToolBar;
diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp
index 7f22e23..838c2b8 100644
--- a/konversation/src/osd_preferences.cpp
+++ b/konversation/src/osd_preferences.cpp
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <kfontrequester.h>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 
 OSD_Config::OSD_Config( TQWidget* parent, const char* name, WFlags fl )
diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
index aec4e7c..3d0a864 100644
--- a/konversation/src/outputfilter.cpp
+++ b/konversation/src/outputfilter.cpp
@@ -33,8 +33,8 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kio/passdlg.h>
-#include <kconfig.h>
+#include <tdeio/passdlg.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kshell.h>
 #include <tdesocketaddress.h>
diff --git a/konversation/src/outputfilter.h b/konversation/src/outputfilter.h
index 63729d6..faabec1 100644
--- a/konversation/src/outputfilter.h
+++ b/konversation/src/outputfilter.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 
 class Server;
diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp
index 98f5c39..b309feb 100644
--- a/konversation/src/quickbuttons_preferences.cpp
+++ b/konversation/src/quickbuttons_preferences.cpp
@@ -19,7 +19,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <klistview.h>
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index 02e5955..236992c 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -50,7 +50,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <kresolver.h>
diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp
index b4099b0..c01d1d0 100644
--- a/konversation/src/theme_preferences.cpp
+++ b/konversation/src/theme_preferences.cpp
@@ -35,12 +35,12 @@
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <ktar.h>
 #include <kdesktopfile.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <unistd.h> // unlink()
 
diff --git a/konversation/src/theme_preferences.h b/konversation/src/theme_preferences.h
index e28a018..80e210a 100644
--- a/konversation/src/theme_preferences.h
+++ b/konversation/src/theme_preferences.h
@@ -18,7 +18,7 @@
 #include "theme_preferencesui.h"
 #include "konvisettingspage.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 class TQStringList;
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
index f1ec356..b91e0a4 100644
--- a/konversation/src/urlcatcher.cpp
+++ b/konversation/src/urlcatcher.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <klistview.h>
 #include <krun.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
 #include <tdeversion.h>
 #include <kshell.h>
diff --git a/konversation/src/warnings_preferences.cpp b/konversation/src/warnings_preferences.cpp
index 70f5428..ddb443e 100644
--- a/konversation/src/warnings_preferences.cpp
+++ b/konversation/src/warnings_preferences.cpp
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/konversation/src/watchednicknames_preferences.cpp b/konversation/src/watchednicknames_preferences.cpp
index 2471037..a39b029 100644
--- a/konversation/src/watchednicknames_preferences.cpp
+++ b/konversation/src/watchednicknames_preferences.cpp
@@ -21,7 +21,7 @@
 #include <tqcheckbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <klocale.h>