diff --git a/acinclude.m4 b/acinclude.m4
index 9eef0ce..f06063d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -606,7 +606,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
@@ -1790,7 +1790,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
@@ -2090,7 +2090,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")
@@ -2100,7 +2100,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 02df154..9245cdc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -618,7 +618,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
@@ -1802,7 +1802,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
@@ -2102,7 +2102,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")
@@ -2112,7 +2112,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/src/canvasmanipulator.cpp b/src/canvasmanipulator.cpp
index 8746333..d0b1649 100644
--- a/src/canvasmanipulator.cpp
+++ b/src/canvasmanipulator.cpp
@@ -26,7 +26,7 @@
 
 #include <cmath>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
diff --git a/src/core/main.cpp b/src/core/main.cpp
index a3206ea..ddf252a 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -14,7 +14,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/src/document.cpp b/src/document.cpp
index d27ecfc..eca7c6b 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -15,7 +15,7 @@
 #include "view.h"
 #include "viewcontainer.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktabwidget.h>
diff --git a/src/electronics/subcircuits.cpp b/src/electronics/subcircuits.cpp
index af459f4..1bdd672 100644
--- a/src/electronics/subcircuits.cpp
+++ b/src/electronics/subcircuits.cpp
@@ -16,7 +16,7 @@
 #include "subcircuits.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
diff --git a/src/filemetainfo.cpp b/src/filemetainfo.cpp
index 21dd949..211ade6 100644
--- a/src/filemetainfo.cpp
+++ b/src/filemetainfo.cpp
@@ -12,7 +12,7 @@
 #include "textdocument.h"
 #include "textview.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 //BEGIN class MetaInfo
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp
index fbc4cf1..32e0cf6 100644
--- a/src/gui/itemselector.cpp
+++ b/src/gui/itemselector.cpp
@@ -19,7 +19,7 @@
 #include "mechanicsdocument.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp
index 2935e7a..7bc0a07 100644
--- a/src/gui/oscilloscope.cpp
+++ b/src/gui/oscilloscope.cpp
@@ -18,7 +18,7 @@
 
 #include <cmath>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index b2535ae..81471b2 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -14,7 +14,7 @@
 #include "probepositioner.h"
 #include "simulator.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/src/gui/outputmethoddlg.cpp b/src/gui/outputmethoddlg.cpp
index 9260fdc..cb53109 100644
--- a/src/gui/outputmethoddlg.cpp
+++ b/src/gui/outputmethoddlg.cpp
@@ -18,7 +18,7 @@
 #include "projectmanager.h"
 
 #include <kcombobox.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 #include <ktempfile.h>
 #include <kurlrequester.h>
diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp
index 7852ff9..d6f0ac6 100644
--- a/src/gui/projectdlgs.cpp
+++ b/src/gui/projectdlgs.cpp
@@ -20,7 +20,7 @@
 #include <assert.h>
 #include <kcombobox.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kurlrequester.h>
diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp
index c267fc4..69d619c 100644
--- a/src/gui/settingsdlg.cpp
+++ b/src/gui/settingsdlg.cpp
@@ -22,7 +22,7 @@
 #include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/src/gui/settingsdlg.h b/src/gui/settingsdlg.h
index 0abf212..9d747cf 100644
--- a/src/gui/settingsdlg.h
+++ b/src/gui/settingsdlg.h
@@ -11,7 +11,7 @@
 #ifndef SETTINGSDLG_H
 #define SETTINGSDLG_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <tqmap.h>
 
 class AsmFormattingWidget;
diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp
index 719618e..71265b6 100644
--- a/src/gui/symbolviewer.cpp
+++ b/src/gui/symbolviewer.cpp
@@ -15,7 +15,7 @@
 #include "symbolviewer.h"
 
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqlabel.h>
diff --git a/src/icnview.cpp b/src/icnview.cpp
index ee27bf5..bd99dd6 100644
--- a/src/icnview.cpp
+++ b/src/icnview.cpp
@@ -13,7 +13,7 @@
 #include "icnview.h"
 #include "ktechlab.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp
index d004419..55696b2 100644
--- a/src/itemdocument.cpp
+++ b/src/itemdocument.cpp
@@ -26,7 +26,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -787,7 +787,7 @@ void ItemDocument::exportToImage()
 	// the Export shortcut is pressed or the Export toolbar
 	// button is clicked
 	
-	// widget for the kfiledialog
+	// widget for the tdefiledialog
 	// It is the bit that says "Crop circuit?"
 	// Okay need to think of something way better to say here.
 	// gotme here, KFileDialog makes itself parent so tries to destroy cropCheck when it is deleted.
diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp
index 28ce741..d5ea552 100644
--- a/src/itemdocumentdata.cpp
+++ b/src/itemdocumentdata.cpp
@@ -20,7 +20,7 @@
 #include "pinmapping.h"
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h> 
 #include <ktempfile.h>
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index 1115298..f7071db 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -26,7 +26,7 @@
 #include <kglobalsettings.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index 8afa4fa..00e6c6c 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -43,9 +43,9 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/src/languages/language.cpp b/src/languages/language.cpp
index 7b70135..1296d93 100644
--- a/src/languages/language.cpp
+++ b/src/languages/language.cpp
@@ -19,7 +19,7 @@
 #include "src/core/ktlconfig.h"
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <tqregexp.h>
diff --git a/src/languages/picprogrammer.cpp b/src/languages/picprogrammer.cpp
index 910f30f..45b6a16 100644
--- a/src/languages/picprogrammer.cpp
+++ b/src/languages/picprogrammer.cpp
@@ -13,7 +13,7 @@
 #include "src/core/ktlconfig.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index d3b8d29..f77cdd9 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -21,9 +21,9 @@
 #include "recentfilesaction.h"
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h> 
 #include <kmimetype.h>
diff --git a/src/recentfilesaction.cpp b/src/recentfilesaction.cpp
index 811b14c..086e81d 100644
--- a/src/recentfilesaction.cpp
+++ b/src/recentfilesaction.cpp
@@ -10,7 +10,7 @@
 
 #include "recentfilesaction.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 49a044c..49a4ff7 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -14,7 +14,7 @@
 #include "view.h"
 #include "viewcontainer.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <klocale.h>