diff --git a/README b/README
index 6aa648d..30a8f76 100644
--- a/README
+++ b/README
@@ -71,7 +71,7 @@ Plugins for Konqueror
 * domtreeviewer: display the document object model (DOM) in a dialog box
 * fsview: Graphical Disk Usage KPart for inode/directory, only for local files.
 * imagerotation: servicemenu for image rotation and conversion
-* khtmlsettingsplugin: to quickly enable/disble Javascript, Java, Cache etc
+* tdehtmlsettingsplugin: to quickly enable/disble Javascript, Java, Cache etc
 * kimgalleryplugin: Konqueror as file manager creates HTML files with a 
                     gallery of graphics file
 * kuick: allows to select a bunch of files and copy and move them really quick
diff --git a/atlantikdesigner/Makefile.am b/atlantikdesigner/Makefile.am
index 982e1e8..62c6f13 100644
--- a/atlantikdesigner/Makefile.am
+++ b/atlantikdesigner/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = $(all_includes)
-LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 LDADD = $(LIB_KSYCOCA) $(LIB_KFILE)
 
 SUBDIRS = designer pics
diff --git a/atlantikdesigner/designer/Makefile.am b/atlantikdesigner/designer/Makefile.am
index d5a5086..edd407b 100644
--- a/atlantikdesigner/designer/Makefile.am
+++ b/atlantikdesigner/designer/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = atlantikdesigner
 INCLUDES = -I$(kde_includes)/atlantic $(all_includes) -I$(kde_includes)/tde
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -latlantic
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -latlantic
 LDADD = -latlantikui -ltdegames $(LIB_KIO) 
 
 SUBDIRS = 
diff --git a/doc/konq-plugins/index.docbook b/doc/konq-plugins/index.docbook
index e009783..edc5c28 100644
--- a/doc/konq-plugins/index.docbook
+++ b/doc/konq-plugins/index.docbook
@@ -102,7 +102,7 @@ Validators</ulink></para>
 Filter</ulink></para>
 </listitem>
 <listitem>
-<para><ulink url="help:/konq-plugins/khtmlsettings/index.html">KHTMLSettings</ulink></para>
+<para><ulink url="help:/konq-plugins/tdehtmlsettings/index.html">KHTMLSettings</ulink></para>
 </listitem>
 <listitem>
 <para><ulink url="help:/konq-plugins/uachanger/index.html">The User Agent Changer</ulink></para>
diff --git a/doc/konq-plugins/khtmlsettings/Makefile.am b/doc/konq-plugins/khtmlsettings/Makefile.am
deleted file mode 100644
index 047e57d..0000000
--- a/doc/konq-plugins/khtmlsettings/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = $(AUTODIRS)
-
-KDE_LANG = en
-KDE_DOCS = konq-plugins/khtmlsettings
-
-
diff --git a/doc/konq-plugins/tdehtmlsettings/Makefile.am b/doc/konq-plugins/tdehtmlsettings/Makefile.am
new file mode 100644
index 0000000..8e07593
--- /dev/null
+++ b/doc/konq-plugins/tdehtmlsettings/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = $(AUTODIRS)
+
+KDE_LANG = en
+KDE_DOCS = konq-plugins/tdehtmlsettings
+
+
diff --git a/doc/konq-plugins/khtmlsettings/index.docbook b/doc/konq-plugins/tdehtmlsettings/index.docbook
similarity index 99%
rename from doc/konq-plugins/khtmlsettings/index.docbook
rename to doc/konq-plugins/tdehtmlsettings/index.docbook
index 3b3bdc4..ba91f0a 100644
--- a/doc/konq-plugins/khtmlsettings/index.docbook
+++ b/doc/konq-plugins/tdehtmlsettings/index.docbook
@@ -7,7 +7,7 @@
 
 <article lang="&language;">
 
-<sect1 id="khtmlsettings">
+<sect1 id="tdehtmlsettings">
 <sect1info>
 
 <authorgroup>
diff --git a/kate/filetemplates/plugin/Makefile.am b/kate/filetemplates/plugin/Makefile.am
index 7963916..826ca4b 100644
--- a/kate/filetemplates/plugin/Makefile.am
+++ b/kate/filetemplates/plugin/Makefile.am
@@ -9,7 +9,7 @@ subdirs=src templates
 kde_module_LTLIBRARIES = katefiletemplates.la
 
 katefiletemplates_la_SOURCES = filetemplates.cpp
-katefiletemplates_la_LIBADD = -lkateinterfaces -lktexteditor $(LIB_KNEWSTUFF)
+katefiletemplates_la_LIBADD = -lkateinterfaces -ltdetexteditor $(LIB_KNEWSTUFF)
 katefiletemplates_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir = $(kde_datadir)/kate/plugins/katefiletemplates
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index e1c35be..0be3393 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -67,7 +67,7 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <ktexteditor/templateinterface.h>
+#include <tdetexteditor/templateinterface.h>
 //END Includes
 
 //BEGIN plugin + factory stuff
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index 327f903..ca95595 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -26,7 +26,7 @@
 #include <cassert>
 #include <kdebug.h>
 #include <tqstring.h>
-#include <ktexteditor/editinterfaceext.h>
+#include <tdetexteditor/editinterfaceext.h>
 #include <kapplication.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 3e044e6..913dbf8 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -977,9 +977,9 @@
 <entity name="nbsp" type="gen">
 <text-expanded>&amp;#x00A0;</text-expanded>
 </entity>
-<entity name="tkmidi" type="gen">
+<entity name="ttdemidi" type="gen">
 <text-expanded>
-<application>tkmidi</application>
+<application>ttdemidi</application>
 </text-expanded>
 </entity>
 <entity name="b.tau" type="gen">
@@ -1246,7 +1246,7 @@
 <entity name="tstrok" type="gen">
 <text-expanded>&amp;#x0167;</text-expanded>
 </entity>
-<entity name="kscreensaver" type="gen">
+<entity name="tdescreensaver" type="gen">
 <text-expanded>
 <application>KScreensaver</application>
 </text-expanded>
@@ -2523,7 +2523,7 @@
 <entity name="gdot" type="gen">
 <text-expanded>&amp;#x0121;</text-expanded>
 </entity>
-<entity name="kspell" type="gen">
+<entity name="tdespell" type="gen">
 <text-expanded>
 <application>KSpell</application>
 </text-expanded>
@@ -2948,7 +2948,7 @@
 <application>kwm</application>
 </text-expanded>
 </entity>
-<entity name="kmidi" type="gen">
+<entity name="tdemidi" type="gen">
 <text-expanded>
 <application>KMidi</application>
 </text-expanded>
@@ -3406,9 +3406,9 @@
 <entity name="equiv" type="gen">
 <text-expanded>&amp;#x2261;</text-expanded>
 </entity>
-<entity name="kmid" type="gen">
+<entity name="tdemid" type="gen">
 <text-expanded>
-<application>kmid</application>
+<application>tdemid</application>
 </text-expanded>
 </entity>
 <entity name="Backspace" type="gen">
diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h
index 56fff4e..6cf5728 100644
--- a/kate/xmltools/plugin_katexmltools.h
+++ b/kate/xmltools/plugin_katexmltools.h
@@ -39,7 +39,7 @@
 #include <kate/mainwindow.h>
 #include <kate/viewmanager.h>
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 #include <kcombobox.h>
 #include <kdialog.h>
diff --git a/kfile-plugins/lnk/Makefile.am b/kfile-plugins/lnk/Makefile.am
index 4e345c2..b8262b1 100644
--- a/kfile-plugins/lnk/Makefile.am
+++ b/kfile-plugins/lnk/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = lnkforward
 
 lnkforward_SOURCES = lnkforward.cpp
 lnkforward_LDADD = $(LIB_TDECORE) $(LIB_KIO)
-lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 lnkforward_METASOURCES = lnkforward.moc
 
 lnkforward_DATA = lnkforward.desktop
diff --git a/konq-plugins/Makefile.am b/konq-plugins/Makefile.am
index fd50180..1e7e7d5 100644
--- a/konq-plugins/Makefile.am
+++ b/konq-plugins/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = adblock crashes khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
+SUBDIRS = adblock crashes tdehtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
           babelfish validators domtreeviewer webarchiver sidebar kuick \
 	  imagerotation minitools microformat autorefresh fsview searchbar \
 	  arkplugin akregator rellinks mediarealfolder rsync
diff --git a/konq-plugins/README b/konq-plugins/README
index 5ab9b1b..cca458b 100644
--- a/konq-plugins/README
+++ b/konq-plugins/README
@@ -27,7 +27,7 @@ cssvalidator
 This works on KHTMLPart.  It uses the w3c HTML validator to validate
 the current page.  This is very handy when debugging Cascading Style Sheets.
 
-khtmlsettingsplugin
+tdehtmlsettingsplugin
 -------------------
 This works on KHTMLPart.  This allows you to enable or disable a bunch
 of HTML settings without going through the settings dialog.
@@ -55,7 +55,7 @@ and provides two menus items to smbmount/umount the current samba share.
 autorefresh
 -------------------
 This works on any readonly part (though currently it only plugs into
-khtmlpart). It lets you tell konqueror to refresh a page automatically
+tdehtmlpart). It lets you tell konqueror to refresh a page automatically
 after a specific period. This is useful for things like news pages,
 and should be very nice for people using kiosk mode.
 
diff --git a/konq-plugins/adblock/Makefile.am b/konq-plugins/adblock/Makefile.am
index 47c4074..da54f2b 100644
--- a/konq-plugins/adblock/Makefile.am
+++ b/konq-plugins/adblock/Makefile.am
@@ -8,7 +8,7 @@ libadblock_la_SOURCES = adblock.cpp adblockdialogue.cpp
 libadblock_la_LIBADD = $(LIB_KHTML) -lkonq
 libadblock_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_adblock.rc plugin_adblock.desktop
 
 messages: rc.cpp
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index c07a2c1..eff9c78 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -27,9 +27,9 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klibloader.h>
-#include <kparts/statusbarextension.h>
-#include <khtml_part.h>
-#include <khtml_settings.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdehtml_part.h>
+#include <tdehtml_settings.h>
 #include <kstatusbar.h>
 #include <kurllabel.h>
 #include <kdialogbase.h>
@@ -129,7 +129,7 @@ void AdBlock::showDialogue()
 void AdBlock::showTDECModule()
 {
     KCMultiDialog* dialogue = new KCMultiDialog(m_part->widget());
-    dialogue->addModule("khtml_filter");
+    dialogue->addModule("tdehtml_filter");
     connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() ));
     connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() ));
     dialogue->show();
diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h
index 391934c..4293169 100644
--- a/konq-plugins/adblock/adblock.h
+++ b/konq-plugins/adblock/adblock.h
@@ -23,7 +23,7 @@
 
 #include <tqguardedptr.h>
 #include <tqvaluelist.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KHTMLPart;
 class KURLLabel;
diff --git a/konq-plugins/akregator/Makefile.am b/konq-plugins/akregator/Makefile.am
index c6964d1..1be20ad 100644
--- a/konq-plugins/akregator/Makefile.am
+++ b/konq-plugins/akregator/Makefile.am
@@ -15,7 +15,7 @@ libakregatorkonqfeedicon_la_LDFLAGS = -module $(KDE_PLUGIN) -avoid-version -no-u
 
 konqplugindir   = $(kde_servicesdir)
 konqplugin_DATA = akregator_konqplugin.desktop
-konqfeedicondir = $(kde_datadir)/khtml/kpartplugins
+konqfeedicondir = $(kde_datadir)/tdehtml/kpartplugins
 konqfeedicon_DATA = akregator_konqfeedicon.desktop akregator_konqfeedicon.rc
 
 rssicondir = $(kde_datadir)/akregator/pics
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index 11d6f6c..6c4d0ff 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -34,8 +34,8 @@
 #include <kpopupmenu.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kmessagebox.h>
 
 #include <tqdir.h>
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index dd8a8c5..07006b6 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -30,11 +30,11 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
@@ -62,7 +62,7 @@ KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringLis
 
     m_part = dynamic_cast<KHTMLPart*>(parent);
     if(!m_part) { kdDebug() << "couldn't get part" << endl; return; }
-    // FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?)
+    // FIXME: need to do this because of a bug in tdehtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?)
     //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon()));
     TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad()));
 }
@@ -154,7 +154,7 @@ void KonqFeedIcon::addFeedIcon()
 
     m_feedIcon = new KURLLabel(m_statusBarEx->statusBar());
 
-    // from khtmlpart's ualabel
+    // from tdehtmlpart's ualabel
     m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
     m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     m_feedIcon->setUseCursor(false);
diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h
index b4152e0..3bcaa38 100644
--- a/konq-plugins/akregator/konqfeedicon.h
+++ b/konq-plugins/akregator/konqfeedicon.h
@@ -26,7 +26,7 @@
 #define KONTQFEEDICON_H
 
 #include <tqguardedptr.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kpopupmenu.h>
 #include "feeddetector.h"
 #include "pluginbase.h"
diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp
index eb590eb..57fd966 100644
--- a/konq-plugins/akregator/pluginbase.cpp
+++ b/konq-plugins/akregator/pluginbase.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kprocess.h>
 #include <dcopref.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <klocale.h>
 
 #include "feeddetector.h"
diff --git a/konq-plugins/autorefresh/Makefile.am b/konq-plugins/autorefresh/Makefile.am
index f97432b..ebc6394 100644
--- a/konq-plugins/autorefresh/Makefile.am
+++ b/konq-plugins/autorefresh/Makefile.am
@@ -10,7 +10,7 @@ libautorefresh_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 KDE_ICON = autorefresh
 
-autorefreshdir = $(kde_datadir)/khtml/kpartplugins
+autorefreshdir = $(kde_datadir)/tdehtml/kpartplugins
 autorefresh_DATA = autorefresh.rc autorefresh.desktop
 
 messages: rc.cpp
diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp
index 64be883..bce4995 100644
--- a/konq-plugins/autorefresh/autorefresh.cpp
+++ b/konq-plugins/autorefresh/autorefresh.cpp
@@ -5,7 +5,7 @@
  */
 
 
-#include <khtml_part.h> // this plugin applies to a khtml part
+#include <tdehtml_part.h> // this plugin applies to a tdehtml part
 #include <kdebug.h>
 #include "autorefresh.h"
 #include <kaction.h>
diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h
index b805921..ca03bb1 100644
--- a/konq-plugins/autorefresh/autorefresh.h
+++ b/konq-plugins/autorefresh/autorefresh.h
@@ -7,7 +7,7 @@
 #ifndef __plugin_autorefresh_h
 #define __plugin_autorefresh_h
  
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
  
 class KURL;
diff --git a/konq-plugins/babelfish/Makefile.am b/konq-plugins/babelfish/Makefile.am
index 3316d68..61eba5b 100644
--- a/konq-plugins/babelfish/Makefile.am
+++ b/konq-plugins/babelfish/Makefile.am
@@ -8,7 +8,7 @@ libbabelfishplugin_la_SOURCES = plugin_babelfish.cpp
 libbabelfishplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_KHTML)
 libbabelfishplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined
 
-pluginsdir   = $(kde_datadir)/khtml/kpartplugins
+pluginsdir   = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_babelfish.rc plugin_babelfish.desktop
 
 appsdir = $(kde_appsdir)/.hidden
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index c4d3f68..325aa36 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -28,7 +28,7 @@
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 typedef KGenericFactory<PluginBabelFish> BabelFishFactory;
 static const TDEAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" );
diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h
index 8a8bfd8..26463e0 100644
--- a/konq-plugins/babelfish/plugin_babelfish.h
+++ b/konq-plugins/babelfish/plugin_babelfish.h
@@ -19,7 +19,7 @@
 #ifndef __plugin_babelfish_h
 #define __plugin_babelfish_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 
 class KURL;
diff --git a/konq-plugins/crashes/Makefile.am b/konq-plugins/crashes/Makefile.am
index 710ec6e..f27fbc1 100644
--- a/konq-plugins/crashes/Makefile.am
+++ b/konq-plugins/crashes/Makefile.am
@@ -6,7 +6,7 @@ libcrashesplugin_la_SOURCES = crashesplugin.cpp
 libcrashesplugin_la_LIBADD = $(LIB_KHTML) -lkonq
 libcrashesplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = crashesplugin.rc crashesplugin.desktop
 
 appsdir = $(kde_appsdir)/.hidden
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index 57a4caa..aa416a4 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -23,7 +23,7 @@
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kinstance.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kgenericfactory.h>
 
 #include <krun.h>
diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h
index d234258..8bdb2a8 100644
--- a/konq-plugins/crashes/crashesplugin.h
+++ b/konq-plugins/crashes/crashesplugin.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KHTMLPart;
 class KActionMenu;
diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index 9a82666..a0a0980 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -44,7 +44,7 @@
 #include <konq_propsview.h>
 #include <kstaticdeleter.h>
 #include <kgenericfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include "dirfilterplugin.h"
 
diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h
index 56d6aa5..1180767 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.h
+++ b/konq-plugins/dirfilter/dirfilterplugin.h
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <kfileitem.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KActionMenu;
 class KonqDirPart;
diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am
index 3dcfcc9..cfb3bb9 100644
--- a/konq-plugins/domtreeviewer/Makefile.am
+++ b/konq-plugins/domtreeviewer/Makefile.am
@@ -23,7 +23,7 @@ libdomtreeviewerplugin_la_SOURCES = 	plugin_domtreeviewer.cpp \
 libdomtreeviewerplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_KHTML)
 libdomtreeviewerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir   = $(kde_datadir)/khtml/kpartplugins
+pluginsdir   = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_domtreeviewer.rc plugin_domtreeviewer.desktop
 
 appsdir = $(kde_appsdir)/.hidden
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 15c7d6a..5b24e9d 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -52,7 +52,7 @@
 #include <keditcl.h>
 #include <kfiledialog.h>
 #include <kglobalsettings.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <klocale.h>
@@ -339,7 +339,7 @@ void DOMTreeView::addElement ( const DOM::Node &node,  DOMListViewItem *cur_item
 
 void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeName)
 {
-  /* This is slow. I could make it O(1) be using the tokenizer of khtml but I don't
+  /* This is slow. I could make it O(1) be using the tokenizer of tdehtml but I don't
    * think it's worth it.
    */
 
@@ -581,7 +581,7 @@ void DOMTreeView::saveRecursive(const DOM::Node &pNode, int indent)
 
   if ( !element.isNull() ) {
     if (nodeName.at(0)=='-') {
-      /* Don't save khtml internal tags '-konq..'
+      /* Don't save tdehtml internal tags '-konq..'
        * Approximating it with <DIV>
        */
       text += "<DIV> <!-- -KONG_BLOCK -->";
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 52b7ba0..d9886df 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -30,7 +30,7 @@
 #include <kconfig.h>
 #include <tdeversion.h>
 #include <kglobal.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmenubar.h>
@@ -41,8 +41,8 @@
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
 
-#include <kparts/partmanager.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/browserextension.h>
 
 #include <kedittoolbar.h>
 
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index bf3afa7..b58a733 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory;
 K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) )
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
index b528f6e..7056f4d 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
@@ -3,7 +3,7 @@
 #ifndef __plugin_domtreeviewer_h
 #define __plugin_domtreeviewer_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 // #include <klibloader.h>
 
 class DOMTreeWindow;
diff --git a/konq-plugins/fsview/Makefile.am b/konq-plugins/fsview/Makefile.am
index a431ad3..4798bef 100644
--- a/konq-plugins/fsview/Makefile.am
+++ b/konq-plugins/fsview/Makefile.am
@@ -24,21 +24,21 @@ libfsview_la_SOURCES = treemap.cpp fsview.cpp scan.cpp inode.cpp
 
 bin_PROGRAMS = fsview
 
-fsview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+fsview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 fsview_SOURCES = main.cpp
-fsview_LDADD   = libfsview.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+fsview_LDADD   = libfsview.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 check_PROGRAMS = scantest
 
-scantest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+scantest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 scantest_SOURCES = scantest.cpp
-scantest_LDADD   = libfsview.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+scantest_LDADD   = libfsview.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # The KPart
 
 kde_module_LTLIBRARIES = libfsviewpart.la
 libfsviewpart_la_SOURCES = fsview_part.cpp
-libfsviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libfsviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 libfsviewpart_la_LIBADD  = libfsview.la $(LIB_KPARTS) $(LIB_KIO) -lkonq
 
 partdesktopdir   = $(kde_servicesdir)
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 33ad518..a4d86a8 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -27,7 +27,7 @@
 #include <kinstance.h>
 #include <kfiledialog.h>
 #include <kfileitem.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <klocale.h>
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 891ebfb..345db20 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -23,8 +23,8 @@
 #ifndef FSVIEW_PART_H
 #define FSVIEW_PART_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 #include <kio/jobclasses.h>
 
 #include "fsview.h"
diff --git a/konq-plugins/khtmlsettingsplugin/Makefile.am b/konq-plugins/khtmlsettingsplugin/Makefile.am
deleted file mode 100644
index 1c98400..0000000
--- a/konq-plugins/khtmlsettingsplugin/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDES = $(all_includes)
-
-kde_module_LTLIBRARIES = libkhtmlsettingsplugin.la
-
-libkhtmlsettingsplugin_la_SOURCES = settingsplugin.cpp
-libkhtmlsettingsplugin_la_LIBADD = $(LIB_KHTML)
-libkhtmlsettingsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
-plugins_DATA = khtmlsettingsplugin.rc khtmlsettingsplugin.desktop
-
-appsdir = $(kde_appsdir)/.hidden
-apps_DATA = khtmlsettingsplugin.desktop 
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/khtmlsettingsplugin.pot
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h
index 8024f36..71e4434 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h
@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 #ifndef kimgalleryplugin_h
 #define kimgalleryplugin_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 #include <konq_dirpart.h>
 #include <kio/jobclasses.h>
diff --git a/konq-plugins/kuick/Makefile.am b/konq-plugins/kuick/Makefile.am
index f0cfa4c..143b698 100644
--- a/konq-plugins/kuick/Makefile.am
+++ b/konq-plugins/kuick/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkuickplugin.la
 # This is all standard.  Remove the LIB_KHTML reference if you are not
 # using the KHTML Part
 libkuickplugin_la_SOURCES = kuick_plugin.cpp kdirmenu.cpp kmetamenu.cpp kimcontactmenu.cpp
-libkuickplugin_la_LIBADD = $(LIB_KABC) -lkimproxy -lkonq
+libkuickplugin_la_LIBADD = $(LIB_KABC) -ltdeimproxy -lkonq
 libkuickplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir   = $(kde_servicesdir)
diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp
index 77ef7a4..cdc5566 100644
--- a/konq-plugins/kuick/kimcontactmenu.cpp
+++ b/konq-plugins/kuick/kimcontactmenu.cpp
@@ -25,7 +25,7 @@
 // The following enables kabc for contact name lookups instead of using Kopete's idea of their name.
 //#define KIMCONTACTS_USE_KABC
 
-#include <kimproxy.h>
+#include <tdeimproxy.h>
 
 #ifdef KIMCONTACTS_USE_KABC
 #include <kabc/addressbook.h>
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index aa4f0dd..efb85e2 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kiconloader.h>
-#include <kimproxy.h>
+#include <tdeimproxy.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kconfig.h>
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 16e11fd..589f212 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -25,7 +25,7 @@
 #include <kaction.h>
 #include <kinstance.h>
 #include <kiconloader.h>
-#include <kimproxy.h>
+#include <tdeimproxy.h>
 #include <klocale.h>
 #include <konq_popupmenu.h>
 #include <kmessagebox.h>
diff --git a/konq-plugins/kuick/kuick_plugin.desktop b/konq-plugins/kuick/kuick_plugin.desktop
index 8974546..ffab27f 100644
--- a/konq-plugins/kuick/kuick_plugin.desktop
+++ b/konq-plugins/kuick/kuick_plugin.desktop
@@ -62,6 +62,6 @@ Name[xh]=Ukhuphelo noHambiso lweKuick
 Name[zh_CN]=快速复制和移动
 Name[zh_TW]=Kuick 複製與移動
 Name[zu]=Kuick Khiphela futhi Ususe
-Icon=kmultiple
+Icon=tdemultiple
 X-TDE-Library=libkuickplugin
 ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/konq-plugins/kuick/kuickplugin.desktop b/konq-plugins/kuick/kuickplugin.desktop
index fe7b825..f015481 100644
--- a/konq-plugins/kuick/kuickplugin.desktop
+++ b/konq-plugins/kuick/kuickplugin.desktop
@@ -61,6 +61,6 @@ Name[xh]=Ukhuphelo noHambiso lweKuick
 Name[zh_CN]=快速复制和移动
 Name[zh_TW]=Kuick 複製與移動
 Name[zu]=Kuick Khiphela futhi Ususe
-Icon=kmultiple
+Icon=tdemultiple
 X-TDE-ParentApp=konqueror
 DocPath=konq-plugins/kuick/index.html
diff --git a/konq-plugins/microformat/Makefile.am b/konq-plugins/microformat/Makefile.am
index d96b5c5..6e13655 100644
--- a/konq-plugins/microformat/Makefile.am
+++ b/konq-plugins/microformat/Makefile.am
@@ -9,7 +9,7 @@ libmfkonqmficon_la_SOURCES = konqmficon.cpp pluginbase.cpp
 libmfkonqmficon_la_LIBADD = -lkonq $(LIB_KHTML)
 libmfkonqmficon_la_LDFLAGS = -module $(KDE_PLUGIN) -avoid-version -no-undefined $(all_libraries)
 
-konqmficondir = $(kde_datadir)/khtml/kpartplugins
+konqmficondir = $(kde_datadir)/tdehtml/kpartplugins
 konqmficon_DATA = mf_konqmficon.desktop mf_konqmficon.rc
 
 mficondir = $(kde_datadir)/microformat/pics
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index af2c58b..b6db90c 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kurllabel.h>
diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h
index 0992fd7..6d1267c 100644
--- a/konq-plugins/microformat/konqmficon.h
+++ b/konq-plugins/microformat/konqmficon.h
@@ -24,8 +24,8 @@
 #ifndef KONTQFEEDICON_H
 #define KONTQFEEDICON_H
 
-#include <khtml_part.h>
-#include <kparts/plugin.h>
+#include <tdehtml_part.h>
+#include <tdeparts/plugin.h>
 #include <kpopupmenu.h>
 #include "pluginbase.h"
 
diff --git a/konq-plugins/minitools/Makefile.am b/konq-plugins/minitools/Makefile.am
index 48f63e4..ed6f8f5 100644
--- a/konq-plugins/minitools/Makefile.am
+++ b/konq-plugins/minitools/Makefile.am
@@ -7,7 +7,7 @@ libminitoolsplugin_la_SOURCES = minitoolsplugin.cpp
 libminitoolsplugin_la_LIBADD = $(LIB_KHTML) -lkonq
 libminitoolsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = minitoolsplugin.rc minitoolsplugin.desktop
 
 messages: rc.cpp
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index 6616e0e..ea89b7e 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -25,7 +25,7 @@
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kinstance.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kgenericfactory.h>
 
 #include <kstandarddirs.h>
diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h
index b66a24d..0e5ba82 100644
--- a/konq-plugins/minitools/minitoolsplugin.h
+++ b/konq-plugins/minitools/minitoolsplugin.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KHTMLPart;
 class KActionMenu;
diff --git a/konq-plugins/rellinks/Makefile.am b/konq-plugins/rellinks/Makefile.am
index aeec3fc..f320d96 100644
--- a/konq-plugins/rellinks/Makefile.am
+++ b/konq-plugins/rellinks/Makefile.am
@@ -5,7 +5,7 @@ librellinksplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 librellinksplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML)
 librellinksplugin_la_SOURCES = plugin_rellinks.cpp
 plugins_DATA = plugin_rellinks.rc plugin_rellinks.desktop
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/rellinks.pot
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index d2b2826..69a8e11 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -35,8 +35,8 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klocale.h>
diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h
index 209f899..d791eb9 100644
--- a/konq-plugins/rellinks/plugin_rellinks.h
+++ b/konq-plugins/rellinks/plugin_rellinks.h
@@ -34,7 +34,7 @@
 #include <tqmap.h>
 
 // KDE includes
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <dom/dom_string.h>
 
 // type definitions
diff --git a/konq-plugins/rsync/Makefile.am b/konq-plugins/rsync/Makefile.am
index c95d672..4d87da6 100644
--- a/konq-plugins/rsync/Makefile.am
+++ b/konq-plugins/rsync/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = $(all_includes)
 METASOURCES = AUTO
 
 librsyncplugin_la_SOURCES = rsyncplugin.cpp
-librsyncplugin_la_LIBADD = -lkonq -lkrsync
+librsyncplugin_la_LIBADD = -lkonq -ltdersync
 librsyncplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 iconviewdir = $(kde_datadir)/konqiconview/kpartplugins
diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp
index 0d5305f..afddb34 100644
--- a/konq-plugins/rsync/rsyncplugin.cpp
+++ b/konq-plugins/rsync/rsyncplugin.cpp
@@ -92,7 +92,7 @@
 #include <konq_propsview.h>
 #include <kstaticdeleter.h>
 #include <kgenericfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <kio/global.h>
 #include <kio/slavebase.h>
diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h
index d7bd6cd..0042762 100644
--- a/konq-plugins/rsync/rsyncplugin.h
+++ b/konq-plugins/rsync/rsyncplugin.h
@@ -26,11 +26,11 @@
 #include <kprocess.h>
 #include <kfileitem.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kio/global.h>
 #include <kio/slavebase.h>
 
-#include <libkrsync/krsync.h>
+#include <libtdersync/tdersync.h>
 
 // NOTE: If ANY of these functions are not utilized in the C file,
 // and in a manner identical to these declarations, the plugin will
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 5fd1047..7542a0f 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -29,7 +29,7 @@
 #include <kdesktopfile.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -42,8 +42,8 @@
 
 #include <kio/job.h>
 
-#include <kparts/mainwindow.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/partmanager.h>
 
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h
index bf01e21..e52f482 100644
--- a/konq-plugins/searchbar/searchbar.h
+++ b/konq-plugins/searchbar/searchbar.h
@@ -24,8 +24,8 @@
 
 #include <kcombobox.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/mainwindow.h>
 
 #include <tqguardedptr.h>
 #include <tqpixmap.h>
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 2621671..4b7361b 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -26,7 +26,7 @@
 #include "widget.h"
 
 #include <kio/jobclasses.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 class TQStringList;
 class KURL;
diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h
index 7ac71a8..da1d51d 100644
--- a/konq-plugins/sidebar/delicious/plugin.h
+++ b/konq-plugins/sidebar/delicious/plugin.h
@@ -25,9 +25,9 @@
 #include "mainWidget.h"
 
 #include <konqsidebarplugin.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 #include <kinstance.h>
 #include <dcopobject.h>
 
diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h
index 5dacf9d..ec26fe1 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.h
+++ b/konq-plugins/sidebar/mediaplayer/engine.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqobject.h>
 #include <kmedia2.h>
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 #include <kurl.h>
 
 namespace Arts
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
index ee1a299..95e04f6 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
@@ -18,9 +18,9 @@
 #ifndef _konq_sidebar_mediaplayer_h_
 #define _konq_sidebar_mediaplayer_h_
 #include <konqsidebarplugin.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 
 class KSB_MediaWidget;
 
diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp
index 741a6b6..38ac506 100644
--- a/konq-plugins/sidebar/mediaplayer/player.cpp
+++ b/konq-plugins/sidebar/mediaplayer/player.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 
 #include "engine.h"
 #include "player.h"
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 3bcf924..9749a5b 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -24,7 +24,7 @@
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <kicontheme.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kdesktopfile.h>
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index bbfb9e2..f994eb5 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kicontheme.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kurl.h>
 #include <klocale.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
index 7108de9..800bb55 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 
 #include <kurl.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 class MetabarFunctions : public TQObject
 {
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index c4282ea..7142f15 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -35,7 +35,7 @@
 #include <tqurl.h>
 #include <tqbuffer.h>
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
@@ -55,7 +55,7 @@
 #include <tdecmoduleinfo.h>
 #include <kmdcodec.h>
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <dom2_events.h>
 #include <dom2_views.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index bf9c7ad..95c1148 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -21,7 +21,7 @@
 #ifndef METABAR_WIDGET_H
 #define METABAR_WIDGET_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include <kconfig.h>
 #include <kfileitem.h>
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 38d0bba..75e62c3 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -64,7 +64,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
       pix = m_items.getFirst()->pixmap(KIcon::SizeLarge);
     }
     else{
-      pix = DesktopIcon("kmultiple", KIcon::SizeLarge);
+      pix = DesktopIcon("tdemultiple", KIcon::SizeLarge);
     }
   
     TQByteArray data;
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h
index 3614a30..6683f61 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.h
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h
@@ -22,7 +22,7 @@
 #define _PROTOCOL_PLUGIN_H
 
 #include <kfileitem.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include <html_element.h>
 
diff --git a/konq-plugins/tdehtmlsettingsplugin/Makefile.am b/konq-plugins/tdehtmlsettingsplugin/Makefile.am
new file mode 100644
index 0000000..6647c14
--- /dev/null
+++ b/konq-plugins/tdehtmlsettingsplugin/Makefile.am
@@ -0,0 +1,18 @@
+INCLUDES = $(all_includes)
+
+kde_module_LTLIBRARIES = libtdehtmlsettingsplugin.la
+
+libtdehtmlsettingsplugin_la_SOURCES = settingsplugin.cpp
+libtdehtmlsettingsplugin_la_LIBADD = $(LIB_KHTML)
+libtdehtmlsettingsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
+plugins_DATA = tdehtmlsettingsplugin.rc tdehtmlsettingsplugin.desktop
+
+appsdir = $(kde_appsdir)/.hidden
+apps_DATA = tdehtmlsettingsplugin.desktop 
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdehtmlsettingsplugin.pot
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
similarity index 98%
rename from konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
rename to konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
index 1d0548c..05619ed 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
@@ -23,7 +23,7 @@
 #include <kaction.h>
 #include <kconfig.h>
 #include <kglobal.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -35,8 +35,8 @@
 #include "settingsplugin.h"
 
 typedef KGenericFactory<SettingsPlugin> SettingsPluginFactory;
-static const TDEAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Settings") , "1.0" );
-K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin,
+static const TDEAboutData aboutdata("tdehtmlsettingsplugin", I18N_NOOP("HTML Settings") , "1.0" );
+K_EXPORT_COMPONENT_FACTORY( libtdehtmlsettingsplugin,
                             SettingsPluginFactory( &aboutdata ) )
 
 SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name,
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.h
similarity index 98%
rename from konq-plugins/khtmlsettingsplugin/settingsplugin.h
rename to konq-plugins/tdehtmlsettingsplugin/settingsplugin.h
index 7f9d8aa..68d40a8 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.h
@@ -20,7 +20,7 @@
 #ifndef SETTINGS_PLUGIN
 #define SETTINGS_PLUGIN
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 
 class TDEConfig;
diff --git a/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
similarity index 97%
rename from konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop
rename to konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
index 3cac711..c6af847 100644
--- a/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop
+++ b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-X-TDE-Library=khtmlsettingsplugin
+X-TDE-Library=tdehtmlsettingsplugin
 X-TDE-PluginInfo-Author=Carsten Pfeiffer
 X-TDE-PluginInfo-Email=pfeiffer@kde.org
-X-TDE-PluginInfo-Name=khtmlsettingsplugin
+X-TDE-PluginInfo-Name=tdehtmlsettingsplugin
 X-TDE-PluginInfo-Version=3.3
 X-TDE-PluginInfo-Website=
 X-TDE-PluginInfo-Category=Tools
@@ -133,4 +133,4 @@ Comment[zh_CN]=改变 KHTML 设置的快速方式
 Comment[zh_TW]=快速變更 KHTML 設定的方法
 X-TDE-ParentApp=konqueror
 Icon=configure
-DocPath=konq-plugins/khtmlsettings/index.html
+DocPath=konq-plugins/tdehtmlsettings/index.html
diff --git a/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.lsm b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.lsm
similarity index 100%
rename from konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.lsm
rename to konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.lsm
diff --git a/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.rc b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.rc
similarity index 72%
rename from konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.rc
rename to konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.rc
index 916a52e..b747440 100644
--- a/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.rc
+++ b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="khtmlsettingsplugin" library="libkhtmlsettingsplugin" version="3">
+<kpartplugin name="tdehtmlsettingsplugin" library="libtdehtmlsettingsplugin" version="3">
 <MenuBar>
  <Menu name="tools"><Text>&amp;Tools</Text>
   <Action name="action menu"/>
diff --git a/konq-plugins/uachanger/Makefile.am b/konq-plugins/uachanger/Makefile.am
index 80e2c2b..61dcc36 100644
--- a/konq-plugins/uachanger/Makefile.am
+++ b/konq-plugins/uachanger/Makefile.am
@@ -7,7 +7,7 @@ libuachangerplugin_la_SOURCES = uachangerplugin.cpp
 libuachangerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML)
 libuachangerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = uachangerplugin.rc uachangerplugin.desktop
 
 appsdir = $(kde_appsdir)/.hidden
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index 8c8e9c3..ecfcff6 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -34,7 +34,7 @@
 #include <kinstance.h>
 #include <kpopupmenu.h>
 #include <dcopref.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kgenericfactory.h>
 #include <kprotocolmanager.h>
 #include <kaboutdata.h>
diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h
index 9aaff84..fc5b707 100644
--- a/konq-plugins/uachanger/uachangerplugin.h
+++ b/konq-plugins/uachanger/uachangerplugin.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KHTMLPart;
 class KActionMenu;
diff --git a/konq-plugins/validators/Makefile.am b/konq-plugins/validators/Makefile.am
index 3c09508..41fe2b0 100644
--- a/konq-plugins/validators/Makefile.am
+++ b/konq-plugins/validators/Makefile.am
@@ -8,7 +8,7 @@ libvalidatorsplugin_la_SOURCES = plugin_validators.cpp validatorsdialog.cpp
 libvalidatorsplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_KHTML)
 libvalidatorsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir   = $(kde_datadir)/khtml/kpartplugins
+pluginsdir   = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_validators.rc plugin_validators.desktop
 
 appsdir = $(kde_appsdir)/.hidden
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index 3d1a6ab..3d6514a 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kaction.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kaboutdata.h>
diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h
index 7cdf2bc..63df771 100644
--- a/konq-plugins/validators/plugin_validators.h
+++ b/konq-plugins/validators/plugin_validators.h
@@ -29,7 +29,7 @@
 #ifndef __plugin_validators_h
 #define __plugin_validators_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 
 #include "validatorsdialog.h"
diff --git a/konq-plugins/webarchiver/Makefile.am b/konq-plugins/webarchiver/Makefile.am
index 53d519e..6a3779a 100644
--- a/konq-plugins/webarchiver/Makefile.am
+++ b/konq-plugins/webarchiver/Makefile.am
@@ -9,7 +9,7 @@ libwebarchiverplugin_la_SOURCES = plugin_webarchiver.cpp archiveviewbase.ui arch
 libwebarchiverplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_KHTML)
 libwebarchiverplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_webarchiver.rc plugin_webarchiver.desktop
 
 appsdir = $(kde_appsdir)/.hidden
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 0a3e6a6..63a7570 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -20,7 +20,7 @@
 
 #include "archivedialog.h"
 #include <tqwidget.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include "archiveviewbase.h"
 #include <kinstance.h>
 #include <ktempfile.h>
@@ -31,7 +31,7 @@
 #include <kpassivepopup.h>
 #include <klocale.h>
 #include <kio/netaccess.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kactivelabel.h>
@@ -234,7 +234,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
 
    if ( !element.isNull() ) {
       if (nodeName.at(0)=='-') {
-        /* Don't save khtml internal tags '-konq..'
+        /* Don't save tdehtml internal tags '-konq..'
          * Approximating it with <DIV>
          */
         text += "<DIV> <!-- -KONTQ_BLOCK -->";
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index a9c6d06..338c52e 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -38,7 +38,7 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kglobalsettings.h>
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.h b/konq-plugins/webarchiver/plugin_webarchiver.h
index 3e96ca6..7c75d58 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.h
+++ b/konq-plugins/webarchiver/plugin_webarchiver.h
@@ -22,7 +22,7 @@
 #ifndef plugin_webarchiver_h
 #define plugin_webarchiver_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 
 class PluginWebArchiver : public KParts::Plugin
diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp
index 1ffd242..200dc54 100644
--- a/konq-plugins/webarchiver/webarchivecreator.cpp
+++ b/konq-plugins/webarchiver/webarchivecreator.cpp
@@ -26,7 +26,7 @@
 #include <tqpainter.h>
 
 #include <kapplication.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include "webarchivecreator.moc"
 
diff --git a/ksig/Makefile.am b/ksig/Makefile.am
index 8518530..b8813f3 100644
--- a/ksig/Makefile.am
+++ b/ksig/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO
 KDE_ICON = AUTO
 
-ksig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 ksig_LDADD   =  $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 rcdir = $(kde_datadir)/ksig
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index cd6754b..fdd73ee 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -2,7 +2,7 @@
 #include <klineeditdlg.h>
 #include <kconfig.h>
 #include <kmessagebox.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kstdaction.h>
 #include <kstatusbar.h>
 #include <tqregexp.h>
diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h
index c41e186..85541ff 100644
--- a/noatun-plugins/lyrics/lyrics.h
+++ b/noatun-plugins/lyrics/lyrics.h
@@ -6,7 +6,7 @@
 #include <noatun/app.h>
 #include <kmainwindow.h>
 #include <tqvaluevector.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kaction.h>
 #include "cmodule.h"
 
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index f39f258..dd0ebb7 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -6,7 +6,7 @@
 #include "file.h"
 
 #include <kregexpeditorinterface.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <klocale.h>
 #include <klistview.h>
 #include <klineedit.h>
diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am
index f79c4cf..d1cb551 100644
--- a/noatun-plugins/synaescope/Makefile.am
+++ b/noatun-plugins/synaescope/Makefile.am
@@ -11,7 +11,7 @@ noatunsynaescope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
 bin_PROGRAMS = noatunsynaescope.bin
 
 noatunsynaescope_bin_SOURCES = core.cpp main.cpp sdlwrap.cpp ui.cpp
-noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 noatunsynaescope_bin_LDADD = $(LIB_TDEUI) -lnoatun $(SDL_LIBS)
 
 noatun_DATA = synaescope.plugin
diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am
index 5192ae2..18a9e35 100644
--- a/noatun-plugins/tippercanoe/Makefile.am
+++ b/noatun-plugins/tippercanoe/Makefile.am
@@ -11,7 +11,7 @@ noatuntippecanoe_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
 bin_PROGRAMS = noatuntippecanoe.bin
 
 noatuntippecanoe_bin_SOURCES = core.cpp main.cpp ui.cpp sdlwrap.cpp
-noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 noatuntippecanoe_bin_LDADD = $(LIB_TDEUI) -lm $(SDL_LIBS)
 
 noatun_DATA = tippecanoe.plugin
diff --git a/noatun-plugins/tyler/Makefile.am b/noatun-plugins/tyler/Makefile.am
index 4e84a80..bbba726 100644
--- a/noatun-plugins/tyler/Makefile.am
+++ b/noatun-plugins/tyler/Makefile.am
@@ -11,7 +11,7 @@ noatuntyler_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
 bin_PROGRAMS = noatuntyler.bin
 
 noatuntyler_bin_SOURCES = main.cpp file.cpp compute.c display.c renderer.c
-noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 noatuntyler_bin_LDADD = $(LIB_TDECORE) -lm $(SDL_LIBS)
 
 noatun_DATA = tyler.plugin tylerstates
diff --git a/renamedlgplugins/audio/Makefile.am b/renamedlgplugins/audio/Makefile.am
index d9a228f..db559ae 100644
--- a/renamedlgplugins/audio/Makefile.am
+++ b/renamedlgplugins/audio/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = librenaudioplugin.la
 
 librenaudioplugin_la_SOURCES = audiopreview.cpp audio_plugin.cpp
-librenaudioplugin_la_LIBADD = $(LIB_KIO) -lkmediaplayer
+librenaudioplugin_la_LIBADD = $(LIB_KIO) -ltdemediaplayer
 librenaudioplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir   = $(kde_servicesdir)
diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp
index d1e1174..8c8cc49 100644
--- a/renamedlgplugins/audio/audiopreview.cpp
+++ b/renamedlgplugins/audio/audiopreview.cpp
@@ -27,8 +27,8 @@
 #include <kio/netaccess.h>
 #include <kurllabel.h>
 #include <kmimetype.h>
-#include <kmediaplayer/player.h>
-#include <kparts/componentfactory.h>
+#include <tdemediaplayer/player.h>
+#include <tdeparts/componentfactory.h>
 #include <ksqueezedtextlabel.h>
 
 #include "audiopreview.h"