diff --git a/acinclude.m4 b/acinclude.m4
index a1d921a..d4831f5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -597,7 +597,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
@@ -1787,7 +1787,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
@@ -2092,7 +2092,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")
@@ -2102,7 +2102,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/file-integration/basketthumbcreator.h b/file-integration/basketthumbcreator.h
index fe16b68..cffde54 100644
--- a/file-integration/basketthumbcreator.h
+++ b/file-integration/basketthumbcreator.h
@@ -20,7 +20,7 @@
 
 #include <tqstring.h>
 #include <tqimage.h>
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class BasketThumbCreator : public ThumbCreator
 {
diff --git a/src/backup.cpp b/src/backup.cpp
index ffcfe72..3bb9593 100644
--- a/src/backup.cpp
+++ b/src/backup.cpp
@@ -38,9 +38,9 @@
 #include <tqgroupbox.h>
 #include <kdirselectdialog.h>
 #include <krun.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kmessagebox.h>
 #include <cstdlib>
diff --git a/src/basket.cpp b/src/basket.cpp
index 9d9d744..0ec22ca 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -40,7 +40,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kaboutdata.h>
 #include <klineedit.h>
 #include <ksavefile.h>
@@ -5503,7 +5503,7 @@ void Basket::lock()
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmimetype.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqdir.h>
 #include <kiconloader.h>
 #include <tqregexp.h>
diff --git a/src/basket.h b/src/basket.h
index 6bcb146..30eac95 100644
--- a/src/basket.h
+++ b/src/basket.h
@@ -31,7 +31,7 @@
 #include <kshortcut.h>
 #include <kdirwatch.h>
 #include <kaction.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdialogbase.h>
 
 #include "filter.h"
@@ -693,7 +693,7 @@ public slots:
 #include <tqclipboard.h>
 #include <tqptrlist.h>
 #include <tqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqcolor.h>
 
 #include "filter.h"
diff --git a/src/basket_part.cpp b/src/basket_part.cpp
index f467dac..17b8558 100644
--- a/src/basket_part.cpp
+++ b/src/basket_part.cpp
@@ -23,7 +23,7 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <bnpview.h>
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index 75424b2..991c445 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kstringhandler.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kaboutdata.h>
diff --git a/src/exporterdialog.cpp b/src/exporterdialog.cpp
index 3089ad6..c90a001 100644
--- a/src/exporterdialog.cpp
+++ b/src/exporterdialog.cpp
@@ -20,7 +20,7 @@
 
 #include <kurlrequester.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqcheckbox.h>
 #include <tqdir.h>
 #include <tqhbox.h>
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "exporterdialog.h"
 #include "basket.h"
diff --git a/src/global.cpp b/src/global.cpp
index b205478..215e34b 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -26,7 +26,7 @@
 #include <kmainwindow.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "global.h"
 #include "bnpview.h"
diff --git a/src/htmlexporter.cpp b/src/htmlexporter.cpp
index 70e0f59..f2dc63a 100644
--- a/src/htmlexporter.cpp
+++ b/src/htmlexporter.cpp
@@ -29,9 +29,9 @@
 
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <tqdir.h>
 #include <tqfile.h>
diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp
index f008489..f23a81d 100644
--- a/src/kiconcanvas.cpp
+++ b/src/kiconcanvas.cpp
@@ -1,7 +1,7 @@
 /* vi: ts=8 sts=4 sw=4
  * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
  *
- * This file is part of the KDE project, module kfile.
+ * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
  *           (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
  *           (C) 2000 Geert Jansen <jansen@kde.org>
diff --git a/src/kiconcanvas.h b/src/kiconcanvas.h
index b177dd1..a49ea4d 100644
--- a/src/kiconcanvas.h
+++ b/src/kiconcanvas.h
@@ -1,7 +1,7 @@
 /* vi: ts=8 sts=4 sw=4
  * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
  *
- * This file is part of the KDE project, module kfile.
+ * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
  *           (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
  *           (C) 2000 Geert Jansen <jansen@kde.org>
diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp
index d7c7837..79db052 100644
--- a/src/kicondialog.cpp
+++ b/src/kicondialog.cpp
@@ -1,7 +1,7 @@
 /* vi: ts=8 sts=4 sw=4
  * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
  *
- * This file is part of the KDE project, module kfile.
+ * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
  *           (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
  *           (C) 2000 Geert Jansen <jansen@kde.org>
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kprogress.h>
 #include <kiconview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
diff --git a/src/kicondialog.h b/src/kicondialog.h
index 3bc0133..01291ae 100644
--- a/src/kicondialog.h
+++ b/src/kicondialog.h
@@ -1,7 +1,7 @@
 /* vi: ts=8 sts=4 sw=4
  * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
  *
- * This file is part of the KDE project, module kfile.
+ * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
  *           (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
  *           (C) 2000 Geert Jansen <jansen@kde.org>
diff --git a/src/likeback.cpp b/src/likeback.cpp
index ac599f7..e388995 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -20,7 +20,7 @@
 
 #include <kapplication.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kiconloader.h>
 #include <kaboutdata.h>
@@ -584,10 +584,10 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 	if (m_process)
 		return;
 	m_process = new TDEProcess();
-	*m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
+	*m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
 	connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(fetchUserEmail()) );
 	if (!m_process->start()) {
-		kdDebug() << "Couldn't start kcmshell.." << endl;
+		kdDebug() << "Couldn't start tdecmshell.." << endl;
 		delete m_process;
 		m_process = 0;
 		return;
diff --git a/src/main.cpp b/src/main.cpp
index 7af8259..a61cc43 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,7 +32,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 
-#include <kconfig.h> // TMP IN ALPHA 1
+#include <tdeconfig.h> // TMP IN ALPHA 1
 
 #include "application.h"
 #include "backgroundmanager.h"
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 63af3b1..2f6b9fb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -59,7 +59,7 @@
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
 #include <kpassivepopup.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kaboutdata.h>
 
diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index a078b2b..defbe47 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -38,15 +38,15 @@
 #include <tqbitmap.h>
 #include <kurifilter.h>
 //#include <kstringhandler.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <tqdatetime.h>
 #include <tdemultipledrag.h>
 
 #include <tqfileinfo.h>
-//#include <kio/kfileitem.h>
-#include <kfileitem.h>
-#include <kio/previewjob.h>
-#include <kio/global.h>
+//#include <tdeio/tdefileitem.h>
+#include <tdefileitem.h>
+#include <tdeio/previewjob.h>
+#include <tdeio/global.h>
 
 #include <iostream>
 
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 0e463be..141db05 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -26,7 +26,7 @@
 #include <kicondialog.h>
 #include <kcolordialog.h>
 #include <kservice.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kmainwindow.h>
diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index ee14c5c..97fc06c 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -34,11 +34,11 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <tqfile.h>
-#include <kfilemetainfo.h>
-#include <kio/jobclasses.h>
+#include <tdefilemetainfo.h>
+#include <tdeio/jobclasses.h>
 #include <tqtextcodec.h>
 #include <kopenwith.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <tqfileinfo.h>
diff --git a/src/settings.cpp b/src/settings.cpp
index ef4e8f2..8e2da4a 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -30,7 +30,7 @@
 #include <knuminput.h>
 #include <kcolorcombo.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqwhatsthis.h>
diff --git a/src/softwareimporters.cpp b/src/softwareimporters.cpp
index fd8e088..df3647c 100644
--- a/src/softwareimporters.cpp
+++ b/src/softwareimporters.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqptrstack.h>
 #include <tqlayout.h>
 #include <tqvbuttongroup.h>