diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42794966..f1439b55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,9 +44,9 @@ tde_setup_paths( )
 
 option( WITH_T1LIB "Enable t1lib support" OFF )
 option( WITH_PAPER "Enable libpaper support" OFF )
-OPTION( WITH_TIFF "Enable tiff support (kfile-plugins)" OFF )
-OPTION( WITH_OPENEXR "Enable openexr support (kfile-plugins)" OFF )
-OPTION( WITH_PDF "Enable pdf support (kfile-plugins)" OFF )
+OPTION( WITH_TIFF "Enable tiff support (tdefile-plugins)" OFF )
+OPTION( WITH_OPENEXR "Enable openexr support (tdefile-plugins)" OFF )
+OPTION( WITH_PDF "Enable pdf support (tdefile-plugins)" OFF )
 
 
 ##### options comments ##########################
@@ -60,9 +60,9 @@ OPTION( WITH_PDF "Enable pdf support (kfile-plugins)" OFF )
 # WITH_PAPER   affects kpdf
 # WITH_PAPER   description this library is only used to set some default
 #                          parameters of paper according to system settings.
-# WITH_TIFF    affects kfile-plugins(tiff)
-# WITH_OPENEXR affects kfile-plugins(exr)
-# WITH_PDF     affects kfile-plugins(pdf dependencies/poppler-tqt)
+# WITH_TIFF    affects tdefile-plugins(tiff)
+# WITH_OPENEXR affects tdefile-plugins(exr)
+# WITH_PDF     affects tdefile-plugins(pdf dependencies/poppler-tqt)
 
 # NOTE: It seems that libtiff was planned to be used in
 #       kviewshell(plugins/djvu) but isn't yet implemented
@@ -77,7 +77,7 @@ option( BUILD_KCOLOREDIT "Build kcoloredit" ${BUILD_ALL} )
 option( BUILD_KDVI "Build kdvi" ${BUILD_ALL} )
 option( BUILD_KFAX "Build kfax" ${BUILD_ALL} )
 option( BUILD_KFAXVIEW "Build kfaxview" ${BUILD_ALL} )
-option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
+option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
 option( BUILD_KGAMMA "Build kgamma" ${BUILD_ALL} )
 option( BUILD_KGHOSTVIEW "Build kghostview" ${BUILD_ALL} )
 option( BUILD_KICONEDIT "Build kiconedit" ${BUILD_ALL} )
@@ -113,7 +113,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
 
 ##### tdegraphics directories ###################
 
-# kfile-plugins/ps requires dscparse-static library
+# tdefile-plugins/ps requires dscparse-static library
 if( BUILD_KFILE_PLUGINS AND NOT BUILD_KGHOSTVIEW )
   add_subdirectory( kghostview/dscparse )
 endif( )
@@ -124,7 +124,7 @@ tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit )
 tde_conditional_add_subdirectory( BUILD_KDVI kdvi )
 tde_conditional_add_subdirectory( BUILD_KFAX kfax )
 tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview )
-tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
+tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
 tde_conditional_add_subdirectory( BUILD_KGAMMA kgamma )
 tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview )
 tde_conditional_add_subdirectory( BUILD_KICONEDIT kiconedit )
diff --git a/Makefile.am.in b/Makefile.am.in
index dddf1aea..8500f20f 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1
 
 COMPILE_BEFORE_kooka = libkscan
 COMPILE_BEFORE_kfaxview = kfax
-COMPILE_BEFORE_kfile-plugins = kghostview
+COMPILE_BEFORE_tdefile-plugins = kghostview
 COMPILE_AFTER_kviewshell = kdvi kfaxview
 
 DISTCLEANFILES = inst-apps
diff --git a/README b/README
index 721bcdbc..d27e6b1d 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ tdegraphics is a collection of graphic oriented applications:
 * kfaxview
     An embeddable KPart to display tiffed fax images.
 
-* kfile-plugins
+* tdefile-plugins
     Provide meta information for graphic files.
 
 * kghostview
diff --git a/kamera/CMakeLists.txt b/kamera/CMakeLists.txt
index 700fe6a9..56e7c70d 100644
--- a/kamera/CMakeLists.txt
+++ b/kamera/CMakeLists.txt
@@ -11,6 +11,6 @@
 
 include( ConfigureChecks.cmake )
 
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 add_subdirectory( kcontrol )
 add_subdirectory( pics )
diff --git a/kamera/Makefile.am b/kamera/Makefile.am
index f012f4a1..e7776502 100644
--- a/kamera/Makefile.am
+++ b/kamera/Makefile.am
@@ -1 +1 @@
-SUBDIRS = kcontrol kioslave pics
+SUBDIRS = kcontrol tdeioslave pics
diff --git a/kamera/kcontrol/CMakeLists.txt b/kamera/kcontrol/CMakeLists.txt
index c4a395ab..c901d4b4 100644
--- a/kamera/kcontrol/CMakeLists.txt
+++ b/kamera/kcontrol/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES kamera.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_kamera SHARED AUTOMOC
   SOURCES kamera.cpp kameradevice.cpp kameraconfigdialog.cpp
-  LINK kio-shared ${GPHOTO2_LIBRARIES}
+  LINK tdeio-shared ${GPHOTO2_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kamera/kcontrol/kamera.desktop b/kamera/kcontrol/kamera.desktop
index ac9f737e..d06c4be9 100644
--- a/kamera/kcontrol/kamera.desktop
+++ b/kamera/kcontrol/kamera.desktop
@@ -188,6 +188,6 @@ Type=Application
 X-TDE-Library=kamera
 X-TDE-ModuleType=Library
 Icon=camera
-Exec=kcmshell kamera
+Exec=tdecmshell kamera
 DocPath=kamera/index.html
 Categories=Qt;TDE;Settings;X-TDE-settings-hardware;
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 20d090fa..e6f26449 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -32,7 +32,7 @@
 #include <tqgrid.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kamera/kioslave/CMakeLists.txt b/kamera/tdeioslave/CMakeLists.txt
similarity index 94%
rename from kamera/kioslave/CMakeLists.txt
rename to kamera/tdeioslave/CMakeLists.txt
index d480f90e..33ca815e 100644
--- a/kamera/kioslave/CMakeLists.txt
+++ b/kamera/tdeioslave/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES camera.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( kio_kamera AUTOMOC
   SOURCES kamera.cpp
-  LINK kio-shared ${GPHOTO2_LIBRARIES}
+  LINK tdeio-shared ${GPHOTO2_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kamera/kioslave/Makefile.am b/kamera/tdeioslave/Makefile.am
similarity index 89%
rename from kamera/kioslave/Makefile.am
rename to kamera/tdeioslave/Makefile.am
index bfb0d198..80877fa7 100644
--- a/kamera/kioslave/Makefile.am
+++ b/kamera/tdeioslave/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
-# Makefile for tdebase/kioslave/kamera
+# Makefile for tdebase/tdeioslave/kamera
 
 INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) $(GPHOTO2_INCS)
 
diff --git a/kamera/kioslave/camera.protocol b/kamera/tdeioslave/camera.protocol
similarity index 100%
rename from kamera/kioslave/camera.protocol
rename to kamera/tdeioslave/camera.protocol
diff --git a/kamera/kioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
similarity index 99%
rename from kamera/kioslave/kamera.cpp
rename to kamera/tdeioslave/kamera.cpp
index 9806a132..45d11970 100644
--- a/kamera/kioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -35,11 +35,11 @@
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
-#include <kio/slaveconfig.h>
+#include <tdeio/slaveconfig.h>
 
 #include <config.h>
 
diff --git a/kamera/kioslave/kamera.h b/kamera/tdeioslave/kamera.h
similarity index 98%
rename from kamera/kioslave/kamera.h
rename to kamera/tdeioslave/kamera.h
index f569f4ac..1e015d0f 100644
--- a/kamera/kioslave/kamera.h
+++ b/kamera/tdeioslave/kamera.h
@@ -24,7 +24,7 @@
 #define __kamera_h__
 
 #include <config.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <gphoto2.h>
 
 class KSimpleConfig;
diff --git a/kcoloredit/CMakeLists.txt b/kcoloredit/CMakeLists.txt
index caf8e202..ad3d5552 100644
--- a/kcoloredit/CMakeLists.txt
+++ b/kcoloredit/CMakeLists.txt
@@ -43,7 +43,7 @@ tde_add_executable( kcoloredit AUTOMOC
     kxycolorselector.cpp paletteview.cpp paletteviewscrolledarea.cpp
     editablestreamhistory.cpp color.cpp palette.cpp loadpalettedlg.cpp
     kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp
index 5b0dffb9..8e62a2d6 100644
--- a/kcoloredit/kcoloredit.cpp
+++ b/kcoloredit/kcoloredit.cpp
@@ -23,11 +23,11 @@
 // include files for KDE
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <klocale.h>
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index 23def4d5..ead23eff 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kpalette.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "main.h"
 #include "palette.h"
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index 36c6bd0e..cfdbcfe5 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -34,9 +34,9 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <keditcl.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kprinter.h>
 #include <kprocess.h>
diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp
index 9fd0809e..a3574162 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -30,9 +30,9 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kprinter.h>
 #include <kprocess.h>
diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp
index 652f89fa..0ec8f36a 100644
--- a/kdvi/infodialog.cpp
+++ b/kdvi/infodialog.cpp
@@ -6,7 +6,7 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <tqfile.h>
 #include <tqlabel.h>
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index 53a5d6df..0396c09e 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -4,9 +4,9 @@
 #include <kaboutdialog.h>
 #include <kapplication.h>
 #include <kbugreport.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kdvi/kdvi_multipage_texthandling.cpp b/kdvi/kdvi_multipage_texthandling.cpp
index dc237da5..bcadd45a 100644
--- a/kdvi/kdvi_multipage_texthandling.cpp
+++ b/kdvi/kdvi_multipage_texthandling.cpp
@@ -29,7 +29,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <keditcl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqapplication.h>
diff --git a/kdvi/prefs.kcfgc b/kdvi/prefs.kcfgc
index 7b77dce6..34148d6f 100644
--- a/kdvi/prefs.kcfgc
+++ b/kdvi/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kdvi.kcfg
 ClassName=Prefs
 Singleton=true
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index f77c281f..9e3479c1 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -43,14 +43,14 @@
 #include <kaboutdata.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
-#include <kfilemetainfo.h>
+#include <tdefiledialog.h>
+#include <tdefilemetainfo.h>
 #include <kstdaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kcmdlineargs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
 #include <kstdaction.h>
@@ -60,7 +60,7 @@
 #include <kaction.h>
 #include <kprocess.h>
 #include <kprinter.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 
 #include "faxexpand.h"
diff --git a/kfaxview/CMakeLists.txt b/kfaxview/CMakeLists.txt
index b01047b8..dcb8b751 100644
--- a/kfaxview/CMakeLists.txt
+++ b/kfaxview/CMakeLists.txt
@@ -48,6 +48,6 @@ tde_add_kpart( kfaxviewpart AUTOMOC
 
 tde_add_executable( kfaxview AUTOMOC
   SOURCES main.cpp
-  LINK kviewshell-static kio-shared tdeparts-shared
+  LINK kviewshell-static tdeio-shared tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kfaxview/faxmultipage.cpp b/kfaxview/faxmultipage.cpp
index b01d4577..5c27a23d 100644
--- a/kfaxview/faxmultipage.cpp
+++ b/kfaxview/faxmultipage.cpp
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 
 #include "faxmultipage.h"
diff --git a/kfile-plugins/bmp/Makefile.am b/kfile-plugins/bmp/Makefile.am
deleted file mode 100644
index dbaa8ff2..00000000
--- a/kfile-plugins/bmp/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for bmp 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_bmp.h
-
-kde_module_LTLIBRARIES = kfile_bmp.la
-
-kfile_bmp_la_SOURCES = kfile_bmp.cpp 
-kfile_bmp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_bmp_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_bmp.cpp -o $(podir)/kfile_bmp.pot
-
-services_DATA = kfile_bmp.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/dds/Makefile.am b/kfile-plugins/dds/Makefile.am
deleted file mode 100644
index c3e0382a..00000000
--- a/kfile-plugins/dds/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for dds 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_dds.h
-
-kde_module_LTLIBRARIES = kfile_dds.la
-
-kfile_dds_la_SOURCES = kfile_dds.cpp 
-kfile_dds_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_dds_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_dds.cpp -o $(podir)/kfile_dds.pot
-
-services_DATA = kfile_dds.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/dvi/Makefile.am b/kfile-plugins/dvi/Makefile.am
deleted file mode 100644
index 61791bdc..00000000
--- a/kfile-plugins/dvi/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for the dvi 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_dvi.h
-
-kde_module_LTLIBRARIES = kfile_dvi.la
-
-kfile_dvi_la_SOURCES = kfile_dvi.cpp
-kfile_dvi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_dvi_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: 
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_dvi.pot
-
-services_DATA = kfile_dvi.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/ico/Makefile.am b/kfile-plugins/ico/Makefile.am
deleted file mode 100644
index df3d65ca..00000000
--- a/kfile-plugins/ico/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for ico 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_ico.h
-
-kde_module_LTLIBRARIES = kfile_ico.la
-
-kfile_ico_la_SOURCES = kfile_ico.cpp 
-kfile_ico_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_ico_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_ico.cpp -o $(podir)/kfile_ico.pot
-
-services_DATA = kfile_ico.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/jpeg/Makefile.am b/kfile-plugins/jpeg/Makefile.am
deleted file mode 100644
index fac3b392..00000000
--- a/kfile-plugins/jpeg/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Makefile.am for jpeg file meta info plugin
-
-KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_jpeg.h exif.h
-
-kde_module_LTLIBRARIES = kfile_jpeg.la
-
-kfile_jpeg_la_SOURCES = kfile_jpeg.cpp exif.cpp kfile_setcomment.cpp
-kfile_jpeg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_jpeg_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_jpeg.pot
-
-services_DATA = kfile_jpeg.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/pcx/Makefile.am b/kfile-plugins/pcx/Makefile.am
deleted file mode 100644
index 111b4c28..00000000
--- a/kfile-plugins/pcx/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Makefile.am for PCX file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-noinst_HEADERS   = kfile_pcx.h
-
-kde_module_LTLIBRARIES = kfile_pcx.la
-
-kfile_pcx_la_SOURCES = kfile_pcx.cpp
-kfile_pcx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_pcx_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_pcx.pot
-
-services_DATA = kfile_pcx.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/pdf/CMakeLists.txt b/kfile-plugins/pdf/CMakeLists.txt
deleted file mode 100644
index c75dcf3f..00000000
--- a/kfile-plugins/pdf/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Calvin Morrison
-#  mutantturkey@gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-#### other data #################################
-
-install( FILES kfile_pdf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-
-
-#### kfile_pdf (module) #########################
-
-tde_add_kpart( kfile_pdf AUTOMOC
-  SOURCES kfile_pdf.cpp
-  LINK kio-shared -L${CMAKE_BINARY_DIR}/kfile-plugins/dependencies/poppler-tqt -lpoppler-tqt
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/kfile-plugins/pdf/Makefile.am b/kfile-plugins/pdf/Makefile.am
deleted file mode 100644
index 0b5bf202..00000000
--- a/kfile-plugins/pdf/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for the pdf file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes) -I$(top_srcdir)/kfile-plugins/dependencies/poppler-tqt
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_pdf.h
-
-kde_module_LTLIBRARIES = kfile_pdf.la
-
-kfile_pdf_la_SOURCES = kfile_pdf.cpp
-kfile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/kfile-plugins/dependencies/poppler-tqt/ -lpoppler-tqt
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: 
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_pdf.pot
-
-services_DATA = kfile_pdf.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/png/CMakeLists.txt b/kfile-plugins/png/CMakeLists.txt
deleted file mode 100644
index 3281651a..00000000
--- a/kfile-plugins/png/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Calvin Morrison
-#  mutantturkey@gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-#### other data #################################
-
-install( FILES kfile_png.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-
-
-#### kfile_png (module) #########################
-tde_add_kpart( kfile_png AUTOMOC
-  SOURCES kfile_png.cpp
-  LINK kio-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/kfile-plugins/png/Makefile.am b/kfile-plugins/png/Makefile.am
deleted file mode 100644
index 9aa820b6..00000000
--- a/kfile-plugins/png/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for png 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_png.h 
-
-kde_module_LTLIBRARIES = kfile_png.la
-
-kfile_png_la_SOURCES = kfile_png.cpp
-kfile_png_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_png_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_png.pot
-
-services_DATA = kfile_png.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/pnm/Makefile.am b/kfile-plugins/pnm/Makefile.am
deleted file mode 100644
index 7148232a..00000000
--- a/kfile-plugins/pnm/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for pnm 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_pnm.h
-
-kde_module_LTLIBRARIES = kfile_pnm.la
-
-kfile_pnm_la_SOURCES = kfile_pnm.cpp
-kfile_pnm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_pnm_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_pnm.pot
-
-services_DATA = kfile_pnm.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/rgb/CMakeLists.txt b/kfile-plugins/rgb/CMakeLists.txt
deleted file mode 100644
index be9870d1..00000000
--- a/kfile-plugins/rgb/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Calvin Morrison
-#  mutantturkey@gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-#### other data #################################
-
-install( FILES kfile_rgb.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-
-
-#### kfile_rgb (module) #########################
-
-tde_add_kpart( kfile_rgb AUTOMOC
-  SOURCES kfile_rgb.cpp
-  LINK kio-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/kfile-plugins/rgb/Makefile.am b/kfile-plugins/rgb/Makefile.am
deleted file mode 100644
index 8fc22e17..00000000
--- a/kfile-plugins/rgb/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for rgb 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_rgb.h
-
-kde_module_LTLIBRARIES = kfile_rgb.la
-
-kfile_rgb_la_SOURCES = kfile_rgb.cpp
-kfile_rgb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_rgb_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_rgb.cpp -o $(podir)/kfile_rgb.pot
-
-services_DATA = kfile_rgb.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/tga/CMakeLists.txt b/kfile-plugins/tga/CMakeLists.txt
deleted file mode 100644
index eddb0d44..00000000
--- a/kfile-plugins/tga/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Calvin Morrison
-#  mutantturkey@gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-#### other data #################################
-
-install( FILES kfile_tga.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-
-
-#### kfile_tga (module) #########################
-
-tde_add_kpart( kfile_tga AUTOMOC
-  SOURCES kfile_tga.cpp
-  LINK kio-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/kfile-plugins/tga/Makefile.am b/kfile-plugins/tga/Makefile.am
deleted file mode 100644
index 3856c26f..00000000
--- a/kfile-plugins/tga/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for tga 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_tga.h
-
-kde_module_LTLIBRARIES = kfile_tga.la
-
-kfile_tga_la_SOURCES = kfile_tga.cpp 
-kfile_tga_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_tga_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_tga.cpp -o $(podir)/kfile_tga.pot
-
-services_DATA = kfile_tga.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/tiff/Makefile.am b/kfile-plugins/tiff/Makefile.am
deleted file mode 100644
index e1e74cde..00000000
--- a/kfile-plugins/tiff/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Makefile.am for Tiff file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-noinst_HEADERS   = kfile_tiff.h
-
-kde_module_LTLIBRARIES = kfile_tiff.la
-
-kfile_tiff_la_SOURCES = kfile_tiff.cpp
-kfile_tiff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_tiff_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_tiff.pot
-
-services_DATA = kfile_tiff.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/xbm/CMakeLists.txt b/kfile-plugins/xbm/CMakeLists.txt
deleted file mode 100644
index 37a9aa6b..00000000
--- a/kfile-plugins/xbm/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Calvin Morrison
-#  mutantturkey@gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-#### other data #################################
-
-install( FILES kfile_xbm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-
-
-#### kfile_xbm (module) ########################
-
-tde_add_kpart( kfile_xbm AUTOMOC
-  SOURCES kfile_xbm.cpp
-  LINK kio-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/kfile-plugins/xbm/Makefile.am b/kfile-plugins/xbm/Makefile.am
deleted file mode 100644
index 1b9d7ff9..00000000
--- a/kfile-plugins/xbm/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for xbm 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_xbm.h
-
-kde_module_LTLIBRARIES = kfile_xbm.la
-
-kfile_xbm_la_SOURCES = kfile_xbm.cpp 
-kfile_xbm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_xbm_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_xbm.cpp -o $(podir)/kfile_xbm.pot
-
-services_DATA = kfile_xbm.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/xpm/CMakeLists.txt b/kfile-plugins/xpm/CMakeLists.txt
deleted file mode 100644
index 0e401288..00000000
--- a/kfile-plugins/xpm/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Calvin Morrison
-#  mutantturkey@gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-#### other data #################################
-
-install( FILES kfile_xpm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-
-
-#### kfile_xpm (module) #########################
-
-tde_add_kpart( kfile_xpm AUTOMOC
-  SOURCES kfile_xpm.cpp
-  LINK kio-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/kfile-plugins/xpm/Makefile.am b/kfile-plugins/xpm/Makefile.am
deleted file mode 100644
index 5a1254b1..00000000
--- a/kfile-plugins/xpm/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Makefile.am for xpm file meta info plugin
-
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_xpm.h
-
-kde_module_LTLIBRARIES = kfile_xpm.la
-
-kfile_xpm_la_SOURCES = kfile_xpm.cpp
-kfile_xpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_xpm_la_LIBADD = $(LIB_KIO)
-kfile_xpm_la_METASOURCES = kfile_xpm.moc
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-kde_services_DATA = kfile_xpm.desktop
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_xpm.pot
diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp
index 8a9a33fd..729f249e 100644
--- a/kgamma/kcmkgamma/kgamma.cpp
+++ b/kgamma/kcmkgamma/kgamma.cpp
@@ -28,7 +28,7 @@
 #include <tqwidgetstack.h>
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kprocess.h>
diff --git a/kgamma/kcmkgamma/kgamma.desktop b/kgamma/kcmkgamma/kgamma.desktop
index 5da57b89..d348afef 100644
--- a/kgamma/kcmkgamma/kgamma.desktop
+++ b/kgamma/kcmkgamma/kgamma.desktop
@@ -84,7 +84,7 @@ Name[xh]=Unobumba wesithathu konoobumba besiGrike
 Name[zh_HK]=伽馬（Gamma）
 
 DocPath=kgamma
-Exec=kcmshell kgamma
+Exec=tdecmshell kgamma
 Icon=kgamma
 Keywords=KGamma, kgamma, Gamma, gamma
 Keywords[bg]=калибриране, гама, яркост, цвят, монитор, екран, KGamma, kgamma, Gamma, gamma
diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am
index 3d7faa44..072c6037 100644
--- a/kghostview/Makefile.am
+++ b/kghostview/Makefile.am
@@ -59,7 +59,7 @@ messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kghostview.pot
 
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kghostview.upd
 update_SCRIPTS = update-to-xt-names.pl
 
diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp
index 6e4dddc7..20931fca 100644
--- a/kghostview/displayoptions.cpp
+++ b/kghostview/displayoptions.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace {
 	const double allowedMagnifications[] = {
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index 3e108866..b226bb78 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -21,7 +21,7 @@
 #include <tqlistbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <tdeversion.h>
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index e651c55d..57b1e7db 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -25,7 +25,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kglobalsettings.h>
@@ -36,7 +36,7 @@
 #include <kstdaction.h>
 #include <kstdaccel.h>
 #include <ktempfile.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kaboutdata.h>
 
 
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index 158ef0ec..e9feb249 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -22,7 +22,7 @@
 #include <tqcstring.h> // TQByteArray
 #include <tqfile.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tdeparts/browserextension.h>
 #include <krun.h>
 
diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp
index 27f2664c..0982cc65 100644
--- a/kghostview/kgvconfigdialog.cpp
+++ b/kghostview/kgvconfigdialog.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlayout.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "configuration.h"
 #include "kgv_view.h"
@@ -75,7 +75,7 @@ namespace {
     /* On a related note:
      * We don't detect upgrades (or downgrades, for that matter) of gs.
      * I am seeing if I can get the version out of gs as a side effect to displaying a file.
-     * This way, using kconfig:/Ghostscript/GS Version we will see whether the version has changed
+     * This way, using tdeconfig:/Ghostscript/GS Version we will see whether the version has changed
      * and trigger a redetection without the trouble of running "gs --version" on each launch.
      *
      * LPC (9 April 2003)
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 673220a0..6303591e 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -21,8 +21,8 @@
 
 #include <tqfileinfo.h>
 
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kfilterdev.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
@@ -30,7 +30,7 @@
 #include <kprinter.h>
 #include <kprocess.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 95aac5f9..75f27dad 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -21,7 +21,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klibloader.h>
 #include <klocale.h>
diff --git a/kiconedit/CMakeLists.txt b/kiconedit/CMakeLists.txt
index fbd10516..285760ce 100644
--- a/kiconedit/CMakeLists.txt
+++ b/kiconedit/CMakeLists.txt
@@ -37,6 +37,6 @@ tde_add_executable( kiconedit AUTOMOC
     kiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp
     kicon.cpp kresize.cpp knew.cpp properties.cpp
     kiconeditslots.cpp kiconconfig.cpp
-  LINK kio-shared tdeprint-shared
+  LINK tdeio-shared tdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp
index b16a78b5..d5ee400a 100644
--- a/kiconedit/kicon.cpp
+++ b/kiconedit/kicon.cpp
@@ -23,8 +23,8 @@
 #include <tqimage.h>
 
 #include <kmessagebox.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <kimageio.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index 1a2d7bf2..3dbd10e7 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index 8f93dc37..0afd63c4 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -23,7 +23,7 @@
 
 #include <kpopupmenu.h>
 #include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index 1c25fe2f..11f27ba8 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -24,7 +24,7 @@
 #include <tqradiobutton.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp
index 1d6ca16d..a64cbf9e 100644
--- a/kiconedit/main.cpp
+++ b/kiconedit/main.cpp
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
diff --git a/kiconedit/properties.cpp b/kiconedit/properties.cpp
index f9ad44b4..8d42c039 100644
--- a/kiconedit/properties.cpp
+++ b/kiconedit/properties.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kapplication.h>
 
diff --git a/kmrml/README b/kmrml/README
index 59f2dd9b..f65ff1ff 100644
--- a/kmrml/README
+++ b/kmrml/README
@@ -2,7 +2,7 @@ kio_mrml and mrml_part
 
 Carsten Pfeiffer <pfeiffer@kde.org>                     2001/05/03
 ----------------------------------------------------------------------
-These are the sources for an mrml kioslave and an accompanying KPart.
+These are the sources for an mrml tdeioslave and an accompanying KPart.
 
 
 How does it work in Konqueror?
diff --git a/kmrml/kmrml/CMakeLists.txt b/kmrml/kmrml/CMakeLists.txt
index b570b684..4d445b2d 100644
--- a/kmrml/kmrml/CMakeLists.txt
+++ b/kmrml/kmrml/CMakeLists.txt
@@ -37,7 +37,7 @@ install( FILES mrml-servicemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/konquero
 
 tde_add_kpart( kio_mrml AUTOMOC
   SOURCES mrml.cpp
-  LINK kmrmlstuff-static kio-shared
+  LINK kmrmlstuff-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kmrml/kmrml/kcontrol/CMakeLists.txt b/kmrml/kmrml/kcontrol/CMakeLists.txt
index 15f85e95..6ff6fbb6 100644
--- a/kmrml/kmrml/kcontrol/CMakeLists.txt
+++ b/kmrml/kmrml/kcontrol/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_kmrml AUTOMOC
     kcmkmrml.cpp mainpage.cpp indexer.cpp
     serverconfigwidget.ui indexcleaner.cpp
   LINK
-    kmrmlstuff-static tdeparts-shared kio-shared
+    kmrmlstuff-static tdeparts-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp
index 9571a88f..6fe6587f 100644
--- a/kmrml/kmrml/kcontrol/indextest.cpp
+++ b/kmrml/kmrml/kcontrol/indextest.cpp
@@ -3,7 +3,7 @@
 #include "indextest.moc"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 using namespace KMrmlConfig;
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.desktop b/kmrml/kmrml/kcontrol/kcmkmrml.desktop
index 1de03e4a..b8f9e4ba 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.desktop
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kcmkmrml
+Exec=tdecmshell kcmkmrml
 Icon=folder_image
 Type=Application
 
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index a8a0ab84..ee8fd88f 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -36,8 +36,8 @@
 
 #include <tdeversion.h>
 #include <kdebug.h>
-#include <kio/slaveconfig.h>
-#include <kio/ioslave_defaults.h> // MAX_PORT_VALUE
+#include <tdeio/slaveconfig.h>
+#include <tdeio/ioslave_defaults.h> // MAX_PORT_VALUE
 
 #include "serverconfigwidget.h"
 #include "mainpage.h"
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index be408bc2..9aa92d54 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 #include <tqtextcodec.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kprocess.h>
diff --git a/kmrml/kmrml/loader.cpp b/kmrml/kmrml/loader.cpp
index ec1d7cdd..576513ed 100644
--- a/kmrml/kmrml/loader.cpp
+++ b/kmrml/kmrml/loader.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <kstaticdeleter.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 
 #include "loader.h"
 
diff --git a/kmrml/kmrml/loader.h b/kmrml/kmrml/loader.h
index aa63823e..4c8b8b21 100644
--- a/kmrml/kmrml/loader.h
+++ b/kmrml/kmrml/loader.h
@@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include <tqobject.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class Download
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index d6273c2c..adbbbe95 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
diff --git a/kmrml/kmrml/mrml.h b/kmrml/kmrml/mrml.h
index 13d3cde7..2a39466f 100644
--- a/kmrml/kmrml/mrml.h
+++ b/kmrml/kmrml/mrml.h
@@ -20,7 +20,7 @@
 #define MRML_H
 
 
-#include <kio/tcpslavebase.h>
+#include <tdeio/tcpslavebase.h>
 #include <kurl.h>
 
 #include <kmrml_config.h>
diff --git a/kmrml/kmrml/mrml.protocol b/kmrml/kmrml/mrml.protocol
index c3a732eb..4efceaee 100644
--- a/kmrml/kmrml/mrml.protocol
+++ b/kmrml/kmrml/mrml.protocol
@@ -7,4 +7,4 @@ reading=true
 defaultMimetype=text/mrml
 determineMimetypeFromExtension=false
 Icon=image
-DocPath=kioslave/mrml.html
+DocPath=tdeioslave/mrml.html
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 29e633a7..a808da9e 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -30,15 +30,15 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatastream.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprotocolinfo.h>
@@ -284,7 +284,7 @@ bool MrmlPart::openURL( const KURL& url )
                                             "kmrml_ask_configure_gift" )
                  == KMessageBox::Yes )
             {
-                TDEApplication::tdeinitExec( "kcmshell",
+                TDEApplication::tdeinitExec( "tdecmshell",
                                            TQString::fromLatin1("kcmkmrml"));
                 setStatus( NeedCollection );
                 return false;
diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp
index fbd1468d..9a06f309 100644
--- a/kmrml/kmrml/mrmlsearch.cpp
+++ b/kmrml/kmrml/mrmlsearch.cpp
@@ -21,7 +21,7 @@
 // from Konqueror and creates a query of the form
 // mrml://host.com/?relevant=url1;url2;url3;url4....
 // By default, the mrml URL is mrml://localhost", but you can override that
-// by editing ~/.trinity/share/config/kio_mrmlrc and adding
+// by editing ~/.trinity/share/config/tdeio_mrmlrc and adding
 // [MRML Settings]
 // Default URL=mrml://url.to.your.giftserver.com
 //
@@ -32,7 +32,7 @@
 
 #include <tqfile.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kinstance.h>
 #include <kurl.h>
diff --git a/kmrml/kmrml/server/CMakeLists.txt b/kmrml/kmrml/server/CMakeLists.txt
index 337bede6..652d5c07 100644
--- a/kmrml/kmrml/server/CMakeLists.txt
+++ b/kmrml/kmrml/server/CMakeLists.txt
@@ -30,6 +30,6 @@ INSTALL( FILES daemonwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 tde_add_kpart( kded_daemonwatcher AUTOMOC
   SOURCES watcher.cpp watcher.skel
-  LINK kmrmlstuff-static tdeparts-shared kio-shared tdeinit_kded-shared
+  LINK kmrmlstuff-static tdeparts-shared tdeio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index db865a70..babbd4d9 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -37,7 +37,7 @@
 
 #include <kactionclasses.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index 100bd5ce..060f19eb 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -48,7 +48,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kimageio.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp
index 3a95171c..b617c469 100644
--- a/kolourpaint/kpdocumentsaveoptions.cpp
+++ b/kolourpaint/kpdocumentsaveoptions.cpp
@@ -33,7 +33,7 @@
 #include <tqpixmap.h>
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index ebc68382..d3a6d422 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -38,7 +38,7 @@
 #include <tqtimer.h>
 
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index b073e01e..ee506883 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -35,7 +35,7 @@
 
 #include <kactionclasses.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index c962d3eb..455732c9 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -37,13 +37,13 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kimagefilepreview.h>
 #include <kimageio.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index ef87fda6..9e351aac 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -32,7 +32,7 @@
 #include <kaction.h>
 #include <kactivelabel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <krun.h>
@@ -205,7 +205,7 @@ void kpMainWindow::slotHelpTakingScreenshotsFollowLink (const TQString &link)
 
     if (link == "configure kde shortcuts")
     {
-        KRun::runCommand ("kcmshell keys");
+        KRun::runCommand ("tdecmshell keys");
     }
     else if (link == "run ksnapshot")
     {
diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp
index 6e54a7ad..6a2ef02e 100644
--- a/kolourpaint/kpmainwindow_image.cpp
+++ b/kolourpaint/kpmainwindow_image.cpp
@@ -34,7 +34,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmenubar.h>
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index d3ca18f4..79746294 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -30,7 +30,7 @@
 
 #include <kactionclasses.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index b0e406b5..e8d3b951 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -31,7 +31,7 @@
 #include <kactionclasses.h>
 #include <kapplication.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp
index 14a541df..93132936 100644
--- a/kolourpaint/kpmainwindow_tools.cpp
+++ b/kolourpaint/kpmainwindow_tools.cpp
@@ -29,7 +29,7 @@
 #include <kpmainwindow.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 4a95255a..49e5e229 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -36,7 +36,7 @@
 
 #include <kactionclasses.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstdaction.h>
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index 001fb7e6..c870b5da 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -37,7 +37,7 @@
 #include <tqvbox.h>
 
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index 206fcc91..61df72e5 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -38,7 +38,7 @@
 
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index a861995f..d037758f 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -43,7 +43,7 @@
 #include <tqpointarray.h>
 #include <tqrect.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 58c17abd..d3ae370d 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -52,7 +52,7 @@
 
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconeffect.h>
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index c66cedb4..5c6a2aca 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -43,7 +43,7 @@
 #include <kapplication.h>
 #include <kcolordialog.h>
 #include <kcolordrag.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index e33986c6..abe63d87 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -39,7 +39,7 @@
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kicontheme.h>
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index ae70a906..fa123d29 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -38,7 +38,7 @@
 #include <tqtooltip.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <kpdefs.h>
diff --git a/kooka/CHANGES b/kooka/CHANGES
index 45997a77..3d87017b 100644
--- a/kooka/CHANGES
+++ b/kooka/CHANGES
@@ -82,7 +82,7 @@ the preview page.
 
 Nov 2001:
 Replaced the old ScanPackager object by a new one based on the new KFileTreeView
-Widget in tdelibs/kfile. Hopefully soon full KURL support and more than one image
+Widget in tdelibs/tdefile. Hopefully soon full KURL support and more than one image
 repository.
 
 Nov 2001:
diff --git a/kooka/imageselectline.cpp b/kooka/imageselectline.cpp
index a21b56c0..c037a958 100644
--- a/kooka/imageselectline.cpp
+++ b/kooka/imageselectline.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 #include "imageselectline.h"
diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp
index 5c61cd31..162cf3a2 100644
--- a/kooka/img_saver.cpp
+++ b/kooka/img_saver.cpp
@@ -31,17 +31,17 @@
 
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kimageio.h>
 #include <kseparator.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kio/jobclasses.h>
-#include <kio/file.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/file.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <kinputdialog.h>
 
diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp
index 9364bef3..3b954f79 100644
--- a/kooka/imgnamecombo.cpp
+++ b/kooka/imgnamecombo.cpp
@@ -33,7 +33,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiletreebranch.h>
+#include <tdefiletreebranch.h>
 
 #include "imgnamecombo.h"
 #include "img_saver.h"
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index 168e9e63..ae1800b2 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -28,11 +28,11 @@
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqtooltip.h>
-#include <kio/job.h>
-#include <kio/previewjob.h>
+#include <tdeio/job.h>
+#include <tdeio/previewjob.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
@@ -50,7 +50,7 @@
 
 #include <kscanslider.h>
 #include <kstandarddirs.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <ksconfig.h>
 #include <tqstringlist.h>
 #include <tqcolor.h>
diff --git a/kooka/kocrbase.h b/kooka/kocrbase.h
index f56d08c7..615ef05f 100644
--- a/kooka/kocrbase.h
+++ b/kooka/kocrbase.h
@@ -28,7 +28,7 @@
 #define KOCRBASE_H
 
 #include <kdialogbase.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <tqimage.h>
 #include <tqstring.h>
 
diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp
index c4c34d4a..d5e9cad0 100644
--- a/kooka/kocrgocr.cpp
+++ b/kooka/kocrgocr.cpp
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 013b5e1a..de0e520e 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -36,7 +36,7 @@
 #include <tqradiobutton.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index f037e4b2..394548bc 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -33,7 +33,7 @@
 #include <tqregexp.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index 30186479..70ff9b21 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -42,9 +42,9 @@
 #include <kiconloader.h>
 #include <kmenubar.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kprinter.h>
 #include <kstatusbar.h>
 #include <kurl.h>
diff --git a/kooka/kookaimage.cpp b/kooka/kookaimage.cpp
index ab491429..14e6ef83 100644
--- a/kooka/kookaimage.cpp
+++ b/kooka/kookaimage.cpp
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "kookaimage.h"
 #include "config.h"
diff --git a/kooka/kookaimage.h b/kooka/kookaimage.h
index b56c086b..14be4f86 100644
--- a/kooka/kookaimage.h
+++ b/kooka/kookaimage.h
@@ -34,7 +34,7 @@
 #include <tqvaluevector.h>
 #include <tqrect.h>
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class KFileItem;
 
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index e0996966..13db5c95 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <knuminput.h>
 #include <kcolorbutton.h>
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index cc1c3af1..bdc2a075 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -59,7 +59,7 @@
 #include <krun.h>
 #include <kapplication.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <ktrader.h>
 #include <klibloader.h>
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index f35d1057..5ae8f1ba 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <ktempfile.h>
 #include <kprocess.h>
diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp
index f8e8f2c2..3ea563cc 100644
--- a/kooka/ocrresedit.cpp
+++ b/kooka/ocrresedit.cpp
@@ -28,7 +28,7 @@
 #include "ocrresedit.h"
 #include "ocrword.h"
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 #include <tqfile.h>
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 24b815cb..ec9ad987 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -45,26 +45,26 @@
 #include <tqstringlist.h>
 #include <tqheader.h>
 
-#include <kfiletreeview.h>
-#include <kfiletreeviewitem.h>
-#include <kfiletreebranch.h>
+#include <tdefiletreeview.h>
+#include <tdefiletreeviewitem.h>
+#include <tdefiletreebranch.h>
 
 #include <kurldrag.h>
 #include <kpopupmenu.h>
 #include <kaction.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kio/global.h>
-#include <kio/progressbase.h>
-#include <kio/netaccess.h>
-#include <kio/jobclasses.h>
-#include <kio/file.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/progressbase.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/file.h>
+#include <tdeio/job.h>
 
 #define STARTUP_FIRST_START "firstStart"
 
@@ -630,7 +630,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item )
    }
 }
 
-/* Hit this slot with a file for a kfiletreeviewitem. */
+/* Hit this slot with a file for a tdefiletreeviewitem. */
 void ScanPackager::slImageArrived( KFileTreeViewItem *item, KookaImage* image )
 {
    if( item && image )
@@ -892,7 +892,7 @@ KFileTreeViewItem *ScanPackager::spFindItem( SearchType type, const TQString nam
 {
    /* Prepare a list of branches to go through. If the parameter branch is set, search
     * only in the parameter branch. If it is zero, search all branches returned by
-    * kfiletreeview.branches()
+    * tdefiletreeview.branches()
     */
    KFileTreeBranchList branchList;
 
diff --git a/kooka/scanpackager.h b/kooka/scanpackager.h
index 0f57b7fc..4e1cee38 100644
--- a/kooka/scanpackager.h
+++ b/kooka/scanpackager.h
@@ -34,10 +34,10 @@
 #include <tqdragobject.h>
 #include <tqmap.h>
 #include <klistview.h>
-#include <kio/job.h>
-#include <kio/global.h>
-#include <kio/file.h>
-#include <kfiletreeview.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/file.h>
+#include <tdefiletreeview.h>
 
 
 /**
diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp
index d1b48045..e69f7b52 100644
--- a/kooka/thumbview.cpp
+++ b/kooka/thumbview.cpp
@@ -30,11 +30,11 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <kdebug.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
-#include <kfiletreeviewitem.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
+#include <tdefiletreeviewitem.h>
 #include <kimageeffect.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kooka/thumbview.h b/kooka/thumbview.h
index c4c58323..4dff2559 100644
--- a/kooka/thumbview.h
+++ b/kooka/thumbview.h
@@ -37,9 +37,9 @@
 
 #include <kiconview.h>
 #include <kurl.h>
-#include <kio/previewjob.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
+#include <tdeio/previewjob.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
 
 /* TDEConfig group definitions */
 #define MARGIN_COLOR1 "MarginColor1"
diff --git a/kooka/thumbviewitem.cpp b/kooka/thumbviewitem.cpp
index e682c34b..7479f535 100644
--- a/kooka/thumbviewitem.cpp
+++ b/kooka/thumbviewitem.cpp
@@ -26,8 +26,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kfileitem.h>
-#include <kfileiconview.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
 
 #include "thumbview.h"
 #include "thumbviewitem.h"
diff --git a/kooka/thumbviewitem.h b/kooka/thumbviewitem.h
index 4478df34..fd1c8b48 100644
--- a/kooka/thumbviewitem.h
+++ b/kooka/thumbviewitem.h
@@ -31,9 +31,9 @@
 
 #include <kiconview.h>
 #include <kurl.h>
-#include <kio/previewjob.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
+#include <tdeio/previewjob.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
 
 class KFileTreeViewItem;
 
diff --git a/kpdf/conf/preferencesdialog.h b/kpdf/conf/preferencesdialog.h
index 488eb763..bc7b0cbf 100644
--- a/kpdf/conf/preferencesdialog.h
+++ b/kpdf/conf/preferencesdialog.h
@@ -10,7 +10,7 @@
 #ifndef _PREFERENCESDIALOG_H
 #define _PREFERENCESDIALOG_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include "conf/settings.h"
 
 class TQWidget;
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index f36d6ce5..0b3b9ca9 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -44,13 +44,13 @@
 #include <tdeversion.h>
 #include <tdeparts/genericfactory.h>
 #include <kurldrag.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kfinddialog.h>
 #include <knuminput.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index 5491321e..8b101fa9 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -23,7 +23,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kmenubar.h>
 #include <tdeparts/componentfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmainwindowiface.h>
 
 // local includes
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 7b4d0e75..a76d03ea 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -34,7 +34,7 @@
 #include <kactioncollection.h>
 #include <kpopupmenu.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimageeffect.h>
 #include <kimageio.h>
 #include <kapplication.h>
diff --git a/kpovmodeler/kdoc.rules b/kpovmodeler/kdoc.rules
index ca8abb0d..87e9cc96 100644
--- a/kpovmodeler/kdoc.rules
+++ b/kpovmodeler/kdoc.rules
@@ -6,5 +6,5 @@
 kde_MODULES = kpovmodeler
 
 kpovmodeler_FILES = *.h 
-kpovmodeler_LIBS = -ltdeui -ltdeparts -ltdecore -ldcop -lkfile -lkio -lqt -p
+kpovmodeler_LIBS = -ltdeui -ltdeparts -ltdecore -ldcop -ltdefile -lkio -lqt -p
 kpovmodeler_PATH = .
\ No newline at end of file
diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp
index fd443623..ab3634c8 100644
--- a/kpovmodeler/pmblendmapmodifiersedit.cpp
+++ b/kpovmodeler/pmblendmapmodifiersedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* parent, const char* name )
       : Base( parent, name )
diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp
index 5a4bf298..cdf14a44 100644
--- a/kpovmodeler/pmbumpmapedit.cpp
+++ b/kpovmodeler/pmbumpmapedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 PMBumpMapEdit::PMBumpMapEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmcontrolpoint.cpp b/kpovmodeler/pmcontrolpoint.cpp
index 70cab9d4..a6b5a497 100644
--- a/kpovmodeler/pmcontrolpoint.cpp
+++ b/kpovmodeler/pmcontrolpoint.cpp
@@ -19,7 +19,7 @@
 #include "pmdefaults.h"
 #include "pmdebug.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 double PMControlPoint::s_moveGrid = c_defaultMoveGrid;
 double PMControlPoint::s_scaleGrid = c_defaultScaleGrid;
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index d56d1b2b..73bec441 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -26,7 +26,7 @@
 #include <tqbuffer.h>
 #include <tqptrdict.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index e3e3c7b4..d92ab0bc 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqstyle.h>
 
 #ifndef NO_KDE2
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <ktoolbar.h>
 #include <kpopupmenu.h>
diff --git a/kpovmodeler/pmdocumentationmap.cpp b/kpovmodeler/pmdocumentationmap.cpp
index 2ee43a02..40e23d24 100644
--- a/kpovmodeler/pmdocumentationmap.cpp
+++ b/kpovmodeler/pmdocumentationmap.cpp
@@ -17,7 +17,7 @@
 
 #include "pmdocumentationmap.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp
index a8e84afc..f2b4ee62 100644
--- a/kpovmodeler/pmerrordialog.cpp
+++ b/kpovmodeler/pmerrordialog.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqtextedit.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 TQSize PMErrorDialog::s_size = TQSize( 150, 200 );
diff --git a/kpovmodeler/pmfiledialog.cpp b/kpovmodeler/pmfiledialog.cpp
index 96085f19..8cee6b3a 100644
--- a/kpovmodeler/pmfiledialog.cpp
+++ b/kpovmodeler/pmfiledialog.cpp
@@ -19,7 +19,7 @@
 #include "pmfiledialog.h"
 #include "pmpart.h"
 
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 
 
 PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal )
diff --git a/kpovmodeler/pmfiledialog.h b/kpovmodeler/pmfiledialog.h
index b45ce050..454cf1f8 100644
--- a/kpovmodeler/pmfiledialog.h
+++ b/kpovmodeler/pmfiledialog.h
@@ -24,7 +24,7 @@
 #endif
 
 #include "pmiomanager.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class PMPart;
 
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 7bd9c0be..71e7eafa 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -38,7 +38,7 @@
 
 #include <kxmlguifactory.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp
index cc413acf..851d6200 100644
--- a/kpovmodeler/pmheightfieldedit.cpp
+++ b/kpovmodeler/pmheightfieldedit.cpp
@@ -29,7 +29,7 @@
 #include <tqslider.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* parent, const char* name )
       : Base( parent, name )
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 206d39a7..c2d7ff88 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 PMImageMapEdit::PMImageMapEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp
index f53d4301..71d5b89d 100644
--- a/kpovmodeler/pmlibrarybrowser.cpp
+++ b/kpovmodeler/pmlibrarybrowser.cpp
@@ -25,10 +25,10 @@
 #include <tqtimer.h>
 #include <tqpushbutton.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
 #include <kdiroperator.h>
diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp
index 0ccfd5b4..86ea01e4 100644
--- a/kpovmodeler/pmlibraryentrypreview.cpp
+++ b/kpovmodeler/pmlibraryentrypreview.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) :
    TQWidget( parent )
diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp
index 4629a388..17620df2 100644
--- a/kpovmodeler/pmlibraryhandleedit.cpp
+++ b/kpovmodeler/pmlibraryhandleedit.cpp
@@ -26,9 +26,9 @@
 #include <tqlabel.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "pmlineedits.h"
 #include "pmdialogeditbase.h"
diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index 757162ec..a0661059 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -24,7 +24,7 @@
 #include <tqdir.h>
 
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmlibrarymanager.cpp b/kpovmodeler/pmlibrarymanager.cpp
index cf9c6f96..4429a88b 100644
--- a/kpovmodeler/pmlibrarymanager.cpp
+++ b/kpovmodeler/pmlibrarymanager.cpp
@@ -17,7 +17,7 @@
 
 #include "pmlibrarymanager.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 
diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp
index 491f9d76..8ec346dd 100644
--- a/kpovmodeler/pmmaterialmapedit.cpp
+++ b/kpovmodeler/pmmaterialmapedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 PMMaterialMapEdit::PMMaterialMapEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp
index 47a38435..6dd1488c 100644
--- a/kpovmodeler/pmobjectlibrarysettings.cpp
+++ b/kpovmodeler/pmobjectlibrarysettings.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp
index ca029887..84a98e83 100644
--- a/kpovmodeler/pmpalettevalueedit.cpp
+++ b/kpovmodeler/pmpalettevalueedit.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name ) 
       : TQWidget( parent, name )
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index f58b87a3..7ca0a555 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -32,15 +32,15 @@
 
 // include files for KDE
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kaction.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <kfilterdev.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 // application specific includes
 #include "pmpart.h"
diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp
index eb65727f..13c39c21 100644
--- a/kpovmodeler/pmpatternedit.cpp
+++ b/kpovmodeler/pmpatternedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 PMPatternEdit::PMPatternEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmpluginmanager.cpp b/kpovmodeler/pmpluginmanager.cpp
index f7313675..a9c86a1b 100644
--- a/kpovmodeler/pmpluginmanager.cpp
+++ b/kpovmodeler/pmpluginmanager.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeparts/plugin.h>
 #include <kxmlguifactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 PMPluginManager* PMPluginManager::s_pInstance = 0;
 KStaticDeleter<PMPluginManager> PMPluginManager::s_staticDeleter;
diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp
index 39c125d6..7ac52131 100644
--- a/kpovmodeler/pmpovrayoutputwidget.cpp
+++ b/kpovmodeler/pmpovrayoutputwidget.cpp
@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp
index a47d66b0..8235e161 100644
--- a/kpovmodeler/pmpovrayrenderwidget.cpp
+++ b/kpovmodeler/pmpovrayrenderwidget.cpp
@@ -23,7 +23,7 @@
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <ktempfile.h>
 #include <tqcolor.h>
diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp
index 3ceaa83b..40153ce8 100644
--- a/kpovmodeler/pmpovraysettings.cpp
+++ b/kpovmodeler/pmpovraysettings.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp
index e077de69..c28b48b9 100644
--- a/kpovmodeler/pmpovraywidget.cpp
+++ b/kpovmodeler/pmpovraywidget.cpp
@@ -23,9 +23,9 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kimageio.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kglobalsettings.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp
index 2e56662a..746f64b9 100644
--- a/kpovmodeler/pmrendermanager.cpp
+++ b/kpovmodeler/pmrendermanager.cpp
@@ -35,7 +35,7 @@
 #include <tqbitmap.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <time.h>
diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp
index e787616c..346f2219 100644
--- a/kpovmodeler/pmrendermodesdialog.cpp
+++ b/kpovmodeler/pmrendermodesdialog.cpp
@@ -29,9 +29,9 @@
 #include <tqcombobox.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "pmlineedits.h"
 
diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp
index ade88b40..4bb6c568 100644
--- a/kpovmodeler/pmsettingsdialog.cpp
+++ b/kpovmodeler/pmsettingsdialog.cpp
@@ -35,7 +35,7 @@
 #include <tqvbox.h>
 #include <tqlistview.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 //#define KPM_WITH_OBJECT_LIBRARY
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 13148682..35cd78cf 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -20,7 +20,7 @@
 #include <kstdaction.h>
 #include <kaction.h>
 #include <kstatusbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
diff --git a/kpovmodeler/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp
index e1e4e038..2ea76346 100644
--- a/kpovmodeler/pmtextedit.cpp
+++ b/kpovmodeler/pmtextedit.cpp
@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMTextEdit::PMTextEdit( TQWidget* parent, const char* name )
       : Base( parent, name )
diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp
index a774aa28..c791375b 100644
--- a/kpovmodeler/pmview.cpp
+++ b/kpovmodeler/pmview.cpp
@@ -21,7 +21,7 @@
 #include <tqsplitter.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index fe3a031d..b6d72b3c 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -20,7 +20,7 @@
 #include "pmviewlayoutmanager.h"
 #include "pmdockwidget_private.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kfilterdev.h>
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index 7123fe04..686af2e5 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -17,7 +17,7 @@
 
 #include <iostream>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index 6a6007ca..9fd455f5 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -13,13 +13,13 @@
 
 #include <klocale.h>
 #include <kimageio.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <kprinter.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ksavefile.h>
 #include <ktempfile.h>
 
diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp
index 3ae1d7ff..01601999 100644
--- a/ksvg/core/KSVGLoader.cpp
+++ b/ksvg/core/KSVGLoader.cpp
@@ -25,9 +25,9 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kfilterdev.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "SVGDocumentImpl.h"
 #include "SVGSVGElementImpl.h"
diff --git a/ksvg/impl/SVGColorProfileElementImpl.cc b/ksvg/impl/SVGColorProfileElementImpl.cc
index 85e3c035..0aa91e52 100644
--- a/ksvg/impl/SVGColorProfileElementImpl.cc
+++ b/ksvg/impl/SVGColorProfileElementImpl.cc
@@ -20,7 +20,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqimage.h>
 
diff --git a/ksvg/impl/SVGScriptElementImpl.cc b/ksvg/impl/SVGScriptElementImpl.cc
index b7ddf420..541c098d 100644
--- a/ksvg/impl/SVGScriptElementImpl.cc
+++ b/ksvg/impl/SVGScriptElementImpl.cc
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kfilterdev.h>
 #include <tqbuffer.h>
 
diff --git a/ksvg/impl/SVGScriptElementImpl.h b/ksvg/impl/SVGScriptElementImpl.h
index 72c75506..df7d88c0 100644
--- a/ksvg/impl/SVGScriptElementImpl.h
+++ b/ksvg/impl/SVGScriptElementImpl.h
@@ -23,7 +23,7 @@
 
 #include <dom/dom_string.h>
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqobject.h>
 
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 49a95760..46e301fd 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -21,7 +21,7 @@
 #include <krun.h>
 #include <kdebug.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <ktempfile.h>
 #include <ksimpleconfig.h>
diff --git a/ksvg/plugin/svgcreator.h b/ksvg/plugin/svgcreator.h
index 53e8e2be..696251ce 100644
--- a/ksvg/plugin/svgcreator.h
+++ b/ksvg/plugin/svgcreator.h
@@ -22,7 +22,7 @@
 #ifndef __svgcreator_h__
 #define __svgcreator_h__
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class SVGCreator : public TQObject, public ThumbCreator
 {
diff --git a/kuickshow/ChangeLog b/kuickshow/ChangeLog
index 4f455d15..eda22bb8 100644
--- a/kuickshow/ChangeLog
+++ b/kuickshow/ChangeLog
@@ -148,7 +148,7 @@ Tue May 29 15:20:34 2001  Carsten Pfeiffer  <pfeiffer@kde.org>
 	changed accels:
 	shift-accel is now for removing brightness/contrast/gamma
 
-	removed delete action, now provided by kfile
+	removed delete action, now provided by tdefile
 
 Thu Apr 19 23:16:12 2001  Carsten Pfeiffer  <pfeiffer@kde.org>
 
@@ -413,9 +413,9 @@ Fri Nov  3 01:49:57 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 Thu Aug 31 01:48:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* src/*: started reworking/rewriting the whole stuff to make it KDE2
-	ready. Now I have to pay for rewriting so much of tdelibs/kfile... 
+	ready. Now I have to pay for rewriting so much of tdelibs/tdefile... 
 	The good thing is: it's mostly about removing stuff from KuickShow
-	because the functionality is already in libkfile, now :)
+	because the functionality is already in libtdefile, now :)
 
 Tue Sep 28 10:35:39 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
@@ -473,7 +473,7 @@ Thu Jul 22 21:26:11 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Fri Jul 16 13:09:07 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* src/kfileview.cpp (refresh): 
+	* src/tdefileview.cpp (refresh): 
 	Oh well, thanks to Robert Hamberger <Robert.Hamberger@AUDI.DE>, I
 	fixed another (hopefully last, for the next time) segfault. SIGSEGV
 	happened, when opening the about-dialog, NOT giving the focus back
@@ -533,7 +533,7 @@ Fri Jul  2 14:27:08 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 	in the filebrowser??? In certain cases, I got an almost completely
 	black Messagebox...
 
-	* src/kfileview.cpp (removeItem): 
+	* src/tdefileview.cpp (removeItem): 
 	oups... segfault fixed: removing the very first item in the 
 	filebrowser caused crash
 
@@ -586,15 +586,15 @@ Fri May 28 11:48:46 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Tue May 18 21:19:32 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* src/kfileview.cpp (refresh): 
+	* src/tdefileview.cpp (refresh): 
 	sorting does somehow work. Some code seems to be duplicated in
 	KFileInfoContents and KDir - both offer sorting. However, both
 	don't work 100% :-/ Anyway, if you have KDE 1.1.1, sorting should
 	work, it is disabled for earlier releases, as there was a segfault
-	problem in kfile (nobody ever seemed to use KFileInfoContent's sorting,
+	problem in tdefile (nobody ever seemed to use KFileInfoContent's sorting,
 	so that was never realized).
 
-	* src/kfileview.cpp, src/fileview.cpp:
+	* src/tdefileview.cpp, src/fileview.cpp:
 	some minor fixlets:  always try to highlight the last active file,
 	whenever the directory contents are updated
 
@@ -630,7 +630,7 @@ Sat Apr 17 18:43:03 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* src/kuickdata.cpp:
 	updated file filters (Photoshop psd and bmp)
 
-	* src/kfileview.cpp:
+	* src/tdefileview.cpp:
 	changed the kdir behavior, so that the browser displays files 
 	altogether at once, not incrementally. This also let me (finally, 
 	yippeee :-P) highlight the last direcory, where you came from.
@@ -670,7 +670,7 @@ Wed Feb  3 22:43:32 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 	
 Tue Dec 29 16:55:11 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* src/kuickshow.cpp, imlibwidget.cpp, kfileview.*: 
+	* src/kuickshow.cpp, imlibwidget.cpp, tdefileview.*: 
 	fixed updating of directory in statusbar and filename in caption of
  	imlibwidget
 
@@ -773,8 +773,8 @@ Mon Sep 21 16:29:56 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Sep 20 19:04:23 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* src/kfileview.cpp (prev): 
-	whoops, fixed a segfault, when trying to get a kfileinfo of index -1.
+	* src/tdefileview.cpp (prev): 
+	whoops, fixed a segfault, when trying to get a tdefileinfo of index -1.
 	I shouldn't check, whether an unsigned int is smaller than 0, which it
 	actually was. Now uses int.
 
@@ -853,7 +853,7 @@ Tue Sep 15 14:06:27 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 Mon Sep 14 16:20:30 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* src/fileview.cpp/.h
-	* src/kfileview.cpp/.h
+	* src/tdefileview.cpp/.h
 	* src/kuickshow.cpp
 	added "change directory" possibility. A dialog asks for a directory
 	and the fileview is being updated. Either accessible via the
diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp
index 4f0d054a..9a2777b0 100644
--- a/kuickshow/src/filefinder.cpp
+++ b/kuickshow/src/filefinder.cpp
@@ -19,7 +19,7 @@
 #include <tqkeycode.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcompletionbox.h>
 #include <kurlcompletion.h>
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 9f158c1a..bc931794 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -93,7 +93,7 @@ void FileWidget::initActions()
     if ( coll->action("kuick_delete") )
         menu->insert( coll->action("kuick_delete"), 9 );
 
-    // properties dialog is now in kfile, but not at the right position,
+    // properties dialog is now in tdefile, but not at the right position,
     // so we move it to the real bottom
     menu->remove( coll->action( "properties" ) );
 
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 558e4c71..97aae529 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -37,14 +37,14 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #ifdef KDE_USE_FINAL
 #undef Unsorted
 #endif
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kimageeffect.h>
 #include <klocale.h>
@@ -59,7 +59,7 @@
 #include <twin.h>
 #include <netwm.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "filecache.h"
 #include "imagewindow.h"
diff --git a/kuickshow/src/imdata.cpp b/kuickshow/src/imdata.cpp
index e084e898..c580f7e3 100644
--- a/kuickshow/src/imdata.cpp
+++ b/kuickshow/src/imdata.cpp
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "imdata.h"
 
diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
index 36420918..530875e8 100644
--- a/kuickshow/src/imlibwidget.cpp
+++ b/kuickshow/src/imlibwidget.cpp
@@ -33,7 +33,7 @@
 
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kimageio.h>
 
 #include "filecache.h"
diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp
index 263e98e7..e72062a8 100644
--- a/kuickshow/src/kuickconfigdlg.cpp
+++ b/kuickshow/src/kuickconfigdlg.cpp
@@ -26,7 +26,7 @@
 #include <tqvbox.h>
 
 #include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/kuickshow/src/kuickdata.cpp b/kuickshow/src/kuickdata.cpp
index c7b5f203..84c4ff38 100644
--- a/kuickshow/src/kuickdata.cpp
+++ b/kuickshow/src/kuickdata.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include <tqcolor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "kuickdata.h"
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
index d0cff155..764210f0 100644
--- a/kuickshow/src/kuickfile.cpp
+++ b/kuickshow/src/kuickfile.cpp
@@ -5,8 +5,8 @@
 #include <kinstance.h>
 #include <klocale.h>
 #include <kprogress.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 
 #include "filecache.h"
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 1e6352fa..da1651a4 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -33,15 +33,15 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
-#include <kfilemetainfo.h>
+#include <tdefiledialog.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h
index 31874153..baba06a3 100644
--- a/kuickshow/src/kuickshow.h
+++ b/kuickshow/src/kuickshow.h
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmainwindow.h>
 #include <kurl.h>
 
diff --git a/kview/config/CMakeLists.txt b/kview/config/CMakeLists.txt
index 53b97f03..d2649a1c 100644
--- a/kview/config/CMakeLists.txt
+++ b/kview/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kviewgeneralconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kviewgeneralconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES kview.setdlg DESTINATION ${DATA_INSTALL_DIR}/kview )
 
 
diff --git a/kview/config/Makefile.am b/kview/config/Makefile.am
index 5d09eee8..0c97cb33 100644
--- a/kview/config/Makefile.am
+++ b/kview/config/Makefile.am
@@ -12,7 +12,7 @@ kcm_kviewgeneralconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewgeneralconfig_la_LIBADD = $(LIB_TDEUI)
 
 kcm_kviewgeneralconfig_DATA = kviewgeneralconfig.desktop
-kcm_kviewgeneralconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewgeneralconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kviewappdatadir = $(kde_datadir)/kview
 kviewappdata_DATA = kview.setdlg
diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp
index f36da30c..2316c920 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tqwhatsthis.h>
 
diff --git a/kview/config/plugins/CMakeLists.txt b/kview/config/plugins/CMakeLists.txt
index f7c4672a..1b1fbec4 100644
--- a/kview/config/plugins/CMakeLists.txt
+++ b/kview/config/plugins/CMakeLists.txt
@@ -22,7 +22,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kviewpluginsconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kviewpluginsconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewpluginsconfig (module) ###########
diff --git a/kview/config/plugins/Makefile.am b/kview/config/plugins/Makefile.am
index d2169a9d..239504dd 100644
--- a/kview/config/plugins/Makefile.am
+++ b/kview/config/plugins/Makefile.am
@@ -11,7 +11,7 @@ kcm_kviewpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewpluginsconfig_la_LIBADD = $(LIB_KUTILS)
 
 kcm_kviewpluginsconfig_DATA = kviewpluginsconfig.desktop
-kcm_kviewpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewpluginsconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kcm_kviewpluginsconfig.pot
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 9aa38524..21b851c3 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -32,7 +32,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kimageio.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <twinmodule.h>
 #include <kmenubar.h>
diff --git a/kview/kviewcanvas/config/CMakeLists.txt b/kview/kviewcanvas/config/CMakeLists.txt
index 99fbb78f..fc094083 100644
--- a/kview/kviewcanvas/config/CMakeLists.txt
+++ b/kview/kviewcanvas/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     kviewcanvasconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewcanvasconfig (module) ############
diff --git a/kview/kviewcanvas/config/Makefile.am b/kview/kviewcanvas/config/Makefile.am
index 25d77983..1439251e 100644
--- a/kview/kviewcanvas/config/Makefile.am
+++ b/kview/kviewcanvas/config/Makefile.am
@@ -8,7 +8,7 @@ kcm_kviewcanvasconfig_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-
 kcm_kviewcanvasconfig_la_LIBADD  = $(LIB_TDEUI)
 
 kcm_kviewcanvasconfig_DATA = kviewcanvasconfig.desktop
-kcm_kviewcanvasconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewcanvasconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 METASOURCES = AUTO
 
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index 4411d752..32260a45 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <ksettings/dispatcher.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #define KIMAGECANVAS_WIPESIZE 5
 
diff --git a/kview/kviewviewer/config/CMakeLists.txt b/kview/kviewviewer/config/CMakeLists.txt
index d3640df6..10b5b05f 100644
--- a/kview/kviewviewer/config/CMakeLists.txt
+++ b/kview/kviewviewer/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     kviewviewerpluginsconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewviewerpluginsconfig (module) #####
diff --git a/kview/kviewviewer/config/Makefile.am b/kview/kviewviewer/config/Makefile.am
index fe65e613..dfa55d4c 100644
--- a/kview/kviewviewer/config/Makefile.am
+++ b/kview/kviewviewer/config/Makefile.am
@@ -11,7 +11,7 @@ kcm_kviewviewerpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_KUTILS)
 
 kcm_kviewviewerpluginsconfig_DATA = kviewviewerpluginsconfig.desktop
-kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kcm_kviewviewerpluginsconfig.pot
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 3e3c7085..4e318342 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -37,9 +37,9 @@
 #include <kpushbutton.h>
 #include <kpassivepopup.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kxmlguifactory.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/plugin.h>
diff --git a/kview/modules/browser/kmyfileitemlist.cpp b/kview/modules/browser/kmyfileitemlist.cpp
index 28c3cb08..24d70527 100644
--- a/kview/modules/browser/kmyfileitemlist.cpp
+++ b/kview/modules/browser/kmyfileitemlist.cpp
@@ -18,7 +18,7 @@
 // $Id$
 
 #include "kmyfileitemlist.h"
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 KMyFileItemList::KMyFileItemList() {}
 KMyFileItemList::KMyFileItemList( const TQPtrList<KFileItem> & l ) : TQPtrList<KFileItem>( l ) {}
diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h
index 985ec564..a26b90c1 100644
--- a/kview/modules/browser/kviewbrowser.h
+++ b/kview/modules/browser/kviewbrowser.h
@@ -21,7 +21,7 @@
 #define __kviewbrowser_h
 
 #include <tdeparts/plugin.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 namespace KImageViewer { class Viewer; }
 
diff --git a/kview/modules/presenter/CMakeLists.txt b/kview/modules/presenter/CMakeLists.txt
index a34cc893..aa21d851 100644
--- a/kview/modules/presenter/CMakeLists.txt
+++ b/kview/modules/presenter/CMakeLists.txt
@@ -36,6 +36,6 @@ install( FILES
 tde_add_kpart( kview_presenterplugin AUTOMOC
   SOURCES
     imagelistitem.cpp imagelistdialog.ui kviewpresenter.cpp
-  LINK kio-shared tdeparts-shared
+  LINK tdeio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/modules/presenter/config/CMakeLists.txt b/kview/modules/presenter/config/CMakeLists.txt
index b8dfc56a..e359bee9 100644
--- a/kview/modules/presenter/config/CMakeLists.txt
+++ b/kview/modules/presenter/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     kviewpresenterconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewpresenterconfig (module) #########
diff --git a/kview/modules/presenter/config/Makefile.am b/kview/modules/presenter/config/Makefile.am
index 8c212e7f..88d3d479 100644
--- a/kview/modules/presenter/config/Makefile.am
+++ b/kview/modules/presenter/config/Makefile.am
@@ -9,7 +9,7 @@ kcm_kviewpresenterconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewpresenterconfig_la_LIBADD = $(LIB_KUTILS)
 
 kcm_kviewpresenterconfig_DATA = kviewpresenterconfig.desktop
-kcm_kviewpresenterconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewpresenterconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 METASOURCES = AUTO
 
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index 7ed447c2..c3682d5f 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 
 typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFactory;
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 05d3b90f..8878eab6 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -256,9 +256,9 @@
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in implementation">kdebug.h</include>
     <include location="global" impldecl="in implementation">kimageviewer/viewer.h</include>
-    <include location="global" impldecl="in implementation">kio/netaccess.h</include>
+    <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
     <include location="global" impldecl="in implementation">kurl.h</include>
-    <include location="global" impldecl="in implementation">kfiledialog.h</include>
+    <include location="global" impldecl="in implementation">tdefiledialog.h</include>
     <include location="global" impldecl="in implementation">tqstring.h</include>
     <include location="global" impldecl="in implementation">kmessagebox.h</include>
     <include location="local" impldecl="in implementation">imagelistitem.h</include>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 534b305c..b7aef984 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -39,11 +39,11 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimageio.h>
 #include <kimageviewer/viewer.h>
 #include <kimageviewer/canvas.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurldrag.h>
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index 1c79ee15..df9622b8 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent )
 	: KPreferencesModule( "kviewpresenter", parent, "KView Presenter Config Module" )
diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h
index 7faaaa32..e19abe36 100644
--- a/kview/photobook/photobook.h
+++ b/kview/photobook/photobook.h
@@ -40,7 +40,7 @@ Copyright (c) 2004 Charles Samuels <charles@kde.org>
 #define PHOTOBOOK_H
 
 #include <tqsplitter.h>
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 #include <kdirlister.h>
 
 #include <tdeparts/part.h>
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index f76c5dd2..017d3e17 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -12,16 +12,16 @@
 #include <kaccel.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kconfigdialog.h>
+#include <tdeconfig.h>
+#include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfilterbase.h>
 #include <kfilterdev.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index b155e73e..a45563c3 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -16,7 +16,7 @@
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kviewshell/kvsprefs.kcfgc b/kviewshell/kvsprefs.kcfgc
index c507ba3d..f72f4bd0 100644
--- a/kviewshell/kvsprefs.kcfgc
+++ b/kviewshell/kvsprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kviewshell.kcfg
 ClassName=KVSPrefs
 Singleton=true
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index dd6d08b1..c60c7c9c 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -23,7 +23,7 @@
 
 #include <kaction.h>
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 #include <kprinter.h>
 #include <ktempfile.h>
diff --git a/kviewshell/plugins/djvu/prefs.kcfgc b/kviewshell/plugins/djvu/prefs.kcfgc
index 93a7650b..80838068 100644
--- a/kviewshell/plugins/djvu/prefs.kcfgc
+++ b/kviewshell/plugins/djvu/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=djvumultipage.kcfg
 ClassName=Prefs
 Singleton=true
diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp
index b6b98855..d08dead7 100644
--- a/kviewshell/tdemultipage.cpp
+++ b/kviewshell/tdemultipage.cpp
@@ -3,9 +3,9 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
diff --git a/libkscan/CMakeLists.txt b/libkscan/CMakeLists.txt
index 12ecff9f..b108f9e9 100644
--- a/libkscan/CMakeLists.txt
+++ b/libkscan/CMakeLists.txt
@@ -43,7 +43,7 @@ tde_add_library( kscan SHARED AUTOMOC
     img_canvas.cpp previewer.cpp imgscaledialog.cpp sizeindicator.cpp
     imgscaninfo.cpp
   VERSION 1.0.0
-  LINK kio-shared ${SANE_LIBRARIES}
+  LINK tdeio-shared ${SANE_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp
index 2945dfdd..2caa054a 100644
--- a/libkscan/devselector.cpp
+++ b/libkscan/devselector.cpp
@@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp
index d42ddb9f..41e05570 100644
--- a/libkscan/kscandevice.cpp
+++ b/libkscan/kscandevice.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <unistd.h>
diff --git a/libkscan/kscanoptset.cpp b/libkscan/kscanoptset.cpp
index 0c9b76e6..84e034c8 100644
--- a/libkscan/kscanoptset.cpp
+++ b/libkscan/kscanoptset.cpp
@@ -22,7 +22,7 @@
 #include <tqmap.h>
 #include <tqdict.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kscandevice.h"
 #include "kscanoption.h"
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index 183c7ba6..c13e45e3 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -43,7 +43,7 @@
 #include "kscandevice.h"
 #include <tqslider.h>
 #include <tqcheckbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqbuttongroup.h>
 #include <tqvbuttongroup.h>
 #include <kmessagebox.h>
diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp
index c4b8691b..9a0d2bf0 100644
--- a/libkscan/scandialog.cpp
+++ b/libkscan/scandialog.cpp
@@ -30,7 +30,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kled.h>
 #include <kglobalsettings.h>
diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp
index 896bf92e..64bcde21 100644
--- a/libkscan/scanparams.cpp
+++ b/libkscan/scanparams.cpp
@@ -36,7 +36,7 @@
 #include <tqbuttongroup.h>
 
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kbuttonbox.h>
diff --git a/kfile-plugins/CMakeLists.txt b/tdefile-plugins/CMakeLists.txt
similarity index 100%
rename from kfile-plugins/CMakeLists.txt
rename to tdefile-plugins/CMakeLists.txt
diff --git a/kfile-plugins/Makefile.am b/tdefile-plugins/Makefile.am
similarity index 100%
rename from kfile-plugins/Makefile.am
rename to tdefile-plugins/Makefile.am
diff --git a/kfile-plugins/RETURNED_ITEMS b/tdefile-plugins/RETURNED_ITEMS
similarity index 100%
rename from kfile-plugins/RETURNED_ITEMS
rename to tdefile-plugins/RETURNED_ITEMS
diff --git a/kfile-plugins/gif/CMakeLists.txt b/tdefile-plugins/bmp/CMakeLists.txt
similarity index 70%
rename from kfile-plugins/gif/CMakeLists.txt
rename to tdefile-plugins/bmp/CMakeLists.txt
index f2fc4320..1bc54e24 100644
--- a/kfile-plugins/gif/CMakeLists.txt
+++ b/tdefile-plugins/bmp/CMakeLists.txt
@@ -20,15 +20,15 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-
 #### other data #################################
 
-install( FILES kfile_gif.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_bmp.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
 
+#### tdefile_bmp (module) #########################
 
-#### kfile_gif (module) #########################
-tde_add_kpart( kfile_gif AUTOMOC
-  SOURCES kfile_gif.cpp
-  LINK kio-shared
+tde_add_kpart( tdefile_bmp AUTOMOC
+  SOURCES tdefile_bmp.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdefile-plugins/bmp/Makefile.am b/tdefile-plugins/bmp/Makefile.am
new file mode 100644
index 00000000..f8f70112
--- /dev/null
+++ b/tdefile-plugins/bmp/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for bmp 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_bmp.h
+
+kde_module_LTLIBRARIES = tdefile_bmp.la
+
+tdefile_bmp_la_SOURCES = tdefile_bmp.cpp 
+tdefile_bmp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_bmp_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_bmp.cpp -o $(podir)/tdefile_bmp.pot
+
+services_DATA = tdefile_bmp.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/bmp/kfile_bmp.cpp b/tdefile-plugins/bmp/tdefile_bmp.cpp
similarity index 97%
rename from kfile-plugins/bmp/kfile_bmp.cpp
rename to tdefile-plugins/bmp/tdefile_bmp.cpp
index cfda7a16..354ea54e 100644
--- a/kfile-plugins/bmp/kfile_bmp.cpp
+++ b/tdefile-plugins/bmp/tdefile_bmp.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_bmp.h"
+#include "tdefile_bmp.h"
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -41,7 +41,7 @@ typedef unsigned short uint16_t;
 
 typedef KGenericFactory<KBmpPlugin> BmpFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_bmp, BmpFactory( "kfile_bmp" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_bmp, BmpFactory( "tdefile_bmp" ))
 
 KBmpPlugin::KBmpPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -171,4 +171,4 @@ bool KBmpPlugin::readInfo( KFileMetaInfo& info, uint what)
     return true;
 }
 
-#include "kfile_bmp.moc"
+#include "tdefile_bmp.moc"
diff --git a/kfile-plugins/bmp/kfile_bmp.desktop b/tdefile-plugins/bmp/tdefile_bmp.desktop
similarity index 98%
rename from kfile-plugins/bmp/kfile_bmp.desktop
rename to tdefile-plugins/bmp/tdefile_bmp.desktop
index eb66bc53..6331c397 100644
--- a/kfile-plugins/bmp/kfile_bmp.desktop
+++ b/tdefile-plugins/bmp/tdefile_bmp.desktop
@@ -60,7 +60,7 @@ Name[zh_HK]=BMP 資訊
 Name[zh_TW]=BMP 資訊
 Name[zu]=Ulwazi lwe-BMP
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_bmp
+X-TDE-Library=tdefile_bmp
 MimeType=image/x-bmp
 PreferredGroups=Technical
 PreferredItems=Type,Resolution,Bitdepth,Compression
diff --git a/kfile-plugins/bmp/kfile_bmp.h b/tdefile-plugins/bmp/tdefile_bmp.h
similarity index 97%
rename from kfile-plugins/bmp/kfile_bmp.h
rename to tdefile-plugins/bmp/tdefile_bmp.h
index b57e725f..27bc31a6 100644
--- a/kfile-plugins/bmp/kfile_bmp.h
+++ b/tdefile-plugins/bmp/tdefile_bmp.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_BMP_H__
 #define __KFILE_BMP_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kfile-plugins/configure.in.bot b/tdefile-plugins/configure.in.bot
similarity index 100%
rename from kfile-plugins/configure.in.bot
rename to tdefile-plugins/configure.in.bot
diff --git a/kfile-plugins/dds/CMakeLists.txt b/tdefile-plugins/dds/CMakeLists.txt
similarity index 70%
rename from kfile-plugins/dds/CMakeLists.txt
rename to tdefile-plugins/dds/CMakeLists.txt
index 77716a5d..eb367982 100644
--- a/kfile-plugins/dds/CMakeLists.txt
+++ b/tdefile-plugins/dds/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 #### other data ##################################
 
-install( FILES kfile_dds.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_dds.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_dds (module) ##########################
+#### tdefile_dds (module) ##########################
 
-tde_add_kpart( kfile_dds AUTOMOC
-  SOURCES kfile_dds.cpp
-  LINK kio-shared
+tde_add_kpart( tdefile_dds AUTOMOC
+  SOURCES tdefile_dds.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdefile-plugins/dds/Makefile.am b/tdefile-plugins/dds/Makefile.am
new file mode 100644
index 00000000..ce77c9c3
--- /dev/null
+++ b/tdefile-plugins/dds/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for dds 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_dds.h
+
+kde_module_LTLIBRARIES = tdefile_dds.la
+
+tdefile_dds_la_SOURCES = tdefile_dds.cpp 
+tdefile_dds_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_dds_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_dds.cpp -o $(podir)/tdefile_dds.pot
+
+services_DATA = tdefile_dds.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/dds/kfile_dds.cpp b/tdefile-plugins/dds/tdefile_dds.cpp
similarity index 98%
rename from kfile-plugins/dds/kfile_dds.cpp
rename to tdefile-plugins/dds/tdefile_dds.cpp
index c392685f..e49bf498 100644
--- a/kfile-plugins/dds/kfile_dds.cpp
+++ b/tdefile-plugins/dds/tdefile_dds.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_dds.h"
+#include "tdefile_dds.h"
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -179,7 +179,7 @@ namespace {	// Private.
 
 
 
-K_EXPORT_COMPONENT_FACTORY(kfile_dds, DdsFactory( "kfile_dds" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_dds, DdsFactory( "tdefile_dds" ))
 
 // Constructor, init mime type info.
 KDdsPlugin::KDdsPlugin(TQObject *parent, const char *name, const TQStringList &args) : 
@@ -313,5 +313,5 @@ bool KDdsPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     return true;
 }
 
-#include "kfile_dds.moc"
+#include "tdefile_dds.moc"
 
diff --git a/kfile-plugins/dds/kfile_dds.desktop b/tdefile-plugins/dds/tdefile_dds.desktop
similarity index 98%
rename from kfile-plugins/dds/kfile_dds.desktop
rename to tdefile-plugins/dds/tdefile_dds.desktop
index c88bfce2..c98f0181 100644
--- a/kfile-plugins/dds/kfile_dds.desktop
+++ b/tdefile-plugins/dds/tdefile_dds.desktop
@@ -47,7 +47,7 @@ Name[zh_CN]=DirectDraw 表面信息
 Name[zh_HK]=DirectDraw 表面資訊
 Name[zh_TW]=DirectDraw Surface 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_dds
+X-TDE-Library=tdefile_dds
 MimeType=image/x-dds
 PreferredGroups=Technical
 PreferredItems=Dimensions,Depth,BitDepth,Type,ColorMode,Compression
diff --git a/kfile-plugins/dds/kfile_dds.h b/tdefile-plugins/dds/tdefile_dds.h
similarity index 97%
rename from kfile-plugins/dds/kfile_dds.h
rename to tdefile-plugins/dds/tdefile_dds.h
index 4a0eefbb..464ed6fd 100644
--- a/kfile-plugins/dds/kfile_dds.h
+++ b/tdefile-plugins/dds/tdefile_dds.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_DDS_H__
 #define __KFILE_DDS_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kfile-plugins/dependencies/CMakeLists.txt b/tdefile-plugins/dependencies/CMakeLists.txt
similarity index 100%
rename from kfile-plugins/dependencies/CMakeLists.txt
rename to tdefile-plugins/dependencies/CMakeLists.txt
diff --git a/kfile-plugins/dependencies/Makefile.am b/tdefile-plugins/dependencies/Makefile.am
similarity index 100%
rename from kfile-plugins/dependencies/Makefile.am
rename to tdefile-plugins/dependencies/Makefile.am
diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
similarity index 95%
rename from kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
rename to tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
index 42d50a80..26e87e1c 100644
--- a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
+++ b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
+  ${CMAKE_SOURCE_DIR}/tdefile-plugins/dependencies/poppler-tqt
   ${POPPLER_INCLUDE_DIRS}
 )
 
diff --git a/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
rename to tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
diff --git a/kfile-plugins/dependencies/poppler-tqt/Makefile.am b/tdefile-plugins/dependencies/poppler-tqt/Makefile.am
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/Makefile.am
rename to tdefile-plugins/dependencies/poppler-tqt/Makefile.am
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-fontinfo.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-fontinfo.cc
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-fontinfo.cc
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-fontinfo.cc
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-link-qt3.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-link-qt3.h
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-link-qt3.h
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-link-qt3.h
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-link.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-link.cc
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-page-transition-private.h
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-page-transition-private.h
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-page-transition-private.h
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-page.cc
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cc
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-private.cc
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-private.h
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-qt.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-qt.h
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-qt.h
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-qt.h
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake b/tdefile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
rename to tdefile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
diff --git a/kfile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp b/tdefile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp
similarity index 100%
rename from kfile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp
rename to tdefile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp
diff --git a/kfile-plugins/dvi/CMakeLists.txt b/tdefile-plugins/dvi/CMakeLists.txt
similarity index 70%
rename from kfile-plugins/dvi/CMakeLists.txt
rename to tdefile-plugins/dvi/CMakeLists.txt
index 116d6032..beb5d8e2 100644
--- a/kfile-plugins/dvi/CMakeLists.txt
+++ b/tdefile-plugins/dvi/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_dvi.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_dvi.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_dvi (module) #########################
+#### tdefile_dvi (module) #########################
 
-tde_add_kpart( kfile_dvi AUTOMOC
-  SOURCES kfile_dvi.cpp
-  LINK kio-shared
+tde_add_kpart( tdefile_dvi AUTOMOC
+  SOURCES tdefile_dvi.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdefile-plugins/dvi/Makefile.am b/tdefile-plugins/dvi/Makefile.am
new file mode 100644
index 00000000..116d7a0d
--- /dev/null
+++ b/tdefile-plugins/dvi/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for the dvi 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_dvi.h
+
+kde_module_LTLIBRARIES = tdefile_dvi.la
+
+tdefile_dvi_la_SOURCES = tdefile_dvi.cpp
+tdefile_dvi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_dvi_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: 
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_dvi.pot
+
+services_DATA = tdefile_dvi.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/dvi/kfile_dvi.cpp b/tdefile-plugins/dvi/tdefile_dvi.cpp
similarity index 96%
rename from kfile-plugins/dvi/kfile_dvi.cpp
rename to tdefile-plugins/dvi/tdefile_dvi.cpp
index b449ad1e..374e5e54 100644
--- a/kfile-plugins/dvi/kfile_dvi.cpp
+++ b/tdefile-plugins/dvi/tdefile_dvi.cpp
@@ -20,12 +20,12 @@
 
 /* further informations about the dvi file format could be downloaded from: http://www.rpi.edu/~sofkam/DVI/archive/standards/dvistd0.dvi */
 
-#include "kfile_dvi.h"
+#include "tdefile_dvi.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #include <tqstring.h>
 #include <tqvariant.h>
@@ -35,9 +35,9 @@
 #include <tqregexp.h>
 
 
-// preprocessormacro K_EXPORT_COMPONENT_FACTORY loads shared library 'kfile_dvi.so' dynamic if necessary
+// preprocessormacro K_EXPORT_COMPONENT_FACTORY loads shared library 'tdefile_dvi.so' dynamic if necessary
 typedef KGenericFactory<KDviPlugin> DviFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_dvi, DviFactory("kfile_dvi"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_dvi, DviFactory("tdefile_dvi"))
 
 KDviPlugin::KDviPlugin (TQObject * parent, const char * name, const TQStringList & preferredItems)
   : KFilePlugin(parent, name, preferredItems)
@@ -147,4 +147,4 @@ bool KDviPlugin::readInfo (KFileMetaInfo & info, uint /* what (unused in this pl
   return true;
 }
 
-#include "kfile_dvi.moc"
+#include "tdefile_dvi.moc"
diff --git a/kfile-plugins/dvi/kfile_dvi.desktop b/tdefile-plugins/dvi/tdefile_dvi.desktop
similarity index 98%
rename from kfile-plugins/dvi/kfile_dvi.desktop
rename to tdefile-plugins/dvi/tdefile_dvi.desktop
index e272eab6..e3bade83 100644
--- a/kfile-plugins/dvi/kfile_dvi.desktop
+++ b/tdefile-plugins/dvi/tdefile_dvi.desktop
@@ -56,5 +56,5 @@ Name[zh_HK]=DVI 資訊
 Name[zh_TW]=DVI 資訊
 ServiceTypes=KFilePlugin
 Type=Service
-X-TDE-Library=kfile_dvi
+X-TDE-Library=tdefile_dvi
 PreferredItems=Title,Author,Subject,Creator,Producer,CreationDate,ModDate,Keywords
diff --git a/kfile-plugins/dvi/kfile_dvi.h b/tdefile-plugins/dvi/tdefile_dvi.h
similarity index 97%
rename from kfile-plugins/dvi/kfile_dvi.h
rename to tdefile-plugins/dvi/tdefile_dvi.h
index 48aadc9a..da4bc6fe 100644
--- a/kfile-plugins/dvi/kfile_dvi.h
+++ b/tdefile-plugins/dvi/tdefile_dvi.h
@@ -21,7 +21,7 @@
 #ifndef __KFILE_DVI_H__
 #define __KFILE_DVI_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kfile-plugins/exr/CMakeLists.txt b/tdefile-plugins/exr/CMakeLists.txt
similarity index 71%
rename from kfile-plugins/exr/CMakeLists.txt
rename to tdefile-plugins/exr/CMakeLists.txt
index 84f526c5..284c973a 100644
--- a/kfile-plugins/exr/CMakeLists.txt
+++ b/tdefile-plugins/exr/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_exr.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_exr.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_exr (module) #########################
+#### tdefile_exr (module) #########################
 
-tde_add_kpart( kfile_exr AUTOMOC
-  SOURCES kfile_exr.cpp
-  LINK kio-shared ${OPENEXR_LIBRARIES}
+tde_add_kpart( tdefile_exr AUTOMOC
+  SOURCES tdefile_exr.cpp
+  LINK tdeio-shared ${OPENEXR_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kfile-plugins/exr/ConfigureChecks.cmake b/tdefile-plugins/exr/ConfigureChecks.cmake
similarity index 100%
rename from kfile-plugins/exr/ConfigureChecks.cmake
rename to tdefile-plugins/exr/ConfigureChecks.cmake
diff --git a/kfile-plugins/exr/Makefile.am b/tdefile-plugins/exr/Makefile.am
similarity index 56%
rename from kfile-plugins/exr/Makefile.am
rename to tdefile-plugins/exr/Makefile.am
index f337359c..8df4ed64 100644
--- a/kfile-plugins/exr/Makefile.am
+++ b/tdefile-plugins/exr/Makefile.am
@@ -7,19 +7,19 @@ INCLUDES         = -Drestrict= $(all_includes) $(EXR_FLAGS)
 # INCLUDES         = $(all_includes) $(EXR_FLAGS) 
 
 # these are the headers for your project
-noinst_HEADERS   = kfile_exr.h 
+noinst_HEADERS   = tdefile_exr.h 
 
-kde_module_LTLIBRARIES = kfile_exr.la
+kde_module_LTLIBRARIES = tdefile_exr.la
 
-kfile_exr_la_SOURCES = kfile_exr.cpp
-kfile_exr_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_exr_la_LIBADD = $(LIB_KIO) $(LIB_EXR)
+tdefile_exr_la_SOURCES = tdefile_exr.cpp
+tdefile_exr_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_exr_la_LIBADD = $(LIB_KIO) $(LIB_EXR)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_exr.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_exr.pot
 
-services_DATA = kfile_exr.desktop
+services_DATA = tdefile_exr.desktop
 servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/exr/configure.in.in b/tdefile-plugins/exr/configure.in.in
similarity index 100%
rename from kfile-plugins/exr/configure.in.in
rename to tdefile-plugins/exr/configure.in.in
diff --git a/kfile-plugins/exr/kfile_exr.cpp b/tdefile-plugins/exr/tdefile_exr.cpp
similarity index 99%
rename from kfile-plugins/exr/kfile_exr.cpp
rename to tdefile-plugins/exr/tdefile_exr.cpp
index 639ac0df..d8007e3d 100644
--- a/kfile-plugins/exr/kfile_exr.cpp
+++ b/tdefile-plugins/exr/tdefile_exr.cpp
@@ -53,12 +53,12 @@
 #include <tqimage.h>
 
 
-#include "kfile_exr.h"
+#include "tdefile_exr.h"
 using namespace Imf;
 
 typedef KGenericFactory<KExrPlugin> ExrFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_exr, ExrFactory("kfile_exr"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_exr, ExrFactory("tdefile_exr"))
 
 KExrPlugin::KExrPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -390,4 +390,4 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 	}
 }
 
-#include "kfile_exr.moc"
+#include "tdefile_exr.moc"
diff --git a/kfile-plugins/exr/kfile_exr.desktop b/tdefile-plugins/exr/tdefile_exr.desktop
similarity index 98%
rename from kfile-plugins/exr/kfile_exr.desktop
rename to tdefile-plugins/exr/tdefile_exr.desktop
index 4ced6088..e9736d67 100644
--- a/kfile-plugins/exr/kfile_exr.desktop
+++ b/tdefile-plugins/exr/tdefile_exr.desktop
@@ -51,7 +51,7 @@ Name[zh_CN]=EXR 信息
 Name[zh_HK]=EXR 資訊
 Name[zh_TW]=EXR 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_exr
+X-TDE-Library=tdefile_exr
 MimeType=image/x-exr
 PreferredGroups=Info,Standard,Channels,Technical,3dsMax
 PreferredItems=Dimensions,Thumbnail,ThumbnailDimensions,Version,Comments,Owner,Latitude,Longitude,Altitude,Capture Date,UTC Offset
diff --git a/kfile-plugins/exr/kfile_exr.h b/tdefile-plugins/exr/tdefile_exr.h
similarity index 97%
rename from kfile-plugins/exr/kfile_exr.h
rename to tdefile-plugins/exr/tdefile_exr.h
index 80e7fea7..2fd23434 100644
--- a/kfile-plugins/exr/kfile_exr.h
+++ b/tdefile-plugins/exr/tdefile_exr.h
@@ -21,7 +21,7 @@
 #ifndef __KFILE_EXR_H__
 #define __KFILE_EXR_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kurl.h>
 
 class TQStringList;
diff --git a/kfile-plugins/bmp/CMakeLists.txt b/tdefile-plugins/gif/CMakeLists.txt
similarity index 70%
rename from kfile-plugins/bmp/CMakeLists.txt
rename to tdefile-plugins/gif/CMakeLists.txt
index c1c46db6..8e71efbf 100644
--- a/kfile-plugins/bmp/CMakeLists.txt
+++ b/tdefile-plugins/gif/CMakeLists.txt
@@ -20,15 +20,15 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-#### other data #################################
 
-install( FILES kfile_bmp.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+#### other data #################################
 
+install( FILES tdefile_gif.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
-#### kfile_bmp (module) #########################
 
-tde_add_kpart( kfile_bmp AUTOMOC
-  SOURCES kfile_bmp.cpp
-  LINK kio-shared
+#### tdefile_gif (module) #########################
+tde_add_kpart( tdefile_gif AUTOMOC
+  SOURCES tdefile_gif.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kfile-plugins/gif/Makefile.am b/tdefile-plugins/gif/Makefile.am
similarity index 52%
rename from kfile-plugins/gif/Makefile.am
rename to tdefile-plugins/gif/Makefile.am
index b847d002..d6f8d82c 100644
--- a/kfile-plugins/gif/Makefile.am
+++ b/tdefile-plugins/gif/Makefile.am
@@ -6,19 +6,19 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 INCLUDES         = $(all_includes)
 
 # these are the headers for your project
-noinst_HEADERS   = kfile_gif.h
+noinst_HEADERS   = tdefile_gif.h
 
-kde_module_LTLIBRARIES = kfile_gif.la
+kde_module_LTLIBRARIES = tdefile_gif.la
 
-kfile_gif_la_SOURCES = kfile_gif.cpp
-kfile_gif_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_gif_la_LIBADD = $(LIB_KIO)
+tdefile_gif_la_SOURCES = tdefile_gif.cpp
+tdefile_gif_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_gif_la_LIBADD = $(LIB_KIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_gif.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_gif.pot
 
-services_DATA = kfile_gif.desktop
+services_DATA = tdefile_gif.desktop
 servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/gif/README b/tdefile-plugins/gif/README
similarity index 65%
rename from kfile-plugins/gif/README
rename to tdefile-plugins/gif/README
index e81cc913..811cbb28 100644
--- a/kfile-plugins/gif/README
+++ b/tdefile-plugins/gif/README
@@ -2,9 +2,9 @@ The original README for this file read:
 <quote>
 Note: Development of this module has been suspended.
 Please feel free to contact me, and pick it up.  All I ask
-is that you preserve both command line and kfile abilities.  Thanks.
+is that you preserve both command line and tdefile abilities.  Thanks.
 bryce@obviously.com
 </quote>
 
 I contacted Bryce, but received no response. The command line code
-is unchanged - I just fixed the kfile code to work, read only.
+is unchanged - I just fixed the tdefile code to work, read only.
diff --git a/kfile-plugins/gif/gif-info.1 b/tdefile-plugins/gif/gif-info.1
similarity index 100%
rename from kfile-plugins/gif/gif-info.1
rename to tdefile-plugins/gif/gif-info.1
diff --git a/kfile-plugins/gif/gif-info.c b/tdefile-plugins/gif/gif-info.c
similarity index 100%
rename from kfile-plugins/gif/gif-info.c
rename to tdefile-plugins/gif/gif-info.c
diff --git a/kfile-plugins/gif/kfile_gif.cpp b/tdefile-plugins/gif/tdefile_gif.cpp
similarity index 96%
rename from kfile-plugins/gif/kfile_gif.cpp
rename to tdefile-plugins/gif/tdefile_gif.cpp
index 009f8cc5..9cc522dc 100644
--- a/kfile-plugins/gif/kfile_gif.cpp
+++ b/tdefile-plugins/gif/tdefile_gif.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <stdlib.h>
-#include "kfile_gif.h"
+#include "tdefile_gif.h"
 
 #include <kurl.h>
 #include <kprocess.h>
@@ -40,7 +40,7 @@
 
 typedef KGenericFactory<KGifPlugin> GifFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_gif, GifFactory("kfile_gif"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_gif, GifFactory("tdefile_gif"))
 
 KGifPlugin::KGifPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -119,4 +119,4 @@ bool KGifPlugin::readInfo( KFileMetaInfo& info, uint what )
     return true;
 }
 
-#include "kfile_gif.moc"
+#include "tdefile_gif.moc"
diff --git a/kfile-plugins/gif/kfile_gif.desktop b/tdefile-plugins/gif/tdefile_gif.desktop
similarity index 98%
rename from kfile-plugins/gif/kfile_gif.desktop
rename to tdefile-plugins/gif/tdefile_gif.desktop
index 246f7565..d6e3bfb3 100644
--- a/kfile-plugins/gif/kfile_gif.desktop
+++ b/tdefile-plugins/gif/tdefile_gif.desktop
@@ -60,6 +60,6 @@ Name[zh_HK]=GIF 資訊
 Name[zh_TW]=GIF 資訊
 Name[zu]=Ulwazi lwe-GIF
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_gif
+X-TDE-Library=tdefile_gif
 MimeType=image/gif
 PreferredItems=Comment,Resolution
diff --git a/kfile-plugins/gif/kfile_gif.h b/tdefile-plugins/gif/tdefile_gif.h
similarity index 97%
rename from kfile-plugins/gif/kfile_gif.h
rename to tdefile-plugins/gif/tdefile_gif.h
index 1285dd45..37588e7a 100644
--- a/kfile-plugins/gif/kfile_gif.h
+++ b/tdefile-plugins/gif/tdefile_gif.h
@@ -19,7 +19,7 @@
 #ifndef __KFILE_GIF_H__
 #define __KFILE_GIF_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kurl.h>
 
 class TQStringList;
diff --git a/kfile-plugins/ico/CMakeLists.txt b/tdefile-plugins/ico/CMakeLists.txt
similarity index 71%
rename from kfile-plugins/ico/CMakeLists.txt
rename to tdefile-plugins/ico/CMakeLists.txt
index 1fdbed2b..54d87add 100644
--- a/kfile-plugins/ico/CMakeLists.txt
+++ b/tdefile-plugins/ico/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_ico.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_ico.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_ico (module) ########################
+#### tdefile_ico (module) ########################
 
-tde_add_kpart( kfile_ico AUTOMOC
-  SOURCES kfile_ico.cpp
-  LINK kio-shared
+tde_add_kpart( tdefile_ico AUTOMOC
+  SOURCES tdefile_ico.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdefile-plugins/ico/Makefile.am b/tdefile-plugins/ico/Makefile.am
new file mode 100644
index 00000000..e95cf924
--- /dev/null
+++ b/tdefile-plugins/ico/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for ico 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_ico.h
+
+kde_module_LTLIBRARIES = tdefile_ico.la
+
+tdefile_ico_la_SOURCES = tdefile_ico.cpp 
+tdefile_ico_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_ico_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_ico.cpp -o $(podir)/tdefile_ico.pot
+
+services_DATA = tdefile_ico.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/ico/kfile_ico.cpp b/tdefile-plugins/ico/tdefile_ico.cpp
similarity index 97%
rename from kfile-plugins/ico/kfile_ico.cpp
rename to tdefile-plugins/ico/tdefile_ico.cpp
index 44fa28d6..273a5e18 100644
--- a/kfile-plugins/ico/kfile_ico.cpp
+++ b/tdefile-plugins/ico/tdefile_ico.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_ico.h"
+#include "tdefile_ico.h"
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -42,7 +42,7 @@ typedef unsigned char uint8_t;
 
 typedef KGenericFactory<KIcoPlugin> IcoFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_ico, IcoFactory( "kfile_ico" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_ico, IcoFactory( "tdefile_ico" ))
 
 KIcoPlugin::KIcoPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -145,4 +145,4 @@ bool KIcoPlugin::readInfo( KFileMetaInfo& info, uint what)
     return true;
 }
 
-#include "kfile_ico.moc"
+#include "tdefile_ico.moc"
diff --git a/kfile-plugins/ico/kfile_ico.desktop b/tdefile-plugins/ico/tdefile_ico.desktop
similarity index 98%
rename from kfile-plugins/ico/kfile_ico.desktop
rename to tdefile-plugins/ico/tdefile_ico.desktop
index 1c63f92c..66cadb95 100644
--- a/kfile-plugins/ico/kfile_ico.desktop
+++ b/tdefile-plugins/ico/tdefile_ico.desktop
@@ -59,7 +59,7 @@ Name[zh_HK]=ICO 資訊
 Name[zh_TW]=ICO 資訊
 Name[zu]=Ulwazi lwe-ICO
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_ico
+X-TDE-Library=tdefile_ico
 MimeType=image/x-ico
 PreferredGroups=Technical
 PreferredItems=Number,Resolution,Colors,ResolutionM,ColorsM
diff --git a/kfile-plugins/ico/kfile_ico.h b/tdefile-plugins/ico/tdefile_ico.h
similarity index 97%
rename from kfile-plugins/ico/kfile_ico.h
rename to tdefile-plugins/ico/tdefile_ico.h
index ed447e50..faa9481e 100644
--- a/kfile-plugins/ico/kfile_ico.h
+++ b/tdefile-plugins/ico/tdefile_ico.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_ICO_H__
 #define __KFILE_ICO_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kfile-plugins/jpeg/CMakeLists.txt b/tdefile-plugins/jpeg/CMakeLists.txt
similarity index 67%
rename from kfile-plugins/jpeg/CMakeLists.txt
rename to tdefile-plugins/jpeg/CMakeLists.txt
index a35543d7..3e99eba7 100644
--- a/kfile-plugins/jpeg/CMakeLists.txt
+++ b/tdefile-plugins/jpeg/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_jpeg.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_jpeg.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_jpeg (module) ########################
+#### tdefile_jpeg (module) ########################
 
-tde_add_kpart( kfile_jpeg AUTOMOC
-  SOURCES kfile_jpeg.cpp exif.cpp kfile_setcomment.cpp
-  LINK kio-shared
+tde_add_kpart( tdefile_jpeg AUTOMOC
+  SOURCES tdefile_jpeg.cpp exif.cpp tdefile_setcomment.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdefile-plugins/jpeg/Makefile.am b/tdefile-plugins/jpeg/Makefile.am
new file mode 100644
index 00000000..76e9e32d
--- /dev/null
+++ b/tdefile-plugins/jpeg/Makefile.am
@@ -0,0 +1,24 @@
+## Makefile.am for jpeg file meta info plugin
+
+KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_jpeg.h exif.h
+
+kde_module_LTLIBRARIES = tdefile_jpeg.la
+
+tdefile_jpeg_la_SOURCES = tdefile_jpeg.cpp exif.cpp tdefile_setcomment.cpp
+tdefile_jpeg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_jpeg_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_jpeg.pot
+
+services_DATA = tdefile_jpeg.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/jpeg/README b/tdefile-plugins/jpeg/README
similarity index 100%
rename from kfile-plugins/jpeg/README
rename to tdefile-plugins/jpeg/README
diff --git a/kfile-plugins/jpeg/exif.cpp b/tdefile-plugins/jpeg/exif.cpp
similarity index 100%
rename from kfile-plugins/jpeg/exif.cpp
rename to tdefile-plugins/jpeg/exif.cpp
diff --git a/kfile-plugins/jpeg/exif.h b/tdefile-plugins/jpeg/exif.h
similarity index 100%
rename from kfile-plugins/jpeg/exif.h
rename to tdefile-plugins/jpeg/exif.h
diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/tdefile-plugins/jpeg/tdefile_jpeg.cpp
similarity index 99%
rename from kfile-plugins/jpeg/kfile_jpeg.cpp
rename to tdefile-plugins/jpeg/tdefile_jpeg.cpp
index 6f187c8e..c902b99b 100644
--- a/kfile-plugins/jpeg/kfile_jpeg.cpp
+++ b/tdefile-plugins/jpeg/tdefile_jpeg.cpp
@@ -21,7 +21,7 @@
 
 
 #include <stdlib.h>
-#include "kfile_jpeg.h"
+#include "tdefile_jpeg.h"
 
 #include <kurl.h>
 #include <kprocess.h>
@@ -42,7 +42,7 @@
 
 typedef KGenericFactory<KJpegPlugin> JpegFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_jpeg, JpegFactory("kfile_jpeg"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_jpeg, JpegFactory("tdefile_jpeg"))
 
 KJpegPlugin::KJpegPlugin(TQObject *parent, const char *name,
                        const TQStringList &args )
@@ -528,4 +528,4 @@ TQDateTime KJpegPlugin::parseDateTime( const TQString& string )
     return dt;
 }
 
-#include "kfile_jpeg.moc"
+#include "tdefile_jpeg.moc"
diff --git a/kfile-plugins/jpeg/kfile_jpeg.desktop b/tdefile-plugins/jpeg/tdefile_jpeg.desktop
similarity index 98%
rename from kfile-plugins/jpeg/kfile_jpeg.desktop
rename to tdefile-plugins/jpeg/tdefile_jpeg.desktop
index fccaaeff..d2cfa0ff 100644
--- a/kfile-plugins/jpeg/kfile_jpeg.desktop
+++ b/tdefile-plugins/jpeg/tdefile_jpeg.desktop
@@ -58,7 +58,7 @@ Name[zh_HK]=JPEG EXIF 資訊
 Name[zh_TW]=JPEG EXIF 資訊
 Name[zu]=Ulwazi lwe-JPEG EXIF
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_jpeg
+X-TDE-Library=tdefile_jpeg
 MimeType=image/jpeg
 PreferredItems=User comment,CreationDate,CreationTime,Dimensions,Exposure time,JPEG quality,Comment
 SupportsThumbnail=true
diff --git a/kfile-plugins/jpeg/kfile_jpeg.h b/tdefile-plugins/jpeg/tdefile_jpeg.h
similarity index 97%
rename from kfile-plugins/jpeg/kfile_jpeg.h
rename to tdefile-plugins/jpeg/tdefile_jpeg.h
index e7c821a6..979ae515 100644
--- a/kfile-plugins/jpeg/kfile_jpeg.h
+++ b/tdefile-plugins/jpeg/tdefile_jpeg.h
@@ -21,7 +21,7 @@
 #define __KFILE_JPEG_H__
 
 #include <tqdatetime.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class KJpegPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/jpeg/kfile_setcomment.cpp b/tdefile-plugins/jpeg/tdefile_setcomment.cpp
similarity index 100%
rename from kfile-plugins/jpeg/kfile_setcomment.cpp
rename to tdefile-plugins/jpeg/tdefile_setcomment.cpp
diff --git a/kfile-plugins/pnm/CMakeLists.txt b/tdefile-plugins/pcx/CMakeLists.txt
similarity index 70%
rename from kfile-plugins/pnm/CMakeLists.txt
rename to tdefile-plugins/pcx/CMakeLists.txt
index 34e78ddf..7eea5125 100644
--- a/kfile-plugins/pnm/CMakeLists.txt
+++ b/tdefile-plugins/pcx/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_pnm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_pcx.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_pnm (module) #########################
+#### tdefile_pcx (module) #########################
 
-tde_add_kpart( kfile_pnm AUTOMOC
-  SOURCES kfile_pnm.cpp
-  LINK kio-shared
+tde_add_kpart( tdefile_pcx AUTOMOC
+  SOURCES tdefile_pcx.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdefile-plugins/pcx/Makefile.am b/tdefile-plugins/pcx/Makefile.am
new file mode 100644
index 00000000..18249bc6
--- /dev/null
+++ b/tdefile-plugins/pcx/Makefile.am
@@ -0,0 +1,21 @@
+## Makefile.am for PCX file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+noinst_HEADERS   = tdefile_pcx.h
+
+kde_module_LTLIBRARIES = tdefile_pcx.la
+
+tdefile_pcx_la_SOURCES = tdefile_pcx.cpp
+tdefile_pcx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_pcx_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_pcx.pot
+
+services_DATA = tdefile_pcx.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/pcx/kfile_pcx.cpp b/tdefile-plugins/pcx/tdefile_pcx.cpp
similarity index 96%
rename from kfile-plugins/pcx/kfile_pcx.cpp
rename to tdefile-plugins/pcx/tdefile_pcx.cpp
index 5dceec9d..2c4047a6 100644
--- a/kfile-plugins/pcx/kfile_pcx.cpp
+++ b/tdefile-plugins/pcx/tdefile_pcx.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "kfile_pcx.h"
+#include "tdefile_pcx.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
@@ -27,7 +27,7 @@
 
 typedef KGenericFactory<KPcxPlugin> PcxFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_pcx, PcxFactory("kfile_pcx"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_pcx, PcxFactory("tdefile_pcx"))
 
 TQDataStream &operator>>( TQDataStream &s, PALETTE &pal )
 {
@@ -115,7 +115,7 @@ bool KPcxPlugin::readInfo( KFileMetaInfo& info, uint )
   return true;
 }
 
-#include "kfile_pcx.moc"
+#include "tdefile_pcx.moc"
 
 /* vim: et sw=2 ts=2
 */
diff --git a/kfile-plugins/pcx/kfile_pcx.desktop b/tdefile-plugins/pcx/tdefile_pcx.desktop
similarity index 98%
rename from kfile-plugins/pcx/kfile_pcx.desktop
rename to tdefile-plugins/pcx/tdefile_pcx.desktop
index b998b479..bcf54b6a 100644
--- a/kfile-plugins/pcx/kfile_pcx.desktop
+++ b/tdefile-plugins/pcx/tdefile_pcx.desktop
@@ -56,7 +56,7 @@ Name[zh_CN]=PCX 文件元信息
 Name[zh_HK]=PCX 檔案 Meta 資訊
 Name[zh_TW]=PCX 檔案 Meta 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_pcx
+X-TDE-Library=tdefile_pcx
 MimeType=image/x-pcx
 PreferredGroups=General
 PreferredItems=Dimensions,Resolution,BitDepth,Compression
diff --git a/kfile-plugins/pcx/kfile_pcx.h b/tdefile-plugins/pcx/tdefile_pcx.h
similarity index 99%
rename from kfile-plugins/pcx/kfile_pcx.h
rename to tdefile-plugins/pcx/tdefile_pcx.h
index 47e74ab6..c7b62e2e 100644
--- a/kfile-plugins/pcx/kfile_pcx.h
+++ b/tdefile-plugins/pcx/tdefile_pcx.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_PCX_H_
 #define __KFILE_PCX_H_
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 struct PALETTE
 {
diff --git a/tdefile-plugins/pdf/CMakeLists.txt b/tdefile-plugins/pdf/CMakeLists.txt
new file mode 100644
index 00000000..5a81d453
--- /dev/null
+++ b/tdefile-plugins/pdf/CMakeLists.txt
@@ -0,0 +1,36 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/tdefile-plugins/dependencies/poppler-tqt
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+#### other data #################################
+
+install( FILES tdefile_pdf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+#### tdefile_pdf (module) #########################
+
+tde_add_kpart( tdefile_pdf AUTOMOC
+  SOURCES tdefile_pdf.cpp
+  LINK tdeio-shared -L${CMAKE_BINARY_DIR}/tdefile-plugins/dependencies/poppler-tqt -lpoppler-tqt
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdefile-plugins/pdf/Makefile.am b/tdefile-plugins/pdf/Makefile.am
new file mode 100644
index 00000000..a6f38115
--- /dev/null
+++ b/tdefile-plugins/pdf/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for the pdf file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes) -I$(top_srcdir)/tdefile-plugins/dependencies/poppler-tqt
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_pdf.h
+
+kde_module_LTLIBRARIES = tdefile_pdf.la
+
+tdefile_pdf_la_SOURCES = tdefile_pdf.cpp
+tdefile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/tdefile-plugins/dependencies/poppler-tqt/ -lpoppler-tqt
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: 
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_pdf.pot
+
+services_DATA = tdefile_pdf.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/pdf/configure.in.in b/tdefile-plugins/pdf/configure.in.in
similarity index 100%
rename from kfile-plugins/pdf/configure.in.in
rename to tdefile-plugins/pdf/configure.in.in
diff --git a/kfile-plugins/pdf/kfile_pdf.cpp b/tdefile-plugins/pdf/tdefile_pdf.cpp
similarity index 97%
rename from kfile-plugins/pdf/kfile_pdf.cpp
rename to tdefile-plugins/pdf/tdefile_pdf.cpp
index a3dcbde7..b3bacc02 100644
--- a/kfile-plugins/pdf/kfile_pdf.cpp
+++ b/tdefile-plugins/pdf/tdefile_pdf.cpp
@@ -18,14 +18,14 @@
  *  $Id$
  */
 
-#include "kfile_pdf.h"
+#include "tdefile_pdf.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<KPdfPlugin> PdfFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_pdf, PdfFactory("kfile_pdf"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_pdf, PdfFactory("tdefile_pdf"))
 
 KPdfPlugin::KPdfPlugin(TQObject *parent, const char *name, const TQStringList &preferredItems)
     : KFilePlugin(parent, name, preferredItems)
@@ -100,5 +100,5 @@ bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */)
     return true;
 }
 
-#include "kfile_pdf.moc"
+#include "tdefile_pdf.moc"
 
diff --git a/kfile-plugins/pdf/kfile_pdf.desktop b/tdefile-plugins/pdf/tdefile_pdf.desktop
similarity index 98%
rename from kfile-plugins/pdf/kfile_pdf.desktop
rename to tdefile-plugins/pdf/tdefile_pdf.desktop
index 0af41176..41f4d21f 100644
--- a/kfile-plugins/pdf/kfile_pdf.desktop
+++ b/tdefile-plugins/pdf/tdefile_pdf.desktop
@@ -59,6 +59,6 @@ Name[zh_HK]=PDF 資訊
 Name[zh_TW]=PDF 資訊
 Name[zu]=Ulwazi lwe-PDF
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_pdf
+X-TDE-Library=tdefile_pdf
 MimeType=application/pdf
 PreferredItems=Title,Subject,Author,Keywords,Creator,Producer,CreationDate,ModificationDate,Pages,Protected,Linearized,Version
diff --git a/kfile-plugins/pdf/kfile_pdf.h b/tdefile-plugins/pdf/tdefile_pdf.h
similarity index 97%
rename from kfile-plugins/pdf/kfile_pdf.h
rename to tdefile-plugins/pdf/tdefile_pdf.h
index e732e2be..d23971c7 100644
--- a/kfile-plugins/pdf/kfile_pdf.h
+++ b/tdefile-plugins/pdf/tdefile_pdf.h
@@ -21,7 +21,7 @@
 #ifndef __KFILE_PDF_H__
 #define __KFILE_PDF_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <poppler-qt.h>
 
 class TQStringList;
diff --git a/tdefile-plugins/png/CMakeLists.txt b/tdefile-plugins/png/CMakeLists.txt
new file mode 100644
index 00000000..7000bcd7
--- /dev/null
+++ b/tdefile-plugins/png/CMakeLists.txt
@@ -0,0 +1,34 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+#### other data #################################
+
+install( FILES tdefile_png.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+#### tdefile_png (module) #########################
+tde_add_kpart( tdefile_png AUTOMOC
+  SOURCES tdefile_png.cpp
+  LINK tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdefile-plugins/png/Makefile.am b/tdefile-plugins/png/Makefile.am
new file mode 100644
index 00000000..7ce05e86
--- /dev/null
+++ b/tdefile-plugins/png/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for png 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_png.h 
+
+kde_module_LTLIBRARIES = tdefile_png.la
+
+tdefile_png_la_SOURCES = tdefile_png.cpp
+tdefile_png_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_png_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_png.pot
+
+services_DATA = tdefile_png.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/png/kfile_png.cpp b/tdefile-plugins/png/tdefile_png.cpp
similarity index 98%
rename from kfile-plugins/png/kfile_png.cpp
rename to tdefile-plugins/png/tdefile_png.cpp
index 531fdfe3..9766fbc6 100644
--- a/kfile-plugins/png/kfile_png.cpp
+++ b/tdefile-plugins/png/tdefile_png.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <stdlib.h>
-#include "kfile_png.h"
+#include "tdefile_png.h"
 
 #include <kurl.h>
 #include <kprocess.h>
@@ -85,7 +85,7 @@ static const char* interlaceModes[] = {
 
 typedef KGenericFactory<KPngPlugin> PngFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_png, PngFactory("kfile_png"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_png, PngFactory("tdefile_png"))
 
 KPngPlugin::KPngPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -312,4 +312,4 @@ end:
     return true;
 }
 
-#include "kfile_png.moc"
+#include "tdefile_png.moc"
diff --git a/kfile-plugins/png/kfile_png.desktop b/tdefile-plugins/png/tdefile_png.desktop
similarity index 98%
rename from kfile-plugins/png/kfile_png.desktop
rename to tdefile-plugins/png/tdefile_png.desktop
index c3df978e..ad2b98e0 100644
--- a/kfile-plugins/png/kfile_png.desktop
+++ b/tdefile-plugins/png/tdefile_png.desktop
@@ -59,7 +59,7 @@ Name[zh_HK]=PNG 資訊
 Name[zh_TW]=PNG 資訊
 Name[zu]=Ulwazi lwe-PNG
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_png
+X-TDE-Library=tdefile_png
 MimeType=image/png
 PreferredGroups=Comment,Technical
 PreferredItems=Title,Author,Dimensions,BitDepth,ColorMode,Compression
diff --git a/kfile-plugins/png/kfile_png.h b/tdefile-plugins/png/tdefile_png.h
similarity index 97%
rename from kfile-plugins/png/kfile_png.h
rename to tdefile-plugins/png/tdefile_png.h
index 24322468..17fa31c8 100644
--- a/kfile-plugins/png/kfile_png.h
+++ b/tdefile-plugins/png/tdefile_png.h
@@ -21,7 +21,7 @@
 #ifndef __KFILE_PNG_H__
 #define __KFILE_PNG_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kurl.h>
 
 class TQStringList;
diff --git a/tdefile-plugins/pnm/CMakeLists.txt b/tdefile-plugins/pnm/CMakeLists.txt
new file mode 100644
index 00000000..637fe59d
--- /dev/null
+++ b/tdefile-plugins/pnm/CMakeLists.txt
@@ -0,0 +1,35 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+#### other data #################################
+
+install( FILES tdefile_pnm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+#### tdefile_pnm (module) #########################
+
+tde_add_kpart( tdefile_pnm AUTOMOC
+  SOURCES tdefile_pnm.cpp
+  LINK tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdefile-plugins/pnm/Makefile.am b/tdefile-plugins/pnm/Makefile.am
new file mode 100644
index 00000000..f2d9e75e
--- /dev/null
+++ b/tdefile-plugins/pnm/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for pnm 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_pnm.h
+
+kde_module_LTLIBRARIES = tdefile_pnm.la
+
+tdefile_pnm_la_SOURCES = tdefile_pnm.cpp
+tdefile_pnm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_pnm_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_pnm.pot
+
+services_DATA = tdefile_pnm.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/pnm/kfile_pnm.cpp b/tdefile-plugins/pnm/tdefile_pnm.cpp
similarity index 96%
rename from kfile-plugins/pnm/kfile_pnm.cpp
rename to tdefile-plugins/pnm/tdefile_pnm.cpp
index 6c965e65..c9bb065e 100644
--- a/kfile-plugins/pnm/kfile_pnm.cpp
+++ b/tdefile-plugins/pnm/tdefile_pnm.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "kfile_pnm.h"
+#include "tdefile_pnm.h"
 
 #include <math.h>
 #include <kgenericfactory.h>
@@ -31,7 +31,7 @@ static const char* formats[] = {
 
 typedef KGenericFactory<KPnmPlugin> PnmFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_pnm, PnmFactory("kfile_pnm"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_pnm, PnmFactory("tdefile_pnm"))
 
 KPnmPlugin::KPnmPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) 
 {
@@ -134,4 +134,4 @@ bool KPnmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 	return true;
 }
 
-#include "kfile_pnm.moc"
+#include "tdefile_pnm.moc"
diff --git a/kfile-plugins/pnm/kfile_pnm.desktop b/tdefile-plugins/pnm/tdefile_pnm.desktop
similarity index 98%
rename from kfile-plugins/pnm/kfile_pnm.desktop
rename to tdefile-plugins/pnm/tdefile_pnm.desktop
index 4de8e7c1..1cf4d310 100644
--- a/kfile-plugins/pnm/kfile_pnm.desktop
+++ b/tdefile-plugins/pnm/tdefile_pnm.desktop
@@ -54,7 +54,7 @@ Name[zh_CN]=PNM 信息
 Name[zh_HK]=PNM 資訊
 Name[zh_TW]=PNM 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_pnm
+X-TDE-Library=tdefile_pnm
 MimeType=image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap
 PreferredGroups=General
 PreferredItems=Format,Dimensions,BitDepth,Comment
diff --git a/kfile-plugins/pnm/kfile_pnm.h b/tdefile-plugins/pnm/tdefile_pnm.h
similarity index 97%
rename from kfile-plugins/pnm/kfile_pnm.h
rename to tdefile-plugins/pnm/tdefile_pnm.h
index b033d022..4b16e4cc 100644
--- a/kfile-plugins/pnm/kfile_pnm.h
+++ b/tdefile-plugins/pnm/tdefile_pnm.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_PNM_H__
 #define __KFILE_PNM_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kfile-plugins/ps/CMakeLists.txt b/tdefile-plugins/ps/CMakeLists.txt
similarity index 76%
rename from kfile-plugins/ps/CMakeLists.txt
rename to tdefile-plugins/ps/CMakeLists.txt
index 2d5cf3df..9a13bcb1 100644
--- a/kfile-plugins/ps/CMakeLists.txt
+++ b/tdefile-plugins/ps/CMakeLists.txt
@@ -25,14 +25,14 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_ps.desktop gsthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_ps.desktop gsthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_ps (module) ########################
+#### tdefile_ps (module) ########################
 
-tde_add_kpart( kfile_ps AUTOMOC
-  SOURCES kfile_ps.cpp
-  LINK dscparse-static kio-shared
+tde_add_kpart( tdefile_ps AUTOMOC
+  SOURCES tdefile_ps.cpp
+  LINK dscparse-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kfile-plugins/ps/Makefile.am b/tdefile-plugins/ps/Makefile.am
similarity index 57%
rename from kfile-plugins/ps/Makefile.am
rename to tdefile-plugins/ps/Makefile.am
index 6d76e075..7e7943c6 100644
--- a/kfile-plugins/ps/Makefile.am
+++ b/tdefile-plugins/ps/Makefile.am
@@ -4,13 +4,13 @@
 INCLUDES         = -I$(top_srcdir)/kghostview/dscparse $(all_includes)
 
 # these are the headers for your project
-noinst_HEADERS   = kfile_ps.h gscreator.h
+noinst_HEADERS   = tdefile_ps.h gscreator.h
 
-kde_module_LTLIBRARIES = kfile_ps.la gsthumbnail.la
+kde_module_LTLIBRARIES = tdefile_ps.la gsthumbnail.la
 
-kfile_ps_la_SOURCES = kfile_ps.cpp
-kfile_ps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_ps_la_LIBADD = $(LIB_KIO) ../../kghostview/libdscparse.la
+tdefile_ps_la_SOURCES = tdefile_ps.cpp
+tdefile_ps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_ps_la_LIBADD = $(LIB_KIO) ../../kghostview/libdscparse.la
 
 gsthumbnail_la_SOURCES = gscreator.cpp
 gsthumbnail_la_LIBADD = $(LIB_TDECORE) ../../kghostview/libdscparse.la
@@ -20,7 +20,7 @@ gsthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 METASOURCES = AUTO
 
 messages: 
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_ps.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_ps.pot
 
-services_DATA = kfile_ps.desktop gsthumbnail.desktop
+services_DATA = tdefile_ps.desktop gsthumbnail.desktop
 servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/ps/gscreator.cpp b/tdefile-plugins/ps/gscreator.cpp
similarity index 100%
rename from kfile-plugins/ps/gscreator.cpp
rename to tdefile-plugins/ps/gscreator.cpp
diff --git a/kfile-plugins/ps/gscreator.h b/tdefile-plugins/ps/gscreator.h
similarity index 97%
rename from kfile-plugins/ps/gscreator.h
rename to tdefile-plugins/ps/gscreator.h
index 7139b233..b155bfa7 100644
--- a/kfile-plugins/ps/gscreator.h
+++ b/tdefile-plugins/ps/gscreator.h
@@ -20,7 +20,7 @@
 #ifndef _GSCREATOR_H_
 #define _GSCREATOR_H_
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 #include "dscparse_adapter.h"
 
 class GSCreator : public ThumbCreator, public KDSCCommentHandler
diff --git a/kfile-plugins/ps/gsthumbnail.desktop b/tdefile-plugins/ps/gsthumbnail.desktop
similarity index 100%
rename from kfile-plugins/ps/gsthumbnail.desktop
rename to tdefile-plugins/ps/gsthumbnail.desktop
diff --git a/kfile-plugins/ps/kfile_ps.cpp b/tdefile-plugins/ps/tdefile_ps.cpp
similarity index 96%
rename from kfile-plugins/ps/kfile_ps.cpp
rename to tdefile-plugins/ps/tdefile_ps.cpp
index 01136d88..87161176 100644
--- a/kfile-plugins/ps/kfile_ps.cpp
+++ b/tdefile-plugins/ps/tdefile_ps.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include "kfile_ps.h"
+#include "tdefile_ps.h"
 
 #include <tqfile.h>
 
@@ -28,7 +28,7 @@
 
 typedef KGenericFactory<KPSPlugin> PSFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_ps, PSFactory("kfile_ps"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_ps, PSFactory("tdefile_ps"))
 
 KPSPlugin::KPSPlugin(TQObject *parent, const char *name,
                        const TQStringList &preferredItems) : 
@@ -120,5 +120,5 @@ void KPSPlugin::comment( Name name )
     }
 }
 
-#include "kfile_ps.moc"
+#include "tdefile_ps.moc"
 
diff --git a/kfile-plugins/ps/kfile_ps.desktop b/tdefile-plugins/ps/tdefile_ps.desktop
similarity index 98%
rename from kfile-plugins/ps/kfile_ps.desktop
rename to tdefile-plugins/ps/tdefile_ps.desktop
index 9c23026d..ec863b8a 100644
--- a/kfile-plugins/ps/kfile_ps.desktop
+++ b/tdefile-plugins/ps/tdefile_ps.desktop
@@ -61,6 +61,6 @@ Name[zh_HK]=PostScript 資訊
 Name[zh_TW]=PostScript 資訊
 Name[zu]=Ulwazi Lwesi-PostScript
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_ps
+X-TDE-Library=tdefile_ps
 MimeType=application/postscript;image/x-eps
 PreferredItems=Title,Creator,CreationDate,For,Pages
diff --git a/kfile-plugins/ps/kfile_ps.h b/tdefile-plugins/ps/tdefile_ps.h
similarity index 97%
rename from kfile-plugins/ps/kfile_ps.h
rename to tdefile-plugins/ps/tdefile_ps.h
index a1d3ebee..1b095bdc 100644
--- a/kfile-plugins/ps/kfile_ps.h
+++ b/tdefile-plugins/ps/tdefile_ps.h
@@ -21,7 +21,7 @@
 #ifndef __KFILE_PS_H__
 #define __KFILE_PS_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #include "dscparse_adapter.h"
 
diff --git a/kfile-plugins/raw/CMakeLists.txt b/tdefile-plugins/raw/CMakeLists.txt
similarity index 75%
rename from kfile-plugins/raw/CMakeLists.txt
rename to tdefile-plugins/raw/CMakeLists.txt
index 9f7aa544..80810e07 100644
--- a/kfile-plugins/raw/CMakeLists.txt
+++ b/tdefile-plugins/raw/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_raw.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_raw.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_raw (module) #########################
+#### tdefile_raw (module) #########################
 
-tde_add_kpart( kfile_raw AUTOMOC
+tde_add_kpart( tdefile_raw AUTOMOC
   SOURCES kcamerarawplugin.cpp parse.c
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kfile-plugins/raw/Makefile.am b/tdefile-plugins/raw/Makefile.am
similarity index 58%
rename from kfile-plugins/raw/Makefile.am
rename to tdefile-plugins/raw/Makefile.am
index c68309bc..196aa4bd 100644
--- a/kfile-plugins/raw/Makefile.am
+++ b/tdefile-plugins/raw/Makefile.am
@@ -6,14 +6,14 @@ INCLUDES         = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = kcamerarawplugin.h
 
-kde_module_LTLIBRARIES = kfile_raw.la
+kde_module_LTLIBRARIES = tdefile_raw.la
 
-kfile_raw_la_SOURCES = kcamerarawplugin.cpp parse.c
-kfile_raw_la_LIBADD = $(LIB_KIO) 
-kfile_raw_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_raw_la_SOURCES = kcamerarawplugin.cpp parse.c
+tdefile_raw_la_LIBADD = $(LIB_KIO) 
+tdefile_raw_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
-services_DATA = kfile_raw.desktop
+services_DATA = tdefile_raw.desktop
 servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/raw/kcamerarawplugin.cpp b/tdefile-plugins/raw/kcamerarawplugin.cpp
similarity index 98%
rename from kfile-plugins/raw/kcamerarawplugin.cpp
rename to tdefile-plugins/raw/kcamerarawplugin.cpp
index 8a0b0ce8..a7a0cb27 100644
--- a/kfile-plugins/raw/kcamerarawplugin.cpp
+++ b/tdefile-plugins/raw/kcamerarawplugin.cpp
@@ -36,7 +36,7 @@
 
 typedef KGenericFactory<KCameraRawPlugin> RawFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_raw, RawFactory("kfile_raw"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_raw, RawFactory("tdefile_raw"))
 
 #ifndef KDE_EXPORT
 # define KDE_EXPORT
diff --git a/kfile-plugins/raw/kcamerarawplugin.h b/tdefile-plugins/raw/kcamerarawplugin.h
similarity index 97%
rename from kfile-plugins/raw/kcamerarawplugin.h
rename to tdefile-plugins/raw/kcamerarawplugin.h
index c1a172ae..d16446e8 100644
--- a/kfile-plugins/raw/kcamerarawplugin.h
+++ b/tdefile-plugins/raw/kcamerarawplugin.h
@@ -20,7 +20,7 @@
 #ifndef KCAMERARAWPLUGIN_H
 #define KCAMERARAWPLUGIN_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQImage;
 
diff --git a/kfile-plugins/raw/parse.c b/tdefile-plugins/raw/parse.c
similarity index 100%
rename from kfile-plugins/raw/parse.c
rename to tdefile-plugins/raw/parse.c
diff --git a/kfile-plugins/raw/kfile_raw.desktop b/tdefile-plugins/raw/tdefile_raw.desktop
similarity index 98%
rename from kfile-plugins/raw/kfile_raw.desktop
rename to tdefile-plugins/raw/tdefile_raw.desktop
index e56cc4f0..cb9b2a14 100644
--- a/kfile-plugins/raw/kfile_raw.desktop
+++ b/tdefile-plugins/raw/tdefile_raw.desktop
@@ -48,6 +48,6 @@ Name[zh_HK]=RAW 相機檔案
 Name[zh_TW]=原始相機檔
 ServiceTypes=KFilePlugin
 MimeType=image/x-raw
-X-TDE-Library=kfile_raw
+X-TDE-Library=tdefile_raw
 CacheThumbnail=false
 SupportsThumbnail=true
diff --git a/tdefile-plugins/rgb/CMakeLists.txt b/tdefile-plugins/rgb/CMakeLists.txt
new file mode 100644
index 00000000..7596f2cb
--- /dev/null
+++ b/tdefile-plugins/rgb/CMakeLists.txt
@@ -0,0 +1,35 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+#### other data #################################
+
+install( FILES tdefile_rgb.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+#### tdefile_rgb (module) #########################
+
+tde_add_kpart( tdefile_rgb AUTOMOC
+  SOURCES tdefile_rgb.cpp
+  LINK tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdefile-plugins/rgb/Makefile.am b/tdefile-plugins/rgb/Makefile.am
new file mode 100644
index 00000000..aab98d29
--- /dev/null
+++ b/tdefile-plugins/rgb/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for rgb 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_rgb.h
+
+kde_module_LTLIBRARIES = tdefile_rgb.la
+
+tdefile_rgb_la_SOURCES = tdefile_rgb.cpp
+tdefile_rgb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_rgb_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_rgb.cpp -o $(podir)/tdefile_rgb.pot
+
+services_DATA = tdefile_rgb.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/tdefile-plugins/rgb/tdefile_rgb.cpp
similarity index 97%
rename from kfile-plugins/rgb/kfile_rgb.cpp
rename to tdefile-plugins/rgb/tdefile_rgb.cpp
index ffcad0b5..e503e438 100644
--- a/kfile-plugins/rgb/kfile_rgb.cpp
+++ b/tdefile-plugins/rgb/tdefile_rgb.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_rgb.h"
+#include "tdefile_rgb.h"
 
 #include <tqfile.h>
 #include <tqvalidator.h>
@@ -29,7 +29,7 @@
 
 typedef KGenericFactory<KRgbPlugin> RgbFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_rgb, RgbFactory("kfile_rgb"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_rgb, RgbFactory("tdefile_rgb"))
 
 
 KRgbPlugin::KRgbPlugin(TQObject *parent, const char *name, const TQStringList &args) :
@@ -205,4 +205,4 @@ TQValidator* KRgbPlugin::createValidator(const TQString&, const TQString &,
 }
 
 
-#include "kfile_rgb.moc"
+#include "tdefile_rgb.moc"
diff --git a/kfile-plugins/rgb/kfile_rgb.desktop b/tdefile-plugins/rgb/tdefile_rgb.desktop
similarity index 98%
rename from kfile-plugins/rgb/kfile_rgb.desktop
rename to tdefile-plugins/rgb/tdefile_rgb.desktop
index 524de909..9edecac8 100644
--- a/kfile-plugins/rgb/kfile_rgb.desktop
+++ b/tdefile-plugins/rgb/tdefile_rgb.desktop
@@ -55,7 +55,7 @@ Name[zh_CN]=SGI 图像(RGB)
 Name[zh_HK]=SGI 圖像 (RGB)
 Name[zh_TW]=SGI 影像（RGB）
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_rgb
+X-TDE-Library=tdefile_rgb
 MimeType=image/x-rgb
 PreferredGroups=Comment,Technical
 PreferredItems=Dimensions,BitDepth,ColorMode,Compression,SharedRows,ImageName
diff --git a/kfile-plugins/rgb/kfile_rgb.h b/tdefile-plugins/rgb/tdefile_rgb.h
similarity index 97%
rename from kfile-plugins/rgb/kfile_rgb.h
rename to tdefile-plugins/rgb/tdefile_rgb.h
index 9d07f10b..6a4e0ae2 100644
--- a/kfile-plugins/rgb/kfile_rgb.h
+++ b/tdefile-plugins/rgb/tdefile_rgb.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_RGB_H__
 #define __KFILE_RGB_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/tdefile-plugins/tga/CMakeLists.txt b/tdefile-plugins/tga/CMakeLists.txt
new file mode 100644
index 00000000..7040c7ca
--- /dev/null
+++ b/tdefile-plugins/tga/CMakeLists.txt
@@ -0,0 +1,35 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+#### other data #################################
+
+install( FILES tdefile_tga.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+#### tdefile_tga (module) #########################
+
+tde_add_kpart( tdefile_tga AUTOMOC
+  SOURCES tdefile_tga.cpp
+  LINK tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdefile-plugins/tga/Makefile.am b/tdefile-plugins/tga/Makefile.am
new file mode 100644
index 00000000..5aad4b7e
--- /dev/null
+++ b/tdefile-plugins/tga/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for tga 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_tga.h
+
+kde_module_LTLIBRARIES = tdefile_tga.la
+
+tdefile_tga_la_SOURCES = tdefile_tga.cpp 
+tdefile_tga_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_tga_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_tga.cpp -o $(podir)/tdefile_tga.pot
+
+services_DATA = tdefile_tga.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/tga/kfile_tga.cpp b/tdefile-plugins/tga/tdefile_tga.cpp
similarity index 97%
rename from kfile-plugins/tga/kfile_tga.cpp
rename to tdefile-plugins/tga/tdefile_tga.cpp
index b102deb6..36fad13c 100644
--- a/kfile-plugins/tga/kfile_tga.cpp
+++ b/tdefile-plugins/tga/tdefile_tga.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_tga.h"
+#include "tdefile_tga.h"
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -42,7 +42,7 @@ typedef unsigned char uint8_t;
 
 typedef KGenericFactory<KTgaPlugin> TgaFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_tga, TgaFactory( "kfile_tga" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_tga, TgaFactory( "tdefile_tga" ))
 
 KTgaPlugin::KTgaPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -162,4 +162,4 @@ bool KTgaPlugin::readInfo( KFileMetaInfo& info, uint what)
     return true;
 }
 
-#include "kfile_tga.moc"
+#include "tdefile_tga.moc"
diff --git a/kfile-plugins/tga/kfile_tga.desktop b/tdefile-plugins/tga/tdefile_tga.desktop
similarity index 98%
rename from kfile-plugins/tga/kfile_tga.desktop
rename to tdefile-plugins/tga/tdefile_tga.desktop
index c581e5ff..30a45faf 100644
--- a/kfile-plugins/tga/kfile_tga.desktop
+++ b/tdefile-plugins/tga/tdefile_tga.desktop
@@ -58,7 +58,7 @@ Name[zh_HK]=Truevision Targa 資訊
 Name[zh_TW]=Truevision Targa 資訊
 Name[zu]=Ulwazi lwe-Truevision Targa
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_tga
+X-TDE-Library=tdefile_tga
 MimeType=image/x-targa
 PreferredGroups=Technical
 PreferredItems=Dimensions,BitDepth,ColorMode,Compression
diff --git a/kfile-plugins/tga/kfile_tga.h b/tdefile-plugins/tga/tdefile_tga.h
similarity index 97%
rename from kfile-plugins/tga/kfile_tga.h
rename to tdefile-plugins/tga/tdefile_tga.h
index f98229df..68b0ae1d 100644
--- a/kfile-plugins/tga/kfile_tga.h
+++ b/tdefile-plugins/tga/tdefile_tga.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_TGA_H__
 #define __KFILE_TGA_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kfile-plugins/tiff/CMakeLists.txt b/tdefile-plugins/tiff/CMakeLists.txt
similarity index 70%
rename from kfile-plugins/tiff/CMakeLists.txt
rename to tdefile-plugins/tiff/CMakeLists.txt
index 9cc70ef0..d3ec9b90 100644
--- a/kfile-plugins/tiff/CMakeLists.txt
+++ b/tdefile-plugins/tiff/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_tiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_tiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_tiff (module) ########################
+#### tdefile_tiff (module) ########################
 
-tde_add_kpart( kfile_tiff AUTOMOC
-  SOURCES kfile_tiff.cpp
-  LINK kio-shared ${TIFF_LIBRARY}
+tde_add_kpart( tdefile_tiff AUTOMOC
+  SOURCES tdefile_tiff.cpp
+  LINK tdeio-shared ${TIFF_LIBRARY}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kfile-plugins/tiff/ConfigureChecks.cmake b/tdefile-plugins/tiff/ConfigureChecks.cmake
similarity index 100%
rename from kfile-plugins/tiff/ConfigureChecks.cmake
rename to tdefile-plugins/tiff/ConfigureChecks.cmake
diff --git a/tdefile-plugins/tiff/Makefile.am b/tdefile-plugins/tiff/Makefile.am
new file mode 100644
index 00000000..9807a66c
--- /dev/null
+++ b/tdefile-plugins/tiff/Makefile.am
@@ -0,0 +1,21 @@
+## Makefile.am for Tiff file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+noinst_HEADERS   = tdefile_tiff.h
+
+kde_module_LTLIBRARIES = tdefile_tiff.la
+
+tdefile_tiff_la_SOURCES = tdefile_tiff.cpp
+tdefile_tiff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_tiff_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_tiff.pot
+
+services_DATA = tdefile_tiff.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/tiff/configure.in.in b/tdefile-plugins/tiff/configure.in.in
similarity index 100%
rename from kfile-plugins/tiff/configure.in.in
rename to tdefile-plugins/tiff/configure.in.in
diff --git a/kfile-plugins/tiff/kfile_tiff.cpp b/tdefile-plugins/tiff/tdefile_tiff.cpp
similarity index 98%
rename from kfile-plugins/tiff/kfile_tiff.cpp
rename to tdefile-plugins/tiff/tdefile_tiff.cpp
index ce55e5b3..dfd813a5 100644
--- a/kfile-plugins/tiff/kfile_tiff.cpp
+++ b/tdefile-plugins/tiff/tdefile_tiff.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "kfile_tiff.h"
+#include "tdefile_tiff.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
@@ -32,7 +32,7 @@
 
 typedef KGenericFactory<KTiffPlugin> TiffFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_tiff, TiffFactory("kfile_tiff"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_tiff, TiffFactory("tdefile_tiff"))
 
 KTiffPlugin::KTiffPlugin(TQObject *parent, const char *name,
         const TQStringList &args) : KFilePlugin(parent, name, args)
@@ -296,4 +296,4 @@ bool KTiffPlugin::readInfo(KFileMetaInfo& info, uint)
     return true;
 }
 
-#include "kfile_tiff.moc"
+#include "tdefile_tiff.moc"
diff --git a/kfile-plugins/tiff/kfile_tiff.desktop b/tdefile-plugins/tiff/tdefile_tiff.desktop
similarity index 98%
rename from kfile-plugins/tiff/kfile_tiff.desktop
rename to tdefile-plugins/tiff/tdefile_tiff.desktop
index 52efbfb6..1309e3a3 100644
--- a/kfile-plugins/tiff/kfile_tiff.desktop
+++ b/tdefile-plugins/tiff/tdefile_tiff.desktop
@@ -61,7 +61,7 @@ Name[zh_HK]=TIFF 檔案 Meta 資訊
 Name[zh_TW]=TIFF 檔案 Meta 資訊
 Name[zu]=Ulwazi Lwefayela yemeta ye-TIFF
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_tiff
+X-TDE-Library=tdefile_tiff
 MimeType=image/tiff
 PreferredGroups=General,Scanner
 PreferredItems=Description,Copyright,Type,Dimensions,Resolution,BitDepth,Compression,Software,DateTime,Artist,FaxPages,Make,Model
diff --git a/kfile-plugins/tiff/kfile_tiff.h b/tdefile-plugins/tiff/tdefile_tiff.h
similarity index 97%
rename from kfile-plugins/tiff/kfile_tiff.h
rename to tdefile-plugins/tiff/tdefile_tiff.h
index 6bd87756..e34eef25 100644
--- a/kfile-plugins/tiff/kfile_tiff.h
+++ b/tdefile-plugins/tiff/tdefile_tiff.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_TIFF_H_
 #define __KFILE_TIFF_H_
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #include <tqintdict.h>
 
diff --git a/kfile-plugins/pcx/CMakeLists.txt b/tdefile-plugins/xbm/CMakeLists.txt
similarity index 71%
rename from kfile-plugins/pcx/CMakeLists.txt
rename to tdefile-plugins/xbm/CMakeLists.txt
index efabc58e..4b96ade8 100644
--- a/kfile-plugins/pcx/CMakeLists.txt
+++ b/tdefile-plugins/xbm/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_pcx.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_xbm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_pcx (module) #########################
+#### tdefile_xbm (module) ########################
 
-tde_add_kpart( kfile_pcx AUTOMOC
-  SOURCES kfile_pcx.cpp
-  LINK kio-shared
+tde_add_kpart( tdefile_xbm AUTOMOC
+  SOURCES tdefile_xbm.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdefile-plugins/xbm/Makefile.am b/tdefile-plugins/xbm/Makefile.am
new file mode 100644
index 00000000..90abdc8e
--- /dev/null
+++ b/tdefile-plugins/xbm/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for xbm 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_xbm.h
+
+kde_module_LTLIBRARIES = tdefile_xbm.la
+
+tdefile_xbm_la_SOURCES = tdefile_xbm.cpp 
+tdefile_xbm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_xbm_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_xbm.cpp -o $(podir)/tdefile_xbm.pot
+
+services_DATA = tdefile_xbm.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kfile-plugins/xbm/kfile_xbm.cpp b/tdefile-plugins/xbm/tdefile_xbm.cpp
similarity index 96%
rename from kfile-plugins/xbm/kfile_xbm.cpp
rename to tdefile-plugins/xbm/tdefile_xbm.cpp
index 2d246c97..d4871d6f 100644
--- a/kfile-plugins/xbm/kfile_xbm.cpp
+++ b/tdefile-plugins/xbm/tdefile_xbm.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_xbm.h"
+#include "tdefile_xbm.h"
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -40,7 +40,7 @@ typedef unsigned short uint32_t;
 
 typedef KGenericFactory<KXbmPlugin> XbmFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_xbm, XbmFactory( "kfile_xbm" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_xbm, XbmFactory( "tdefile_xbm" ))
 
 KXbmPlugin::KXbmPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -125,4 +125,4 @@ bool KXbmPlugin::readInfo( KFileMetaInfo& info, uint what)
     return false;
 }
 
-#include "kfile_xbm.moc"
+#include "tdefile_xbm.moc"
diff --git a/kfile-plugins/xbm/kfile_xbm.desktop b/tdefile-plugins/xbm/tdefile_xbm.desktop
similarity index 98%
rename from kfile-plugins/xbm/kfile_xbm.desktop
rename to tdefile-plugins/xbm/tdefile_xbm.desktop
index 127a5c9d..76102cea 100644
--- a/kfile-plugins/xbm/kfile_xbm.desktop
+++ b/tdefile-plugins/xbm/tdefile_xbm.desktop
@@ -59,7 +59,7 @@ Name[zh_HK]=XBM 資訊
 Name[zh_TW]=XBM 資訊
 Name[zu]=Ulwazi lwe-XBM
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_xbm
+X-TDE-Library=tdefile_xbm
 MimeType=image/x-xbm
 PreferredGroups=Technical
 PreferredItems=Resolution
diff --git a/kfile-plugins/xbm/kfile_xbm.h b/tdefile-plugins/xbm/tdefile_xbm.h
similarity index 97%
rename from kfile-plugins/xbm/kfile_xbm.h
rename to tdefile-plugins/xbm/tdefile_xbm.h
index cf4450ef..5e7f6429 100644
--- a/kfile-plugins/xbm/kfile_xbm.h
+++ b/tdefile-plugins/xbm/tdefile_xbm.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_XBM_H__
 #define __KFILE_XBM_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/tdefile-plugins/xpm/CMakeLists.txt b/tdefile-plugins/xpm/CMakeLists.txt
new file mode 100644
index 00000000..5b357416
--- /dev/null
+++ b/tdefile-plugins/xpm/CMakeLists.txt
@@ -0,0 +1,35 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+#### other data #################################
+
+install( FILES tdefile_xpm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+#### tdefile_xpm (module) #########################
+
+tde_add_kpart( tdefile_xpm AUTOMOC
+  SOURCES tdefile_xpm.cpp
+  LINK tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdefile-plugins/xpm/Makefile.am b/tdefile-plugins/xpm/Makefile.am
new file mode 100644
index 00000000..3a32555e
--- /dev/null
+++ b/tdefile-plugins/xpm/Makefile.am
@@ -0,0 +1,21 @@
+## Makefile.am for xpm file meta info plugin
+
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_xpm.h
+
+kde_module_LTLIBRARIES = tdefile_xpm.la
+
+tdefile_xpm_la_SOURCES = tdefile_xpm.cpp
+tdefile_xpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_xpm_la_LIBADD = $(LIB_KIO)
+tdefile_xpm_la_METASOURCES = tdefile_xpm.moc
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+kde_services_DATA = tdefile_xpm.desktop
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_xpm.pot
diff --git a/kfile-plugins/xpm/kfile_xpm.cpp b/tdefile-plugins/xpm/tdefile_xpm.cpp
similarity index 95%
rename from kfile-plugins/xpm/kfile_xpm.cpp
rename to tdefile-plugins/xpm/tdefile_xpm.cpp
index a121a359..46b07e51 100644
--- a/kfile-plugins/xpm/kfile_xpm.cpp
+++ b/tdefile-plugins/xpm/tdefile_xpm.cpp
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <tqimage.h>
-#include "kfile_xpm.h"
+#include "tdefile_xpm.h"
 
 #include <kgenericfactory.h>
 
@@ -28,7 +28,7 @@
 
 typedef KGenericFactory<xpmPlugin> xpmFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_xpm, xpmFactory( "kfile_xpm" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_xpm, xpmFactory( "tdefile_xpm" ))
 
 //--------------------------------------------------------------------------------
 
@@ -68,4 +68,4 @@ bool xpmPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
   return true;
 }
 
-#include "kfile_xpm.moc"
+#include "tdefile_xpm.moc"
diff --git a/kfile-plugins/xpm/kfile_xpm.desktop b/tdefile-plugins/xpm/tdefile_xpm.desktop
similarity index 98%
rename from kfile-plugins/xpm/kfile_xpm.desktop
rename to tdefile-plugins/xpm/tdefile_xpm.desktop
index d5ce55db..43c18514 100644
--- a/kfile-plugins/xpm/kfile_xpm.desktop
+++ b/tdefile-plugins/xpm/tdefile_xpm.desktop
@@ -47,7 +47,7 @@ Name[zh_CN]=XPM 信息
 Name[zh_HK]=XPM 資訊
 Name[zh_TW]=XPM 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_xpm
+X-TDE-Library=tdefile_xpm
 MimeType=image/x-xpm
 PreferredGroups=xpmInfo
 PreferredItems=Dimension
diff --git a/kfile-plugins/xpm/kfile_xpm.h b/tdefile-plugins/xpm/tdefile_xpm.h
similarity index 94%
rename from kfile-plugins/xpm/kfile_xpm.h
rename to tdefile-plugins/xpm/tdefile_xpm.h
index ef05e9b5..275d3dd7 100644
--- a/kfile-plugins/xpm/kfile_xpm.h
+++ b/tdefile-plugins/xpm/tdefile_xpm.h
@@ -25,9 +25,9 @@
 #define KFILE_XPM_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;