diff --git a/tderadio3/convert-presets/convert-presets.cpp b/tderadio3/convert-presets/convert-presets.cpp
index 28e0c36..770bdbc 100644
--- a/tderadio3/convert-presets/convert-presets.cpp
+++ b/tderadio3/convert-presets/convert-presets.cpp
@@ -2,14 +2,14 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tqfile.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <tqregexp.h>
 #include <time.h>
 #include <sys/fcntl.h>
diff --git a/tderadio3/plugins/alsa-sound/alsa-sound.cpp b/tderadio3/plugins/alsa-sound/alsa-sound.cpp
index 4133983..15cb98f 100644
--- a/tderadio3/plugins/alsa-sound/alsa-sound.cpp
+++ b/tderadio3/plugins/alsa-sound/alsa-sound.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/tderadio3/plugins/gui-docking-menu/docking.cpp b/tderadio3/plugins/gui-docking-menu/docking.cpp
index 186a590..a766360 100644
--- a/tderadio3/plugins/gui-docking-menu/docking.cpp
+++ b/tderadio3/plugins/gui-docking-menu/docking.cpp
@@ -18,10 +18,10 @@
 #include <kiconloader.h>
 #include <tqtooltip.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <twin.h>
 
diff --git a/tderadio3/plugins/gui-quickbar/quickbar.cpp b/tderadio3/plugins/gui-quickbar/quickbar.cpp
index c2a070a..d4f5f54 100644
--- a/tderadio3/plugins/gui-quickbar/quickbar.cpp
+++ b/tderadio3/plugins/gui-quickbar/quickbar.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "../../src/include/aboutwidget.h"
 #include "../../src/include/station-drag-object.h"
diff --git a/tderadio3/plugins/gui-standard-display/radioview.cpp b/tderadio3/plugins/gui-standard-display/radioview.cpp
index a79a8d8..2c7c08e 100644
--- a/tderadio3/plugins/gui-standard-display/radioview.cpp
+++ b/tderadio3/plugins/gui-standard-display/radioview.cpp
@@ -27,7 +27,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
@@ -45,7 +45,7 @@
 #include "radioview_frequencyseeker.h"
 #include "radioview-configuration.h"
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #define POPUP_ID_START_RECORDING_DEFAULT  0
 #define POPUP_ID_STOP_RECORDING_BASE      100
diff --git a/tderadio3/plugins/lirc/lircsupport.cpp b/tderadio3/plugins/lirc/lircsupport.cpp
index f6264c6..8fef92f 100644
--- a/tderadio3/plugins/lirc/lircsupport.cpp
+++ b/tderadio3/plugins/lirc/lircsupport.cpp
@@ -25,8 +25,8 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 
 #include "../../src/include/errorlog-interfaces.h"
diff --git a/tderadio3/plugins/oss-sound/oss-sound.cpp b/tderadio3/plugins/oss-sound/oss-sound.cpp
index ac1aac4..a6579e8 100644
--- a/tderadio3/plugins/oss-sound/oss-sound.cpp
+++ b/tderadio3/plugins/oss-sound/oss-sound.cpp
@@ -19,7 +19,7 @@
 
 #include "../../src/include/aboutwidget.h"
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/soundcard.h>
diff --git a/tderadio3/plugins/radio/radio.cpp b/tderadio3/plugins/radio/radio.cpp
index ab1a553..4e853ce 100644
--- a/tderadio3/plugins/radio/radio.cpp
+++ b/tderadio3/plugins/radio/radio.cpp
@@ -23,7 +23,7 @@
 
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 
 #include "../../src/include/debug-profiler.h"
diff --git a/tderadio3/plugins/recording/recording-monitor.cpp b/tderadio3/plugins/recording/recording-monitor.cpp
index c83f543..0e0bd62 100644
--- a/tderadio3/plugins/recording/recording-monitor.cpp
+++ b/tderadio3/plugins/recording/recording-monitor.cpp
@@ -27,7 +27,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 RecordingMonitor::RecordingMonitor(const TQString &name)
   : TQWidget(NULL, name.ascii()),
diff --git a/tderadio3/plugins/recording/recording.cpp b/tderadio3/plugins/recording/recording.cpp
index 0b17d30..2f1ce05 100644
--- a/tderadio3/plugins/recording/recording.cpp
+++ b/tderadio3/plugins/recording/recording.cpp
@@ -36,7 +36,7 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 
 ///////////////////////////////////////////////////////////////////////
diff --git a/tderadio3/plugins/soundserver/soundserver.cpp b/tderadio3/plugins/soundserver/soundserver.cpp
index ac61f80..a864ca3 100644
--- a/tderadio3/plugins/soundserver/soundserver.cpp
+++ b/tderadio3/plugins/soundserver/soundserver.cpp
@@ -17,7 +17,7 @@
 
 #include "soundserver.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 
diff --git a/tderadio3/plugins/streaming/streaming.cpp b/tderadio3/plugins/streaming/streaming.cpp
index 1e34a93..0f90f0f 100644
--- a/tderadio3/plugins/streaming/streaming.cpp
+++ b/tderadio3/plugins/streaming/streaming.cpp
@@ -20,7 +20,7 @@
 #include "../../src/include/aboutwidget.h"
 #include "../../src/include/utils.h"
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kurl.h>
 #include <klocale.h>
 
diff --git a/tderadio3/plugins/timecontrol/timecontrol.cpp b/tderadio3/plugins/timecontrol/timecontrol.cpp
index fee7c28..1b56ff0 100644
--- a/tderadio3/plugins/timecontrol/timecontrol.cpp
+++ b/tderadio3/plugins/timecontrol/timecontrol.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 
 #include "timecontrol.h"
diff --git a/tderadio3/plugins/v4lradio/v4lradio.cpp b/tderadio3/plugins/v4lradio/v4lradio.cpp
index f0a8766..8fa4c81 100644
--- a/tderadio3/plugins/v4lradio/v4lradio.cpp
+++ b/tderadio3/plugins/v4lradio/v4lradio.cpp
@@ -39,7 +39,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "../../src/include/aboutwidget.h"
diff --git a/tderadio3/src/aboutwidget.cpp b/tderadio3/src/aboutwidget.cpp
index 5c82481..728840e 100644
--- a/tderadio3/src/aboutwidget.cpp
+++ b/tderadio3/src/aboutwidget.cpp
@@ -23,7 +23,7 @@
 #include "include/tderadioversion.h"
 #include "include/aboutwidget.h"
 #include <tqframe.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <tqtabwidget.h>
 #include <tqlayout.h>
 #include <tqtabbar.h>
@@ -33,12 +33,12 @@
 #include <ktextbrowser.h>
 #include <tqtextedit.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kurllabel.h>
 
-// copied (and renamed) from kaboutdialog.cpp
+// copied (and renamed) from tdeaboutdialog.cpp
 // original: TDEAboutTabWidget
 
 class TDERadioAboutTabWidget : public TQTabWidget
@@ -51,7 +51,7 @@ public:
 };
 
 
-// copied (renamed and extended) from kaboutdialog.cpp
+// copied (renamed and extended) from tdeaboutdialog.cpp
 // original: TDEAboutContainerBase
 
 TDERadioAboutWidget::TDERadioAboutWidget(const TDEAboutData &aboutData, int layoutType, TQWidget *_parent,
@@ -486,7 +486,7 @@ void TDERadioAboutWidget::slotMailClick( const TQString &/*_name*/,
 }
 
 
-// copied (and renamed) from kaboutapplication.cpp
+// copied (and renamed) from tdeaboutapplication.cpp
 // original: TDEAboutApplication::buildDialog
 
 void TDERadioAboutWidget::setAboutData(const TDEAboutData &_aboutData)
@@ -576,7 +576,7 @@ void TDERadioAboutWidget::setAboutData(const TDEAboutData &_aboutData)
 //
 // A class that can can monitor mouse movements on the image
 //
-// copied (and renamed) from kaboutdialog.cpp
+// copied (and renamed) from tdeaboutdialog.cpp
 // original: KImageTrackLabel
 
 TDERadioImageTrackLabel::TDERadioImageTrackLabel( TQWidget *_parent, const char *_name, WFlags f )
diff --git a/tderadio3/src/include/tderadioapp.h b/tderadio3/src/include/tderadioapp.h
index f3f3592..80185b7 100644
--- a/tderadio3/src/include/tderadioapp.h
+++ b/tderadio3/src/include/tderadioapp.h
@@ -24,8 +24,8 @@
 
 #include <tqdict.h>
 
-#include <kapplication.h>
-#include <kaboutapplication.h>
+#include <tdeapplication.h>
+#include <tdeaboutapplication.h>
 #include "pluginmanager.h"
 #include "plugins.h"
 
diff --git a/tderadio3/src/main.cpp b/tderadio3/src/main.cpp
index 3399a7b..f79fe88 100644
--- a/tderadio3/src/main.cpp
+++ b/tderadio3/src/main.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "include/tderadioversion.h"
diff --git a/tderadio3/src/tderadioapp.cpp b/tderadio3/src/tderadioapp.cpp
index c83efa3..0fc4012 100644
--- a/tderadio3/src/tderadioapp.cpp
+++ b/tderadio3/src/tderadioapp.cpp
@@ -20,7 +20,7 @@
 #endif
 
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <klibloader.h>
 #include <tdeconfig.h>