diff --git a/acinclude.m4 b/acinclude.m4
index 4be09b4..5d61873 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/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp
index d86f6d0..5682efc 100644
--- a/yakuake/src/main_window.cpp
+++ b/yakuake/src/main_window.cpp
@@ -25,7 +25,7 @@
 #include <kaboutapplication.h>
 #include <kaboutkde.h>
 #include <kmessagebox.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kiconloader.h>
 #include <twin.h>
 #include <dcopref.h>
diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h
index 3aa327c..a4751ff 100644
--- a/yakuake/src/main_window.h
+++ b/yakuake/src/main_window.h
@@ -30,7 +30,7 @@
 
 #include <twin.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <kkeydialog.h>
diff --git a/yakuake/src/skin_settings.cpp b/yakuake/src/skin_settings.cpp
index 3659124..39586c9 100644
--- a/yakuake/src/skin_settings.cpp
+++ b/yakuake/src/skin_settings.cpp
@@ -29,10 +29,10 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <ktar.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>
diff --git a/yakuake/src/skin_settings.h b/yakuake/src/skin_settings.h
index c5a2859..6ab558e 100644
--- a/yakuake/src/skin_settings.h
+++ b/yakuake/src/skin_settings.h
@@ -16,7 +16,7 @@
 
 #include "skin_settings_ui.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 class SkinSettings : public SkinSettingsUI
diff --git a/yakuake/src/tab_bar.h b/yakuake/src/tab_bar.h
index 9b95711..32846ff 100644
--- a/yakuake/src/tab_bar.h
+++ b/yakuake/src/tab_bar.h
@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <krootpixmap.h>
 #include <kstandarddirs.h>
 
diff --git a/yakuake/src/title_bar.h b/yakuake/src/title_bar.h
index c751651..c0ca941 100644
--- a/yakuake/src/title_bar.h
+++ b/yakuake/src/title_bar.h
@@ -26,7 +26,7 @@
 #include <tqpushbutton.h>
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>