diff --git a/acinclude.m4 b/acinclude.m4
index a6818fc..520d941 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1657,7 +1657,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
@@ -1974,7 +1974,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")
@@ -1984,7 +1984,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 5168596..ed3f7ac 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1669,7 +1669,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
@@ -1986,7 +1986,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")
@@ -1996,7 +1996,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/knights/audio.cpp b/knights/audio.cpp
index b7c9501..de2f602 100644
--- a/knights/audio.cpp
+++ b/knights/audio.cpp
@@ -21,7 +21,7 @@
 #include <arts/flowsystem.h>
 #include <arts/connect.h>
 #include <ksimpleconfig.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqptrlist.h>
 #include <tqfile.h>
 #include <tqmap.h>
diff --git a/knights/core.cpp b/knights/core.cpp
index 112f8d6..a7ea87c 100644
--- a/knights/core.cpp
+++ b/knights/core.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 /* KDE */
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 /* TQt */
diff --git a/knights/dlg_engine.cpp b/knights/dlg_engine.cpp
index 4976793..03a8f50 100644
--- a/knights/dlg_engine.cpp
+++ b/knights/dlg_engine.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kicontheme.h>
 #include "dlg_engine.moc"
 
diff --git a/knights/dlg_server.h b/knights/dlg_server.h
index 3135bee..cb30497 100644
--- a/knights/dlg_server.h
+++ b/knights/dlg_server.h
@@ -21,7 +21,7 @@
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 #include <tqvbox.h>
diff --git a/knights/knights.cpp b/knights/knights.cpp
index fb59d80..bf83dff 100644
--- a/knights/knights.cpp
+++ b/knights/knights.cpp
@@ -32,7 +32,7 @@
 #include <kpopupmenu.h>
 #include <klocale.h>
 /* KFile */
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 /* TQt */
 #include <tqpalette.h>
 #include <tqiconset.h>
diff --git a/knights/pgn.h b/knights/pgn.h
index 650c053..4afa46f 100644
--- a/knights/pgn.h
+++ b/knights/pgn.h
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/knights/resource.cpp b/knights/resource.cpp
index b813723..a956fd8 100644
--- a/knights/resource.cpp
+++ b/knights/resource.cpp
@@ -18,10 +18,10 @@
 #include <kstddirs.h>
 #include <kglobalsettings.h>
 #include <ksimpleconfig.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kmdcodec.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 /* TQt */
 #include <tqdir.h>
 #include <tqimage.h>
diff --git a/knights/setpagedisplay.cpp b/knights/setpagedisplay.cpp
index d891a92..a2ea5a7 100644
--- a/knights/setpagedisplay.cpp
+++ b/knights/setpagedisplay.cpp
@@ -23,8 +23,8 @@
 #include <tqstyle.h>
 #include <tqregexp.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 
 setPageDisplay::setPageDisplay(TQWidget *parent, resource *Rsrc  ) : TQVBoxLayout(parent)
 {	
diff --git a/knights/setpagegeneral.cpp b/knights/setpagegeneral.cpp
index 3a89bf4..5db3cd7 100644
--- a/knights/setpagegeneral.cpp
+++ b/knights/setpagegeneral.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kicontheme.h>
 #include "setpagegeneral.moc"
 
diff --git a/knights/tabmanager.h b/knights/tabmanager.h
index 1d6a702..9fc17d3 100644
--- a/knights/tabmanager.h
+++ b/knights/tabmanager.h
@@ -21,7 +21,7 @@
 #include <tqobject.h>
 #include <tqptrlist.h>
 #include <kapp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "tabbox.h"
 
 /**