diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 58d47734..2af17897 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -25,14 +25,14 @@
 
 #include <kgenericfactory.h>
 #include <ksimpleconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kiconview.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
 #include <kdebug.h>
 
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 8a76b37f..d5d74b99 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 
diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp
index 7ecc032e..d5079fa6 100644
--- a/kcoloredit/kcoloredit.cpp
+++ b/kcoloredit/kcoloredit.cpp
@@ -36,7 +36,7 @@
 #include "kcoloreditdoc.h"
 #include "loadpalettedlg.h"
 #include "resource.h"
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 
 
diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h
index 557cdc02..81e8b200 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -27,8 +27,8 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 
 // application specific includes
 #include "color.h"
diff --git a/kcoloredit/kxycolorselector.h b/kcoloredit/kxycolorselector.h
index 0016dac7..276174ff 100644
--- a/kcoloredit/kxycolorselector.h
+++ b/kcoloredit/kxycolorselector.h
@@ -19,7 +19,7 @@
 #define KXYCOLORSELECTOR_H
 
 #include <tqwidget.h>
-#include <kselect.h>
+#include <tdeselect.h>
 
 #include "main.h"
 
diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h
index 6afd369d..cae9d1c5 100644
--- a/kcoloredit/kzcolorselector.h
+++ b/kcoloredit/kzcolorselector.h
@@ -20,7 +20,7 @@
 
 #include "tqcolor.h"
 #include "tqpixmap.h"
-#include "kselect.h"
+#include "tdeselect.h"
 
 #include "color.h"
 
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index eadd9a5f..06a7cc83 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -1,5 +1,5 @@
 #include <config.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kaboutdata.h>
 #include <kaboutdialog.h>
 #include <kapplication.h>
@@ -26,7 +26,7 @@
 #include "fontpool.h"
 #include "kprinterwrapper.h"
 #include "kviewpart.h"
-#include "marklist.h"
+#include "martdelist.h"
 #include "optionDialogFontsWidget.h"
 #include "optionDialogSpecialWidget.h"
 #include "performanceMeasurement.h"
diff --git a/kdvi/kdvi_multipage_texthandling.cpp b/kdvi/kdvi_multipage_texthandling.cpp
index bcadd45a..495ed06f 100644
--- a/kdvi/kdvi_multipage_texthandling.cpp
+++ b/kdvi/kdvi_multipage_texthandling.cpp
@@ -26,7 +26,7 @@
 
 #include <config.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <keditcl.h>
 #include <tdefiledialog.h>
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index b742a372..1a3d2046 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -45,7 +45,7 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <tdefilemetainfo.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <tdeconfig.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
@@ -57,7 +57,7 @@
 #include <kdebug.h>
 #include <kurldrag.h>
 #include <kstatusbar.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kprocess.h>
 #include <kprinter.h>
 #include <tdeio/job.h>
diff --git a/kfax/kfax.h b/kfax/kfax.h
index 2627cff1..2371c92c 100644
--- a/kfax/kfax.h
+++ b/kfax/kfax.h
@@ -29,7 +29,7 @@
 #define _KFAX_H_
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqptrlist.h>
 #include <kurl.h>
 
diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt
index 316f387e..fe8fad8e 100644
--- a/kghostview/CMakeLists.txt
+++ b/kghostview/CMakeLists.txt
@@ -41,7 +41,7 @@ install( PROGRAMS update-to-xt-names.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}
 tde_add_library( kghostviewlib SHARED AUTOMOC
   SOURCES
     kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp
-    marklist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp ps.c
+    martdelist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp ps.c
     kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp
     kgvconfigdialog.cpp kgvmainwidget.cpp  kdscerrordialog.cpp
     displayoptions.cpp kpswidget.cpp fullscreenfilter.cpp
diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am
index eae2dee0..e2a92fcd 100644
--- a/kghostview/Makefile.am
+++ b/kghostview/Makefile.am
@@ -17,7 +17,7 @@ libkghostviewpart_la_LIBADD = libkghostviewlib.la
 
 # Check "make final" after making changes to the following line!!
 libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
-	marklist.cpp logwindow.cpp infodialog.cpp \
+	martdelist.cpp logwindow.cpp infodialog.cpp \
 	kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp \
 	kgvconfigdialog.cpp kgvmainwidget.cpp \
 	kdscerrordialog.cpp displayoptions.cpp kpswidget.cpp \
@@ -35,7 +35,7 @@ libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
 libdscparse_la_LIBADD = $(LIB_QT)
 libdscparse_la_SOURCES = $(top_srcdir)/kghostview/dscparse/dscparse.cpp $(top_srcdir)/kghostview/dscparse/dscparse_adapter.cpp
 
-noinst_HEADERS =  marklist.h logwindow.h infodialog.h kgvshell.h \
+noinst_HEADERS =  martdelist.h logwindow.h infodialog.h kgvshell.h \
 	kpswidget.h kgvpageview.h ps.h kgv_miniwidget.h kgv_view.h scrollbox.h \
 	kgvpagedecorator.h kgvconfigdialog.h kgvmainwidget.h $(top_srcdir)/kghostview/dscparse/dscparse.h \
 	$(top_srcdir)/kghostview/dscparse/dscparse_adapter.h kdscerrordialog.h kgvdocument.h displayoptions.h \
diff --git a/kghostview/TODO b/kghostview/TODO
index f747ff13..113893dd 100644
--- a/kghostview/TODO
+++ b/kghostview/TODO
@@ -34,7 +34,7 @@
 Done:
 - Scrollbox should show a thumbnail (like kdvi).
 
-- New implementation for the marklist because QTableView won't be in Qt-3.0 
+- New implementation for the martdelist because QTableView won't be in Qt-3.0 
   anymore. (I'll keep using QTableView, simply because there's no suitable
   alternative in Qt3.)
 
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index d8210cdf..a9c46dc6 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 
 #include "infodialog.h"
-#include "marklist.h"
+#include "martdelist.h"
 #include "kgvdocument.h"
 #include "kgv_view.h"
 #include "version.h"
@@ -508,7 +508,7 @@ void KGVMiniWidget::buildTOC()
 
     int last_page = 0;
 
-    MarkList*  marklist = _part->markList();
+    MarkList*  martdelist = _part->markList();
 
     if( dsc()->isStructured() ) {
 	if( _usePageLabels )
@@ -530,11 +530,11 @@ void KGVMiniWidget::buildTOC()
 	    else
 		s = tip;
 
-	    marklist->insertItem( s, i, tip );
+	    martdelist->insertItem( s, i, tip );
 	}
     }
     else {
-	marklist->insertItem( TQString::fromLatin1( "1" ), 0 );
+	martdelist->insertItem( TQString::fromLatin1( "1" ), 0 );
     }
 }
 
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 97c6965b..ff5162ca 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqregexp.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -32,9 +32,9 @@
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstdaction.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <ktempfile.h>
 #include <tdeio/scheduler.h>
 #include <kaboutdata.h>
@@ -50,7 +50,7 @@
 #include "kpswidget.h"
 #include "kgvfactory.h"
 #include "logwindow.h"
-#include "marklist.h"
+#include "martdelist.h"
 #include "scrollbox.h"
 #include "version.h"
 #include "configuration.h"
@@ -162,7 +162,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     _docManager->setPSWidget( _psWidget );
     _docManager->setDocument( document() );
 
-    _markList = new MarkList( _mainWidget, "marklist", _docManager );
+    _markList = new MarkList( _mainWidget, "martdelist", _docManager );
     _markList->setFixedWidth( PAGELIST_WIDTH );
     vlay->addWidget( _markList, 1 );
     connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ),
@@ -192,7 +192,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
                  actionCollection(), "info" );
 
     //-- Edit Menu -----------------------------------------------------
-    _popup = new TDEPopupMenu( _markList, "marklist_menu" );
+    _popup = new TDEPopupMenu( _markList, "martdelist_menu" );
 
     TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 6303591e..74adfd6a 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -37,7 +37,7 @@
 #include "configuration.h"
 #include "kdscerrordialog.h"
 #include "kgv_miniwidget.h"
-#include "marklist.h"
+#include "martdelist.h"
 #include "kgvfactory.h"
 
 extern "C" {
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 2cf72258..17544d6a 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
@@ -29,7 +29,7 @@
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <ktempfile.h>
 #include <kmenubar.h>
 #include <kedittoolbar.h>
@@ -37,7 +37,7 @@
 
 #include <kicontheme.h>
 #include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeparts/componentfactory.h>
 
 #include <twin.h>
diff --git a/kghostview/martdelist.cpp b/kghostview/martdelist.cpp
index 9505b965..1f15e7d3 100644
--- a/kghostview/martdelist.cpp
+++ b/kghostview/martdelist.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "marklist.moc"
+#include "martdelist.moc"
 
 #include <cassert>
 
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index 3dbd10e7..70bbba39 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -27,7 +27,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kbuttonbox.h>
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index c51e0d58..9ff485ff 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -21,7 +21,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h
index 1b057b17..ac9f41bd 100644
--- a/kiconedit/kiconedit.h
+++ b/kiconedit/kiconedit.h
@@ -25,14 +25,14 @@
 #include <tqpixmap.h>
 #include <tqptrlist.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kiconloader.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
-#include <kaccel.h>
+#include <tdetoolbar.h>
+#include <tdeaccel.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "knew.h"
 #include "kicon.h"
diff --git a/kiconedit/palettetoolbar.h b/kiconedit/palettetoolbar.h
index b54a2ac9..d9a60b40 100644
--- a/kiconedit/palettetoolbar.h
+++ b/kiconedit/palettetoolbar.h
@@ -22,7 +22,7 @@
 #ifndef PALLETTETOOLBAR_H
 #define PALLETTETOOLBAR_H
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 class TQBoxLayout;
 class TQLabel;
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index 4b0d1ac1..be02660d 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -35,13 +35,13 @@
 
 #include <tqdatetime.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 3d8fc81a..8f06efa2 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -33,7 +33,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpmainwindow.h b/kolourpaint/kpmainwindow.h
index 0ac7d114..180ae801 100644
--- a/kolourpaint/kpmainwindow.h
+++ b/kolourpaint/kpmainwindow.h
@@ -37,7 +37,7 @@
 #include <tqsize.h>
 #include <tqvaluevector.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index 65e1f7d5..3b20417f 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -35,7 +35,7 @@
 #include <tqpixmap.h>
 #include <tqvaluevector.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index 6cc81cfc..65eda702 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -36,7 +36,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
@@ -47,7 +47,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kscan.h>
 
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index 91662481..201302e8 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -29,7 +29,7 @@
 #include <kpmainwindow_p.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kactivelabel.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
@@ -37,7 +37,7 @@
 #include <kdialogbase.h>
 #include <krun.h>
 #include <klocale.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <kptool.h>
 
diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp
index 6d7bc13d..2a0e60f8 100644
--- a/kolourpaint/kpmainwindow_image.cpp
+++ b/kolourpaint/kpmainwindow_image.cpp
@@ -32,7 +32,7 @@
 #include <tqcolor.h>
 #include <tqsize.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index e28b7152..70521a94 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -28,7 +28,7 @@
 
 #include <kpmainwindow.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 0e151025..84445585 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -28,7 +28,7 @@
 
 #include <kpmainwindow.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 
 #include <tdeconfig.h>
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 7d58055c..b8757d10 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpsinglekeytriggersaction.h b/kolourpaint/kpsinglekeytriggersaction.h
index b041d250..51784672 100644
--- a/kolourpaint/kpsinglekeytriggersaction.h
+++ b/kolourpaint/kpsinglekeytriggersaction.h
@@ -29,7 +29,7 @@
 #define KP_SINGLE_KEY_TRIGGERS_ACTION_H
 
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 
 class kpSingleKeyTriggersActionInterface
@@ -53,7 +53,7 @@ protected:
 };
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 class kpSingleKeyTriggersAction : public TDEAction,
diff --git a/kolourpaint/tools/kptoolaction.h b/kolourpaint/tools/kptoolaction.h
index 210c7668..c1d77159 100644
--- a/kolourpaint/tools/kptoolaction.h
+++ b/kolourpaint/tools/kptoolaction.h
@@ -28,7 +28,7 @@
 #ifndef KP_TOOL_ACTION_H
 #define KP_TOOL_ACTION_H
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 #include <kpsinglekeytriggersaction.h>
 
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index 14b613c6..b4d52a18 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -34,7 +34,7 @@
 #include <tqwidget.h>
 
 #include <kcolordialog.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <kpcolor.h>
 #include <kpcolorsimilaritycube.h>
diff --git a/kolourpaint/widgets/kptooltoolbar.h b/kolourpaint/widgets/kptooltoolbar.h
index 3777c1fa..5a5f8f7a 100644
--- a/kolourpaint/widgets/kptooltoolbar.h
+++ b/kolourpaint/widgets/kptooltoolbar.h
@@ -31,7 +31,7 @@
 
 #include <tqvaluevector.h>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 
 class TQBoxLayout;
diff --git a/kooka/dwmenuaction.h b/kooka/dwmenuaction.h
index 0430eb29..130933a4 100644
--- a/kooka/dwmenuaction.h
+++ b/kooka/dwmenuaction.h
@@ -31,7 +31,7 @@
 #define __DW_MENU_ACTION
 #include <kdockwidget.h>
 #include <tqstring.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 /**
  * This class is just a helper class since the KDockWidget classes do not yet
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index 018fa120..5c08f69b 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmenubar.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
@@ -54,8 +54,8 @@
 #include <kmessagebox.h>
 #include <kdockwidget.h>
 #include <tdeparts/partmanager.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tqiconset.h>
 #include <kurldrag.h>
diff --git a/kooka/kooka.h b/kooka/kooka.h
index 6702af62..f689ce5f 100644
--- a/kooka/kooka.h
+++ b/kooka/kooka.h
@@ -32,7 +32,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdockwidget.h>
 #include <tdeparts/dockmainwindow.h>
 
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index d74eed20..d7a32f80 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -68,15 +68,15 @@
 #include <keditcl.h>
 #include <kled.h>
 #include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kdockwidget.h>
 #include <tqobject.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tqimage.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 #define STARTUP_IMG_SELECTION   "SelectedImageOnStartup"
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index e02ff547..50fd6ed9 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -50,8 +50,8 @@
 #include <tdefiletreebranch.h>
 
 #include <kurldrag.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
diff --git a/kooka/scanpackager.h b/kooka/scanpackager.h
index 0fcabb38..fdae6495 100644
--- a/kooka/scanpackager.h
+++ b/kooka/scanpackager.h
@@ -33,7 +33,7 @@
 #include <tqpixmap.h>
 #include <tqdragobject.h>
 #include <tqmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeio/job.h>
 #include <tdeio/global.h>
 #include <tdeio/file.h>
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 20bb8516..817da45c 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -17,7 +17,7 @@
 #include <tqregexp.h>
 #include <tqvariant.h>
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpassdlg.h>
 #include <tdewallet.h>
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index d0d6ba8e..2cb3aa77 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -35,7 +35,7 @@
 #include <dcopobject.h>
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdirwatch.h>
 #include <kinstance.h>
 #include <kprinter.h>
@@ -51,7 +51,7 @@
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index 14baa149..47e500ea 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -20,7 +20,7 @@
 // qt/kde includes
 #include <tqcursor.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
@@ -33,7 +33,7 @@
 #include <kmenubar.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeio/netaccess.h>
-#include <kmainwindowiface.h>
+#include <tdemainwindowiface.h>
 
 // local includes
 #include "shell.h"
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index 262b74c7..eaceeed2 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -17,7 +17,7 @@
 #include <tqvalidator.h>
 #include <tqpainter.h>
 #include <kiconloader.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <tdeversion.h>
 
 // local includes
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index a0ce66e7..12bfc100 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -29,10 +29,10 @@
 #include <kcursor.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kaction.h>
-#include <kstdaccel.h>
-#include <kactioncollection.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
+#include <tdeactioncollection.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
 #include <kimageeffect.h>
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 94cfdc08..f51ea189 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -14,11 +14,11 @@
 #include <tqapplication.h>
 #include <tqdesktopwidget.h>
 #include <tqtooltip.h>
-#include <kaccel.h>
-#include <kactioncollection.h>
+#include <tdeaccel.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <kcursor.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index feff5eae..79203666 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -10,7 +10,7 @@
 // qt/kde includes
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <ksqueezedtextlabel.h>
 #include <kglobalsettings.h>
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index 19f77753..35f61dd3 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -11,13 +11,13 @@
 #include <tqtooltip.h>
 #include <tqapplication.h>
 #include <tqtimer.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kpopupmenu.h>
-#include <ktoolbarbutton.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbarbutton.h>
 
 // local includes
 #include "searchwidget.h"
diff --git a/kpdf/ui/searchwidget.h b/kpdf/ui/searchwidget.h
index a6a9efb4..c84db96f 100644
--- a/kpdf/ui/searchwidget.h
+++ b/kpdf/ui/searchwidget.h
@@ -10,7 +10,7 @@
 #ifndef _KPDF_SEARCHWIDGET_H_
 #define _KPDF_SEARCHWIDGET_H_
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 class TDEPopupMenu;
 class KPDFDocument;
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index 14d9d2f5..ab25704f 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -13,9 +13,9 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 // local includes
 #include "thumbnaillist.h"
diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h
index 5b1e5f94..b9fc06ae 100644
--- a/kpdf/ui/thumbnaillist.h
+++ b/kpdf/ui/thumbnaillist.h
@@ -13,7 +13,7 @@
 #include <tqscrollview.h>
 #include <tqvaluevector.h>
 #include <tqvbox.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include "core/observer.h"
 
 class TQTimer;
diff --git a/kpdf/ui/toc.h b/kpdf/ui/toc.h
index eef7dbb4..3de43502 100644
--- a/kpdf/ui/toc.h
+++ b/kpdf/ui/toc.h
@@ -11,7 +11,7 @@
 #define _KPDF_TOC_H_
 
 #include <tqdom.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include "core/document.h"
 #include "core/observer.h"
 
diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index a49c2041..31ef2aac 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 #include <tqstyle.h>
 #include <tqpainter.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include "pmdebug.h"
 
diff --git a/kpovmodeler/pmactions.h b/kpovmodeler/pmactions.h
index e5b0b4c2..7e4a4f68 100644
--- a/kpovmodeler/pmactions.h
+++ b/kpovmodeler/pmactions.h
@@ -21,7 +21,7 @@
 #define PMACTIONS_H
 
 #include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TQComboBox;
 class TQSpinBox;
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 987f6a8c..a8850184 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -32,8 +32,8 @@
 #ifndef NO_KDE2
 #include <tdeconfig.h>
 #include <kglobal.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
 #include <twin.h>
 #include <kdebug.h>
 #ifdef TQ_WS_X11
@@ -50,7 +50,7 @@
 
 #include <tdeparts/event.h>
 #include <tdeparts/part.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeparts/plugin.h>
 #include <kstatusbar.h>
 #include <kinstance.h>
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 04a43ef9..d4a66f4a 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -64,14 +64,14 @@
 #include <tqtabwidget.h>
 
 #ifndef NO_KDE2
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <netwm_def.h>
 #undef  EXPORT_DOCKCLASS
 #define EXPORT_DOCKCLASS
 #else
 #include <tqmainwindow.h>
 #include "exportdockclass.h"
-#include "dummykmainwindow.h"
+#include "dummytdemainwindow.h"
 #endif
 
 #include <tdeparts/part.h>
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 71e7eafa..615ff417 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -37,7 +37,7 @@
 #include <tqdom.h>
 
 #include <kxmlguifactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <klocale.h>
diff --git a/kpovmodeler/pminsertpopup.h b/kpovmodeler/pminsertpopup.h
index 6f55803f..b9242611 100644
--- a/kpovmodeler/pminsertpopup.h
+++ b/kpovmodeler/pminsertpopup.h
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 /**
  * Popup menu. Ask the user where to insert new objects
diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp
index fe7b4fd4..c8a48601 100644
--- a/kpovmodeler/pmlibraryobjectsearch.cpp
+++ b/kpovmodeler/pmlibraryobjectsearch.cpp
@@ -32,7 +32,7 @@
 #include <kurl.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) :
    TQWidget( parent, "" )
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index 011a86af..11e8b0a3 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <tdeio/netaccess.h>
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index 4758d51c..f6435872 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kurl.h>
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 86dea89b..f2faceed 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
@@ -26,7 +26,7 @@
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <kaboutdialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqtimer.h>
 
 #include "pmshell.h"
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index f8e1c968..6522f6da 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kfilterdev.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include <tqfile.h>
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index 6c81272a..7dc680b1 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -25,9 +25,9 @@
 #include <kiconloader.h>
 #include <kimageeffect.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <knotifyclient.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <twin.h>
 #include <kstdguiitem.h>
diff --git a/kruler/klineal.h b/kruler/klineal.h
index 1ec5f747..566bd92e 100644
--- a/kruler/klineal.h
+++ b/kruler/klineal.h
@@ -19,11 +19,11 @@
 #define KLINEAL_H
 
 #include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kmainwindow.h>
+#include <tdepopupmenu.h>
+#include <tdemainwindow.h>
 
 #include <kcolordialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 #include <tqlabel.h>
 #include <tqpainter.h>
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index eaa38dc0..e62ce162 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -29,10 +29,10 @@
 #include <tqclipboard.h>
 #include <tqvbox.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <knotifyclient.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstartupinfo.h>
 
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 36ff7992..1873dfcc 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -20,7 +20,7 @@
 
 #include <krun.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <ktempfile.h>
diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp
index 015d7bad..ee8b315e 100644
--- a/ksvg/plugin/ksvg_widget.cpp
+++ b/ksvg/plugin/ksvg_widget.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kcursor.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kxmlguifactory.h>
 #include "ksvg_widget.moc"
 
diff --git a/ksvg/plugin/ksvg_widget.h b/ksvg/plugin/ksvg_widget.h
index 6d372def..6b934895 100644
--- a/ksvg/plugin/ksvg_widget.h
+++ b/ksvg/plugin/ksvg_widget.h
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <SVGEventImpl.h>
 
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 525397e5..52a054ba 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -22,7 +22,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
 #include <kurlcompletion.h>
 
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 0fcbde11..dae0fc3c 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -51,7 +51,7 @@
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kpropertiesdialog.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdguiitem.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
diff --git a/kuickshow/src/imagewindow.h b/kuickshow/src/imagewindow.h
index bf5427a8..fbc8b900 100644
--- a/kuickshow/src/imagewindow.h
+++ b/kuickshow/src/imagewindow.h
@@ -21,7 +21,7 @@
 
 #include <tqevent.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 
 #include "imlibwidget.h"
diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp
index 09951e54..908aadb3 100644
--- a/kuickshow/src/kuickconfigdlg.cpp
+++ b/kuickshow/src/kuickconfigdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqkeycode.h>
 #include <tqvbox.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index ebd03b81..c9bffe25 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -29,8 +29,8 @@
 #include <tqstring.h>
 
 #include <kaboutdata.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <tdeconfig.h>
@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
@@ -53,7 +53,7 @@
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kstartupinfo.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kurldrag.h>
diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h
index 33f5a9f5..79d05889 100644
--- a/kuickshow/src/kuickshow.h
+++ b/kuickshow/src/kuickshow.h
@@ -25,7 +25,7 @@
 #include <tqvaluelist.h>
 
 #include <tdefileitem.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include <Imlib.h>
diff --git a/kview/kview.cpp b/kview/kview.cpp
index f03b6a07..33ba9c81 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -29,7 +29,7 @@
 #include <tdeparts/plugin.h>
 #include <tdeparts/part.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kimageio.h>
 #include <tdefiledialog.h>
@@ -39,7 +39,7 @@
 #include <kstatusbar.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kprogress.h>
 
 #include <tqimage.h>
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index 84f897c4..04b3cf3a 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kcolorbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 #include <kgenericfactory.h>
 
diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index 37d4b0f5..d6d38452 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -294,7 +294,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 3495adbf..b2fbe46e 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -47,10 +47,10 @@
 #include <ktempfile.h>
 #include <kapplication.h>
 #include <kimageio.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdirwatch.h>
 #include <kurldrag.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 typedef KParts::GenericFactory<KViewViewer> KViewViewerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory )
diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp
index ea12d237..29d1d9aa 100644
--- a/kview/modules/browser/kviewbrowser.cpp
+++ b/kview/modules/browser/kviewbrowser.cpp
@@ -23,7 +23,7 @@
 #include <tqcursor.h>
 
 #include <kdirlister.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp
index 4b717da7..a2525e77 100644
--- a/kview/modules/effects/kvieweffects.cpp
+++ b/kview/modules/effects/kvieweffects.cpp
@@ -6,7 +6,7 @@
 
 #include <tqobjectlist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index b9a21da4..b3f8cf48 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -275,7 +275,7 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kdialog.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index 74e82bea..62ca6e90 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -22,7 +22,7 @@
 
 #include <tqimage.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 ImageListItem::ImageListItem( TDEListView * parent, const KURL & url )
 	: TDEListViewItem( parent, parent->lastItem(), url.prettyURL() )
diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h
index 4eabcb39..321dcf4d 100644
--- a/kview/modules/presenter/imagelistitem.h
+++ b/kview/modules/presenter/imagelistitem.h
@@ -21,7 +21,7 @@
 #ifndef IMAGELISTITEM_H
 #define IMAGELISTITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <tqstring.h>
 
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index c554e446..7cc3285c 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -32,7 +32,7 @@
 
 #include <kpushbutton.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp
index 4dbdbd92..d2f6c9c5 100644
--- a/kview/modules/scale/kview_scale.cpp
+++ b/kview/modules/scale/kview_scale.cpp
@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqvbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp
index 010296e5..1c35fa68 100644
--- a/kview/modules/scanner/kviewscanner.cpp
+++ b/kview/modules/scanner/kviewscanner.cpp
@@ -23,7 +23,7 @@
 #include <tqimage.h>
 #include <tqobjectlist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp
index 78e10595..f148f7ac 100644
--- a/kview/modules/template/kviewtemplate.cpp
+++ b/kview/modules/template/kviewtemplate.cpp
@@ -6,7 +6,7 @@
 
 #include <tqobjectlist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 /*#include <klocale.h>*/
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp
index a434994b..ed21f123 100644
--- a/kview/photobook/photobook.cpp
+++ b/kview/photobook/photobook.cpp
@@ -40,8 +40,8 @@ Copyright (c) 2004,2005 Charles Samuels <charles@kde.org>
 #include "photobook.h"
 
 #include <tdeparts/componentfactory.h>
-#include <kaction.h>
-#include <kstdaccel.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
 #include <kstandarddirs.h>
 
 Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes)
diff --git a/kviewshell/CMakeLists.txt b/kviewshell/CMakeLists.txt
index 3ad83e46..61156ee7 100644
--- a/kviewshell/CMakeLists.txt
+++ b/kviewshell/CMakeLists.txt
@@ -71,7 +71,7 @@ tde_add_library( kviewshell STATIC_PIC AUTOMOC
 
 tde_add_library( tdemultipage SHARED AUTOMOC
   SOURCES
-    tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel
+    tdemultipage.cpp pageView.cpp martdelist.cpp tdemultipageInterface.skel
     units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp
     renderedDocumentPagePixmap.cpp renderedDocumentPagePrinter.cpp
     documentPageCache.cpp documentWidget.cpp searchWidget.cpp
diff --git a/kviewshell/Makefile.am b/kviewshell/Makefile.am
index 136a4177..4262ff4e 100644
--- a/kviewshell/Makefile.am
+++ b/kviewshell/Makefile.am
@@ -20,7 +20,7 @@ kviewerpart_la_SOURCES = kviewpart.cpp pageSizeWidget_base.ui \
 kviewerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 kviewerpart_la_LIBADD = ./libifaces.la $(LIB_TDEFILE) -ltdeparts
 
-libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel \
+libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp martdelist.cpp tdemultipageInterface.skel \
 		units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp renderedDocumentPagePixmap.cpp \
 		renderedDocumentPagePrinter.cpp documentPageCache.cpp documentWidget.cpp searchWidget.cpp \
 		selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc tableOfContents.cpp \
diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp
index 4db64d0b..04dffc75 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index d165fc38..69c3a4a3 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -9,8 +9,8 @@
 #include <tqprintdialog.h>
 
 #include <kaboutdialog.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index 93a39b7f..1975a6ea 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -15,7 +15,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kviewshell/martdelist.cpp b/kviewshell/martdelist.cpp
index 1cbf6581..ad9f284d 100644
--- a/kviewshell/martdelist.cpp
+++ b/kviewshell/martdelist.cpp
@@ -32,16 +32,16 @@
 #include <kapplication.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
 #include "documentPageCache.h"
 #include "kvsprefs.h"
-#include "marklist.h"
+#include "martdelist.h"
 
 
-#include "marklist.moc"
+#include "martdelist.moc"
 
 
 namespace {
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index 0a8cdd78..ad044d20 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -21,7 +21,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
diff --git a/kviewshell/tableOfContents.h b/kviewshell/tableOfContents.h
index ccd106e8..d4f58c44 100644
--- a/kviewshell/tableOfContents.h
+++ b/kviewshell/tableOfContents.h
@@ -24,7 +24,7 @@
 
 #include "anchor.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class Bookmark;
 
diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp
index d08dead7..0b2b83fd 100644
--- a/kviewshell/tdemultipage.cpp
+++ b/kviewshell/tdemultipage.cpp
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
@@ -20,7 +20,7 @@
 #include <tqvbox.h>
 
 #include "documentWidget.h"
-#include "marklist.h"
+#include "martdelist.h"
 #include "tableOfContents.h"
 #include "kprintDialogPage_pageoptions.h"
 #include "kvsprefs.h"
@@ -66,7 +66,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject
   connect(tableOfContents, TQT_SIGNAL(gotoPage(const Anchor&)), this, TQT_SLOT(gotoPage(const Anchor&)));
   
   // Create MarkList
-  _markList = new MarkList(sideBar, "marklist");
+  _markList = new MarkList(sideBar, "martdelist");
   sideBar->addItem(_markList, TQIconSet(SmallIcon("thumbnail")), i18n("Thumbnails"));
 
   // Restore state of the sidebar
@@ -898,7 +898,7 @@ void KMultiPage::updateWidgetSize(const PageNumber& pageNumber)
     }
   }
 
-  // Update marklist
+  // Update martdelist
   markList()->updateWidgetSize(pageNumber);
 }
 
diff --git a/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h
index 1e0910ee..dfc4a076 100644
--- a/kviewshell/tdemultipage.h
+++ b/kviewshell/tdemultipage.h
@@ -7,7 +7,7 @@
 #include "documentRenderer.h"
 #include "history.h"
 #include "tdemultipageInterface.h"
-#include "marklist.h"
+#include "martdelist.h"
 
 #include <tdeparts/part.h>
 #include <tqtimer.h>
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index 9618b47b..5dfa43b7 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqmessagebox.h>
 #include <tqscrollview.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqlabel.h>
 #include <tqdict.h>
 #include <tqimage.h>
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index 5aba1b04..a8d3f6be 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 
 #include "previewer.h"