diff --git a/README b/README
index 30a8f76..d91cfea 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ In this file:
 
 * What it is
 * Plugins for Kate
-* Plugins for kfile
+* Plugins for tdefile
 * Plugins for Kicker
 * Plugins for Konqueror
 * Plugins for Noatun
@@ -36,7 +36,7 @@ Plugins for Kate
 * xmltools: lists XML elements, attributes, attributes values and
             entities allowed by DTD
 
-Plugins for kfile
+Plugins for tdefile
 -----------------
 
 * cert: Certificate Info
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index fc4085c..3ed7e24 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -15,10 +15,10 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmainwindow.h>
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index cb9e461..a068e4b 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
@@ -32,8 +32,8 @@
 #include <tqfile.h>
 #include <tqmap.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
index 0d0ffbd..48a3901 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index 6bf06d7..39abc4a 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqlayout.h>
 #include <tqgroupbox.h>
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
index 05fbb39..1f18dfb 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index ccc8afa..b0530c5 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
                                      
 K_EXPORT_COMPONENT_FACTORY( katefll_initplugin, KGenericFactory<InitPluginKateFileListLoader>( "katefll_loader" ) )
 
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index deec021..6852485 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -26,8 +26,8 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
 
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 0be3393..5488f48 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -27,14 +27,14 @@
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kdirwatch.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index 0d473a4..2d0587f 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -32,9 +32,9 @@
 
 #include <kaction.h>
 #include <kanimwidget.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index f7f69ce..6e573a1 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -51,7 +51,7 @@
 #include <kpassivepopup.h>
 #include <klineedit.h>
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kate/toolviewmanager.h>
 
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index ba5dfb7..f6ede42 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 class PluginView : public KXMLGUIClient
 {
diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h
index d50a851..cf04e06 100644
--- a/kate/snippets/plugin_katesnippets.h
+++ b/kate/snippets/plugin_katesnippets.h
@@ -19,7 +19,7 @@
 
 #include <tqlistview.h>
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqptrlist.h>
 #include <tqtoolbutton.h>
 #include <tqtextedit.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 56f7b61..3c9e5f3 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -33,9 +33,9 @@
 
 #include <kdebug.h>
 #include <ktoolbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqpushbutton.h>
 #include <tqlayout.h>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 90108e1..05ff8ae 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -94,10 +94,10 @@ TODO:
 #include <klineedit.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kfile-plugins/cert/Makefile.am b/kfile-plugins/cert/Makefile.am
deleted file mode 100644
index 0c8c1be..0000000
--- a/kfile-plugins/cert/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for cert file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_cert.h
-
-kde_module_LTLIBRARIES = kfile_cert.la
-
-kfile_cert_la_SOURCES = kfile_cert.cpp
-kfile_cert_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_cert_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_cert.cpp -o $(podir)/kfile_cert.pot
-
-services_DATA = kfile_cert.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/cert/configure.in.in b/kfile-plugins/cert/configure.in.in
deleted file mode 100644
index 29f0193..0000000
--- a/kfile-plugins/cert/configure.in.in
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_CHECK_SSL
-AM_CONDITIONAL(include_kfileplugin_cert_SUBDIR, test "$have_ssl" = yes)
diff --git a/kfile-plugins/desktop/Makefile.am b/kfile-plugins/desktop/Makefile.am
deleted file mode 100644
index 4fdfa7f..0000000
--- a/kfile-plugins/desktop/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for .desktop file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_desktop.h
-
-kde_module_LTLIBRARIES = kfile_desktop.la
-
-kfile_desktop_la_SOURCES = kfile_desktop.cpp
-kfile_desktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_desktop_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_desktop.pot
-
-services_DATA = kfile_desktop.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/folder/Makefile.am b/kfile-plugins/folder/Makefile.am
deleted file mode 100644
index 8c689dc..0000000
--- a/kfile-plugins/folder/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Makefile.am for folder file meta info plugin
-
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_folder.h
-
-kde_module_LTLIBRARIES = kfile_folder.la
-
-kfile_folder_la_SOURCES = kfile_folder.cpp
-kfile_folder_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_folder_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-services_DATA = kfile_folder.desktop
-servicesdir = $(kde_servicesdir)
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_folder.pot
diff --git a/kfile-plugins/html/Makefile.am b/kfile-plugins/html/Makefile.am
deleted file mode 100644
index 610b74f..0000000
--- a/kfile-plugins/html/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for html file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_html.h
-
-kde_module_LTLIBRARIES = kfile_html.la
-
-kfile_html_la_SOURCES = kfile_html.cpp
-kfile_html_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_html_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_html.cpp -o $(podir)/kfile_html.pot
-
-services_DATA = kfile_html.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/mhtml/Makefile.am b/kfile-plugins/mhtml/Makefile.am
deleted file mode 100644
index 326820d..0000000
--- a/kfile-plugins/mhtml/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Makefile.am for folder file meta info plugin
-
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_mhtml.h
-
-kde_module_LTLIBRARIES = kfile_mhtml.la
-
-kfile_mhtml_la_SOURCES = kfile_mhtml.cpp
-kfile_mhtml_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_mhtml_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-services_DATA = kfile_mhtml.desktop
-servicesdir = $(kde_servicesdir)
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_mhtml.pot
diff --git a/kfile-plugins/txt/Makefile.am b/kfile-plugins/txt/Makefile.am
deleted file mode 100644
index 84e6ce7..0000000
--- a/kfile-plugins/txt/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Makefile.am for text file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-noinst_HEADERS   = kfile_txt.h
-
-kde_module_LTLIBRARIES = kfile_txt.la
-
-kfile_txt_la_SOURCES = kfile_txt.cpp
-kfile_txt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_txt_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_txt.pot
-
-services_DATA = kfile_txt.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index c19aff5..feddedb 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -20,8 +20,8 @@
 #include "datepicker.h"
 
 #include <kapplication.h>
-#include <kconfigdialog.h>
-#include <kconfig.h>
+#include <tdeconfigdialog.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 
@@ -329,12 +329,12 @@ void KBinaryClock::openContextMenu() {
 		proc << locate("exe", "tdesu");
 		proc << "--nonewdcop";
 		proc << TQString("%1 clock --lang %2")
-				.arg(locate("exe", "kcmshell"))
+				.arg(locate("exe", "tdecmshell"))
 				.arg(TDEGlobal::locale()->language());
 		proc.start(TDEProcess::DontCare);
 		break;
 	case 104:
-		proc << locate("exe", "kcmshell");
+		proc << locate("exe", "tdecmshell");
 		proc << "language";
 					proc.start(TDEProcess::DontCare);
 		break;
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h
index e816056..73fd1b1 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.h
+++ b/kicker-applets/kbinaryclock/kbinaryclock.h
@@ -25,7 +25,7 @@
 #include <kaboutdata.h>
 #include <tqdatetime.h>
 #include <tqtooltip.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "settings.h"
 #include "prefs.h"
diff --git a/kicker-applets/kbinaryclock/prefs.kcfgc b/kicker-applets/kbinaryclock/prefs.kcfgc
index 7e91072..9a081dc 100644
--- a/kicker-applets/kbinaryclock/prefs.kcfgc
+++ b/kicker-applets/kbinaryclock/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kbinaryclock.kcfg
 #IncludeFiles=defines.h
 ClassName=Prefs
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 52f1f40..164e1ab 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -34,7 +34,7 @@ $Id$
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 #include <kmessagebox.h>
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index 3f32558..43c6fe8 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -17,7 +17,7 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <khelpmenu.h>
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 9efce39..7856142 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kurifilter.h>
 #include <kdialog.h>
diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h
index 30d0166..bbae0bb 100644
--- a/kicker-applets/mediacontrol/configfrontend.h
+++ b/kicker-applets/mediacontrol/configfrontend.h
@@ -21,7 +21,7 @@
 #ifndef CONFIGFRONTEND_H
 #define CONFIGFRONTEND_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 class ConfigFrontend : public TQObject
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 14e92fa..76ab823 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -34,7 +34,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klistbox.h>
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index eff9c78..d62eae5 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -34,7 +34,7 @@
 #include <kurllabel.h>
 #include <kdialogbase.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kpopupmenu.h>
diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h
index 658730c..ee99306 100644
--- a/konq-plugins/akregator/akregatorplugin.h
+++ b/konq-plugins/akregator/akregatorplugin.h
@@ -22,8 +22,8 @@
 #define _AKREGATORPLUGIN_H_
 
 #include <konq_popupmenu.h>
-#include <kfileitem.h>
-#include <kconfig.h>
+#include <tdefileitem.h>
+#include <tdeconfig.h>
 
 #include "pluginbase.h"
 
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index acd10f6..2bf0734 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -31,7 +31,7 @@
 #include <kpopupmenu.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqdir.h>
 #include <tqcstring.h>
diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h
index a1290fa..0d13158 100644
--- a/konq-plugins/arkplugin/arkplugin.h
+++ b/konq-plugins/arkplugin/arkplugin.h
@@ -22,8 +22,8 @@
 #define _ARKPLUGIN_H_
 
 #include <konq_popupmenu.h>
-#include <kfileitem.h>
-#include <kconfig.h>
+#include <tdefileitem.h>
+#include <tdeconfig.h>
 
 class KAction;
 class TQSignalMapper;
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index 325aa36..0cd4a54 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -24,7 +24,7 @@
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index aa416a4..358d728 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kaction.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <tdehtml_part.h>
 #include <kgenericfactory.h>
diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h
index 1180767..c9a3a27 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.h
+++ b/konq-plugins/dirfilter/dirfilterplugin.h
@@ -25,7 +25,7 @@
 
 
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
 #include <tdeparts/plugin.h>
 
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 5b24e9d..175696e 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -50,7 +50,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <keditcl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <tdehtml_part.h>
 #include <klineedit.h>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index d9886df..e3ae074 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -27,7 +27,7 @@
 #include <kaccel.h>
 #include <kapplication.h>
 #include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kglobal.h>
 #include <tdehtml_part.h>
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 3ad3066..e1c8e01 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
@@ -34,7 +34,7 @@
 #include <kmimetype.h>
 #include <kurl.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include "fsview.h"
 
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index a4d86a8..b2b40ce 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -25,8 +25,8 @@
 #include <tqwhatsthis.h>
 
 #include <kinstance.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
 #include <tdeparts/genericfactory.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
@@ -35,7 +35,7 @@
 #include <kpopupmenu.h>
 #include <kglobalsettings.h>
 #include <kprotocolinfo.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 
 // from tdebase/libkonq...
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 345db20..3cd4f97 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -25,7 +25,7 @@
 
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 #include "fsview.h"
 
diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp
index 2906f74..a2086c2 100644
--- a/konq-plugins/fsview/main.cpp
+++ b/konq-plugins/fsview/main.cpp
@@ -9,7 +9,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "fsview.h"
 
diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h
index 384a6dc..9062fb1 100644
--- a/konq-plugins/fsview/scan.h
+++ b/konq-plugins/fsview/scan.h
@@ -29,7 +29,7 @@
 
 /* Use KDE_lstat and TDEIO::fileoffset_t for 64-bit sizes */
 #include <klargefile.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class ScanDir;
 class ScanFile;
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index 466b91a..d0356ab 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -30,7 +30,7 @@
 #include <tqpopupmenu.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "treemap.h"
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 047e368..016f58a 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -39,7 +39,7 @@ Boston, MA 02110-1301, USA.
 #include <kcolorbutton.h>
 #include <kurlrequester.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "imgallerydialog.h"
 #include "imgallerydialog.moc"
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index ea343da..eee6d9d 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -39,7 +39,7 @@ Boston, MA 02110-1301, USA.
 #include <kimageio.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kpushbutton.h>
 
 #include "imgallerydialog.h"
@@ -438,7 +438,7 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou
     const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/");
     int extent = m_configDlg->getThumbnailSize();
 
-    // this code is stolen from tdebase/kioslave/thumbnail/imagecreator.cpp
+    // this code is stolen from tdebase/tdeioslave/thumbnail/imagecreator.cpp
     // (c) 2000 gis and malte
 
     m_imgWidth = 120; // Setting the size of the images is
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h
index 71e4434..0b5b611 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h
@@ -24,7 +24,7 @@ Boston, MA 02110-1301, USA.
 #include <tdeparts/plugin.h>
 #include <klibloader.h>
 #include <konq_dirpart.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class TQProgressDialog;
 class KURL;
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index a2894f9..9816d9b 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -18,7 +18,7 @@
 #include <tqfile.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kstandarddirs.h>
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
index ad46287..2fc4fd4 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=editcopy
 Type=Application
-Exec=kcmshell kcmkuick
+Exec=tdecmshell kcmkuick
 X-TDE-ModuleType=Library
 X-TDE-Library=kuick
 Name=Quick Copy & Move Plugin
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index cfe19f0..754de2b 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -24,7 +24,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <ksimpleconfig.h>
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index efb85e2..7ba7a87 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -21,8 +21,8 @@
 #include <tdeimproxy.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <konq_popupmenu.h>
 
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 589f212..b0ccaef 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -31,8 +31,8 @@
 #include <kmessagebox.h>
 #include <kgenericfactory.h>
 #include <tqobject.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 typedef KGenericFactory<KTestMenu, KonqPopupMenu> KTestMenuFactory;
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index ea89b7e..97fc4aa 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kaction.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <tdehtml_part.h>
 #include <kgenericfactory.h>
diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp
index afddb34..d337287 100644
--- a/konq-plugins/rsync/rsyncplugin.cpp
+++ b/konq-plugins/rsync/rsyncplugin.cpp
@@ -82,7 +82,7 @@
 #include <kpassdlg.h>
 #include <klistview.h>
 #include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
@@ -94,8 +94,8 @@
 #include <kgenericfactory.h>
 #include <tdeparts/browserextension.h>
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 #include "rsyncplugin.h"
 
diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h
index 0042762..af28935 100644
--- a/konq-plugins/rsync/rsyncplugin.h
+++ b/konq-plugins/rsync/rsyncplugin.h
@@ -24,11 +24,11 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
 #include <tdeparts/plugin.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 #include <libtdersync/tdersync.h>
 
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 7542a0f..e6c1830 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -24,7 +24,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kgenericfactory.h>
@@ -40,7 +40,7 @@
 #include <kstandarddirs.h>
 #include <kurifilter.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/partmanager.h>
@@ -448,13 +448,13 @@ void SearchBarPlugin::selectSearchEngines()
 {
 	TDEProcess *process = new TDEProcess;
 
-	*process << "kcmshell" << "ebrowsing";
+	*process << "tdecmshell" << "ebrowsing";
 
 	connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(searchEnginesSelected(TDEProcess *)));
 
 	if(!process->start())
 	{
-		kdDebug(1202) << "Couldn't invoke kcmshell." << endl;
+		kdDebug(1202) << "Couldn't invoke tdecmshell." << endl;
 		delete process;
 	}
 }
diff --git a/konq-plugins/sidebar/delicious/Makefile.am b/konq-plugins/sidebar/delicious/Makefile.am
index cb8eb48..35939eb 100644
--- a/konq-plugins/sidebar/delicious/Makefile.am
+++ b/konq-plugins/sidebar/delicious/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = . pics
 
 METASOURCES = AUTO
-INCLUDES = -I$(kde_includes)/kio $(all_includes)
+INCLUDES = -I$(kde_includes)/tdeio $(all_includes)
 
 ################################
 # these are the headers for your project
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 8a591b4..919c498 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -32,14 +32,14 @@
 #include <tqdatetime.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <krfcdate.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 
 MainWidget::MainWidget( TDEConfig * config, TQWidget * parent )
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 4b7361b..733a594 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -25,7 +25,7 @@
 
 #include "widget.h"
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <tdeparts/browserextension.h>
 
 class TQStringList;
diff --git a/konq-plugins/sidebar/mediaplayer/Makefile.am b/konq-plugins/sidebar/mediaplayer/Makefile.am
index 12ba913..3a79209 100644
--- a/konq-plugins/sidebar/mediaplayer/Makefile.am
+++ b/konq-plugins/sidebar/mediaplayer/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = . pics
 
 # set the include path for X, qt and KDE
-INCLUDES = -I$(kde_includes)/kio -I$(kde_includes)/arts $(all_includes)        
+INCLUDES = -I$(kde_includes)/tdeio -I$(kde_includes)/arts $(all_includes)        
 
 # these are the headers for your project
 noinst_HEADERS = 
diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp
index e4590b6..92343cc 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.cpp
+++ b/konq-plugins/sidebar/mediaplayer/engine.cpp
@@ -26,7 +26,7 @@ extern "C"
 #include <sys/wait.h>
 }
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index fc281b4..b615e88 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -20,7 +20,7 @@
 #include "mediaplayer.moc"
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index a6993ae..ba2b129 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -36,7 +36,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktar.h>
 #include <karchive.h>
 #include <dcopref.h>
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 3e10757..190c982 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -24,7 +24,7 @@
 #include <kpushbutton.h>
 #include <klistview.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqptrdict.h>
 #include <tqlistbox.h>
 #include <kactionselector.h>
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 9749a5b..0edf060 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -30,13 +30,13 @@
 #include <kdesktopfile.h>
 #include <ktrader.h>
 #include <krun.h>
-#include <kfilemetainfo.h>
-#include <kconfig.h>
+#include <tdefilemetainfo.h>
+#include <tdeconfig.h>
 #include <kimageio.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h
index b86b12e..a9feb56 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.h
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h
@@ -24,7 +24,7 @@
 #include "protocolplugin.h"
 #include "serviceloader.h"
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <tqdict.h>
 #include <tqmap.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h
index 29c8efa..baf40d5 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.h
+++ b/konq-plugins/sidebar/metabar/src/metabar.h
@@ -7,7 +7,7 @@
 
 #include <konqsidebarplugin.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class Metabar : public KonqSidebarPlugin
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index adf316c..aefa5fd 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -24,7 +24,7 @@
 #include <html_document.h>
 #include <css_value.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqrect.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 7142f15..af44158 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -361,10 +361,10 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
     }
   }
   
-  else if(protocol == "kcmshell"){
+  else if(protocol == "tdecmshell"){
     TQString module = url.path().remove('/');
     
-    KRun::runCommand("kcmshell " + module);
+    KRun::runCommand("tdecmshell " + module);
   }
   
   else if(protocol == "action"){
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index 95c1148..aad695b 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -23,8 +23,8 @@
 
 #include <tdehtml_part.h>
 
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kurl.h>
 #include <kservice.h>
 #include <kpopupmenu.h>
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h
index 6683f61..2ffd207 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.h
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h
@@ -21,7 +21,7 @@
 #ifndef _PROTOCOL_PLUGIN_H
 #define _PROTOCOL_PLUGIN_H
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tdehtml_part.h>
 
 #include <html_element.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 6e47a76..99d85ed 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 
 #include <kpopupmenu.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmimetype.h>
 #include <kurl.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 71fce21..b5186e7 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -72,7 +72,7 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
       TDECModuleInfo kcminfo(service);
       
       DOM::DOMString innerHTML;      
-      MetabarWidget::addEntry(innerHTML, i18n("Run"), "kcmshell:/" + name, kcminfo.icon());
+      MetabarWidget::addEntry(innerHTML, i18n("Run"), "tdecmshell:/" + name, kcminfo.icon());
       node.setInnerHTML(innerHTML);
       
       m_functions->show("actions");
@@ -180,7 +180,7 @@ void SettingsPlugin::slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &
     kdDebug() << url << endl;
     
     if(type == S_IFREG){
-      url = "kcmshell:/" + KURL(url).filename();
+      url = "tdecmshell:/" + KURL(url).filename();
     }
 
     MetabarWidget::addEntry(innerHTML, name, url, icon);
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h
index c8580de..75f61d3 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.h
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h
@@ -23,8 +23,8 @@
 
 #include "protocolplugin.h"
 
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 
 class SettingsPlugin : public ProtocolPlugin
 {
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 8419dff..602b189 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include "sidebarsettings.h"
 #include "configfeeds.h"
 #include "norsswidget.h"
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 6a3ee73..b8590ca 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -30,7 +30,7 @@
 #include <tqtooltip.h>
 #include <dcopref.h>
 #include <dcopobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klistbox.h>
 
 
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index ecbad6c..f6b3b7d 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -42,7 +42,7 @@
 #include <kapplication.h>
 #include <kbugreport.h>
 #include <kstdguiitem.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include "sidebarsettings.h"
 #include "configfeeds.h"
 #include "nsstacktabwidget.h"
diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
index 05619ed..e5f8f60 100644
--- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kapplication.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tdehtml_part.h>
 #include <kinstance.h>
@@ -249,7 +249,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
 
 
 //
-// sync with kcontrol/kio/ksaveioconfig.* !
+// sync with kcontrol/tdeio/ksaveioconfig.* !
 //
 
 void SettingsPlugin::toggleProxy()
@@ -266,7 +266,7 @@ void SettingsPlugin::toggleProxy()
       type = KProtocolManager::NoProxy;
     }
     
-    TDEConfig config("kioslaverc", false, false);
+    TDEConfig config("tdeioslaverc", false, false);
     config.setGroup( "Proxy Settings" );    
     config.writeEntry( "ProxyType", type );
 
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index ecfcff6..763e685 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <ktrader.h>
-#include <kconfig.h>
-#include <kio/job.h>
+#include <tdeconfig.h>
+#include <tdeio/job.h>
 #include <kservice.h>
 #include <kinstance.h>
 #include <kpopupmenu.h>
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index e23b091..27b5294 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -22,7 +22,7 @@
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 #include <tqcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <klocale.h>
 
diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h
index 4d219e7..3e6c80d 100644
--- a/konq-plugins/validators/validatorsdialog.h
+++ b/konq-plugins/validators/validatorsdialog.h
@@ -22,7 +22,7 @@
 
 #include <tqcombobox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 
 class ValidatorsDialog : public KDialogBase
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 63a7570..4c83c43 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -26,11 +26,11 @@
 #include <ktempfile.h>
 #include <ktar.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kpassivepopup.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdehtml_part.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -38,7 +38,7 @@
 #include <tqstylesheet.h>
 #include <tqiodevice.h>
 #include <klistview.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kapplication.h>
 #include <kurllabel.h>
 #include <kprogress.h>
diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h
index c882529..da0212c 100644
--- a/konq-plugins/webarchiver/archivedialog.h
+++ b/konq-plugins/webarchiver/archivedialog.h
@@ -25,7 +25,7 @@
 
 #include <kdialogbase.h>
 #include <ktempfile.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqstring.h>
 #include <tqmap.h>
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index 338c52e..2d7f006 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -35,7 +35,7 @@
 #include <kaction.h>
 #include <kinstance.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <tdehtml_part.h>
diff --git a/konq-plugins/webarchiver/webarchivecreator.h b/konq-plugins/webarchiver/webarchivecreator.h
index a5ad7de..461ccfc 100644
--- a/konq-plugins/webarchiver/webarchivecreator.h
+++ b/konq-plugins/webarchiver/webarchivecreator.h
@@ -22,7 +22,7 @@
 #ifndef __webarchivecreator_h__
 #define __webarchivecreator_h__
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class KHTMLPart;
 
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index a9d29f1..0858b4a 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -18,7 +18,7 @@
 #include <kapplication.h>
 #include <kstdaction.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
diff --git a/ksig/siggenerator.cpp b/ksig/siggenerator.cpp
index 9617742..138fce8 100644
--- a/ksig/siggenerator.cpp
+++ b/ksig/siggenerator.cpp
@@ -20,7 +20,7 @@
 
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index e62ddc8..55d5ac6 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -33,7 +33,7 @@
 #include <tqwhatsthis.h>
 #include <kiconloader.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include "wakeup.h"
 #include "kminutespinbox.h"
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index a619a0e..ec0b123 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index 9e13f12..5eadaf9 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -38,7 +38,7 @@
 #include <kpopupmenu.h>
 #include <kurldrag.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index b48f011..f3ba458 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 91cff44..11c4988 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -36,7 +36,7 @@
 #include <kurldrag.h>
 #include <kstatusbar.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
diff --git a/noatun-plugins/dub/dub.kdevprj b/noatun-plugins/dub/dub.kdevprj
index ef387e6..8bef2aa 100644
--- a/noatun-plugins/dub/dub.kdevprj
+++ b/noatun-plugins/dub/dub.kdevprj
@@ -28,7 +28,7 @@ bin_program=dub
 cflags=
 cppflags=
 cxxflags=\s-O0 -g3 -Wall
-ldadd=\s-lkfile -ltdeui -ltdecore -lqt
+ldadd=\s-ltdefile -ltdeui -ltdecore -lqt
 ldflags=\s  \s
 
 [General]
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index 5322ae6..55cfbb1 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -23,11 +23,11 @@
 // include files for KDE
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kurl.h>
 #include <kurlrequester.h>
diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp
index 375fc4b..d5cfce0 100644
--- a/noatun-plugins/dub/dub/dubapp.cpp
+++ b/noatun-plugins/dub/dub/dubapp.cpp
@@ -19,11 +19,11 @@
 // include files for KDE
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <noatun/playlist.h>
 
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 9e81d45..9de7eee 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -11,7 +11,7 @@
 //
 //
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/noatun-plugins/dub/dub/dubplaylist.h b/noatun-plugins/dub/dub/dubplaylist.h
index d250926..831486a 100644
--- a/noatun-plugins/dub/dub/dubplaylist.h
+++ b/noatun-plugins/dub/dub/dubplaylist.h
@@ -17,7 +17,7 @@
 class Dub;
 class DubConfigModule;
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <noatun/playlist.h>
 #include <noatun/plugin.h>
 
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp
index 62d2e5c..065ebe9 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.cpp
+++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp
@@ -15,8 +15,8 @@
 
 
 #include "dubplaylistitem.h"
-#include <kfile.h>
-#include <kfileitem.h>
+#include <tdefile.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.h b/noatun-plugins/dub/dub/dubplaylistitem.h
index f61daaf..211a0bc 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.h
+++ b/noatun-plugins/dub/dub/dubplaylistitem.h
@@ -15,7 +15,7 @@
 #ifndef DUBPLAYLISTITEM_H
 #define DUBPLAYLISTITEM_H
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <dubplaylistitem.h>
 
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index ac1892e..437f943 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -26,7 +26,7 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <kdiroperator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index d278aa9..9d38a86 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/fileselectorwidget.h
@@ -22,7 +22,7 @@
 #include <klistview.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kcombobox.h>
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index a562751..04ae3ef 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -6,7 +6,7 @@
 #include <tqpainter.h>
 #include <tqbitmap.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqcursor.h>
 #include <tqtooltip.h>
 #include <twin.h>
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 3d5f677..8791f30 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -10,7 +10,7 @@
 #include <klineedit.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 extern Lyrics *lyrics;
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index fdd73ee..ed8cfef 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -1,6 +1,6 @@
 #include <klocale.h>
 #include <klineeditdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <tdehtmlview.h>
 #include <kstdaction.h>
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index 624eb48..803aba0 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -2,7 +2,7 @@
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqdragobject.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstdaction.h>
 #include <kaction.h>
 
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index dd0ebb7..bde3302 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -12,7 +12,7 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
diff --git a/noatun-plugins/oblique/file.cpp b/noatun-plugins/oblique/file.cpp
index 2946f23..6b0fd01 100644
--- a/noatun-plugins/oblique/file.cpp
+++ b/noatun-plugins/oblique/file.cpp
@@ -8,7 +8,7 @@
 #include <iostream>
 
 #include <klocale.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kmimetype.h>
 
 
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index 15e0520..4209d9b 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -19,7 +19,7 @@
 
 #include "kdatacollection.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index f25338a..2c12588 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -10,10 +10,10 @@
 
 #include <noatun/player.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 
 #include <tqtimer.h>
 
diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h
index f5c1798..ed03d79 100644
--- a/noatun-plugins/oblique/oblique.h
+++ b/noatun-plugins/oblique/oblique.h
@@ -9,7 +9,7 @@
 #include "query.h"
 #include "kdatacollection.h"
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class View;
 class Tree;
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index c769603..5714c99 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -10,7 +10,7 @@
 #include <kstdaction.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqlabel.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index ac8c701..a35de7c 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -17,7 +17,7 @@
 // AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp
index 02ad014..4ff7148 100644
--- a/noatun-plugins/synaescope/main.cpp
+++ b/noatun-plugins/synaescope/main.cpp
@@ -174,7 +174,7 @@ void warning(const char *str, bool)
 
 #include <kinstance.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 int main(void)
 {
diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp
index cd16408..0c69c4a 100644
--- a/noatun-plugins/synaescope/ui.cpp
+++ b/noatun-plugins/synaescope/ui.cpp
@@ -3,7 +3,7 @@
 #include "syna.h"
 #include <math.h>
 #include <stdlib.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <unistd.h>
 
diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp
index b61bf51..7213e1f 100644
--- a/noatun-plugins/tippercanoe/ui.cpp
+++ b/noatun-plugins/tippercanoe/ui.cpp
@@ -3,7 +3,7 @@
 #include "syna.h"
 #include <math.h>
 #include <stdlib.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #define output core->output()
 
diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp
index 2e0112e..cebc10e 100644
--- a/noatun-plugins/wavecapture/wavecapture.cpp
+++ b/noatun-plugins/wavecapture/wavecapture.cpp
@@ -28,11 +28,11 @@
 
 #include <klocale.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <krecentdocument.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqfile.h>
 #include <tqstring.h>
diff --git a/renamedlgplugins/audio/audio_plugin.cpp b/renamedlgplugins/audio/audio_plugin.cpp
index a1251df..c8cc14d 100644
--- a/renamedlgplugins/audio/audio_plugin.cpp
+++ b/renamedlgplugins/audio/audio_plugin.cpp
@@ -21,12 +21,12 @@
 
 #include <kgenericfactory.h>
 #include <renamedlgplugin.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 #include <tqlabel.h>
 #include <tqdialog.h>
 #include <tqwidget.h>
 #include <tqstringlist.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tqlayout.h>
 
 #include <sys/types.h>
diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp
index 8c8cc49..533cc3c 100644
--- a/renamedlgplugins/audio/audiopreview.cpp
+++ b/renamedlgplugins/audio/audiopreview.cpp
@@ -17,14 +17,14 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurllabel.h>
 #include <kmimetype.h>
 #include <tdemediaplayer/player.h>
diff --git a/renamedlgplugins/images/image_plugin.cpp b/renamedlgplugins/images/image_plugin.cpp
index ef3b715..0cf908b 100644
--- a/renamedlgplugins/images/image_plugin.cpp
+++ b/renamedlgplugins/images/image_plugin.cpp
@@ -23,12 +23,12 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <renamedlgplugin.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 #include <tqlabel.h>
 #include <tqdialog.h>
 #include <tqwidget.h>
 #include <tqstringlist.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tqlayout.h>
 
 #include <sys/types.h>
diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp
index 1ef7cd5..2ac153a 100644
--- a/renamedlgplugins/images/imagevisualizer.cpp
+++ b/renamedlgplugins/images/imagevisualizer.cpp
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <tqimage.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "imagevisualizer.h"
 
diff --git a/kfile-plugins/Makefile.am b/tdefile-plugins/Makefile.am
similarity index 68%
rename from kfile-plugins/Makefile.am
rename to tdefile-plugins/Makefile.am
index 23348fb..f62e59b 100644
--- a/kfile-plugins/Makefile.am
+++ b/tdefile-plugins/Makefile.am
@@ -1,4 +1,4 @@
-if include_kfileplugin_cert_SUBDIR
+if include_tdefileplugin_cert_SUBDIR
 CERT_SUBDIR=cert
 endif
 
diff --git a/kfile-plugins/RETURNED_ITEMS b/tdefile-plugins/RETURNED_ITEMS
similarity index 89%
rename from kfile-plugins/RETURNED_ITEMS
rename to tdefile-plugins/RETURNED_ITEMS
index 245dbff..642a6b2 100644
--- a/kfile-plugins/RETURNED_ITEMS
+++ b/tdefile-plugins/RETURNED_ITEMS
@@ -1,25 +1,25 @@
 If you make a new plugin, please add the list of returned items to this list.
 
-kfile_txt
+tdefile_txt
 =========
 int     Characters
 int     Words
 int     Lines
 QString Format (Unix/DOS/Macintosh)
 
-kfile_folder
+tdefile_folder
 ============
 int     items
 QString size (as a string to display bytes, kB, MB, etc)
 
-kfile_lnk
+tdefile_lnk
 ============
 int     Size of target
 QString Location
 QString Points to
 QString Description
 
-kfile_mhtml
+tdefile_mhtml
 ===========
 QString Sender
 QString Recipient
diff --git a/tdefile-plugins/cert/Makefile.am b/tdefile-plugins/cert/Makefile.am
new file mode 100644
index 0000000..ff679f5
--- /dev/null
+++ b/tdefile-plugins/cert/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for cert file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_cert.h
+
+kde_module_LTLIBRARIES = tdefile_cert.la
+
+tdefile_cert_la_SOURCES = tdefile_cert.cpp
+tdefile_cert_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_cert_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_cert.cpp -o $(podir)/tdefile_cert.pot
+
+services_DATA = tdefile_cert.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/tdefile-plugins/cert/configure.in.in b/tdefile-plugins/cert/configure.in.in
new file mode 100644
index 0000000..5c78161
--- /dev/null
+++ b/tdefile-plugins/cert/configure.in.in
@@ -0,0 +1,2 @@
+KDE_CHECK_SSL
+AM_CONDITIONAL(include_tdefileplugin_cert_SUBDIR, test "$have_ssl" = yes)
diff --git a/kfile-plugins/cert/kfile_cert.cpp b/tdefile-plugins/cert/tdefile_cert.cpp
similarity index 97%
rename from kfile-plugins/cert/kfile_cert.cpp
rename to tdefile-plugins/cert/tdefile_cert.cpp
index 8a711ba..7f68023 100644
--- a/kfile-plugins/cert/kfile_cert.cpp
+++ b/tdefile-plugins/cert/tdefile_cert.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <config.h>
-#include "kfile_cert.h"
+#include "tdefile_cert.h"
 
 #include <kgenericfactory.h>
 #include <ksslcertificate.h>
@@ -27,7 +27,7 @@
 #include <kopenssl.h>
 //#include <kstandarddirs.h>
 //#include <kdebug.h>
-//#include <kio/global.h>
+//#include <tdeio/global.h>
 
 #include <tqdatetime.h>
 #include <tqfile.h>
@@ -37,7 +37,7 @@
 
 typedef KGenericFactory<CertPlugin> CertFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_cert, CertFactory("kfile-cert"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_cert, CertFactory("tdefile-cert"))
 
 CertPlugin::CertPlugin(TQObject *parent, const char *name, const TQStringList &args)
   : KFilePlugin(parent, name, args)
@@ -158,4 +158,4 @@ bool CertPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
   }
 }
 
-#include "kfile_cert.moc"
+#include "tdefile_cert.moc"
diff --git a/kfile-plugins/cert/kfile_cert.desktop b/tdefile-plugins/cert/tdefile_cert.desktop
similarity index 98%
rename from kfile-plugins/cert/kfile_cert.desktop
rename to tdefile-plugins/cert/tdefile_cert.desktop
index b2cd4c7..3e589b8 100644
--- a/kfile-plugins/cert/kfile_cert.desktop
+++ b/tdefile-plugins/cert/tdefile_cert.desktop
@@ -54,7 +54,7 @@ Name[vi]=Thông tin chứng nhận
 Name[zh_CN]=证书信息
 Name[zh_TW]=憑證資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_cert
+X-TDE-Library=tdefile_cert
 MimeType=application/x-x509-ca-cert
 PreferredGroups=certInfo,certSubjectInfo
 PreferredItems=State,CN,O,OU,L,C
diff --git a/kfile-plugins/cert/kfile_cert.h b/tdefile-plugins/cert/tdefile_cert.h
similarity index 94%
rename from kfile-plugins/cert/kfile_cert.h
rename to tdefile-plugins/cert/tdefile_cert.h
index 2a76c5e..4d3b93b 100644
--- a/kfile-plugins/cert/kfile_cert.h
+++ b/tdefile-plugins/cert/tdefile_cert.h
@@ -22,9 +22,9 @@
 #define __KFILE_CERT_H__
 
 /**
- * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h>
+ * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
  */
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 class TQString;
diff --git a/tdefile-plugins/desktop/Makefile.am b/tdefile-plugins/desktop/Makefile.am
new file mode 100644
index 0000000..e8315ad
--- /dev/null
+++ b/tdefile-plugins/desktop/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for .desktop file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_desktop.h
+
+kde_module_LTLIBRARIES = tdefile_desktop.la
+
+tdefile_desktop_la_SOURCES = tdefile_desktop.cpp
+tdefile_desktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_desktop_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_desktop.pot
+
+services_DATA = tdefile_desktop.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/desktop/kfile_desktop.cpp b/tdefile-plugins/desktop/tdefile_desktop.cpp
similarity index 96%
rename from kfile-plugins/desktop/kfile_desktop.cpp
rename to tdefile-plugins/desktop/tdefile_desktop.cpp
index 5c56d9e..2bcd930 100644
--- a/kfile-plugins/desktop/kfile_desktop.cpp
+++ b/tdefile-plugins/desktop/tdefile_desktop.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "kfile_desktop.h"
+#include "tdefile_desktop.h"
 
 #include <kurl.h>
 #include <klocale.h>
@@ -28,7 +28,7 @@
 
 typedef KGenericFactory<KDotDesktopPlugin> DotDesktopFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_desktop, DotDesktopFactory("kfile_desktop"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_desktop, DotDesktopFactory("tdefile_desktop"))
 
 KDotDesktopPlugin::KDotDesktopPlugin(TQObject *parent, const char *name,
                                      const TQStringList &preferredItems)
@@ -125,4 +125,4 @@ bool KDotDesktopPlugin::readInfo( KFileMetaInfo& info, uint )
     return true;
 }
 
-#include "kfile_desktop.moc"
+#include "tdefile_desktop.moc"
diff --git a/kfile-plugins/desktop/kfile_desktop.desktop b/tdefile-plugins/desktop/tdefile_desktop.desktop
similarity index 99%
rename from kfile-plugins/desktop/kfile_desktop.desktop
rename to tdefile-plugins/desktop/tdefile_desktop.desktop
index f2dba8c..ad9a851 100644
--- a/kfile-plugins/desktop/kfile_desktop.desktop
+++ b/tdefile-plugins/desktop/tdefile_desktop.desktop
@@ -63,6 +63,6 @@ Name[xh]=Ungeniso Lolwazi lwe Desktop
 Name[zh_CN]=桌面项目信息
 Name[zh_TW]=桌面項目資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_desktop
+X-TDE-Library=tdefile_desktop
 MimeType=application/x-desktop
 PreferredItems=Name,Comment,Type,Service Type
diff --git a/kfile-plugins/desktop/kfile_desktop.h b/tdefile-plugins/desktop/tdefile_desktop.h
similarity index 97%
rename from kfile-plugins/desktop/kfile_desktop.h
rename to tdefile-plugins/desktop/tdefile_desktop.h
index 57db52b..b6d0104 100644
--- a/kfile-plugins/desktop/kfile_desktop.h
+++ b/tdefile-plugins/desktop/tdefile_desktop.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_DESKTOP_H__
 #define __KFILE_DESKTOP_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kurl.h>
 
 class TQStringList;
diff --git a/tdefile-plugins/folder/Makefile.am b/tdefile-plugins/folder/Makefile.am
new file mode 100644
index 0000000..a6917c1
--- /dev/null
+++ b/tdefile-plugins/folder/Makefile.am
@@ -0,0 +1,21 @@
+## Makefile.am for folder file meta info plugin
+
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_folder.h
+
+kde_module_LTLIBRARIES = tdefile_folder.la
+
+tdefile_folder_la_SOURCES = tdefile_folder.cpp
+tdefile_folder_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_folder_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+services_DATA = tdefile_folder.desktop
+servicesdir = $(kde_servicesdir)
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_folder.pot
diff --git a/kfile-plugins/folder/kfile_folder.cpp b/tdefile-plugins/folder/tdefile_folder.cpp
similarity index 93%
rename from kfile-plugins/folder/kfile_folder.cpp
rename to tdefile-plugins/folder/tdefile_folder.cpp
index f4db1f3..24a0365 100644
--- a/kfile-plugins/folder/kfile_folder.cpp
+++ b/tdefile-plugins/folder/tdefile_folder.cpp
@@ -18,17 +18,17 @@
  */
 
 #include <config.h>
-#include "kfile_folder.h"
+#include "tdefile_folder.h"
 
 #include <kgenericfactory.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqfileinfo.h>
 #include <tqdir.h>
 
 typedef KGenericFactory<KFolderPlugin> KFolderFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_folder, KFolderFactory( "kfile_folder" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_folder, KFolderFactory( "tdefile_folder" ))
 
 KFolderPlugin::KFolderPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -83,4 +83,4 @@ bool KFolderPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     return true;
 }
 
-#include "kfile_folder.moc"
+#include "tdefile_folder.moc"
diff --git a/kfile-plugins/folder/kfile_folder.desktop b/tdefile-plugins/folder/tdefile_folder.desktop
similarity index 98%
rename from kfile-plugins/folder/kfile_folder.desktop
rename to tdefile-plugins/folder/tdefile_folder.desktop
index 4db8401..8f14b20 100644
--- a/kfile-plugins/folder/kfile_folder.desktop
+++ b/tdefile-plugins/folder/tdefile_folder.desktop
@@ -64,7 +64,7 @@ Name[xh]=Ulwazi lwencwadi enencukhacha
 Name[zh_CN]=文件夹信息
 Name[zh_TW]=資料夾資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_folder
+X-TDE-Library=tdefile_folder
 MimeType=inode/directory
 PreferredGroups=FolderInfo
 PreferredItems=Items,Size
diff --git a/kfile-plugins/folder/kfile_folder.h b/tdefile-plugins/folder/tdefile_folder.h
similarity index 97%
rename from kfile-plugins/folder/kfile_folder.h
rename to tdefile-plugins/folder/tdefile_folder.h
index e3cd2e6..8fe7e94 100644
--- a/kfile-plugins/folder/kfile_folder.h
+++ b/tdefile-plugins/folder/tdefile_folder.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_KFOLDER_H__
 #define __KFILE_KFOLDER_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/tdefile-plugins/html/Makefile.am b/tdefile-plugins/html/Makefile.am
new file mode 100644
index 0000000..6097b26
--- /dev/null
+++ b/tdefile-plugins/html/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for html file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_html.h
+
+kde_module_LTLIBRARIES = tdefile_html.la
+
+tdefile_html_la_SOURCES = tdefile_html.cpp
+tdefile_html_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_html_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_html.cpp -o $(podir)/tdefile_html.pot
+
+services_DATA = tdefile_html.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/html/kfile_html.cpp b/tdefile-plugins/html/tdefile_html.cpp
similarity index 97%
rename from kfile-plugins/html/kfile_html.cpp
rename to tdefile-plugins/html/tdefile_html.cpp
index 7ed2859..c59711a 100644
--- a/kfile-plugins/html/kfile_html.cpp
+++ b/tdefile-plugins/html/tdefile_html.cpp
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#include "kfile_html.h"
-#include "kfile_html.moc"
+#include "tdefile_html.h"
+#include "tdefile_html.moc"
 #include <kgenericfactory.h>
 #include <kmimetype.h>
 #include <kurl.h>
@@ -32,7 +32,7 @@
 
 typedef KGenericFactory<KHtmlPlugin> HtmlFactory;
 
-K_EXPORT_COMPONENT_FACTORY( kfile_html, HtmlFactory( "kfile_html" ) )
+K_EXPORT_COMPONENT_FACTORY( tdefile_html, HtmlFactory( "tdefile_html" ) )
 
 KHtmlPlugin::KHtmlPlugin( TQObject *parent, const char *name,
                           const TQStringList &args )
diff --git a/kfile-plugins/html/kfile_html.desktop b/tdefile-plugins/html/tdefile_html.desktop
similarity index 99%
rename from kfile-plugins/html/kfile_html.desktop
rename to tdefile-plugins/html/tdefile_html.desktop
index 244c51a..4dfd89c 100644
--- a/kfile-plugins/html/kfile_html.desktop
+++ b/tdefile-plugins/html/tdefile_html.desktop
@@ -61,6 +61,6 @@ Name[xh]=Ulwazi loluhlu lodweliso lomdlali we HTML
 Name[zh_CN]=HTML 播放列表信息
 Name[zh_TW]=HTML 播放清單資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_html
+X-TDE-Library=tdefile_html
 MimeType=text/html
 PreferredItems=Title,Javascript,Doctype,Keywords
diff --git a/kfile-plugins/html/kfile_html.h b/tdefile-plugins/html/tdefile_html.h
similarity index 97%
rename from kfile-plugins/html/kfile_html.h
rename to tdefile-plugins/html/tdefile_html.h
index 7e5018a..858d6a1 100644
--- a/kfile-plugins/html/kfile_html.h
+++ b/tdefile-plugins/html/tdefile_html.h
@@ -21,7 +21,7 @@
 #ifndef __KMIME_HTML_H__
 #define __KMIME_HTML_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kurl.h>
 
 class TQStringList;
diff --git a/kfile-plugins/lnk/Makefile.am b/tdefile-plugins/lnk/Makefile.am
similarity index 62%
rename from kfile-plugins/lnk/Makefile.am
rename to tdefile-plugins/lnk/Makefile.am
index b8262b1..083f9a0 100644
--- a/kfile-plugins/lnk/Makefile.am
+++ b/tdefile-plugins/lnk/Makefile.am
@@ -13,22 +13,22 @@ lnkforward_DATA = lnkforward.desktop
 lnkforwarddir = $(kde_appsdir)/.hidden
 
 # these are the headers for your project
-noinst_HEADERS   = kfile_lnk.h read_lnk.h lnkforward.h
+noinst_HEADERS   = tdefile_lnk.h read_lnk.h lnkforward.h
 
-kde_module_LTLIBRARIES = kfile_lnk.la
+kde_module_LTLIBRARIES = tdefile_lnk.la
 
-kfile_lnk_la_SOURCES = kfile_lnk.cpp read_lnk.cpp
-kfile_lnk_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_lnk_la_LIBADD = $(LIB_KIO)
-kfile_lnk_la_METASOURCES = kfile_lnk.moc
+tdefile_lnk_la_SOURCES = tdefile_lnk.cpp read_lnk.cpp
+tdefile_lnk_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_lnk_la_LIBADD = $(LIB_KIO)
+tdefile_lnk_la_METASOURCES = tdefile_lnk.moc
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
-kde_services_DATA = kfile_lnk.desktop
+kde_services_DATA = tdefile_lnk.desktop
 
 mime_DATA = x-win-lnk.desktop
 mimedir = $(kde_mimedir)/application
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_lnk.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_lnk.pot
diff --git a/kfile-plugins/lnk/README b/tdefile-plugins/lnk/README
similarity index 90%
rename from kfile-plugins/lnk/README
rename to tdefile-plugins/lnk/README
index a61c473..8b17918 100644
--- a/kfile-plugins/lnk/README
+++ b/tdefile-plugins/lnk/README
@@ -5,7 +5,7 @@ by providing tools to work with Windows .lnk files
 
 This package contains 2 tools:
 
-- a KFile plugin, kfile_lnk, which gives metadata information for a .lnk file (where does it point to)
+- a KFile plugin, tdefile_lnk, which gives metadata information for a .lnk file (where does it point to)
 
 - a small tool, lnkforward, to start an associated application for which the path is in a .lnk file
   (e.g. when you double-click a file in konqueror)
diff --git a/kfile-plugins/lnk/lnkforward.cpp b/tdefile-plugins/lnk/lnkforward.cpp
similarity index 100%
rename from kfile-plugins/lnk/lnkforward.cpp
rename to tdefile-plugins/lnk/lnkforward.cpp
diff --git a/kfile-plugins/lnk/lnkforward.desktop b/tdefile-plugins/lnk/lnkforward.desktop
similarity index 100%
rename from kfile-plugins/lnk/lnkforward.desktop
rename to tdefile-plugins/lnk/lnkforward.desktop
diff --git a/kfile-plugins/lnk/lnkforward.h b/tdefile-plugins/lnk/lnkforward.h
similarity index 100%
rename from kfile-plugins/lnk/lnkforward.h
rename to tdefile-plugins/lnk/lnkforward.h
diff --git a/kfile-plugins/lnk/read_lnk.cpp b/tdefile-plugins/lnk/read_lnk.cpp
similarity index 99%
rename from kfile-plugins/lnk/read_lnk.cpp
rename to tdefile-plugins/lnk/read_lnk.cpp
index 1170f9a..47ed5a5 100644
--- a/kfile-plugins/lnk/read_lnk.cpp
+++ b/tdefile-plugins/lnk/read_lnk.cpp
@@ -24,7 +24,7 @@
 #include "read_lnk.h"
 #include <stdio.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 //--------------------------------------------------------------------------------
 
diff --git a/kfile-plugins/lnk/read_lnk.h b/tdefile-plugins/lnk/read_lnk.h
similarity index 100%
rename from kfile-plugins/lnk/read_lnk.h
rename to tdefile-plugins/lnk/read_lnk.h
diff --git a/kfile-plugins/lnk/kfile_lnk.cpp b/tdefile-plugins/lnk/tdefile_lnk.cpp
similarity index 96%
rename from kfile-plugins/lnk/kfile_lnk.cpp
rename to tdefile-plugins/lnk/tdefile_lnk.cpp
index eb9e106..b706366 100644
--- a/kfile-plugins/lnk/kfile_lnk.cpp
+++ b/tdefile-plugins/lnk/tdefile_lnk.cpp
@@ -22,7 +22,7 @@
 // http://www.i2s-lab.com/Papers/The_Windows_Shortcut_File_Format.pdf
 
 #include <config.h>
-#include "kfile_lnk.h"
+#include "tdefile_lnk.h"
 #include "read_lnk.h"
 
 #include <kgenericfactory.h>
@@ -31,7 +31,7 @@
 
 typedef KGenericFactory<lnkPlugin> lnkFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_lnk, lnkFactory( "kfile_lnk" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_lnk, lnkFactory( "tdefile_lnk" ))
 
 //--------------------------------------------------------------------------------
 
@@ -90,4 +90,4 @@ bool lnkPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
   return true;
 }
 
-#include "kfile_lnk.moc"
+#include "tdefile_lnk.moc"
diff --git a/kfile-plugins/lnk/kfile_lnk.desktop b/tdefile-plugins/lnk/tdefile_lnk.desktop
similarity index 99%
rename from kfile-plugins/lnk/kfile_lnk.desktop
rename to tdefile-plugins/lnk/tdefile_lnk.desktop
index ade9b01..b7d28c7 100644
--- a/kfile-plugins/lnk/kfile_lnk.desktop
+++ b/tdefile-plugins/lnk/tdefile_lnk.desktop
@@ -57,6 +57,6 @@ Name[vi]=Thông tin tập tin Ink Windows
 Name[zh_CN]=Windows lnk 文件信息
 Name[zh_TW]=Windows lnk 檔資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_lnk
+X-TDE-Library=tdefile_lnk
 MimeType=application/x-win-lnk
 PreferredItems=PointsTo,Where,TargetSize,Description
diff --git a/kfile-plugins/lnk/kfile_lnk.h b/tdefile-plugins/lnk/tdefile_lnk.h
similarity index 95%
rename from kfile-plugins/lnk/kfile_lnk.h
rename to tdefile-plugins/lnk/tdefile_lnk.h
index 7bc96d9..3d43dbc 100644
--- a/kfile-plugins/lnk/kfile_lnk.h
+++ b/tdefile-plugins/lnk/tdefile_lnk.h
@@ -26,9 +26,9 @@
 #define __KFILE_LNK_H__
 
 /**
- * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h>
+ * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
  */
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kfile-plugins/lnk/x-win-lnk.desktop b/tdefile-plugins/lnk/x-win-lnk.desktop
similarity index 100%
rename from kfile-plugins/lnk/x-win-lnk.desktop
rename to tdefile-plugins/lnk/x-win-lnk.desktop
diff --git a/tdefile-plugins/mhtml/Makefile.am b/tdefile-plugins/mhtml/Makefile.am
new file mode 100644
index 0000000..3d0b98f
--- /dev/null
+++ b/tdefile-plugins/mhtml/Makefile.am
@@ -0,0 +1,21 @@
+## Makefile.am for folder file meta info plugin
+
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_mhtml.h
+
+kde_module_LTLIBRARIES = tdefile_mhtml.la
+
+tdefile_mhtml_la_SOURCES = tdefile_mhtml.cpp
+tdefile_mhtml_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_mhtml_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+services_DATA = tdefile_mhtml.desktop
+servicesdir = $(kde_servicesdir)
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_mhtml.pot
diff --git a/kfile-plugins/mhtml/kfile_mhtml.cpp b/tdefile-plugins/mhtml/tdefile_mhtml.cpp
similarity index 98%
rename from kfile-plugins/mhtml/kfile_mhtml.cpp
rename to tdefile-plugins/mhtml/tdefile_mhtml.cpp
index 0a07ea9..fdf2ffe 100644
--- a/kfile-plugins/mhtml/kfile_mhtml.cpp
+++ b/tdefile-plugins/mhtml/tdefile_mhtml.cpp
@@ -20,7 +20,7 @@
 
 
 #include <config.h>
-#include "kfile_mhtml.h"
+#include "tdefile_mhtml.h"
 
 #include <kgenericfactory.h>
 #include <kmdcodec.h>
@@ -32,7 +32,7 @@
 
 typedef KGenericFactory<mhtmlPlugin> mhtmlFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_mhtml, mhtmlFactory( "kfile_mhtml" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_mhtml, mhtmlFactory( "tdefile_mhtml" ))
 
 mhtmlPlugin::mhtmlPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -197,5 +197,5 @@ TQString mhtmlPlugin::decodeRFC2047String(const TQString &msg){
 		return decodedText + notEncodedText;
 	}else return msg;
 }
-#include "kfile_mhtml.moc"
+#include "tdefile_mhtml.moc"
 
diff --git a/kfile-plugins/mhtml/kfile_mhtml.desktop b/tdefile-plugins/mhtml/tdefile_mhtml.desktop
similarity index 98%
rename from kfile-plugins/mhtml/kfile_mhtml.desktop
rename to tdefile-plugins/mhtml/tdefile_mhtml.desktop
index 52a7492..bbcac48 100644
--- a/kfile-plugins/mhtml/kfile_mhtml.desktop
+++ b/tdefile-plugins/mhtml/tdefile_mhtml.desktop
@@ -54,7 +54,7 @@ Name[vi]=Thông tin mhtml
 Name[zh_CN]=mhtml 信息
 Name[zh_TW]=mhtml 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_mhtml
+X-TDE-Library=tdefile_mhtml
 MimeType=application/x-mimearchive
 PreferredGroups=mhtmlInfo
 PreferredItems=Subject,Sender,Recipient,CopyTo,BlindCopyTo,Date
diff --git a/kfile-plugins/mhtml/kfile_mhtml.h b/tdefile-plugins/mhtml/tdefile_mhtml.h
similarity index 94%
rename from kfile-plugins/mhtml/kfile_mhtml.h
rename to tdefile-plugins/mhtml/tdefile_mhtml.h
index b48583e..50e1231 100644
--- a/kfile-plugins/mhtml/kfile_mhtml.h
+++ b/tdefile-plugins/mhtml/tdefile_mhtml.h
@@ -23,9 +23,9 @@
 #define __KFILE_MHTML_H__
 
 /**
- * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h>
+ * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
  */
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/tdefile-plugins/txt/Makefile.am b/tdefile-plugins/txt/Makefile.am
new file mode 100644
index 0000000..71c0333
--- /dev/null
+++ b/tdefile-plugins/txt/Makefile.am
@@ -0,0 +1,21 @@
+## Makefile.am for text file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+noinst_HEADERS   = tdefile_txt.h
+
+kde_module_LTLIBRARIES = tdefile_txt.la
+
+tdefile_txt_la_SOURCES = tdefile_txt.cpp
+tdefile_txt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_txt_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_txt.pot
+
+services_DATA = tdefile_txt.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/txt/kfile_txt.cpp b/tdefile-plugins/txt/tdefile_txt.cpp
similarity index 97%
rename from kfile-plugins/txt/kfile_txt.cpp
rename to tdefile-plugins/txt/tdefile_txt.cpp
index fbd1c8b..acf7a6d 100644
--- a/kfile-plugins/txt/kfile_txt.cpp
+++ b/tdefile-plugins/txt/tdefile_txt.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "kfile_txt.h"
+#include "tdefile_txt.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
@@ -28,7 +28,7 @@
 
 typedef KGenericFactory<KTxtPlugin> TxtFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_txt, TxtFactory("kfile_txt"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_txt, TxtFactory("tdefile_txt"))
 
 KTxtPlugin::KTxtPlugin(TQObject *parent, const char *name,
         const TQStringList &args) : KFilePlugin(parent, name, args)
@@ -126,4 +126,4 @@ bool KTxtPlugin::readInfo(KFileMetaInfo& info, uint)
     return true;
 }
 
-#include "kfile_txt.moc"
+#include "tdefile_txt.moc"
diff --git a/kfile-plugins/txt/kfile_txt.desktop b/tdefile-plugins/txt/tdefile_txt.desktop
similarity index 99%
rename from kfile-plugins/txt/kfile_txt.desktop
rename to tdefile-plugins/txt/tdefile_txt.desktop
index 8a8b223..ab06d5f 100644
--- a/kfile-plugins/txt/kfile_txt.desktop
+++ b/tdefile-plugins/txt/tdefile_txt.desktop
@@ -64,7 +64,7 @@ Name[xh]=Ulwazi Lombhalo Wefayile
 Name[zh_CN]=文本文件信息
 Name[zh_TW]=文字檔案資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_txt
+X-TDE-Library=tdefile_txt
 MimeType=text/plain
 PreferredGroups=General
 PreferredItems=Lines,Words,Characters,Format
diff --git a/kfile-plugins/txt/kfile_txt.h b/tdefile-plugins/txt/tdefile_txt.h
similarity index 97%
rename from kfile-plugins/txt/kfile_txt.h
rename to tdefile-plugins/txt/tdefile_txt.h
index 1cfc05d..86e80cc 100644
--- a/kfile-plugins/txt/kfile_txt.h
+++ b/tdefile-plugins/txt/tdefile_txt.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_TXT_H_
 #define __KFILE_TXT_H_
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;