diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index d33bf6e..b3bf475 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index a9f642a..8a15d70 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <krandomsequence.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp
index 414c53a..75ca94f 100644
--- a/kaffeine/src/input/dvb/dvbsi.cpp
+++ b/kaffeine/src/input/dvb/dvbsi.cpp
@@ -25,7 +25,7 @@
 
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "dvbsi.h"
 
diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp
index 180ba82..62f45d6 100644
--- a/kaffeine/src/input/dvb/dvbstream.cpp
+++ b/kaffeine/src/input/dvb/dvbstream.cpp
@@ -42,7 +42,7 @@
 #include <tqprogressdialog.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "dvbstream.h"
diff --git a/kaffeine/src/input/dvbclient/cddump.cpp b/kaffeine/src/input/dvbclient/cddump.cpp
index 9775cc2..1225768 100644
--- a/kaffeine/src/input/dvbclient/cddump.cpp
+++ b/kaffeine/src/input/dvbclient/cddump.cpp
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "cddump.h"
diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
index a6d72a6..af17236 100644
--- a/kaffeine/src/instwizard.cpp
+++ b/kaffeine/src/instwizard.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <tqstringlist.h>
 #include <tdeversion.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //#include <xine.h>
 
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index d76f596..d7b101d 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -50,12 +50,12 @@
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 
 #include <tqdir.h>
diff --git a/kaffeine/src/main.cpp b/kaffeine/src/main.cpp
index 46e503f..8ed8eda 100644
--- a/kaffeine/src/main.cpp
+++ b/kaffeine/src/main.cpp
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kuniqueapplication.h>
 
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h
index a410e23..67d55ef 100644
--- a/kaffeine/src/player-parts/gstreamer-part/video.h
+++ b/kaffeine/src/player-parts/gstreamer-part/video.h
@@ -25,7 +25,7 @@
 #define VIDEO_H
 
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqsize.h>
 
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index e656d94..eb24868 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -20,7 +20,7 @@
 
 #include "xine_part.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tdeaction.h>