diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui
index 9605f84..9ad2b87 100644
--- a/k3bsetup/base_k3bsetup2.ui
+++ b/k3bsetup/base_k3bsetup2.ui
@@ -372,8 +372,8 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp
index e0a8d89..bb44a97 100644
--- a/k3bsetup/k3bsetup2.cpp
+++ b/k3bsetup/k3bsetup2.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kgenericfactory.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <keditlistbox.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
index 6687c94..b49283e 100644
--- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp
+++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqframe.h>
 #include <tqlabel.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 
diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h
index 333b9f0..b29f594 100644
--- a/libk3b/tools/k3blistview.h
+++ b/libk3b/tools/k3blistview.h
@@ -18,7 +18,7 @@
 #define K3BLISTVIEW_H
 
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "k3b_export.h"
 #include <tqptrvector.h>
 #include <tqptrlist.h>
diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp
index a70b5be..d19f579 100644
--- a/libk3b/tools/k3bradioaction.cpp
+++ b/libk3b/tools/k3bradioaction.cpp
@@ -15,7 +15,7 @@
 
 #include "k3bradioaction.h"
 
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 K3bRadioAction::K3bRadioAction( const TQString& text, const TDEShortcut& cut,
 				TQObject* parent, const char* name )
diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h
index cf77f88..1932efb 100644
--- a/libk3b/tools/k3bradioaction.h
+++ b/libk3b/tools/k3bradioaction.h
@@ -16,7 +16,7 @@
 #ifndef _K3B_RADIO_ACTION_H_
 #define _K3B_RADIO_ACTION_H_
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include "k3b_export.h"
 
 /**
diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp
index 22b7a94..8b00f51 100644
--- a/libk3b/tools/k3btoolbox.cpp
+++ b/libk3b/tools/k3btoolbox.cpp
@@ -15,9 +15,9 @@
 
 #include "k3btoolbox.h"
 
-#include <kaction.h>
-#include <kpopupmenu.h>
-#include <ktoolbarbutton.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbarbutton.h>
 #include <kiconloader.h>
 
 #include <tqtoolbutton.h>
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index b897ebd..cd931fc 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -57,7 +57,7 @@ void K3bToolButton::drawButton( TQPainter* p )
   TQToolButton::drawButton( p );
 
   //
-  // code below comes from ktoolbarbutton.cpp from the tdelibs sources
+  // code below comes from tdetoolbarbutton.cpp from the tdelibs sources
   // see the file for copyright information
   //
   if( TQToolButton::popup() ) {
diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
index 93b12f1..9eff938 100644
--- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
+++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
@@ -32,7 +32,7 @@
 #include <k3bpluginfactory.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/src/k3b.cpp b/src/k3b.cpp
index 8d19aec..8b8ddd2 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -48,7 +48,7 @@
 #include <kprocess.h>
 #include <kurl.h>
 #include <kurllabel.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <kglobalsettings.h>
 #include <kdialog.h>
@@ -60,7 +60,7 @@
 #include <kstdguiitem.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 #include <stdlib.h>
 
diff --git a/src/k3b.h b/src/k3b.h
index a9ed38b..4b57559 100644
--- a/src/k3b.h
+++ b/src/k3b.h
@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <tdeparts/dockmainwindow.h>
 #include <kdockwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 
 class TQVBox;
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index 04da69f..f9c5e33 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -21,14 +21,14 @@
 #include <k3bapplication.h>
 #include <k3bmediacache.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <tdeio/job.h>
 #include <klocale.h>
 #include <tdeio/global.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name )
diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp
index 74b8c15..b49626e 100644
--- a/src/k3baudioplayer.cpp
+++ b/src/k3baudioplayer.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <string.h>
 
diff --git a/src/k3baudioplayer.h b/src/k3baudioplayer.h
index 387aa53..7e375d5 100644
--- a/src/k3baudioplayer.h
+++ b/src/k3baudioplayer.h
@@ -17,7 +17,7 @@
 #ifndef K3BAUDIOPLAYER_H
 #define K3BAUDIOPLAYER_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <config.h>
 
diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp
index 16893ff..e8e1bb9 100644
--- a/src/k3bdiroperator.cpp
+++ b/src/k3bdiroperator.cpp
@@ -23,10 +23,10 @@
 
 #include <kcombiview.h>
 #include <tdefilepreview.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbookmarkmenu.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqdir.h>
 
diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp
index 5b57939..22ef018 100644
--- a/src/k3bdirview.cpp
+++ b/src/k3bdirview.cpp
@@ -61,7 +61,7 @@
 #include <kmimetype.h>
 #include <kcursor.h>
 #include <tdefiledetailview.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kurl.h>
 #include <klocale.h>
@@ -77,7 +77,7 @@
 #include <kmessagebox.h>
 #include <kstdaction.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 
 
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index 397e309..7de833b 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -40,7 +40,7 @@
 
 #include <kdialog.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index 23d6ac2..8d32675 100644
--- a/src/k3bfiletreeview.cpp
+++ b/src/k3bfiletreeview.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeio/global.h>
 #include <tdefileitem.h>
 #include <kapplication.h>
diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp
index b38b994..b4add44 100644
--- a/src/k3bfileview.cpp
+++ b/src/k3bfileview.cpp
@@ -29,10 +29,10 @@
 #include <tqtoolbutton.h>
 
 #include <tdefiledetailview.h>
-#include <klistview.h>
-#include <kaction.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdelistview.h>
+#include <tdeaction.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <tdefilefiltercombo.h>
diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp
index b574b0f..edea8b0 100644
--- a/src/k3bflatbutton.cpp
+++ b/src/k3bflatbutton.cpp
@@ -17,7 +17,7 @@
 #include "k3bthememanager.h"
 #include "k3bapplication.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 
diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp
index ed912f9..25551e5 100644
--- a/src/k3bjobprogressdialog.cpp
+++ b/src/k3bjobprogressdialog.cpp
@@ -55,7 +55,7 @@
 #include <kprogress.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -63,7 +63,7 @@
 #include <knotifyclient.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 
diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp
index f3151c9..a2345a2 100644
--- a/src/k3bjobprogressosd.cpp
+++ b/src/k3bjobprogressosd.cpp
@@ -24,7 +24,7 @@
 #include <kcursor.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqpixmap.h>
 #include <tqpainter.h>
diff --git a/src/k3bprojecttabwidget.cpp b/src/k3bprojecttabwidget.cpp
index eb2f1a9..2507feb 100644
--- a/src/k3bprojecttabwidget.cpp
+++ b/src/k3bprojecttabwidget.cpp
@@ -22,7 +22,7 @@
 #include <k3bview.h>
 #include <k3bdoc.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kurldrag.h>
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index c654a90..d3037bc 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -35,7 +35,7 @@
 #include <tdeio/global.h>
 #include <kstatusbar.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqlabel.h>
 #include <tqhbox.h>
diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp
index 92c9fa7..8af0ec6 100644
--- a/src/k3bwelcomewidget.cpp
+++ b/src/k3bwelcomewidget.cpp
@@ -41,9 +41,9 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kaboutdata.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 
 static const char* s_allActions[] = {
diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h
index 48d585f..58d85ca 100644
--- a/src/k3bwelcomewidget.h
+++ b/src/k3bwelcomewidget.h
@@ -23,7 +23,7 @@
 #include <tqimage.h>
 
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class K3bMainWindow;
 class TQDropEvent;
diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp
index 79c32db..49534f1 100644
--- a/src/misc/k3bblankingdialog.cpp
+++ b/src/misc/k3bblankingdialog.cpp
@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui
index 507b846..0c15130 100644
--- a/src/option/base_k3bcddboptiontab.ui
+++ b/src/option/base_k3bcddboptiontab.ui
@@ -553,8 +553,8 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>knuminput.h</includehint>
 </includehints>
 </UI>
diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui
index daf0f18..f1eab04 100644
--- a/src/option/base_k3bthemeoptiontab.ui
+++ b/src/option/base_k3bthemeoptiontab.ui
@@ -203,6 +203,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index b944073..16a838d 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -32,7 +32,7 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <krun.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp
index 762816a..d34b3a0 100644
--- a/src/option/k3bexternalbinoptiontab.cpp
+++ b/src/option/k3bexternalbinoptiontab.cpp
@@ -22,7 +22,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 13904e4..27c9f8f 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <keditlistbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kglobalsettings.h>
 #include <tdeversion.h>
 
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index b61c81b..515c4f0 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -23,7 +23,7 @@
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui
index a5a6f03..0bfefa5 100644
--- a/src/projects/base_k3badvanceddataimagesettings.ui
+++ b/src/projects/base_k3badvanceddataimagesettings.ui
@@ -186,7 +186,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui
index 439ac16..f0e5f27 100644
--- a/src/projects/base_k3bbootimageview.ui
+++ b/src/projects/base_k3bbootimageview.ui
@@ -389,6 +389,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp
index ec1e815..57e7ebb 100644
--- a/src/projects/k3baudiotrackplayer.cpp
+++ b/src/projects/k3baudiotrackplayer.cpp
@@ -18,7 +18,7 @@
 #include <k3baudiotrack.h>
 #include <k3baudioserver.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 
 #include <tqslider.h>
diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp
index 2569add..f0c7fcb 100644
--- a/src/projects/k3baudiotracksplitdialog.cpp
+++ b/src/projects/k3baudiotracksplitdialog.cpp
@@ -21,9 +21,9 @@
 #include <k3bmsfedit.h>
 
 #include <klocale.h>
-#include <kactioncollection.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 #include <tqlabel.h>
 #include <tqframe.h>
diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp
index 7539aa8..f59ec9e 100644
--- a/src/projects/k3baudiotrackview.cpp
+++ b/src/projects/k3baudiotrackview.cpp
@@ -53,8 +53,8 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp
index cdfaaea..bddd065 100644
--- a/src/projects/k3baudioview.cpp
+++ b/src/projects/k3baudioview.cpp
@@ -34,7 +34,7 @@
 #include <k3bfillstatusdisplay.h>
 #include <k3bmsf.h>
 #include <k3btoolbox.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <k3bprojectplugin.h>
 
 // QT-includes
diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp
index 9f95d7c..7b3e2f4 100644
--- a/src/projects/k3bbootimageview.cpp
+++ b/src/projects/k3bbootimageview.cpp
@@ -20,7 +20,7 @@
 #include <k3bintvalidator.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp
index 9ecc9bc..be1cb17 100644
--- a/src/projects/k3bdataadvancedimagesettingswidget.cpp
+++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp
@@ -28,7 +28,7 @@
 #include <tqvalidator.h>
 #include <tqregexp.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp
index cd35c2f..cb35a18 100644
--- a/src/projects/k3bdatadirtreeview.cpp
+++ b/src/projects/k3bdatadirtreeview.cpp
@@ -31,11 +31,11 @@
 #include <tqtimer.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <kdebug.h>
 
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index c4b625a..d703d2f 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -38,11 +38,11 @@
 #include <tqfileinfo.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <krun.h>
 #include <tdeversion.h>
 
diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp
index d59e55b..474d799 100644
--- a/src/projects/k3bdataview.cpp
+++ b/src/projects/k3bdataview.cpp
@@ -34,8 +34,8 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index 29324a8..b2d2e2a 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -39,8 +39,8 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <tdeconfig.h>
diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp
index 8d1b939..1647ef6 100644
--- a/src/projects/k3bmixedview.cpp
+++ b/src/projects/k3bmixedview.cpp
@@ -41,7 +41,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 
 K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* parent, const char* name )
diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp
index 58c4f3c..85d8312 100644
--- a/src/projects/k3bmovixview.cpp
+++ b/src/projects/k3bmovixview.cpp
@@ -27,8 +27,8 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kurl.h>
diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp
index b2c5508..8035cd7 100644
--- a/src/projects/k3bvcdlistview.cpp
+++ b/src/projects/k3bvcdlistview.cpp
@@ -27,8 +27,8 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kdialog.h>
 
 // K3b Includes
diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp
index 252e2d0..3bcc328 100644
--- a/src/projects/k3bvideodvdview.cpp
+++ b/src/projects/k3bvideodvdview.cpp
@@ -26,7 +26,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 #include <tqsplitter.h>
 
diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp
index 86e97e3..66b05a4 100644
--- a/src/projects/k3bview.cpp
+++ b/src/projects/k3bview.cpp
@@ -22,7 +22,7 @@
 #include <tqptrlist.h>
 #include <tqtoolbutton.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index d083af6..91e5a51 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index f9bcfdb..425d64b 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -34,7 +34,7 @@
 #include <kcombobox.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdeio/global.h>
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 876d91f..20fbe15 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdeio/global.h>
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index c7799bd..1dd9753 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -14,7 +14,7 @@
 */
 
 // kde includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcutlabel.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 3195f3c..c4bc79b 100644
--- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
+++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
@@ -708,7 +708,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index b5deed5..f964a67 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -24,7 +24,7 @@
 #include <k3bfilesysteminfo.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kurlrequester.h>
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp
index 9567afd..cce8f09 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 5a229bf..742a7f7 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -20,7 +20,7 @@
 #include <k3brichtextlabel.h>
 #include <k3bintmapcombobox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <tdeio/global.h>