diff --git a/acinclude.m4 b/acinclude.m4
index e6fcc9b..09777ed 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
@@ -1788,7 +1788,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
@@ -2094,7 +2094,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")
@@ -2104,7 +2104,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/po/lt.po b/po/lt.po
index 343cdb8..1a775dd 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -262,7 +262,7 @@ msgid "Ready."
 msgstr ""
 "#-#-#-#-#  kfindpart.po (kfindpart)  #-#-#-#-#\n"
 "Pasiruošęs\n"
-"#-#-#-#-#  kfilereplace.po (kfilereplace)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefilereplace.po (tdefilereplace)  #-#-#-#-#\n"
 "Pasirengęs.\n"
 "#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
 "Pasirengęs.\n"
@@ -969,7 +969,7 @@ msgid "Unknown"
 msgstr ""
 "#-#-#-#-#  kcmkclock.po (kcmkclock)  #-#-#-#-#\n"
 "Nežinoma\n"
-"#-#-#-#-#  quicklauncher.po (quicklauncher)  #-#-#-#-#\n"
+"#-#-#-#-#  quictdelauncher.po (quictdelauncher)  #-#-#-#-#\n"
 "Nežinoma\n"
 "#-#-#-#-#  kpartapp.po (kpartapp)  #-#-#-#-#\n"
 "Nežinoma\n"
@@ -1005,7 +1005,7 @@ msgstr ""
 "Nežinoma\n"
 "#-#-#-#-#  kttsd_festivalintplugin.po (kttsd_festivalintplugin)  #-#-#-#-#\n"
 "Nežinoma\n"
-"#-#-#-#-#  kfile_png.po (kfile_png)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_png.po (tdefile_png)  #-#-#-#-#\n"
 "Nežinoma\n"
 "#-#-#-#-#  kstars.po (kstars)  #-#-#-#-#\n"
 "Nežinoma\n"
@@ -1029,7 +1029,7 @@ msgstr ""
 "Nežinoma\n"
 "#-#-#-#-#  kgpg.po (kgpg)  #-#-#-#-#\n"
 "Nežinomas\n"
-"#-#-#-#-#  kfile_txt.po (kfile_txt)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_txt.po (tdefile_txt)  #-#-#-#-#\n"
 "Nežinoma\n"
 "#-#-#-#-#  kopete.po (kopete)  #-#-#-#-#\n"
 "Nežinoma\n"
@@ -1251,7 +1251,7 @@ msgstr ""
 "Vardas:\n"
 "#-#-#-#-#  kopete.po (kopete)  #-#-#-#-#\n"
 "Vardas:\n"
-"#-#-#-#-#  kfileshare.po (kfileshare)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefileshare.po (tdefileshare)  #-#-#-#-#\n"
 "Vardas:\n"
 "#-#-#-#-#  knewsticker.po (knewsticker)  #-#-#-#-#\n"
 "Pavadinimas:\n"
@@ -1338,7 +1338,7 @@ msgstr ""
 "Bendri\n"
 "#-#-#-#-#  kcmkonsole.po (kcmkonsole)  #-#-#-#-#\n"
 "Bendra\n"
-"#-#-#-#-#  kfile_font.po (kfile_font)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_font.po (tdefile_font)  #-#-#-#-#\n"
 "Bendra\n"
 "#-#-#-#-#  kcmsmserver.po (kcmsmserver)  #-#-#-#-#\n"
 "Bendra\n"
@@ -1352,7 +1352,7 @@ msgstr ""
 "Bendros\n"
 "#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Bendros\n"
-"#-#-#-#-#  kfilereplace.po (kfilereplace)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefilereplace.po (tdefilereplace)  #-#-#-#-#\n"
 "Bendra\n"
 "#-#-#-#-#  kchart.po (kchart)  #-#-#-#-#\n"
 "Bendra\n"
@@ -1360,11 +1360,11 @@ msgstr ""
 "Bendra\n"
 "#-#-#-#-#  pwmanager.po (pwmanager)  #-#-#-#-#\n"
 "Bendra\n"
-"#-#-#-#-#  kfile_rpm.po (kfile_rpm)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_rpm.po (tdefile_rpm)  #-#-#-#-#\n"
 "Pagrindai\n"
 "#-#-#-#-#  kuser.po (kuser)  #-#-#-#-#\n"
 "Bendrieji\n"
-"#-#-#-#-#  kfile_deb.po (kfile_deb)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_deb.po (tdefile_deb)  #-#-#-#-#\n"
 "Pagrindai\n"
 "#-#-#-#-#  ksnake.po (ksnake)  #-#-#-#-#\n"
 "Bendri\n"
@@ -1376,9 +1376,9 @@ msgstr ""
 "Bendrieji\n"
 "#-#-#-#-#  kghostview.po (kghostview)  #-#-#-#-#\n"
 "Bendra\n"
-"#-#-#-#-#  kfile_pdf.po (kfile_pdf)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_pdf.po (tdefile_pdf)  #-#-#-#-#\n"
 "Bendra\n"
-"#-#-#-#-#  kfile_ps.po (kfile_ps)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_ps.po (tdefile_ps)  #-#-#-#-#\n"
 "Bendra\n"
 "#-#-#-#-#  kstars.po (kstars)  #-#-#-#-#\n"
 "Bendra\n"
@@ -1410,11 +1410,11 @@ msgstr ""
 "Bendra\n"
 "#-#-#-#-#  kcalc.po (kcalc)  #-#-#-#-#\n"
 "Bendra\n"
-"#-#-#-#-#  kfile_txt.po (kfile_txt)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_txt.po (tdefile_txt)  #-#-#-#-#\n"
 "Bendra\n"
-"#-#-#-#-#  kfile_desktop.po (kfile_desktop)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_desktop.po (tdefile_desktop)  #-#-#-#-#\n"
 "Bendra\n"
-"#-#-#-#-#  kfile_html.po (kfile_html)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_html.po (tdefile_html)  #-#-#-#-#\n"
 "Bendra\n"
 "#-#-#-#-#  kcmmediacontrol.po (kcmmediacontrol)  #-#-#-#-#\n"
 "Bendra\n"
@@ -1422,7 +1422,7 @@ msgstr ""
 "Bendra\n"
 "#-#-#-#-#  kopete.po (kopete)  #-#-#-#-#\n"
 "Bendra\n"
-"#-#-#-#-#  kfileshare.po (kfileshare)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefileshare.po (tdefileshare)  #-#-#-#-#\n"
 "Bendra\n"
 "#-#-#-#-#  ksirc.po (ksirc)  #-#-#-#-#\n"
 "Bendra\n"
@@ -2012,7 +2012,7 @@ msgstr ""
 "Formatas\n"
 "#-#-#-#-#  kompare.po (kompare)  #-#-#-#-#\n"
 "Formatas\n"
-"#-#-#-#-#  kfile_txt.po (kfile_txt)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_txt.po (tdefile_txt)  #-#-#-#-#\n"
 "Formatas\n"
 "#-#-#-#-#  kaudiocreator.po (kaudiocreator)  #-#-#-#-#\n"
 "Formatas"
diff --git a/src/Makefile.am b/src/Makefile.am
index fc625fa..3ac67d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS= -I$(kde_includes)/kio $(CFLAGS_GST) $(all_includes) $(LIBCAIRO_CFLAGS) $(LIBNSPR_CFLAGS) $(LIBDBUS_CFLAGS)
+AM_CPPFLAGS= -I$(kde_includes)/tdeio $(CFLAGS_GST) $(all_includes) $(LIBCAIRO_CFLAGS) $(LIBNSPR_CFLAGS) $(LIBDBUS_CFLAGS)
 
 METASOURCES= AUTO
 
diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp
index 4284c3b..e37a7d8 100644
--- a/src/kmplayer_koffice_part.cpp
+++ b/src/kmplayer_koffice_part.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <kaboutdata.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kstandarddirs.h>
 #include <tdeparts/factory.h>
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index 1ba8dbe..5cffa49 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -31,7 +31,7 @@
 class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, kactioncollection.h does not forward declare KXMLGUIClient
 #include <klibloader.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kaction.h>
 #include <kapplication.h>
diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp
index 3c2d196..f144f3a 100644
--- a/src/kmplayer_smil.cpp
+++ b/src/kmplayer_smil.cpp
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include "kmplayer_smil.h"
 #include "kmplayer_rp.h"
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index a4b2ccf..65a3d45 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -42,13 +42,13 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineeditdlg.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kurldrag.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kdebug.h>
 #include <dcopclient.h>
@@ -1695,7 +1695,7 @@ KDE_NO_EXPORT void KMPlayerApp::startArtsControl () {
     TQCString replytype;
     TQDataStream stream (data, IO_WriteOnly);
     stream << TQString ("aRts Control Tool") << args;
-    if (kapp->dcopClient ()->call ("klauncher", "klauncher", "start_service_by_name(TQString,TQStringList)", data, replytype, replydata)) {
+    if (kapp->dcopClient ()->call ("tdelauncher", "tdelauncher", "start_service_by_name(TQString,TQStringList)", data, replytype, replydata)) {
         int result;
         TQDataStream replystream (replydata, IO_ReadOnly);
         replystream >> result >> m_dcopName;
diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp
index 845a47c..0733eb3 100644
--- a/src/kmplayerbroadcast.cpp
+++ b/src/kmplayerbroadcast.cpp
@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kled.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 #include <kprocctrl.h>
 #include <kmessagebox.h>
diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp
index 5839b79..4f50f86 100644
--- a/src/kmplayerconfig.cpp
+++ b/src/kmplayerconfig.cpp
@@ -34,7 +34,7 @@
 #include <klineedit.h>
 #include <kstatusbar.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/src/kmplayerconfig.h b/src/kmplayerconfig.h
index 2dcb571..bb9d595 100644
--- a/src/kmplayerconfig.h
+++ b/src/kmplayerconfig.h
@@ -106,7 +106,7 @@ public:
     void applyColorSetting (bool only_changed_ones);
     Preferences *configDialog() const { return configdialog; }
     View * defaultView ();
-    TDEConfig * kconfig () { return m_config; }
+    TDEConfig * tdeconfig () { return m_config; }
 
     TQStringList urllist;
     TQStringList sub_urllist;
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 8e171b6..d6c9409 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <kbookmarkmenu.h>
 #include <kbookmarkmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kaction.h>
 #include <kprocess.h>
@@ -50,8 +50,8 @@
 #include <kprotocolinfo.h>
 #include <kapplication.h>
 #include <kstaticdeleter.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include "kmplayerpartbase.h"
 #include "kmplayerview.h"
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index 3f258d4..f0b8cff 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -40,12 +40,12 @@
 #include <kdebug.h>
 #include <kprocctrl.h>
 #include <kprotocolmanager.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #ifdef HAVE_DBUS
 # include <kstaticdeleter.h>
diff --git a/src/kmplayerprocess.h b/src/kmplayerprocess.h
index d1de37d..a8f46e8 100644
--- a/src/kmplayerprocess.h
+++ b/src/kmplayerprocess.h
@@ -29,7 +29,7 @@
 #include <tqregexp.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include "kmplayerconfig.h"
 #include "kmplayersource.h"
diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp
index b2b5714..fc432a7 100644
--- a/src/kmplayertvsource.cpp
+++ b/src/kmplayertvsource.cpp
@@ -39,7 +39,7 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "kmplayerpartbase.h"
diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index 20dd120..3f126c1 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -48,7 +48,7 @@
 #include <kcombobox.h>
 #include <kstatusbar.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kiconloader.h>
 #include <klistview.h>
diff --git a/src/pref.cpp b/src/pref.cpp
index a274a28..600fac1 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -44,7 +44,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
 #include <kiconloader.h>