Rename common header files for consistency with class renaming

93 files changed, 135 insertions, 135 deletions

diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp
index acfd9367..9c8ed639 100644
--- a/arts/builder/dirmanager.cpp
+++ b/arts/builder/dirmanager.cpp
@@ -27,7 +27,7 @@
 
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "dirmanager.h"
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index 9e4819e2..fc14f6b0 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -30,7 +30,7 @@
 #include <tdefiledialog.h>
 #include <kseparator.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdguiitem.h>
 
 #include <unistd.h>
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 58637153..b4d0ae6d 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -27,7 +27,7 @@
 #include <kbuttonbox.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 #include <klocale.h>
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index eed56aaa..0a60801a 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -43,15 +43,15 @@
 #include <arts/debug.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <tdestdaccel.h>
 #include <tdefiledialog.h>
 #include <ksavefile.h>
 #include <kmessagebox.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 #include <kartsserver.h>
 #include <tqfile.h>
diff --git a/arts/builder/main.h b/arts/builder/main.h
index dd8c1c51..74408022 100644
--- a/arts/builder/main.h
+++ b/arts/builder/main.h
@@ -25,7 +25,7 @@
 #include "mwidget.h"
 
 #include <kdockwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <ksimpleconfig.h>
 
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 021d39f3..e4ea94a2 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -29,7 +29,7 @@
 #include <kinputdialog.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 #include <tqlineedit.h>
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index 781a628e..702a088e 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -21,7 +21,7 @@
 #include "propertypanel.moc"
 #include "module.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index 1df54dca..ca4b255b 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -27,7 +27,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kseparator.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp
index 23833992..5c3613d7 100644
--- a/arts/gui/kde/artstestgui.cpp
+++ b/arts/gui/kde/artstestgui.cpp
@@ -24,7 +24,7 @@
 #include <connect.h>
 #include <qiomanager.h>
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <objectmanager.h>
 
 using namespace Arts;
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index 38ef5f7e..0cd781b1 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -1,7 +1,7 @@
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kstdaction.h>
 #include <tdeactioncollection.h>
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index 32202b39..c0a3b5d2 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -36,7 +36,7 @@
 #include <kpixmapeffect.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #define PI 3.1415926
 static const int thresholdTime = 500;
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index 026a3907..285e08b0 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -18,7 +18,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <tqcursor.h>
@@ -70,8 +70,8 @@ ArtsControlApplet::~ArtsControlApplet() {
 kdDebug()<<k_funcinfo<<endl;
 }
 
-#include <kaboutdata.h>
-#include <kaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutapplication.h>
 
 void ArtsControlApplet::about() {
 	TDEAboutData about( "artscontrolapplet", I18N_NOOP( "aRts Control Applet" ), "0.5",
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 3793294f..0a4c5b89 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -32,7 +32,7 @@
 #include <kseparator.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
 
diff --git a/arts/tools/main.h b/arts/tools/main.h
index ae2819b7..a967e512 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -25,11 +25,11 @@
 #include <qiomanager.h>
 #include <dispatcher.h>
 #include <tqmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqframe.h>
 #include <tdemainwindow.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kstdaction.h>
 #include <tqlayout.h>
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 234a53a8..04859733 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqfile.h>
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 49611ec0..b8b70bda 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -22,7 +22,7 @@
 #include "midiportdlg.h"
 #include <klocale.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <kseparator.h>
diff --git a/juk/collectionlist.h b/juk/collectionlist.h
index c15dccc3..2a835c10 100644
--- a/juk/collectionlist.h
+++ b/juk/collectionlist.h
@@ -16,7 +16,7 @@
 #ifndef COLLECTIONLIST_H
 #define COLLECTIONLIST_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirwatch.h>
 #include <tdefileitem.h>
 
diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp
index 77354862..3c6dfe19 100644
--- a/juk/coverdialog.cpp
+++ b/juk/coverdialog.cpp
@@ -17,7 +17,7 @@
 #include <kiconview.h>
 #include <kiconviewsearchline.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <klocale.h>
 
diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp
index bc48fa0d..b16bebb8 100644
--- a/juk/coverinfo.cpp
+++ b/juk/coverinfo.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index e9202f2e..fb55bb55 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -30,7 +30,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 
diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp
index 4b893815..81df1f03 100644
--- a/juk/gstreamerplayer.cpp
+++ b/juk/gstreamerplayer.cpp
@@ -16,7 +16,7 @@
 
 #if HAVE_GSTREAMER
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/juk/juk.cpp b/juk/juk.cpp
index e4238416..15742ba9 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -15,7 +15,7 @@
 
 #include <config.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp
index ac066119..502b946c 100644
--- a/juk/k3bexporter.cpp
+++ b/juk/k3bexporter.cpp
@@ -21,7 +21,7 @@
 #include <tdeactioncollection.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqcstring.h>
 #include <tqmap.h>
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp
index 45399ce2..74abd3c0 100644
--- a/juk/ktrm.cpp
+++ b/juk/ktrm.cpp
@@ -23,7 +23,7 @@
 
 #if HAVE_MUSICBRAINZ
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kresolver.h>
 #include <kprotocolmanager.h>
 #include <kurl.h>
diff --git a/juk/main.cpp b/juk/main.cpp
index 1613293f..35ffd168 100644
--- a/juk/main.cpp
+++ b/juk/main.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
 #include <tdeconfigbase.h>
 #include <tdeconfig.h>
diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp
index c63bf22c..9f607f3d 100644
--- a/juk/musicbrainzquery.cpp
+++ b/juk/musicbrainzquery.cpp
@@ -23,7 +23,7 @@
 #include "tagtransactionmanager.h"
 
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 3c8da448..f6eb2fdc 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -36,7 +36,7 @@
 
 #include <kiconloader.h>
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp
index d20e5896..38bbfc47 100644
--- a/juk/splashscreen.cpp
+++ b/juk/splashscreen.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp
index ae165c6e..eec8afb5 100644
--- a/juk/tagguesser.cpp
+++ b/juk/tagguesser.cpp
@@ -8,7 +8,7 @@
  */
 #include "tagguesser.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp
index ba9e984d..15263ff1 100644
--- a/juk/tagguesserconfigdlg.cpp
+++ b/juk/tagguesserconfigdlg.cpp
@@ -15,7 +15,7 @@
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqtoolbutton.h>
 #include <tqevent.h>
diff --git a/juk/tagguessertest.cpp b/juk/tagguessertest.cpp
index 0a7c09bb..a6a01ce1 100644
--- a/juk/tagguessertest.cpp
+++ b/juk/tagguessertest.cpp
@@ -22,9 +22,9 @@
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "tagguesser.h"
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <tqdir.h>
 #include <iostream>
 
diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp
index 048e8962..27e4a382 100644
--- a/juk/tagtransactionmanager.cpp
+++ b/juk/tagtransactionmanager.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqfileinfo.h>
 #include <tqdir.h>
diff --git a/juk/tracksequenceiterator.cpp b/juk/tracksequenceiterator.cpp
index ae9a3001..f06f837f 100644
--- a/juk/tracksequenceiterator.cpp
+++ b/juk/tracksequenceiterator.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "tracksequenceiterator.h"
diff --git a/juk/treeviewitemplaylist.cpp b/juk/treeviewitemplaylist.cpp
index 22872760..a130c4ea 100644
--- a/juk/treeviewitemplaylist.cpp
+++ b/juk/treeviewitemplaylist.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/juk/upcomingplaylist.cpp b/juk/upcomingplaylist.cpp
index 6c04106a..9f91514b 100644
--- a/juk/upcomingplaylist.cpp
+++ b/juk/upcomingplaylist.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 
 #include "upcomingplaylist.h"
diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp
index 4a4e8621..b05bdff3 100644
--- a/juk/webimagefetcher.cpp
+++ b/juk/webimagefetcher.cpp
@@ -16,7 +16,7 @@
 #include <tqdom.h>
 #include <tqwaitcondition.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
 #include <tdemainwindow.h>
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index c08b0015..6eb0735e 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h
index ca00c084..f1a3f72e 100644
--- a/kaboodle/kaboodle_factory.h
+++ b/kaboodle/kaboodle_factory.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef KABOODLE_FACTORY_H
 #define KABOODLE_FACTORY_H
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
 #include <tdeparts/factory.h>
 
diff --git a/kaboodle/kaboodleapp.cpp b/kaboodle/kaboodleapp.cpp
index e153c725..223a74c8 100644
--- a/kaboodle/kaboodleapp.cpp
+++ b/kaboodle/kaboodleapp.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 
 #include "kaboodleapp.h"
diff --git a/kaboodle/kaboodleapp.h b/kaboodle/kaboodleapp.h
index e81340cf..c248b91f 100644
--- a/kaboodle/kaboodleapp.h
+++ b/kaboodle/kaboodleapp.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef KABOODLEAPP_H
 #define KABOODLEAPP_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 namespace Kaboodle
 {
diff --git a/kaboodle/main.cpp b/kaboodle/main.cpp
index 0723b78e..0a206cfc 100644
--- a/kaboodle/main.cpp
+++ b/kaboodle/main.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tqapplication.h>
 
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index 509fb7b0..9a5823b5 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kaudiocreator/main.cpp b/kaudiocreator/main.cpp
index 8fbe8d35..bf5ab59e 100644
--- a/kaudiocreator/main.cpp
+++ b/kaudiocreator/main.cpp
@@ -18,11 +18,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kaudiocreator.h"
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 static const TDECmdLineOptions options[] = {
   {"+[device]",I18N_NOOP( "CD device, can be a path or a media:/ URL" ),0},
diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp
index f99e33af..8885243d 100644
--- a/kaudiocreator/tracksimp.cpp
+++ b/kaudiocreator/tracksimp.cpp
@@ -22,7 +22,7 @@
 #include <dcopref.h>
 #include <fixx11h.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index 4ba34863..e4eefa31 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <kpanelapplet.h>
 #include <tdepopupmenu.h>
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 57f094e5..31f69c5a 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -35,10 +35,10 @@
 
 
 // KDE
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbugreport.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index 5b4a74a5..fea63cf7 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 
 // KDE
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialogbase.h>
 #include <kpanelapplet.h>
 
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index d48b8fb8..f95274f5 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -19,9 +19,9 @@
  */
 
 #include "mixertoolbox.h"
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 7743392f..87027ec1 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeaction.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpanelapplet.h>
 #include <tdepopupmenu.h>
 #include <kglobalsettings.h>
diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index ad6d3f92..876fafcb 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 // For "kapp"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kmix.h"
 #include "kmixprefdlg.h"
diff --git a/kmix/main.cpp b/kmix/main.cpp
index b85b329c..358b6ad7 100644
--- a/kmix/main.cpp
+++ b/kmix/main.cpp
@@ -19,8 +19,8 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index d84a36e5..1d4ea37b 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -32,7 +32,7 @@
 // KDE
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 // KMix
diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp
index 36f7d3b3..9ad1f2fa 100644
--- a/krec/krecconfig_files.cpp
+++ b/krec/krecconfig_files.cpp
@@ -24,7 +24,7 @@
 #include <tqlineedit.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp
index 96340ed3..8eb4dda4 100644
--- a/krec/krecconfig_fileswidget.cpp
+++ b/krec/krecconfig_fileswidget.cpp
@@ -21,7 +21,7 @@
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tqlabel.h>
diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp
index 5db92218..f08bf48c 100644
--- a/krec/krecconfigure.cpp
+++ b/krec/krecconfigure.cpp
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp
index bee2f733..cfd2ef6b 100644
--- a/krec/krecfile.cpp
+++ b/krec/krecfile.cpp
@@ -19,7 +19,7 @@
 #include "krecnewproperties.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempdir.h>
 #include <ktempfile.h>
 #include <ktar.h>
diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp
index 5ca06a6a..3c0191de 100644
--- a/krec/krecglobal.cpp
+++ b/krec/krecglobal.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeconfig.h>
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 
 #include <ktrader.h>
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index 30d029b6..955c8b89 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -29,7 +29,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tqlayout.h>
diff --git a/krec/main.cpp b/krec/main.cpp
index 8613b209..75333177 100644
--- a/krec/main.cpp
+++ b/krec/main.cpp
@@ -15,9 +15,9 @@
 // Should stay here because I use it for Start-/Stop-Info (see below)
 //#include <iostream>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "krecord.h"
diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp
index f5d1111a..eec94a70 100644
--- a/kscd/cddbdlg.cpp
+++ b/kscd/cddbdlg.cpp
@@ -13,7 +13,7 @@
 #include <knuminput.h>
 
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 845f434d..830e92ca 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -27,9 +27,9 @@
 #include <tqhbox.h>
 #include <tqtooltip.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 02186e81..ee0be3b5 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -33,12 +33,12 @@
 #include <tqsqlpropertymap.h>
 
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
 #include <dcopref.h>
 #include <kcharsets.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kscd/kscd.h b/kscd/kscd.h
index f0689368..3fa7be5a 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -52,7 +52,7 @@ class TDECompactDisc;
 #include "panel.h"
 #include "prefs.h"
 #include "configWidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 #include <kprocess.h>
 #include <krandomsequence.h>
diff --git a/kscd/kscdmagic/main.cpp b/kscd/kscdmagic/main.cpp
index 77a2e77c..9472ddf9 100644
--- a/kscd/kscdmagic/main.cpp
+++ b/kscd/kscdmagic/main.cpp
@@ -52,10 +52,10 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "logo.h"
 #include "magicconf.h"
diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp
index a693d22f..c6c6f7f3 100644
--- a/libkcddb/kcmcddb/cddbconfigwidget.cpp
+++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqspinbox.h>
 #include <tqlineedit.h>
 #include <tdefiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp
index 10813ffd..9699f54f 100644
--- a/libkcddb/test/asynccddblookuptest.cpp
+++ b/libkcddb/test/asynccddblookuptest.cpp
@@ -1,6 +1,6 @@
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "asynccddblookuptest.h"
 
diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp
index 60a93efe..3cba7d7b 100644
--- a/libkcddb/test/asynchttplookuptest.cpp
+++ b/libkcddb/test/asynchttplookuptest.cpp
@@ -1,6 +1,6 @@
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "asynchttplookuptest.h"
 #include "libkcddb/cache.h"
diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp
index af24ccfa..0dd0766e 100644
--- a/libkcddb/test/asynchttpsubmittest.cpp
+++ b/libkcddb/test/asynchttpsubmittest.cpp
@@ -1,6 +1,6 @@
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "asynchttpsubmittest.h"
 #include "libkcddb/submit.h"
diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp
index dae10a87..72ee0adc 100644
--- a/libkcddb/test/asyncsmtpsubmittest.cpp
+++ b/libkcddb/test/asyncsmtpsubmittest.cpp
@@ -1,6 +1,6 @@
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "asyncsmtpsubmittest.h"
 #include "libkcddb/submit.h"
diff --git a/libkcddb/test/sitestest.cpp b/libkcddb/test/sitestest.cpp
index 021dd92d..164436f0 100644
--- a/libkcddb/test/sitestest.cpp
+++ b/libkcddb/test/sitestest.cpp
@@ -18,8 +18,8 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "libkcddb/sites.h"
 
diff --git a/libkcddb/test/synccddblookuptest.cpp b/libkcddb/test/synccddblookuptest.cpp
index 511ea571..c2c86618 100644
--- a/libkcddb/test/synccddblookuptest.cpp
+++ b/libkcddb/test/synccddblookuptest.cpp
@@ -1,5 +1,5 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include "libkcddb/client.h"
diff --git a/libkcddb/test/synchttplookuptest.cpp b/libkcddb/test/synchttplookuptest.cpp
index 579b40cf..15e76ee8 100644
--- a/libkcddb/test/synchttplookuptest.cpp
+++ b/libkcddb/test/synchttplookuptest.cpp
@@ -1,5 +1,5 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include "libkcddb/client.h"
diff --git a/libkcddb/test/synchttpsubmittest.cpp b/libkcddb/test/synchttpsubmittest.cpp
index c7f1c3a6..8b26dc82 100644
--- a/libkcddb/test/synchttpsubmittest.cpp
+++ b/libkcddb/test/synchttpsubmittest.cpp
@@ -18,8 +18,8 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "libkcddb/client.h"
 #include "libkcddb/config.h"
diff --git a/libkcddb/test/syncsmtpsubmittest.cpp b/libkcddb/test/syncsmtpsubmittest.cpp
index 02bda641..91e87d56 100644
--- a/libkcddb/test/syncsmtpsubmittest.cpp
+++ b/libkcddb/test/syncsmtpsubmittest.cpp
@@ -18,8 +18,8 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "libkcddb/client.h"
 #include "libkcddb/config.h"
diff --git a/libkcddb/test/utf8test.cpp b/libkcddb/test/utf8test.cpp
index 6d7b4f2b..8c255962 100644
--- a/libkcddb/test/utf8test.cpp
+++ b/libkcddb/test/utf8test.cpp
@@ -1,5 +1,5 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include "libkcddb/client.h"
diff --git a/noatun/app/main.cpp b/noatun/app/main.cpp
index 3f2ce3b1..20c18c18 100644
--- a/noatun/app/main.cpp
+++ b/noatun/app/main.cpp
@@ -1,8 +1,8 @@
 #include <noatun/app.h>
 //#include "joinhandler.h"
 //#include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] = I18N_NOOP("The Fusion of Frequencies");
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index afccd7aa..29ea0496 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -18,8 +18,8 @@
 #include <common.h>
 #include <dcopobject.h>
 #include <dispatcher.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp
index 8f81c3e8..7e59885f 100644
--- a/noatun/library/playlist.cpp
+++ b/noatun/library/playlist.cpp
@@ -4,7 +4,7 @@
 #include <noatun/downloader.h>
 #include <noatun/pluginloader.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdefile.h>
 #include <kmimetype.h>
 #include <tqregexp.h>
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index 32beb766..903660dd 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index b174a287..36a41281 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -40,7 +40,7 @@
 
 #include <tdefiledialog.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index e9d8acae..34690f91 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -2,7 +2,7 @@
 #include "view.h"
 #include <noatun/player.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krandomsequence.h>
 #include <kdebug.h>
 #include <twin.h>
diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp
index 39796001..2366847b 100644
--- a/tdeioslave/audiocd/audiocd.cpp
+++ b/tdeioslave/audiocd/audiocd.cpp
@@ -46,9 +46,9 @@ extern "C"
 #include <kmacroexpander.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqregexp.h>
 
diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index f3190d43..bd1e721f 100644
--- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -25,7 +25,7 @@
 #include <tqgroupbox.h>
 #include <tqslider.h>
 #include <tqtabwidget.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <knuminput.h>
 #include <tqregexp.h>
 #include <tqlabel.h>
diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
index 6040f9a4..509e1c39 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -29,7 +29,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqfileinfo.h>
 #include <ktempfile.h>
 #include <kstandarddirs.h>
diff --git a/tdemid/channelcfgdlg.cpp b/tdemid/channelcfgdlg.cpp
index db320a28..7dee1dbb 100644
--- a/tdemid/channelcfgdlg.cpp
+++ b/tdemid/channelcfgdlg.cpp
@@ -3,7 +3,7 @@
 #include <tqradiobutton.h>
 #include <kdialogbase.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "channelview.h"
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index 3bc76c25..b2108e41 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -22,7 +22,7 @@
 
 ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "channelview.h"
diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp
index 0e4a84fe..8cbe6624 100644
--- a/tdemid/collectdlg.cpp
+++ b/tdemid/collectdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlistbox.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kinputdialog.h>
diff --git a/tdemid/main.cpp b/tdemid/main.cpp
index 5080372a..10460e04 100644
--- a/tdemid/main.cpp
+++ b/tdemid/main.cpp
@@ -28,11 +28,11 @@
 #include <tqwidget.h>
 #include <tqtextcodec.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeio/job.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "tdemidframe.h"
 #include "tdemid_part.h"
diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp
index 3724abcf..c6741f87 100644
--- a/tdemid/midicfgdlg.cpp
+++ b/tdemid/midicfgdlg.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h> 
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index ee82529f..bcfe054c 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -3,7 +3,7 @@
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <tqiconset.h>
 
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index 5c0ff444..958c38c6 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -37,7 +37,7 @@
 #include <tqcombobox.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index 452e4ac2..feeb0ab8 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -32,9 +32,9 @@
 #include <tqstring.h>
 
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdefiledialog.h>
 #include <tdefontdialog.h>
 #include <kglobal.h>
diff --git a/xine_artsplugin/tools/thumbnail/videocreator.cpp b/xine_artsplugin/tools/thumbnail/videocreator.cpp
index ceea0da7..a96d574a 100644
--- a/xine_artsplugin/tools/thumbnail/videocreator.cpp
+++ b/xine_artsplugin/tools/thumbnail/videocreator.cpp
@@ -36,7 +36,7 @@
 #include <iostream>
 
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #define XINE_ENABLE_EXPERIMENTAL_FEATURES	1