Rename common header files for consistency with class renaming

89 files changed, 137 insertions, 137 deletions

diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 871190eac..850bb10f2 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -71,8 +71,8 @@ link_directories(
 install( FILES
     tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h ksimpleconfig.h
     tdeconfigdialogmanager.h tdeconfigbase.h kdesktopfile.h
-    kurl.h ksock.h kaboutdata.h kcmdlineargs.h tdeconfigbackend.h
-    kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h
+    kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h
+    kapp.h tdeapplication.h kuniqueapp.h kuniqueapplication.h
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
     klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
     twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
@@ -120,7 +120,7 @@ install( FILES eventsrc
 set( target tdecore )
 
 set( ${target}_SRCS
-  libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
+  libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp
   tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
   kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
   ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
@@ -134,7 +134,7 @@ set( ${target}_SRCS
   kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
   kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
-  kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
+  tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
   kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp
   kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
   kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 2b171743c..e4a9ad80d 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -6,18 +6,18 @@ When adding yourself as a maintainer, don't be afraid to reorder the files to a
 more logical grouping.
 
 dmalloc.cpp
-kaboutdata.cpp		David Faure <faure@kde.org>
+tdeaboutdata.cpp		David Faure <faure@kde.org>
 tdeaccel.cpp		Ellis Whitehead <ellis@kde.org>
 tdeaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
 tdeaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
 kallocator.cpp		Waldo Bastian <bastian@kde.org>
 kappdcopiface.cpp
-kapplication.cpp	Waldo Bastian <bastian@kde.org>
+tdeapplication.cpp	Waldo Bastian <bastian@kde.org>
 kaudioplayer.cpp
 kcatalogue.cpp		Hans Petter Bieker <bieker@kde.org>
 kcharsets.cpp		Lars Knoll <knoll@kde.org>
 kckey.cpp
-kcmdlineargs.cpp	Waldo Bastian <bastian@kde.org>
+tdecmdlineargs.cpp	Waldo Bastian <bastian@kde.org>
 kcompletion.cpp		Carsten Pfeiffer <pfeiffer@kde.org>
 kcompletionbase.cpp
 tdeconfig.cpp		Waldo Bastian <bastian@kde.org>
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 332e178ea..ae5048ed9 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -38,8 +38,8 @@ lib_LIBRARIES = libtdefakes_nonpic.a libtdefakes_pic.a
 
 include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	tdeconfigdata.h ksimpleconfig.h tdeconfigdialogmanager.h \
-	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
-	kcmdlineargs.h tdeconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
+	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \
+	tdecmdlineargs.h tdeconfigbackend.h kapp.h tdeapplication.h kuniqueapp.h \
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
 	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
 	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
@@ -89,7 +89,7 @@ noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
 
-libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
+libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
 	tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
@@ -103,7 +103,7 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
 	kuniqueapplication.cpp tdeaccelmanager.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
-	kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
+	tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
 	kaudioplayer.cpp kdcoppropertyproxy.cpp \
 	ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \
 	kpixmapprovider.cpp kurldrag.cpp \
diff --git a/tdecore/kapp.h b/tdecore/kapp.h
index c51c463a0..5d48a852f 100644
--- a/tdecore/kapp.h
+++ b/tdecore/kapp.h
@@ -1,6 +1,6 @@
-// kapp.h is the old name. Use #include <kapplication.h> from now on
+// kapp.h is the old name. Use #include <tdeapplication.h> from now on
 #ifdef KDE_NO_COMPAT
-#error include <kapplication.h> instead of <kapp.h>
+#error include <tdeapplication.h> instead of <kapp.h>
 #else
-#include <kapplication.h>
+#include <tdeapplication.h>
 #endif
diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp
index 9f1148579..31bc8dd5b 100644
--- a/tdecore/kappdcopiface.cpp
+++ b/tdecore/kappdcopiface.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "kappdcopiface.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp
index cd7145ac7..940bc379e 100644
--- a/tdecore/kapplication_win.cpp
+++ b/tdecore/kapplication_win.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurl.h>
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index 17617bf9e..fa623b693 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -21,7 +21,7 @@
 #include "kqiodevicegzip_p.h"
 #include "kentities.c"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 53865a2c2..54d051486 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 
diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp
index 730eadbf9..a5349b3ee 100644
--- a/tdecore/kcompletion.cpp
+++ b/tdecore/kcompletion.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <knotifyclient.h>
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 05f502311..2eed7c282 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -46,9 +46,9 @@
 #include <tqwindowdefs.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <../kinit/tdelauncher_cmds.h>
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 27dcf1418..062864fca 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -27,7 +27,7 @@
 
 #include "kdebugdcopiface.h"
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kglobal.h"
 #include "kinstance.h"
 #include "kstandarddirs.h"
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index 41d7a3d41..a5a57cdd8 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include "kurl.h"
 #include "tdeconfigbackend.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kstandarddirs.h"
 #include "kmountpoint.h"
 #include "kcatalogue.h"
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index 1c7a6f1c3..d78d76b34 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -21,9 +21,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index 107d3317e..965a537a3 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -27,8 +27,8 @@
 #include <tqptrlist.h>
 #include "kglobal.h"
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp
index 0393bdd8d..09c216b99 100644
--- a/tdecore/kglobalaccel_win.cpp
+++ b/tdecore/kglobalaccel_win.cpp
@@ -31,7 +31,7 @@
 #include <tqwidget.h>
 #include <tqmetaobject.h>
 #include <private/qucomextra_p.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kkeynative.h>
 
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index 64af90572..2a67c73b5 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -31,7 +31,7 @@
 #include <tqwidget.h>
 #include <tqmetaobject.h>
 #include <tqucomextra_p.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kkeynative.h>
 
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index d7006b37a..a103c4652 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kipc.h>
 
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 5938331cd..be44a921f 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -26,7 +26,7 @@
 #include <tqmovie.h>
 #include <tqbitmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 749979750..cf0b35791 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -26,7 +26,7 @@
 #include "kiconloader.h"
 #include "tdehardwaredevices.h"
 #include "tdenetworkconnections.h"
-#include "kaboutdata.h"
+#include "tdeaboutdata.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
 #include "kglobal.h"
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index b7cad0fbe..f7e63c215 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 #include <tqobjectdict.h>
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "klibloader.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp
index 8b4a991ce..ee09a06c8 100644
--- a/tdecore/klockfile.cpp
+++ b/tdecore/klockfile.cpp
@@ -37,8 +37,8 @@
 #include <tqtextstream.h>
 
 #include <kde_file.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <ktempfile.h>
 
diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp
index 15e273d6d..2e019f73e 100644
--- a/tdecore/kmanagerselection.cpp
+++ b/tdecore/kmanagerselection.cpp
@@ -47,7 +47,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <kdebug.h>
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kxerrorhandler.h>
 #include <X11/Xatom.h>
 
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index 309be40f0..b6f70bd23 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -23,9 +23,9 @@
 #include <tqdatastream.h>
 #include <tqptrstack.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kdebug.h>
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 088ea0363..8cc5091c5 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -27,7 +27,7 @@
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksimpleconfig.h>
 #include <tdeconfig.h>
diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp
index c651024ef..4daab08dd 100644
--- a/tdecore/kprotocolinfofactory.cpp
+++ b/tdecore/kprotocolinfofactory.cpp
@@ -19,7 +19,7 @@
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdesycoca.h>
 #include <tdesycocadict.h>
diff --git a/tdecore/krandomsequence.cpp b/tdecore/krandomsequence.cpp
index 9529ccabb..8896db70b 100644
--- a/tdecore/krandomsequence.cpp
+++ b/tdecore/krandomsequence.cpp
@@ -21,7 +21,7 @@
 #include <tqptrlist.h>
 
 #include "krandomsequence.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 const int    KRandomSequence::m_nShuffleTableSize = 32;
 
diff --git a/tdecore/krootprop.cpp b/tdecore/krootprop.cpp
index cb0200c99..bb15462dd 100644
--- a/tdecore/krootprop.cpp
+++ b/tdecore/krootprop.cpp
@@ -26,7 +26,7 @@
 #include "kglobal.h"
 #include "klocale.h"
 #include "kcharsets.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <tqtextstream.h>
 
 #include <X11/Xlib.h>
diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp
index fdf47daf9..4ad96c0f2 100644
--- a/tdecore/ksavefile.cpp
+++ b/tdecore/ksavefile.cpp
@@ -36,7 +36,7 @@
 #include <tqdir.h>
 
 #include <kde_file.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "ksavefile.h"
 #include "kstandarddirs.h"
 
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index 8454c7a74..f39a94221 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -43,7 +43,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp
index cc0cde8ca..95e36dc15 100644
--- a/tdecore/ksocks.cpp
+++ b/tdecore/ksocks.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include "klibloader.h"
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp
index 0eb0e91de..a472de5fd 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/kstartupinfo.cpp
@@ -55,7 +55,7 @@ DEALINGS IN THE SOFTWARE.
 #include <netwm.h>
 #endif
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <signal.h>
 #ifdef Q_WS_X11
 #include <twinmodule.h>
diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp
index 69554fd86..53cc83f99 100644
--- a/tdecore/ktempdir.cpp
+++ b/tdecore/ktempdir.cpp
@@ -48,7 +48,7 @@
 #include <tqdir.h>
 
 #include "kglobal.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kinstance.h"
 #include "ktempdir.h"
 #include "kstandarddirs.h"
diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp
index 35d66f81c..973e14070 100644
--- a/tdecore/ktempfile.cpp
+++ b/tdecore/ktempfile.cpp
@@ -49,7 +49,7 @@
 #include <tqtextstream.h>
 
 #include "kglobal.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kinstance.h"
 #include "ktempfile.h"
 #include "kstandarddirs.h"
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index fb8cda9fd..964c7c8c7 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -34,9 +34,9 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #if defined Q_WS_X11
 #include <twin.h> 
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index ede89ef19..3b7bd8d6e 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -21,7 +21,7 @@
 #ifndef _KUNIQUEAPP_H
 #define _KUNIQUEAPP_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopobject.h>
 
 class KUniqueApplicationPrivate;
@@ -36,7 +36,7 @@ class KUniqueApplicationPrivate;
  * the information to the first instance and then quit.
  *
  * The .desktop file for the application should state X-DCOP-ServiceType=Unique,
- * see kapplication.h
+ * see tdeapplication.h
  *
  * If your application is used to open files, it should also support the --tempfile
  * option (see TDECmdLineArgs::addTempFileOption()), to delete tempfiles after use.
diff --git a/tdecore/kxmessages.cpp b/tdecore/kxmessages.cpp
index 52781188f..116c74d1c 100644
--- a/tdecore/kxmessages.cpp
+++ b/tdecore/kxmessages.cpp
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "kxmessages.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #ifdef Q_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E
 
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index dd5e33f23..cde24f752 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -46,7 +46,7 @@
 #include "kdebug.h"
 #include "kglobal.h"
 #include "kstandarddirs.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include "kresolver.h"
 #include "tdesocketaddress.h"
diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp
index c1649c340..69c674438 100644
--- a/tdecore/network/ksockssocketdevice.cpp
+++ b/tdecore/network/ksockssocketdevice.cpp
@@ -32,7 +32,7 @@
 #define kde_socklen_t ksocklen_t 
 #endif 
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include "ksocks.h"
 #include "tdesocketaddress.h"
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index e235c4f8c..98481cefe 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -1,15 +1,15 @@
 // -*- c++ -*-
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <stdio.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <config.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static const char *description = I18N_NOOP("A little program to output installation paths");
 
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index d44ccd6b5..ac49e5c41 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -1,15 +1,15 @@
 // -*- c++ -*-
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <stdio.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <config.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static const char *description = I18N_NOOP("A little program to output installation paths");
 
diff --git a/tdecore/kaboutdata.cpp b/tdecore/tdeaboutdata.cpp
index c5055e4dc..bf8538152 100644
--- a/tdecore/kaboutdata.cpp
+++ b/tdecore/tdeaboutdata.cpp
@@ -20,7 +20,7 @@
  */
 
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/tdecore/kaboutdata.h b/tdecore/tdeaboutdata.h
index d5addac0a..d5addac0a 100644
--- a/tdecore/kaboutdata.h
+++ b/tdecore/tdeaboutdata.h
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index be8fba51b..e019baafc 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include "tdeaccelbase.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeshortcut.h>
diff --git a/tdecore/kapplication.cpp b/tdecore/tdeapplication.cpp
index 15c8a132b..24c77826b 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -35,7 +35,7 @@
 #undef QT_NO_TRANSLATION
 #undef TQT_NO_TRANSLATION
 #include <tqtranslator.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #define QT_NO_TRANSLATION
 #define TQT_NO_TRANSLATION
 #include <tqdir.h>
@@ -65,13 +65,13 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <kiconloader.h>
 #include <kclipboard.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobalsettings.h>
 #include <kcrash.h>
 #include <kdatastream.h>
@@ -3635,4 +3635,4 @@ void TDEApplication::virtual_hook( int id, void* data )
 void KSessionManaged::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kapplication.moc"
+#include "tdeapplication.moc"
diff --git a/tdecore/kapplication.h b/tdecore/tdeapplication.h
index 5ab8d7ee7..5ab8d7ee7 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/tdeapplication.h
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp
index a1d3adcf9..ad24467e2 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/tdecmdlineargs.cpp
@@ -35,10 +35,10 @@
 #include <tqasciidict.h>
 #include <tqstrlist.h>
 
-#include "kcmdlineargs.h"
-#include <kaboutdata.h>
+#include "tdecmdlineargs.h"
+#include <tdeaboutdata.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>
diff --git a/tdecore/kcmdlineargs.h b/tdecore/tdecmdlineargs.h
index 9b7dc0f4f..9b7dc0f4f 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/tdecmdlineargs.h
diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp
index 1e75be6f1..35c5b73bc 100644
--- a/tdecore/tdeconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -32,7 +32,7 @@
 
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "tdeconfigbackend.h"
 
 #include "tdeconfig.h"
diff --git a/tdecore/tdeconfig_compiler/example/autoexample.cpp b/tdecore/tdeconfig_compiler/example/autoexample.cpp
index 6ed89d75f..e25219787 100644
--- a/tdecore/tdeconfig_compiler/example/autoexample.cpp
+++ b/tdecore/tdeconfig_compiler/example/autoexample.cpp
@@ -24,11 +24,11 @@
 
 #include "exampleprefs_base.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/tdecore/tdeconfig_compiler/example/example.cpp b/tdecore/tdeconfig_compiler/example/example.cpp
index 6788d1ee0..c08339d4a 100644
--- a/tdecore/tdeconfig_compiler/example/example.cpp
+++ b/tdecore/tdeconfig_compiler/example/example.cpp
@@ -21,11 +21,11 @@
 
 #include "exampleprefs_base.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
index 4a8f52712..753bae532 100644
--- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
+++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
@@ -27,11 +27,11 @@
 #include <tqdom.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 4ad70b4a8..d050a2efe 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -41,7 +41,7 @@
 
 #include "tdeconfigbackend.h"
 #include "tdeconfigbase.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kprocess.h>
 #include <klocale.h>
diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index d2ecef888..668a688d8 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -27,7 +27,7 @@
 #include <tqdir.h>
 #include <tqtextstream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kcharsets.h>
diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index ab5218687..dfabefb59 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index 559650e20..263bc5507 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -30,7 +30,7 @@
 #include <ksimpledirwatch.h>
 #include <kstandarddirs.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <libudev.h>
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index 31da8b741..16914c0bc 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqbuffer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/tdecore/tests/KIDLTest.cpp b/tdecore/tests/KIDLTest.cpp
index f022e307a..a54e32be5 100644
--- a/tdecore/tests/KIDLTest.cpp
+++ b/tdecore/tests/KIDLTest.cpp
@@ -1,6 +1,6 @@
 #include "KIDLTest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 KIDLTest::KIDLTest( const TQCString& id )
diff --git a/tdecore/tests/KIDLTestClient.cpp b/tdecore/tests/KIDLTestClient.cpp
index 75d5949c7..4614ed51e 100644
--- a/tdecore/tests/KIDLTestClient.cpp
+++ b/tdecore/tests/KIDLTestClient.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include "KIDLTest_stub.h"
diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp
index 79137cd5f..b8bb055d6 100644
--- a/tdecore/tests/dcopkonqtest.cpp
+++ b/tdecore/tests/dcopkonqtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index bae6a9c2e..0952f292c 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -17,11 +17,11 @@
 */
 
 #define private public
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <stdio.h>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobalsettings.h>
 #include <tdesycoca.h>
 
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 7856c0430..12c9010e2 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -7,12 +7,12 @@
 
 #include <tqstringlist.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 class TDELocale;
 
diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp
index f05168e1a..8148e4208 100644
--- a/tdecore/tests/kcmdlineargstest.cpp
+++ b/tdecore/tests/kcmdlineargstest.cpp
@@ -1,6 +1,6 @@
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 
diff --git a/tdecore/tests/kglobaltest.cpp b/tdecore/tests/kglobaltest.cpp
index 9c7b081de..eaab091f9 100644
--- a/tdecore/tests/kglobaltest.cpp
+++ b/tdecore/tests/kglobaltest.cpp
@@ -2,11 +2,11 @@
 
 #include <kglobal.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <assert.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static bool check(const TQString& txt, TQString a, TQString b)
 {
diff --git a/tdecore/tests/kiconloadertest.cpp b/tdecore/tests/kiconloadertest.cpp
index 29f810488..c6da1994c 100644
--- a/tdecore/tests/kiconloadertest.cpp
+++ b/tdecore/tests/kiconloadertest.cpp
@@ -1,7 +1,7 @@
 #include <kiconloader.h>
 #include <tqdatetime.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 
diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp
index d6cff80e3..af6785f0c 100644
--- a/tdecore/tests/kipctest.cpp
+++ b/tdecore/tests/kipctest.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <tqobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include "kipctest.h"
 
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index 1d0ca7aba..0647a10d3 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -14,7 +14,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include "klocale.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 
diff --git a/tdecore/tests/kmacroexpandertest.cpp b/tdecore/tests/kmacroexpandertest.cpp
index fe3f66c65..e357b5801 100644
--- a/tdecore/tests/kmacroexpandertest.cpp
+++ b/tdecore/tests/kmacroexpandertest.cpp
@@ -1,7 +1,7 @@
 #include <kmacroexpander.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include <stdlib.h>
diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp
index 5cdf4ac3e..bd3162f52 100644
--- a/tdecore/tests/kmdcodectest.cpp
+++ b/tdecore/tests/kmdcodectest.cpp
@@ -28,8 +28,8 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <kmdcodec.h>
 
diff --git a/tdecore/tests/kmemtest.cpp b/tdecore/tests/kmemtest.cpp
index 0a2a1bdb8..f0115b569 100644
--- a/tdecore/tests/kmemtest.cpp
+++ b/tdecore/tests/kmemtest.cpp
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
diff --git a/tdecore/tests/knotifytest.cpp b/tdecore/tests/knotifytest.cpp
index 27076a1e8..6c5af25a7 100644
--- a/tdecore/tests/knotifytest.cpp
+++ b/tdecore/tests/knotifytest.cpp
@@ -1,5 +1,5 @@
 #include <knotifyclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp
index f86cb2f20..c81dada50 100644
--- a/tdecore/tests/kprocesstest.cpp
+++ b/tdecore/tests/kprocesstest.cpp
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <signal.h>
 
diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp
index a4fbb19ad..ee7aaf2b7 100644
--- a/tdecore/tests/kprociotest.cpp
+++ b/tdecore/tests/kprociotest.cpp
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <signal.h>
 
diff --git a/tdecore/tests/krandomsequencetest.cpp b/tdecore/tests/krandomsequencetest.cpp
index 53c42facb..2ba0c72ae 100644
--- a/tdecore/tests/krandomsequencetest.cpp
+++ b/tdecore/tests/krandomsequencetest.cpp
@@ -19,7 +19,7 @@
 #include <tqptrlist.h>
 
 #include "krandomsequence.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include <stdio.h>
 
diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp
index 6e1a3080f..0e05cab4e 100644
--- a/tdecore/tests/kresolvertest.cpp
+++ b/tdecore/tests/kresolvertest.cpp
@@ -40,8 +40,8 @@
 #include <ksocks.h>
 #include <ksockaddr.h>
 #include <kextsock.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "netsupp.h"
 
diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp
index cb8bffbfd..6ef0fe5e5 100644
--- a/tdecore/tests/krfcdatetest.cpp
+++ b/tdecore/tests/krfcdatetest.cpp
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdecore/tests/ksimpleconfigtest.cpp b/tdecore/tests/ksimpleconfigtest.cpp
index 85193f40b..8b0e4ef25 100644
--- a/tdecore/tests/ksimpleconfigtest.cpp
+++ b/tdecore/tests/ksimpleconfigtest.cpp
@@ -6,7 +6,7 @@
 // demonstrates use of KSimpleConfig class
 
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <unistd.h>
 #include <stdio.h>
 
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index e038cbd2c..01a9c4c3a 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -23,8 +23,8 @@
 #include "ksockaddr.h"
 #include "kextsock.h"
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp
index 75c326280..ae6ea16bd 100644
--- a/tdecore/tests/kstddirstest.cpp
+++ b/tdecore/tests/kstddirstest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp
index ec3a004cd..20cd6b36d 100644
--- a/tdecore/tests/ktempfiletest.cpp
+++ b/tdecore/tests/ktempfiletest.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "ktempfile.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kstandarddirs.h"
 #include <tqstring.h>
 
diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp
index 729c88bb6..5eaf5a4fb 100644
--- a/tdecore/tests/ktimezonestest.cpp
+++ b/tdecore/tests/ktimezonestest.cpp
@@ -1,5 +1,5 @@
 #include "ktimezones.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index 053956715..60ac98b5a 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -22,8 +22,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 class TestApp : public KUniqueApplication
 {
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index 178aec6d5..6694d0d80 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -2,7 +2,7 @@
 
 #include <kurl.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -10,7 +10,7 @@
 #include <tqtextcodec.h>
 #include <tqdatastream.h>
 #include <assert.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static bool check(TQString txt, TQString a, TQString b)
 {
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index 5cccaa3dc..20fc95f34 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -16,11 +16,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <stdio.h>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 
diff --git a/tdecore/tests/tdeconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp
index 5ae85d26d..d1e2d5393 100644
--- a/tdecore/tests/tdeconfigtestgui.cpp
+++ b/tdecore/tests/tdeconfigtestgui.cpp
@@ -29,7 +29,7 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdialog.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/tdecore/tests/tdeconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h
index 347a9c81d..4aa50cb5f 100644
--- a/tdecore/tests/tdeconfigtestgui.h
+++ b/tdecore/tests/tdeconfigtestgui.h
@@ -19,7 +19,7 @@
 #ifndef _KCONFIG_TEST_H
 #define _KCONFIG_TEST_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdialog.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/tdecore/tests/tdestdacceltest.cpp b/tdecore/tests/tdestdacceltest.cpp
index fbc5077a5..7a1fe8697 100644
--- a/tdecore/tests/tdestdacceltest.cpp
+++ b/tdecore/tests/tdestdacceltest.cpp
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdestdaccel.h>
 #include <stdlib.h> // for exit
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index a27073468..8383f930e 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -28,7 +28,7 @@
   --bg is aliased to --background but If you try it with --background or 
   -background, you get the same thing.
 
-  in tdecore/kapplication.cpp, TDECmdLineOption qt_options is defined and used 
+  in tdecore/tdeapplication.cpp, TDECmdLineOption qt_options is defined and used 
   by the static method Kapplication::addCmdLineOptions to add the Qt options
   but its' entries look like this:
 
@@ -43,9 +43,9 @@ application palette (light and dark shades are\ncalculated)."), 0},
 
 */
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 static const TDECmdLineOptions options[] =
diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp
index 841463e52..93352dacc 100644
--- a/tdecore/twin.cpp
+++ b/tdecore/twin.cpp
@@ -35,7 +35,7 @@
 
 #include "config.h"
 #include "twin.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp
index adc20f218..27b8b0cdd 100644
--- a/tdecore/twinmodule.cpp
+++ b/tdecore/twinmodule.cpp
@@ -26,7 +26,7 @@
 #include "twinmodule.h"
 #include "twin.h"
 #include <X11/Xatom.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kdebug.h"
 #include <tqtl.h>
 #include <tqptrlist.h>