diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 1c8f95e38..b375854de 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -175,7 +175,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   certain option was specified on the command line and your application 
   now automatically supports --help and --version. It aborts with a
   useful error message when the command line contains a syntax error.
-  See tdelibs/tdecore/kcmdlineargs.h for more info.<P>
+  See tdelibs/tdecore/tdecmdlineargs.h for more info.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index edd317c11..47246adb8 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -73,7 +73,7 @@ instead, everything else is source compatible.
 
 <H4>Header file names</H4>
 <UL>
-<LI>kapp.h is now kapplication.h</LI>
+<LI>kapp.h is now tdeapplication.h</LI>
 <LI>kuniqueapp.h is now kuniqueapplication.h</LI>
 <LI>kstddirs.h is now kstandarddirs.h</LI>
 <LI>kcolorbtn.h is now kcolorbutton.h</LI>
diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cc
index c5a526db6..1eb8c20e5 100644
--- a/arts/kde/kaudioconverter.cc
+++ b/arts/kde/kaudioconverter.cc
@@ -37,7 +37,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 using namespace std;
 
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc
index 42fd98072..70c4b7918 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cc
@@ -4,9 +4,9 @@
 #include <tqobject.h>
 
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <flowsystem.h>
 #include <kplayobject.h>
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index bf6b3654a..d893675cd 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -29,7 +29,7 @@
  * until the buffer is small enough again.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/kmimetype.h>
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index cb26a649f..01ce8f3f1 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <kmedia2.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <connect.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include "qiomanager.h"
 #include "artskde.h"
 
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index ffeceafd5..df6ed645f 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <kmedia2.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <connect.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <stdsynthmodule.h>
 #include "qiomanager.h"
 #include "artskde.h"
diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp
index 0ba9b48a4..d134aeca4 100644
--- a/arts/kde/mcop-dcop/kmcop.cpp
+++ b/arts/kde/mcop-dcop/kmcop.cpp
@@ -18,8 +18,8 @@
 
 #include <kdebug.h>
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <dcopclient.h>
 
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index a5b736608..3d0e45d02 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -44,12 +44,12 @@
 
 // KDE headers
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #ifndef WITHOUT_ARTS
 #include <kartsdispatcher.h>
 #include <kartsserver.h>
 #endif
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/arts/knotify/knotifytest.cpp b/arts/knotify/knotifytest.cpp
index 232b1b8c7..0f370d80a 100644
--- a/arts/knotify/knotifytest.cpp
+++ b/arts/knotify/knotifytest.cpp
@@ -1,6 +1,6 @@
 #include <string>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 
 int main(int argc, char **argv)
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index 389d09bf9..4eb62f1fb 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -33,10 +33,10 @@ Gnome, etc. and used instead.
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 // command line options
 static TDECmdLineOptions options[] = 
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 7126d3c1d..4c98b6df2 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -491,7 +491,7 @@ A few back-of-the-napkin tests folks:
 
 Code:
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char **argv)
 {
diff --git a/dcop/dcop_deadlock_test.h b/dcop/dcop_deadlock_test.h
index 0557e7062..461c53cba 100644
--- a/dcop/dcop_deadlock_test.h
+++ b/dcop/dcop_deadlock_test.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _TESTDCOP_H_
 #define _TESTDCOP_H_
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <dcopobject.h>
 
diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp
index eb953f1d7..18b983829 100644
--- a/dcop/tests/driver.cpp
+++ b/dcop/tests/driver.cpp
@@ -1,8 +1,8 @@
 #include "driver.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <iostream>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqtimer.h>
 #include <tqtimer.h>
 
diff --git a/dcop/tests/test.cpp b/dcop/tests/test.cpp
index 2be39f601..4a751c358 100644
--- a/dcop/tests/test.cpp
+++ b/dcop/tests/test.cpp
@@ -1,8 +1,8 @@
 #include "test.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <iostream>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 
 
diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp
index 2afadb769..229d56f7f 100644
--- a/dnssd/domainbrowser.cpp
+++ b/dnssd/domainbrowser.cpp
@@ -26,7 +26,7 @@
 #include "remoteservice.h"
 #include "query.h"
 #include "servicebrowser.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #ifdef HAVE_DNSSD
 #ifdef AVAHI_API_0_6
 #include <avahi-client/lookup.h>
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index a65388974..c4d77c61e 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -24,7 +24,7 @@
 #include <tqglobal.h>
 #include <tqpixmapcache.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopservicestarter.h> 
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp
index 9ec34f7a2..766613551 100644
--- a/interfaces/tdescript/sample/shellscript.cpp
+++ b/interfaces/tdescript/sample/shellscript.cpp
@@ -19,7 +19,7 @@
 
 #include "shellscript.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <kgenericfactory.h>
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 65b6604b5..ad6c8df20 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -18,7 +18,7 @@
 */
 #include "scriptloader.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
 #include <kglobal.h>
diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index cd20655d0..42e20cd5b 100644
--- a/interfaces/tdescript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -1,7 +1,7 @@
 #include "scriptmanager.h"
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index 331e64bbb..aed904c54 100644
--- a/interfaces/tdetexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -8,7 +8,7 @@
 #include <kservice.h>
 #include <klocale.h>
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 
 #include "editorchooser_ui.h"
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index 19b820056..bcce6fdbc 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -3,9 +3,9 @@
 #include <ktrader.h>
 #include <klibloader.h>
 #include <tdemainwindow.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <tqdir.h>
 #include <assert.h>
 #include <kmessagebox.h>
diff --git a/kab/addressbook.cc b/kab/addressbook.cc
index 0408a4db7..ab73111be 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cc
@@ -21,7 +21,7 @@
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 2fce393e0..46b483b43 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -20,7 +20,7 @@
 
 #include "address.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index b31df2b73..8e1eca333 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
diff --git a/kabc/key.cpp b/kabc/key.cpp
index fadc89dce..7c66579b3 100644
--- a/kabc/key.cpp
+++ b/kabc/key.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "key.h"
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index f696ae915..1c2b2d833 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -29,7 +29,7 @@
 #include <tqtextstream.h>
 #include <tqurl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
diff --git a/kabc/lock.cpp b/kabc/lock.cpp
index 42c8c8580..8f64a3c23 100644
--- a/kabc/lock.cpp
+++ b/kabc/lock.cpp
@@ -20,7 +20,7 @@
 
 #include "lock.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 0a58eeec2..adf8566f1 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "phonenumber.h"
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 6b1759f1d..936eea6e4 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 2d2008c0d..7c99782c3 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -29,7 +29,7 @@
 #include <tqfileinfo.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/scheduler.h>
diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp
index b235a70ae..9aff3a708 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/kabc/scripts/addressee.src.cpp
@@ -24,7 +24,7 @@
 
 #include <ksharedptr.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "addresseehelper.h"
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index f3c5b5c0e..c887fcb83 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcrash.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kabc/tdeab2tdeabc.cpp b/kabc/tdeab2tdeabc.cpp
index 5472f3bc2..f03a80f45 100644
--- a/kabc/tdeab2tdeabc.cpp
+++ b/kabc/tdeab2tdeabc.cpp
@@ -22,9 +22,9 @@
 #include <tqtextstream.h>
 
 #include <kabapi.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp
index bb19379bb..5ea2393dc 100644
--- a/kabc/tests/bigread.cpp
+++ b/kabc/tests/bigread.cpp
@@ -1,10 +1,10 @@
 #include <sys/times.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 "addressbook.h"
 #include "vcardformat.h"
diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp
index b1f705eb9..167f5d44d 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/kabc/tests/bigwrite.cpp
@@ -1,10 +1,10 @@
 #include <sys/times.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 "addressbook.h"
 #include "vcardformat.h"
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index 62b1df25e..589c973f2 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -22,10 +22,10 @@
 #include <tqtextstream.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp
index 956af2b75..09f95d29b 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/kabc/tests/testaddressee.cpp
@@ -1,8 +1,8 @@
-#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 <kstandarddirs.h>
 
 #include "addressbook.h"
diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp
index be14da540..10fa4aaef 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/kabc/tests/testaddresseelist.cpp
@@ -1,8 +1,8 @@
-#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 <kstandarddirs.h>
 
 #include "addressbook.h"
diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp
index 0c4ae1439..ca13a116c 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/kabc/tests/testaddressfmt.cpp
@@ -1,8 +1,8 @@
-#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 <kstandarddirs.h>
 
 #include "addressbook.h"
diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp
index 474b5fc7a..7315aef7e 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/kabc/tests/testaddresslineedit.cpp
@@ -1,8 +1,8 @@
-#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 "addresslineedit.h"
 
diff --git a/kabc/tests/testdb.cpp b/kabc/tests/testdb.cpp
index 4759a4bd2..fd4e4f6c1 100644
--- a/kabc/tests/testdb.cpp
+++ b/kabc/tests/testdb.cpp
@@ -1,8 +1,8 @@
-#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 "addressbook.h"
 #include "vcardformat.h"
diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp
index 18e223e9a..0f0e90f90 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/kabc/tests/testdistlist.cpp
@@ -1,10 +1,10 @@
 #include <tqwidget.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 "stdaddressbook.h"
 
diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp
index b8b9fe3b5..3caea88f1 100644
--- a/kabc/tests/testkabc.cpp
+++ b/kabc/tests/testkabc.cpp
@@ -1,8 +1,8 @@
-#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 <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp
index 183c6a19d..24225cc1b 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/kabc/tests/testkabcdlg.cpp
@@ -1,10 +1,10 @@
 #include <tqwidget.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 "addresseedialog.h"
 
diff --git a/kabc/tests/testldapclient.cpp b/kabc/tests/testldapclient.cpp
index bb52afd1a..df9fd6226 100644
--- a/kabc/tests/testldapclient.cpp
+++ b/kabc/tests/testldapclient.cpp
@@ -18,9 +18,9 @@
 
 #include "testldapclient.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqeventloop.h>
 
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 389819ea7..632c690a6 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -23,11 +23,11 @@
 
 #include "stdaddressbook.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 <kdirwatch.h>
 
 #include <kmessagebox.h>
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index fe218c0b1..67f8eb20a 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -1,8 +1,8 @@
-#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 <VCard.h>
 
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index ebe5f14b2..6c3405ef9 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -25,10 +25,10 @@
 
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "vcardconverter.h"
 #include "vcard.h"
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index 73d462d4a..5a58bd8a8 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -24,9 +24,9 @@
 #include <kabc/picture.h>
 #include <kabc/sound.h>
 #include <kabc/secrecy.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index d1c9fd1ee..9c8e0856f 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -27,7 +27,7 @@
 
 #include <math.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kcharsets.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 35a836072..03257735c 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -43,7 +43,7 @@
 #include <tdeio/netaccess.h>
 
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcharsets.h>
 #include <kcolorbutton.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 22a207fac..1928ec225 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -51,7 +51,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index bca0fe8a9..72fef8781 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -24,7 +24,7 @@
 
 #include <ktrader.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 // katepart version must be a string in double quotes, format: "x.x"
 #define KATEPART_VERSION "2.5"
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 3c84007eb..f6d5ae315 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -44,7 +44,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqstringlist.h>
 #include <tqtextstream.h>
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 77ed4dcca..6f22b2407 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -30,7 +30,7 @@
 #include <kateschema.h>
 #include <katetextline.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kdialog.h> // for spacingHint()
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 8f4f03a10..388513f17 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -38,8 +38,8 @@
 #include <kmessagebox.h>
 #include <tdepopupmenu.h>
 #include <kcolordialog.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tdetexteditor/markinterface.h>
 
 #include <tqbuttongroup.h>
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index dc82922a3..92d1bb97e 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -55,7 +55,7 @@
 #include <tdeconfig.h>
 #include <kurldrag.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index ef70e3449..e8df70aa8 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -32,7 +32,7 @@
 #include "kateview.h"
 #include "kateviewinternal.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <knotifyclient.h>
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index bea6ba3bc..a687c5523 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -37,7 +37,7 @@
 
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kurldrag.h>
 
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 5c10143ea..a503020c3 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -31,7 +31,7 @@
 #include <pwd.h>
 #include <signal.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
@@ -40,7 +40,7 @@
 #include <stdio.h>
 
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include "katefactory.h"
 #include <tdeio/job.h>
 #include <tdemainwindow.h>
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 4e0d70b86..495233d40 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -29,7 +29,7 @@
 #include <tdetexteditor/document.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 5041cc8ad..4a3d34207 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -33,7 +33,7 @@
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/variableinterface.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 774712e0e..b6e6b523f 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -36,8 +36,8 @@
 #include <dcopclient.h>
 
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kprocess.h>
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 227106eea..7585e0ad0 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -28,10 +28,10 @@
 
 #include <dcopclient.h>
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp
index fa2d220af..4ad6bc3db 100644
--- a/kded/tde-menu.cpp
+++ b/kded/tde-menu.cpp
@@ -23,9 +23,9 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 
-#include "kaboutdata.h"
-#include "kapplication.h"
-#include "kcmdlineargs.h"
+#include "tdeaboutdata.h"
+#include "tdeapplication.h"
+#include "tdecmdlineargs.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kservice.h"
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index 74eba4a1b..aa03c2c94 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -40,7 +40,7 @@
 #include <tqtimer.h>
 
 #include <assert.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
 #include <kdebug.h>
@@ -48,8 +48,8 @@
 #include <kstandarddirs.h>
 #include <ksavefile.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kcrash.h>
 
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
diff --git a/kded/tdemimelist.cpp b/kded/tdemimelist.cpp
index c82f6d9f7..673520e52 100644
--- a/kded/tdemimelist.cpp
+++ b/kded/tdemimelist.cpp
@@ -8,7 +8,7 @@
 #include <kuserprofile.h>
 #include <kprotocolinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index e6208de0f..5e1338595 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -1,7 +1,7 @@
 /* Copyright (C) 2004-2005 ian reinhart geiser <geiseri@sourcextreme.com> */
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kmacroexpander.h>
 #include <kdebug.h>
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 730dd38d0..d0a1b7323 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -18,9 +18,9 @@
 #include <xslt.h>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index a323feace..d839ffe30 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -5,7 +5,7 @@
 #include <tqfile.h>
 #include <tqpainter.h>
 #include <tqprinter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 #include "eps.h"
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index c1ba0920d..f6b4a3e59 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -57,7 +57,7 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #ifdef HAVE_SYS_PRCTL_H
diff --git a/kinit/tdelauncher_main.cpp b/kinit/tdelauncher_main.cpp
index 3ceadf84c..d59cfb86f 100644
--- a/kinit/tdelauncher_main.cpp
+++ b/kinit/tdelauncher_main.cpp
@@ -22,9 +22,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "tdelauncher.h"
-#include "kcmdlineargs.h"
+#include "tdecmdlineargs.h"
 #include "kcrash.h"
 #include "kdebug.h"
 #include <stdio.h>
diff --git a/kinit/tests/tdelaunchertest.cpp b/kinit/tests/tdelaunchertest.cpp
index a8989870b..07eaf21f7 100644
--- a/kinit/tests/tdelaunchertest.cpp
+++ b/kinit/tests/tdelaunchertest.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <stdio.h>
 #include <tqvaluelist.h>
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index 4ca68fbcb..ccbde83d6 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -29,7 +29,7 @@
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <knewstuff/entry.h>
diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp
index 063c2c7b9..a22750f8b 100644
--- a/knewstuff/engine.cpp
+++ b/knewstuff/engine.cpp
@@ -22,7 +22,7 @@
 #include <tqdom.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <klocale.h>
diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp
index 6c0c2a9fc..dfe86a2a4 100644
--- a/knewstuff/ghns.cpp
+++ b/knewstuff/ghns.cpp
@@ -25,11 +25,11 @@
 #include <tqtextstream.h>
 #include <tqlabel.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 <kprocess.h>
 #include <kdialog.h>
 
diff --git a/knewstuff/ghns.h b/knewstuff/ghns.h
index 727dc6a0f..74efc007e 100644
--- a/knewstuff/ghns.h
+++ b/knewstuff/ghns.h
@@ -25,7 +25,7 @@
 
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "knewstuff.h"
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index 7727783bb..07034b454 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/knewstuff/tdehotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp
index 5a496328b..87d735330 100644
--- a/knewstuff/tdehotnewstuff.cpp
+++ b/knewstuff/tdehotnewstuff.cpp
@@ -18,11 +18,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "downloaddialog.h"
 
diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp
index db8e255ff..82b6d18f7 100644
--- a/knewstuff/testnewstuff.cpp
+++ b/knewstuff/testnewstuff.cpp
@@ -24,11 +24,11 @@
 #include <tqfile.h>
 #include <tqtextstream.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 <kprocess.h>
 #include <kdialog.h>
 
diff --git a/knewstuff/testnewstuff.h b/knewstuff/testnewstuff.h
index 3af0d68cc..a7bc5710f 100644
--- a/knewstuff/testnewstuff.h
+++ b/knewstuff/testnewstuff.h
@@ -25,7 +25,7 @@
 
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "knewstuff.h"
diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp
index 72ba4a2c4..98f8f60c7 100644
--- a/knewstuff/uploaddialog.cpp
+++ b/knewstuff/uploaddialog.cpp
@@ -32,7 +32,7 @@
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kuser.h>
 
 #include "engine.h"
diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h
index 52d18291b..d6be130aa 100644
--- a/kstyles/asteroid/asteroid.h
+++ b/kstyles/asteroid/asteroid.h
@@ -7,7 +7,7 @@
 #ifndef __ASTEROID_H
 #define __ASTEROID_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 class AsteroidStyle : public TDEStyle
 {
diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h
index 33ded2d17..7fa618a92 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/kstyles/highcolor/highcolor.h
@@ -34,7 +34,7 @@
 #include <tqintdict.h>
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 enum GradientType{ VSmall=0, VMed, VLarge, HMed, HLarge, GradientCount };
diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp
index 0b2e677b1..af021a91a 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/kstyles/highcontrast/highcontrast.cpp
@@ -776,7 +776,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 			break;
 		}
 		case KPE_ListViewBranch: 
-			// TODO Draw (thick) dotted line. Check kstyle.cpp
+			// TODO Draw (thick) dotted line. Check tdestyle.cpp
 			// Fall down for now
 		default:
 			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
@@ -1194,7 +1194,7 @@ void HighContrastStyle::drawControlMask (TQ_ControlElement element,
 }
 
 // Helper to find the next sibling that's not hidden
-// Lifted from kstyle.cpp
+// Lifted from tdestyle.cpp
 static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
 {
     TQListViewItem* sibling = item;
@@ -1329,7 +1329,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 		// -------------------------------------------------------------------
 		case CC_ListView: {
 			/*
-			 * Sigh... Lifted and modified from kstyle.cpp 
+			 * Sigh... Lifted and modified from tdestyle.cpp 
 			 */
 			/* 
 			 * Many thanks to TrollTech AS for donating CC_ListView from TQWindowsStyle.
diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h
index 1a721e8c6..552526254 100644
--- a/kstyles/highcontrast/highcontrast.h
+++ b/kstyles/highcontrast/highcontrast.h
@@ -41,7 +41,7 @@
 #include <tqintdict.h>
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 class TQPopupMenu;
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index 02ec9499e..7bf8cd3d4 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -33,7 +33,7 @@
 #define __keramik_h__
 
 #include <tqframe.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 #include "pixmaploader.h"
 
diff --git a/kstyles/klegacy/klegacystyle.h b/kstyles/klegacy/klegacystyle.h
index ee3cecfe5..f82fd5d0a 100644
--- a/kstyles/klegacy/klegacystyle.h
+++ b/kstyles/klegacy/klegacystyle.h
@@ -25,7 +25,7 @@
 #ifndef   __KLegacyStyle_hh
 #define   __KLegacyStyle_hh
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 // forward declaration
 class KLegacyStylePrivate;
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index faef98dfd..1e16bcee7 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -34,7 +34,7 @@ Copyright (C) 1998, 1999, 2000 KDE Team
 #include <kpixmap.h>
 #include <tqintcache.h>
 #include <tqstring.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqsettings.h>
 #include <tqpalette.h> // for QColorGroup
 #include "kstyledirs.h"
diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h
index 75d096a4b..90b3e89c9 100644
--- a/kstyles/light/lightstyle-v2.h
+++ b/kstyles/light/lightstyle-v2.h
@@ -24,7 +24,7 @@
 #define LIGHTSTYLE_V2_H
 
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 #ifdef QT_PLUGIN
diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h
index 7ce62c3a8..0330c8f87 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/kstyles/light/lightstyle-v3.h
@@ -28,7 +28,7 @@
 #include <tqcommonstyle.h>
 #endif // QT_H
 
-#include "kstyle.h"
+#include "tdestyle.h"
 
 #ifdef QT_PLUGIN
 #  define Q_EXPORT_STYLE_LIGHT_V3
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index 7c3e0484b..68f707d79 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -39,7 +39,7 @@
 #ifndef __PLASTIK_H
 #define __PLASTIK_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqbitmap.h>
 #include <tqintcache.h>
 
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index 67e29f706..274c2d335 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -25,8 +25,8 @@
 #include <tqstringlist.h>
 #include <tqsettings.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index aca43fb74..d96688ee0 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -32,7 +32,7 @@
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdrawutil.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kstyles/web/webstyle.h b/kstyles/web/webstyle.h
index 68f83c99b..0e4c59dbd 100644
--- a/kstyles/web/webstyle.h
+++ b/kstyles/web/webstyle.h
@@ -20,7 +20,7 @@
 #ifndef WEB_STYLE_H
 #define WEB_STYLE_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqpalette.h>
 
 class TQPainter;
diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp
index aa4fa8395..f9d8ccb17 100644
--- a/libtdescreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -27,8 +27,8 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kcrash.h>
 
 #include "tdescreensaver.h"
diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp
index 4474e5874..30120b164 100644
--- a/libtdescreensaver/tdescreensaver.cpp
+++ b/libtdescreensaver/tdescreensaver.cpp
@@ -20,7 +20,7 @@
 
 #include <tqpainter.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "tdescreensaver.h"
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp
index 29174e773..c37214ecd 100644
--- a/networkstatus/connectionmanager.cpp
+++ b/networkstatus/connectionmanager.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstaticdeleter.h>
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index ed7c402f3..41bff9edb 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "clientifaceimpl.h"
diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp
index 1611721ba..809d9cd0b 100644
--- a/networkstatus/testservice.cpp
+++ b/networkstatus/testservice.cpp
@@ -21,7 +21,7 @@
 
 #include <tqtimer.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "provideriface.h"
 
 #include "testservice.h"
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc
index b02981e44..7c84f31d1 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -22,7 +22,7 @@
 #include "tdecertpart.h"
 #include <tdeparts/genericfactory.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqframe.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index 2174dfc36..3d54abc45 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -27,9 +27,9 @@
 #include <dcopclient.h>
 #include <qxembed.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdecmoduleinfo.h>
 #include <tdecmoduleloader.h>
 #include <tdecmoduleproxy.h>
diff --git a/tdecmshell/main.h b/tdecmshell/main.h
index f135c2a33..e97145a82 100644
--- a/tdecmshell/main.h
+++ b/tdecmshell/main.h
@@ -24,7 +24,7 @@
 
 #include <dcopobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcmultidialog.h>
 
 /**
diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp
index 208faa503..458b3b523 100644
--- a/tdeconf_update/tdeconf_update.cpp
+++ b/tdeconf_update/tdeconf_update.cpp
@@ -31,10 +31,10 @@
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
 #include <ktempfile.h>
 
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
similarity index 99%
rename from tdecore/kaboutdata.cpp
rename to 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
similarity index 100%
rename from tdecore/kaboutdata.h
rename to 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
similarity index 99%
rename from tdecore/kapplication.cpp
rename to 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
similarity index 100%
rename from tdecore/kapplication.h
rename to tdecore/tdeapplication.h
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp
similarity index 99%
rename from tdecore/kcmdlineargs.cpp
rename to 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
similarity index 100%
rename from tdecore/kcmdlineargs.h
rename to 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>
diff --git a/tdefx/CMakeLists.txt b/tdefx/CMakeLists.txt
index 1aa52627f..60d81fe38 100644
--- a/tdefx/CMakeLists.txt
+++ b/tdefx/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
 
 install( FILES
     kpixmap.h kpixmapsplitter.h kpixmapeffect.h
-    kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
+    kimageeffect.h kdrawutil.h tdestyle.h kcpuinfo.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
@@ -37,7 +37,7 @@ set( target tdefx )
 
 set( ${target}_SRCS
   kpixmap.cpp kpixmapsplitter.cpp kpixmapeffect.cpp
-  kimageeffect.cpp kdrawutil.cpp kstyle.cpp kcpuinfo.cpp
+  kimageeffect.cpp kdrawutil.cpp tdestyle.cpp kcpuinfo.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tdefx/Makefile.am b/tdefx/Makefile.am
index 2b588ba54..7fb97e400 100644
--- a/tdefx/Makefile.am
+++ b/tdefx/Makefile.am
@@ -30,10 +30,10 @@ libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/
 	$(top_srcdir)/tdecore/standard_weak.nmcheck
 
 include_HEADERS = kpixmap.h kpixmapsplitter.h \
-	kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
+	kpixmapeffect.h kimageeffect.h kdrawutil.h tdestyle.h kcpuinfo.h
 
 libtdefx_la_SOURCES = kpixmap.cpp kpixmapsplitter.cpp \
-		kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp kstyle.cpp \
+		kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp tdestyle.cpp \
 		kcpuinfo.cpp
 
 METASOURCES = AUTO
diff --git a/tdefx/kstyle.cpp b/tdefx/tdestylen.cpp
similarity index 99%
rename from tdefx/kstyle.cpp
rename to tdefx/tdestylen.cpp
index 29663faf3..0c6a7f1fe 100644
--- a/tdefx/kstyle.cpp
+++ b/tdefx/tdestylen.cpp
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "kstyle.h"
+#include "tdestyle.h"
 
 #include <tqapplication.h>
 #include <tqbitmap.h>
@@ -2415,4 +2415,4 @@ void kde_kstyle_set_scrollbar_type_windows( void* style )
 // vim: set noet ts=4 sw=4:
 // kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
 
-#include "kstyle.moc"
+#include "tdestyle.moc"
diff --git a/tdefx/kstyle.h b/tdefx/tdestylen.h
similarity index 100%
rename from tdefx/kstyle.h
rename to tdefx/tdestylen.h
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 069720c0b..f1b2b430d 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -55,7 +55,7 @@
 #include <tdeshortcut.h>
 #include <tdeconfig.h>
 #include <tdeconfigbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcop/dcopclient.h>
 #include <kstringhandler.h> 
 
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index 21c3e12c5..e4f090973 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -44,7 +44,7 @@
 #include "dom/dom_exception.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kglobal.h>
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 3f8384a97..372904e0e 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -51,7 +51,7 @@
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #ifndef TDEHTML_NO_WALLET
 #include <tdewallet.h>
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 7ad046b9a..5d108ffcf 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdeparts/browserextension.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 #include <tdeio/job.h>
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 913678092..5d5b47fbf 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -30,12 +30,12 @@
 #include <tqlabel.h>
 
 #include <klibloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdeio/authinfo.h>
diff --git a/tdehtml/java/tests/testkjavaappletserver.cpp b/tdehtml/java/tests/testkjavaappletserver.cpp
index d0af25127..641b06327 100644
--- a/tdehtml/java/tests/testkjavaappletserver.cpp
+++ b/tdehtml/java/tests/testkjavaappletserver.cpp
@@ -1,5 +1,5 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tqstring.h>
 #include <stdio.h>
diff --git a/tdehtml/misc/helper.cpp b/tdehtml/misc/helper.cpp
index 047a278fa..b5191c7ca 100644
--- a/tdehtml/misc/helper.cpp
+++ b/tdehtml/misc/helper.cpp
@@ -29,7 +29,7 @@
 #include <rendering/render_object.h>
 #include <tqptrlist.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqtooltip.h>
 
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 6fccfced8..b7f42aa29 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -56,7 +56,7 @@
 #include <tqmovie.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kglobal.h>
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 64bef11dc..12d0d75ec 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -38,7 +38,7 @@
 #include "tdehtml_part.h"
 #include "misc/knsplugininstaller.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <klocale.h>
diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index 97c2641ba..b41911e3a 100644
--- a/tdehtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -30,7 +30,7 @@
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index fe9763b0e..3cc65676d 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -53,7 +53,7 @@
 #include <ksavefile.h>
 #include <kurldrag.h>
 #include <kstringhandler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <krun.h>
diff --git a/tdehtml/tdehtml_factory.cpp b/tdehtml/tdehtml_factory.cpp
index 103945736..b52476ea1 100644
--- a/tdehtml/tdehtml_factory.cpp
+++ b/tdehtml/tdehtml_factory.cpp
@@ -30,7 +30,7 @@
 #include "misc/arena.h"
 
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include <assert.h>
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index b6fdde210..c4bba759c 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -91,7 +91,7 @@ using namespace DOM;
 #include <ktempfile.h>
 #include <kglobalsettings.h>
 #include <kurldrag.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/browserinterface.h>
 #if !defined(QT_NO_DRAGANDDROP)
 #include <tdemultipledrag.h>
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 48ead5cf2..010075f2a 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -61,7 +61,7 @@
 #include "xml/dom2_rangeimpl.h"
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/tdehtml/tdemultipart/tdemultipart.h b/tdehtml/tdemultipart/tdemultipart.h
index 776584c91..de309eef1 100644
--- a/tdehtml/tdemultipart/tdemultipart.h
+++ b/tdehtml/tdemultipart/tdemultipart.h
@@ -25,7 +25,7 @@
 #include <tdeparts/part.h>
 #include <tdeparts/factory.h>
 #include <tdeparts/browserextension.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqdatetime.h>
 
 class TDEHTMLPart;
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index a127bb709..028fadc36 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -30,7 +30,7 @@
 #include <pwd.h>
 #include <signal.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
@@ -60,7 +60,7 @@
 
 
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include "tdehtml_factory.h"
 #include <tdeio/job.h>
 #include <tdemainwindow.h>
diff --git a/tdehtml/test_regression_fontoverload.cpp b/tdehtml/test_regression_fontoverload.cpp
index 744150ffe..d09a3dbd1 100644
--- a/tdehtml/test_regression_fontoverload.cpp
+++ b/tdehtml/test_regression_fontoverload.cpp
@@ -353,7 +353,7 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
     done = true;
 }
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 void TDEApplication::dcopFailure( const TQString & )
 {
     tqDebug( "TDEApplication::dcopFailure" );
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 91eb19eee..bce2c4db0 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -2,7 +2,7 @@
 
 #include <stdlib.h>
 #include "decoder.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "html_document.h"
 #include "htmltokenizer.h"
 // to be able to delete a static protected member pointer in kbrowser...
@@ -27,7 +27,7 @@
 #include "html/html_imageimpl.h"
 #include "rendering/render_style.h"
 #include <tdemainwindow.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeaction.h>
 #include "domtreeview.h"
 #include <tdefiledialog.h>
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 854d7b3e3..47836b41e 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -77,7 +77,7 @@
 #include "html/html_tableimpl.h"
 #include "html/html_objectimpl.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/job.h>
 
 #include <stdlib.h>
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index ab1cc398a..e6bef2e02 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -28,7 +28,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <assert.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kbookmarkmanager.h>
 
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cc
index f49879124..0443b3b1c 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cc
@@ -24,7 +24,7 @@
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqdir.h>
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index a87e0f20e..205d879ab 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -32,7 +32,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index c99d02284..0468bcd5a 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -26,7 +26,7 @@
 #include "kbookmarkimporter_ie.h"
 #include "kbookmarkdrag.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index ff7295181..4986eb45a 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -29,7 +29,7 @@
 
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc
index 3d51c1e85..ea3c29556 100644
--- a/tdeio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cc
@@ -29,7 +29,7 @@
 #include <tqframe.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
diff --git a/tdeio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cc
index 289c3a8d2..03a1300e8 100644
--- a/tdeio/kssl/ksslinfodlg.cc
+++ b/tdeio/kssl/ksslinfodlg.cc
@@ -30,7 +30,7 @@
 #include <tqscrollview.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kprocess.h>
diff --git a/tdeio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cc
index 669a76cee..93d6d2da4 100644
--- a/tdeio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cc
@@ -23,7 +23,7 @@
 #include "keygenwizard.h"
 #include "keygenwizard2.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index b651e2313..a010d328e 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -22,7 +22,7 @@
 #include <ctime>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <knotifyclient.h>
 #include <kprotocolmanager.h>
diff --git a/tdeio/misc/tdefile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index 854aeffc5..df210fa4d 100644
--- a/tdeio/misc/tdefile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -21,9 +21,9 @@
 #include <tqfile.h>
 #include <tqptrlist.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdefilemetainfo.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
diff --git a/tdeio/misc/tdemailservice.cpp b/tdeio/misc/tdemailservice.cpp
index c59067610..2d256c5c9 100644
--- a/tdeio/misc/tdemailservice.cpp
+++ b/tdeio/misc/tdemailservice.cpp
@@ -16,9 +16,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static const TDECmdLineOptions options[] =
 {
diff --git a/tdeio/misc/tdentlm/tdentlm.cpp b/tdeio/misc/tdentlm/tdentlm.cpp
index 2ef5d1cb6..812c41a64 100644
--- a/tdeio/misc/tdentlm/tdentlm.cpp
+++ b/tdeio/misc/tdentlm/tdentlm.cpp
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include <tqdatetime.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kswap.h>
 #include <kmdcodec.h>
 #include <kdebug.h>
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index 9b44a18b2..aaffd3b65 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -8,11 +8,11 @@
 
 #include <tqtextstream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kemailsettings.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 
diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp
index d3788e5d2..99260d8d0 100644
--- a/tdeio/misc/tdetelnetservice.cpp
+++ b/tdeio/misc/tdetelnetservice.cpp
@@ -21,9 +21,9 @@
 
 // $Id$
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprocess.h>
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index a8b3ade1a..364197b72 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -28,7 +28,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index abe918854..107b57c64 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -29,8 +29,8 @@
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <dcopclient.h>
diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index ae408c8e2..13830ab01 100644
--- a/tdeio/tdefile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -32,7 +32,7 @@
 
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index 706b63164..1ae03daec 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -32,7 +32,7 @@
 #include <tqvbox.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index e26c2cdf5..39959229d 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqvaluestack.h>
 
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index aa8968b05..9d7975e2b 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -19,7 +19,7 @@
 
 #include <kiconviewsearchline.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index 6c6722951..a1ce7d6b3 100644
--- a/tdeio/tdefile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index bd1abb277..f23ac78e4 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -18,8 +18,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kaudioplayer.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index ca0043e70..5a855de21 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -34,7 +34,7 @@
 #include <tqstyle.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <kdesktopfile.h>
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 9d4ee6534..389115a3c 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -85,7 +85,7 @@ extern "C" {
 }
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kdirsize.h>
 #include <kdirwatch.h>
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index 0f575e4e5..46b096c2b 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -30,7 +30,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index 897c99aec..b3c44250e 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefileitem.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index ed50ae49b..8db764724 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -44,9 +44,9 @@
 
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdecompletionbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 406e3d3fe..131485273 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -30,7 +30,7 @@
 #include <tqtooltip.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdefileitem.h>
 #include <kiconeffect.h>
diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index d64918b4f..6204fa6bb 100644
--- a/tdeio/tdefile/tdefilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -37,7 +37,7 @@
 #include <tdeio/tdefileshare.h>
 #include <kseparator.h>
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <kmessagebox.h>
 
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index fb3cb0e9f..63c973723 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/tdeio/tdefile/tderecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp
index 3d5ec44e7..968db93a4 100644
--- a/tdeio/tdefile/tderecentdocument.cpp
+++ b/tdeio/tdefile/tderecentdocument.cpp
@@ -28,7 +28,7 @@
 #include <tderecentdocument.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmimetype.h>
diff --git a/tdeio/tdefile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp
index 40a34b203..3d95b6c9f 100644
--- a/tdeio/tdefile/tests/kcustommenueditortest.cpp
+++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp
@@ -1,5 +1,5 @@
 #include "kcustommenueditor.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 
diff --git a/tdeio/tdefile/tests/kdirselectdialogtest.cpp b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
index 3d15c47d0..0c2209d31 100644
--- a/tdeio/tdefile/tests/kdirselectdialogtest.cpp
+++ b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirselectdialog.h>
 #include <kmessagebox.h>
 #include <kurl.h>
diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index 60c8b6d70..baf82725f 100644
--- a/tdeio/tdefile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -2,7 +2,7 @@
 
 #include <tqstringlist.h>
 #include <tdefiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tqtimer.h>
 
diff --git a/tdeio/tdefile/tests/kfstest.cpp b/tdeio/tdefile/tests/kfstest.cpp
index 0a2a698f5..c57e3678e 100644
--- a/tdeio/tdefile/tests/kfstest.cpp
+++ b/tdeio/tdefile/tests/kfstest.cpp
@@ -32,7 +32,7 @@
 #include <tdefileiconview.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kurlbar.h>
 #include <kdiroperator.h>
diff --git a/tdeio/tdefile/tests/kicondialogtest.cpp b/tdeio/tdefile/tests/kicondialogtest.cpp
index c3f7a827d..3000e89a0 100644
--- a/tdeio/tdefile/tests/kicondialogtest.cpp
+++ b/tdeio/tdefile/tests/kicondialogtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kicondialog.h>
 
 int main( int argc, char **argv )
diff --git a/tdeio/tdefile/tests/knotifytest.cpp b/tdeio/tdefile/tests/knotifytest.cpp
index 0493b59b4..1716a86a3 100644
--- a/tdeio/tdefile/tests/knotifytest.cpp
+++ b/tdeio/tdefile/tests/knotifytest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifydialog.h>
 
 int main( int argc, char **argv )
diff --git a/tdeio/tdefile/tests/kopenwithtest.cpp b/tdeio/tdefile/tests/kopenwithtest.cpp
index f78b1830b..925aa7625 100644
--- a/tdeio/tdefile/tests/kopenwithtest.cpp
+++ b/tdeio/tdefile/tests/kopenwithtest.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
diff --git a/tdeio/tdefile/tests/kurlrequestertest.cpp b/tdeio/tdefile/tests/kurlrequestertest.cpp
index 0e4851cfb..829055304 100644
--- a/tdeio/tdefile/tests/kurlrequestertest.cpp
+++ b/tdeio/tdefile/tests/kurlrequestertest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditlistbox.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdlg.h>
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 689472597..529d12dda 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -22,7 +22,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 10db4fde7..4293e752e 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -22,7 +22,7 @@
 #include <tqdatetime.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kstringhandler.h>
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index eba15be03..a4e731451 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -41,7 +41,7 @@ extern "C" {
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
diff --git a/tdeio/tdeio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp
index a6e39815f..c859cce2b 100644
--- a/tdeio/tdeio/kdcopservicestarter.cpp
+++ b/tdeio/tdeio/kdcopservicestarter.cpp
@@ -18,7 +18,7 @@
 
 #include "kdcopservicestarter.h"
 #include "ktrader.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kservice.h"
 #include <kstaticdeleter.h>
 #include <kdebug.h>
diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp
index 0d3498aa7..669766ab5 100644
--- a/tdeio/tdeio/kdirlister.cpp
+++ b/tdeio/tdeio/kdirlister.cpp
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 #include <tqeventloop.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeio/job.h>
diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp
index 4fcb921bb..63c89b9d7 100644
--- a/tdeio/tdeio/kdirwatch.cpp
+++ b/tdeio/tdeio/kdirwatch.cpp
@@ -54,7 +54,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/tdeio/tdeio/kimageio.cpp b/tdeio/tdeio/kimageio.cpp
index e983cb945..f9de08376 100644
--- a/tdeio/tdeio/kimageio.cpp
+++ b/tdeio/tdeio/kimageio.cpp
@@ -11,7 +11,7 @@
 #include"config.h"
 
 #include <tqdir.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqstring.h>
 #include <tqregexp.h>
diff --git a/tdeio/tdeio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h
index 3590b5e89..c55060549 100644
--- a/tdeio/tdeio/kmessageboxwrapper.h
+++ b/tdeio/tdeio/kmessageboxwrapper.h
@@ -19,7 +19,7 @@
 #ifndef KMESSAGEBOXWRAPPER_H
 #define KMESSAGEBOXWRAPPER_H
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 /**
diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index 4285e3ec7..4d75d8d58 100644
--- a/tdeio/tdeio/kmimemagic.cpp
+++ b/tdeio/tdeio/kmimemagic.cpp
@@ -18,7 +18,7 @@
 */
 #include "kmimemagic.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqfile.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index c610e7e3f..8129b31f9 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -46,7 +46,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
diff --git a/tdeio/tdeio/kprotocolmanager.h b/tdeio/tdeio/kprotocolmanager.h
index ce504a83f..95106f90d 100644
--- a/tdeio/tdeio/kprotocolmanager.h
+++ b/tdeio/tdeio/kprotocolmanager.h
@@ -22,7 +22,7 @@
 
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/global.h>
 
 /** @deprecated Use KProtocolManager::defaultUserAgent() instead. */
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 69274ce24..8547802d6 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -42,7 +42,7 @@
 #include <kdatastream.h>
 #include <kmessageboxwrapper.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 5147af0ad..13be78bea 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -37,7 +37,7 @@
 #include <tqtl.h>
 
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>
diff --git a/tdeio/tdeio/kservicetypefactory.cpp b/tdeio/tdeio/kservicetypefactory.cpp
index ecf527384..e198f1333 100644
--- a/tdeio/tdeio/kservicetypefactory.cpp
+++ b/tdeio/tdeio/kservicetypefactory.cpp
@@ -24,7 +24,7 @@
 #include "kmimetype.h"
 #include "kuserprofile.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <assert.h>
 #include <kstringhandler.h>
diff --git a/tdeio/tdeio/kshred.cpp b/tdeio/tdeio/kshred.cpp
index f3997bf58..470f9a03e 100644
--- a/tdeio/tdeio/kshred.cpp
+++ b/tdeio/tdeio/kshred.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kdebug.h>
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // antlarr: KDE 4: Make it const TQString &
 KShred::KShred(TQString fileName)
diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index dc6581ce6..e9ce26908 100644
--- a/tdeio/tdeio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -39,7 +39,7 @@
 #include <tqdeepcopy.h>
 #include <tqthread.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <kurl.h>
diff --git a/tdeio/tdeio/kuserprofile.cpp b/tdeio/tdeio/kuserprofile.cpp
index ebd8b8deb..124f7f8f8 100644
--- a/tdeio/tdeio/kuserprofile.cpp
+++ b/tdeio/tdeio/kuserprofile.cpp
@@ -22,7 +22,7 @@
 #include "kservicetypefactory.h"
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp
index 89830d88b..dd3a1bdc8 100644
--- a/tdeio/tdeio/netaccess.cpp
+++ b/tdeio/tdeio/netaccess.cpp
@@ -33,7 +33,7 @@
 #include <tqfile.h>
 #include <tqmetaobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kdebug.h>
diff --git a/tdeio/tdeio/observer.cpp b/tdeio/tdeio/observer.cpp
index 5e4e7aa87..dfd847b04 100644
--- a/tdeio/tdeio/observer.cpp
+++ b/tdeio/tdeio/observer.cpp
@@ -22,7 +22,7 @@
 #include <assert.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kurl.h>
 
diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp
index 2279aef40..c51ba154d 100644
--- a/tdeio/tdeio/previewjob.cpp
+++ b/tdeio/tdeio/previewjob.cpp
@@ -42,7 +42,7 @@
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
 #include <tdefileitem.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <ktrader.h>
 #include <kmdcodec.h>
diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index f5c2d32dd..06b12d129 100644
--- a/tdeio/tdeio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -32,7 +32,7 @@
 
 #include <kmessagebox.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/global.h>
 #include <ktrader.h>
 #include <klibloader.h>
diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp
index eab245dfc..6cd924136 100644
--- a/tdeio/tdeio/skipdlg.cpp
+++ b/tdeio/tdeio/skipdlg.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kpushbutton.h>
diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp
index 380be2058..e66a719df 100644
--- a/tdeio/tdeio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <ksock.h>
 #include <kprocess.h>
diff --git a/tdeio/tdeio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp
index 8b6ee3903..29a8e0c48 100644
--- a/tdeio/tdeio/slavebase.cpp
+++ b/tdeio/tdeio/slavebase.cpp
@@ -44,7 +44,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksock.h>
 #include <kcrash.h>
 #include <tdesu/client.h>
diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp
index 40b66c47a..6de70b57f 100644
--- a/tdeio/tdeio/slaveinterface.cpp
+++ b/tdeio/tdeio/slaveinterface.cpp
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <tdeio/observer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <time.h>
 #include <tqtimer.h>
diff --git a/tdeio/tdeio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp
index 66517ca03..e0497e391 100644
--- a/tdeio/tdeio/statusbarprogress.cpp
+++ b/tdeio/tdeio/statusbarprogress.cpp
@@ -22,7 +22,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kprogress.h>
diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index 2b7df9d7b..2a4aff68e 100644
--- a/tdeio/tdeio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -53,7 +53,7 @@
 #include <tqcstring.h>
 #include <tqdatastream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kprotocolmanager.h>
 #include <kde_file.h>
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index 0276008a4..eb615344b 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -26,7 +26,7 @@
 
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -36,8 +36,8 @@
 #include <kprocess.h>
 #include <kservice.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kstartupinfo.h>
 #include <kshell.h>
 #include <kde_file.h>
diff --git a/tdeio/tests/getalltest.cpp b/tdeio/tests/getalltest.cpp
index 07d8723ed..37f9b1ab2 100644
--- a/tdeio/tests/getalltest.cpp
+++ b/tdeio/tests/getalltest.cpp
@@ -2,7 +2,7 @@
 #include <kmimetype.h>
 #include <kservicetype.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 int main(int argc, char *argv[])
diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index c6a79743a..a2d5b40d1 100644
--- a/tdeio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -22,11 +22,11 @@
 #include <config.h>
 
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klargefile.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kprotocolinfo.h>
 
 #include <tqfileinfo.h>
diff --git a/tdeio/tests/kacltest.cpp b/tdeio/tests/kacltest.cpp
index b55aedce8..50d3bc25a 100644
--- a/tdeio/tests/kacltest.cpp
+++ b/tdeio/tests/kacltest.cpp
@@ -22,9 +22,9 @@
 #include <config.h>
 
 #include <kacl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfileinfo.h>
 #include <tqeventloop.h>
diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp
index 79f050f51..5f1ad611a 100644
--- a/tdeio/tests/kdcopcheck.cpp
+++ b/tdeio/tests/kdcopcheck.cpp
@@ -13,7 +13,7 @@
 #include "kdcopcheck.h"
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tdeio/tests/kdefaultprogresstest.cpp b/tdeio/tests/kdefaultprogresstest.cpp
index 7e77611ed..7f1bad6a4 100644
--- a/tdeio/tests/kdefaultprogresstest.cpp
+++ b/tdeio/tests/kdefaultprogresstest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/defaultprogress.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/tdeio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp
index 000fb200c..aaba5400a 100644
--- a/tdeio/tests/kdirlistertest.cpp
+++ b/tdeio/tests/kdirlistertest.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirlister.h>
 #include <kdebug.h>
 
diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp
index 0ca853f1a..9f50c2170 100644
--- a/tdeio/tests/kdirwatchtest.cpp
+++ b/tdeio/tests/kdirwatchtest.cpp
@@ -12,7 +12,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "kdirwatchtest.h"
 
diff --git a/tdeio/tests/kdirwatchtest.h b/tdeio/tests/kdirwatchtest.h
index 24dc94a91..493043c01 100644
--- a/tdeio/tests/kdirwatchtest.h
+++ b/tdeio/tests/kdirwatchtest.h
@@ -17,7 +17,7 @@
 #include <tqobject.h>
 
 #include "kdirwatch.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 class myTest : public TQObject 
 {
diff --git a/tdeio/tests/kdirwatchunittest.h b/tdeio/tests/kdirwatchunittest.h
index 42222a787..416aeecfe 100644
--- a/tdeio/tests/kdirwatchunittest.h
+++ b/tdeio/tests/kdirwatchunittest.h
@@ -17,7 +17,7 @@
 #include <tqobject.h>
 
 #include "kdirwatch.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include <tdeunittest/tester.h>
 #include <tdeunittest/module.h>
diff --git a/tdeio/tests/kionetrctest.cpp b/tdeio/tests/kionetrctest.cpp
index 4c05f77e1..b0fbf7087 100644
--- a/tdeio/tests/kionetrctest.cpp
+++ b/tdeio/tests/kionetrctest.cpp
@@ -1,7 +1,7 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "authinfo.h"
 
diff --git a/tdeio/tests/kiopassdlgtest.cpp b/tdeio/tests/kiopassdlgtest.cpp
index adb14a306..3dd4d7294 100644
--- a/tdeio/tests/kiopassdlgtest.cpp
+++ b/tdeio/tests/kiopassdlgtest.cpp
@@ -1,8 +1,8 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "passdlg.h"
 
diff --git a/tdeio/tests/kmimefromext.cpp b/tdeio/tests/kmimefromext.cpp
index 9b3f9dd54..d2cc0bca8 100644
--- a/tdeio/tests/kmimefromext.cpp
+++ b/tdeio/tests/kmimefromext.cpp
@@ -18,8 +18,8 @@
 
 #include <ktrader.h>
 #include <kmimetype.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 
diff --git a/tdeio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp
index c09ff622c..638a60ec2 100644
--- a/tdeio/tests/kpropsdlgtest.cpp
+++ b/tdeio/tests/kpropsdlgtest.cpp
@@ -1,8 +1,8 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kpropertiesdialog.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 
 static TDECmdLineOptions options[] =
diff --git a/tdeio/tests/kprotocolinfotest.cpp b/tdeio/tests/kprotocolinfotest.cpp
index 30c9decd8..646249678 100644
--- a/tdeio/tests/kprotocolinfotest.cpp
+++ b/tdeio/tests/kprotocolinfotest.cpp
@@ -18,10 +18,10 @@
 
 #include <kprotocolinfo.h>
 #include <kprotocolmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <assert.h>
 
diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp
index d8f47859b..f2065f8b8 100644
--- a/tdeio/tests/kruntest.cpp
+++ b/tdeio/tests/kruntest.cpp
@@ -21,7 +21,7 @@
 
 #include "kruntest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kshell.h>
 #include <kservice.h>
diff --git a/tdeio/tests/kscantest.cpp b/tdeio/tests/kscantest.cpp
index 14abd1b33..d37f2eb97 100644
--- a/tdeio/tests/kscantest.cpp
+++ b/tdeio/tests/kscantest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kscan.h>
 
 int main( int argc, char **argv )
diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index 67f27645d..5cc79bd82 100644
--- a/tdeio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -22,10 +22,10 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
diff --git a/tdeio/tests/kurlcompletiontest.cpp b/tdeio/tests/kurlcompletiontest.cpp
index c8dc99595..7d479d156 100644
--- a/tdeio/tests/kurlcompletiontest.cpp
+++ b/tdeio/tests/kurlcompletiontest.cpp
@@ -16,14 +16,14 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurlcompletion.h>
 #include <kdebug.h>
 #include <tqdir.h>
 #include <assert.h>
 #include <tqfile.h>
 #include <ktempdir.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <unistd.h>
 
 class KURLCompletionTest
diff --git a/tdeio/tests/metatest.cpp b/tdeio/tests/metatest.cpp
index 9890bb711..cd391e0d5 100644
--- a/tdeio/tests/metatest.cpp
+++ b/tdeio/tests/metatest.cpp
@@ -1,6 +1,6 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefilemetainfo.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqstringlist.h>
 #include <tqimage.h>
 #include <kdebug.h>
diff --git a/tdeio/tests/netaccesstest.cpp b/tdeio/tests/netaccesstest.cpp
index 1a5de205d..b9b0ffab7 100644
--- a/tdeio/tests/netaccesstest.cpp
+++ b/tdeio/tests/netaccesstest.cpp
@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/tdeio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp
index 87bdd326d..6d0cd78b2 100644
--- a/tdeio/tests/previewtest.cpp
+++ b/tdeio/tests/previewtest.cpp
@@ -3,7 +3,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp
index 8256fa04f..4b14a6bb6 100644
--- a/tdeio/tests/speed.cpp
+++ b/tdeio/tests/speed.cpp
@@ -17,11 +17,11 @@
  *  Boston, MA 02110-1301, USA.
  */
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <time.h>
 #include "speed.h"
 #include <tdeio/job.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqdir.h>
 #include <tdeio/global.h>
 
diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index aee514f54..ecc5e4af5 100644
--- a/tdeio/tests/tdeioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -14,8 +14,8 @@
 #include <tqdir.h>
 
 #include <kacl.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp
index e1b40339f..719d90da8 100644
--- a/tdeio/tests/tdesycocatest.cpp
+++ b/tdeio/tests/tdesycocatest.cpp
@@ -28,7 +28,7 @@
 #include <kprotocolinfo.h>
 #include <kiconloader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tdeio/tests/tdesycocaupdatetest.cpp b/tdeio/tests/tdesycocaupdatetest.cpp
index e7778e056..48a195a00 100644
--- a/tdeio/tests/tdesycocaupdatetest.cpp
+++ b/tdeio/tests/tdesycocaupdatetest.cpp
@@ -1,6 +1,6 @@
 #include <kservice.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tdeio/tests/tdetradertest.cpp b/tdeio/tests/tdetradertest.cpp
index 7a4b258dc..b33dcf398 100644
--- a/tdeio/tests/tdetradertest.cpp
+++ b/tdeio/tests/tdetradertest.cpp
@@ -16,10 +16,10 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <ktrader.h>
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdio.h>
 
 static TDECmdLineOptions options[] =
diff --git a/tdeioslave/http/http.cc b/tdeioslave/http/http.cc
index 2dd5cc143..539cc4dc5 100644
--- a/tdeioslave/http/http.cc
+++ b/tdeioslave/http/http.cc
@@ -62,7 +62,7 @@
 #include <kmimemagic.h>
 #include <dcopclient.h>
 #include <kdatastream.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <kremoteencoding.h>
diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index c9f4e4678..af9ede123 100644
--- a/tdeioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kinstance.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
diff --git a/tdeioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp
index ceb1df57f..798b06318 100644
--- a/tdeioslave/http/kcookiejar/kcookieserver.cpp
+++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp
@@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "kcookiejar.h"
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index 57a22f62c..3b845a104 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
@@ -63,7 +63,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kurllabel.h>
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
diff --git a/tdeioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp
index 976b6b87c..59d912524 100644
--- a/tdeioslave/http/kcookiejar/main.cpp
+++ b/tdeioslave/http/kcookiejar/main.cpp
@@ -22,9 +22,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static const char description[] =
 	I18N_NOOP("HTTP Cookie Daemon");
diff --git a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
index 51e61a332..9d720d6c4 100644
--- a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
@@ -24,9 +24,9 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "../kcookiejar.cpp"
diff --git a/tdeioslave/metainfo/metainfo.cpp b/tdeioslave/metainfo/metainfo.cpp
index 68f07c800..54f7acc3a 100644
--- a/tdeioslave/metainfo/metainfo.cpp
+++ b/tdeioslave/metainfo/metainfo.cpp
@@ -20,7 +20,7 @@
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmimetype.h>
 #include <kdebug.h>
 #include <tdefilemetainfo.h>
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp
index 7d58c9f08..99af949ed 100644
--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@@ -43,10 +43,10 @@ extern "C" {
 #include <tqfileinfo.h>
 
 #include <kglobal.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 /* return application name */
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index db29c293f..88bfa020d 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -33,7 +33,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index d3e162e14..255150289 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -22,7 +22,7 @@
 #include "guiclient.moc"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <klocale.h>
diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 358791ab0..4d477fc9c 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -52,7 +52,7 @@
 #include <tqmenubar.h>
 
 #include <kmenubar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index 17f4dcf8a..ba0ba0de0 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index c9b2f70f3..1c43b8039 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -21,7 +21,7 @@
 #include "tdemdiguiclient.moc"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 771afb8de..3c9f7c442 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -44,7 +44,7 @@
 #include <tqmenubar.h>
 
 #include <kmenubar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
diff --git a/tdemdi/test/main.cpp b/tdemdi/test/main.cpp
index 4f14a410c..29a91e39f 100644
--- a/tdemdi/test/main.cpp
+++ b/tdemdi/test/main.cpp
@@ -26,7 +26,7 @@
 //----------------------------------------------------------------------------
 
 #ifndef NO_KDE
-# include <kapplication.h>
+# include <tdeapplication.h>
  TDEApplication* theApp;
 #else
 # include <tqapplication.h>
diff --git a/tdeparts/genericfactory.h b/tdeparts/genericfactory.h
index 75a5292ed..eb54959a4 100644
--- a/tdeparts/genericfactory.h
+++ b/tdeparts/genericfactory.h
@@ -4,7 +4,7 @@
 #include <tdeparts/factory.h>
 #include <tdeparts/part.h>
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 namespace KParts
diff --git a/tdeparts/historyprovider.cpp b/tdeparts/historyprovider.cpp
index 17cf609a1..9c893ae53 100644
--- a/tdeparts/historyprovider.cpp
+++ b/tdeparts/historyprovider.cpp
@@ -19,7 +19,7 @@
 
 #include <tqdict.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "historyprovider.h"
 
diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp
index 0571bf4ad..403fda062 100644
--- a/tdeparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -9,7 +9,7 @@
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
 #include <klocale.h>
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index 24d70a14d..72b165e65 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -1,11 +1,11 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klibloader.h>
 
 #include <tqwidget.h>
diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index 14efbef94..664d6c7ec 100644
--- a/tdeparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -9,7 +9,7 @@
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
 #include <klocale.h>
diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp
index 547cab520..81ff2c1f2 100644
--- a/tdeparts/tests/notepad.cpp
+++ b/tdeparts/tests/notepad.cpp
@@ -8,8 +8,8 @@
 #include <tqtextstream.h>
 #include <tqmultilineedit.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <klocale.h>
diff --git a/tdeparts/tests/parts.cpp b/tdeparts/tests/parts.cpp
index e765f55e7..408e73280 100644
--- a/tdeparts/tests/parts.cpp
+++ b/tdeparts/tests/parts.cpp
@@ -12,7 +12,7 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp
index 5febb18a1..abc81477c 100644
--- a/tdeprint/cups/cupsdconf2/main.cpp
+++ b/tdeprint/cups/cupsdconf2/main.cpp
@@ -21,8 +21,8 @@
 
 #include <tqfile.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 static TDECmdLineOptions options[] =
 {
diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp
index 5013b57cc..330429583 100644
--- a/tdeprint/cups/cupsinfos.cpp
+++ b/tdeprint/cups/cupsinfos.cpp
@@ -26,7 +26,7 @@
 #include <tdeio/authinfo.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kstringhandler.h>
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 99fff556a..cd472eefa 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -41,7 +41,7 @@
 #include <tqdatetime.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index 7d972cbf8..09a2cf45a 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdeio/authinfo.h>
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index 1c772ec3c..ca9b1036f 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klibloader.h>
 #include <unistd.h>
 
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index 3557fe4d4..d804cc9f2 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -34,7 +34,7 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp
index 7f3d18807..4704abb15 100644
--- a/tdeprint/kpfilterpage.cpp
+++ b/tdeprint/kpfilterpage.cpp
@@ -32,7 +32,7 @@
 #include <kmessagebox.h>
 #include <kactivelabel.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 
 KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 73e700886..312146855 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -61,7 +61,7 @@
 #include <tdeconfig.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/renamedlg.h>
 
 #include <time.h>
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 4d34280a0..95cfc1733 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -33,7 +33,7 @@
 #include <tqtl.h>
 #include <tqdir.h>
 #include <tqguardedptr.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index fd05024a3..ac79220f5 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -34,7 +34,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdatastream.h>
 #include <kdebug.h>
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index b1a2f50ac..0311f543d 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -32,7 +32,7 @@
 #include <ktrader.h>
 #include <kuserprofile.h>
 #include <krun.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp
index fbee05a0c..ec93fcce6 100644
--- a/tdeprint/kprintprocess.cpp
+++ b/tdeprint/kprintprocess.cpp
@@ -18,7 +18,7 @@
  **/
 
 #include "kprintprocess.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqfile.h>
 
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index 738f7e178..e1242c5fc 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -31,7 +31,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <tqfile.h>
diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp
index 99da2a9b7..256b85011 100644
--- a/tdeprint/management/kaddprinterwizard.cpp
+++ b/tdeprint/management/kaddprinterwizard.cpp
@@ -1,6 +1,6 @@
 #include "kmmanager.h"
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index c101bb270..2297d4034 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -25,7 +25,7 @@
 #include <tqfileinfo.h>
 #include <tqdir.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index a7d14fe92..9eb28cf87 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -28,7 +28,7 @@
 #include <tqtextstream.h>
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 KMDriverDB* KMDriverDB::m_self = 0;
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 9d5c498c0..741e69378 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -39,7 +39,7 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kmenubar.h>
 #include <kdebug.h>
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index da5b2dd0a..5e68f3726 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -54,7 +54,7 @@
 #include <kdialogbase.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 
 #undef m_manager
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index 4f57762aa..cb46a45a0 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -29,7 +29,7 @@
 #include <kpushbutton.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
 #include <tdeio/netaccess.h>
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index 5dc915572..5bb86967a 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdguiitem.h>
 
 #include "kmwinfopage.h"
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index 04556c07b..a4f23959a 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -32,7 +32,7 @@
 #include <tqregexp.h>
 #include <knumvalidator.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kextsock.h>
 #include <kdebug.h>
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 5019b92b3..2080149d9 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -45,7 +45,7 @@
 #include <tdelistbox.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
 
diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp
index a1b6ddf29..7f642896e 100644
--- a/tdeprint/messagewindow.cpp
+++ b/tdeprint/messagewindow.cpp
@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 #include <tqhbox.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 TQPtrDict<MessageWindow> MessageWindow::m_windows;
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 02d32ab77..5080cc40c 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp
index 3f04c9196..71d4a0680 100644
--- a/tdeprint/tests/drawdemo.cpp
+++ b/tdeprint/tests/drawdemo.cpp
@@ -14,7 +14,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqapplication.h>
 #include <math.h>
 
diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp
index 332ba1fc4..d714bcdf6 100644
--- a/tdeprint/tests/main.cpp
+++ b/tdeprint/tests/main.cpp
@@ -9,7 +9,7 @@
 *****************************************************************************/
 
 #include "helpwindow.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwindowsstyle.h>
 #include <tqstylesheet.h>
 #include <stdlib.h>
diff --git a/tderandr/libtderandr.cc b/tderandr/libtderandr.cc
index 65005f91e..976b156ac 100644
--- a/tderandr/libtderandr.cc
+++ b/tderandr/libtderandr.cc
@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp
index 334da5a79..68bfc2e68 100644
--- a/tderandr/randr.cpp
+++ b/tderandr/randr.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
 #include <kipc.h>
diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp
index d0ba22df7..e70332c71 100644
--- a/tderesources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/tderesources/kcmtderesources.cpp b/tderesources/kcmtderesources.cpp
index 6afc1c1f6..1b779fabd 100644
--- a/tderesources/kcmtderesources.cpp
+++ b/tderesources/kcmtderesources.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 
diff --git a/tderesources/managerimpl.cpp b/tderesources/managerimpl.cpp
index 467f049e9..288a40223 100644
--- a/tderesources/managerimpl.cpp
+++ b/tderesources/managerimpl.cpp
@@ -23,8 +23,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/tderesources/resource.cpp b/tderesources/resource.cpp
index 2a16ee159..41c08767e 100644
--- a/tderesources/resource.cpp
+++ b/tderesources/resource.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include "resource.h"
diff --git a/tderesources/testresources.cpp b/tderesources/testresources.cpp
index 515563172..7644315d4 100644
--- a/tderesources/testresources.cpp
+++ b/tderesources/testresources.cpp
@@ -1,7 +1,7 @@
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "resource.h"
 #include "manager.h"
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 8b22b84a2..78df9e335 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -82,7 +82,7 @@
 #include <kprogressbox.h>
 #include <kpassdlg.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index ffb5cfd6f..a4908fe63 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -61,7 +61,7 @@
 #include <kprogressbox.h>
 #include <kpassdlg.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
diff --git a/tdespell2/tests/backgroundtest.cpp b/tdespell2/tests/backgroundtest.cpp
index 14f9e029d..92c7e7792 100644
--- a/tdespell2/tests/backgroundtest.cpp
+++ b/tdespell2/tests/backgroundtest.cpp
@@ -24,7 +24,7 @@
 #include "broker.h"
 using namespace KSpell2;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 const char *text = "Rationale \
diff --git a/tdespell2/tests/test.cpp b/tdespell2/tests/test.cpp
index e8ceabaf7..b68dbee42 100644
--- a/tdespell2/tests/test.cpp
+++ b/tdespell2/tests/test.cpp
@@ -21,7 +21,7 @@
 #include "broker.h"
 #include "dictionary.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqdatetime.h>
diff --git a/tdespell2/tests/test_config.cpp b/tdespell2/tests/test_config.cpp
index 2d243bd46..c3c5ec740 100644
--- a/tdespell2/tests/test_config.cpp
+++ b/tdespell2/tests/test_config.cpp
@@ -20,7 +20,7 @@
  */
 #include "configdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 
diff --git a/tdespell2/tests/test_configdialog.cpp b/tdespell2/tests/test_configdialog.cpp
index a9ff16cdd..4e3b560e9 100644
--- a/tdespell2/tests/test_configdialog.cpp
+++ b/tdespell2/tests/test_configdialog.cpp
@@ -21,7 +21,7 @@
 #include "configdialog.h"
 #include "broker.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 
diff --git a/tdespell2/tests/test_dialog.cpp b/tdespell2/tests/test_dialog.cpp
index 19503e307..d6441bde6 100644
--- a/tdespell2/tests/test_dialog.cpp
+++ b/tdespell2/tests/test_dialog.cpp
@@ -25,7 +25,7 @@
 #include "dictionary.h"
 #include "filter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 
diff --git a/tdespell2/tests/test_filter.cpp b/tdespell2/tests/test_filter.cpp
index 430f157dd..a1fcb670c 100644
--- a/tdespell2/tests/test_filter.cpp
+++ b/tdespell2/tests/test_filter.cpp
@@ -21,7 +21,7 @@
 #include "filter.h"
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 using namespace KSpell2;
diff --git a/tdespell2/tests/test_highlighter.cpp b/tdespell2/tests/test_highlighter.cpp
index c11972254..3f7c253e4 100644
--- a/tdespell2/tests/test_highlighter.cpp
+++ b/tdespell2/tests/test_highlighter.cpp
@@ -22,7 +22,7 @@
 #include "dictionary.h"
 #include "filter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqtextedit.h>
diff --git a/tdesu/client.cpp b/tdesu/client.cpp
index 8eaf86af8..91e922250 100644
--- a/tdesu/client.cpp
+++ b/tdesu/client.cpp
@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kde_file.h>
 
 #include "client.h"
diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp
index f5b435b40..4cd5864de 100644
--- a/tdesu/stub.cpp
+++ b/tdesu/stub.cpp
@@ -20,7 +20,7 @@
 #include <tqcstring.h>
 #include <kdatastream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index b8e11ed32..85d2fc9b4 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -53,7 +53,7 @@ install( FILES
     klineeditdlg.h kinputdialog.h kactivelabel.h
     kcharselect.h kcolordrag.h qxembed.h
     knumvalidator.h kdialog.h kdialogbase.h
-    kjanuswidget.h kaboutdialog.h
+    kjanuswidget.h tdeaboutdialog.h
     kauthicon.h kmessagebox.h ksharedpixmap.h
     kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h
     tdetoolbarradiogroup.h ktextbrowser.h
@@ -64,7 +64,7 @@ install( FILES
     kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h
     kpixmapio.h kwordwrap.h
     kedittoolbar.h kdockwidget.h kanimwidget.h
-    krootpixmap.h kaboutkde.h kaboutapplication.h
+    krootpixmap.h tdeabouttde.h tdeaboutapplication.h
     kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h
     kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h
     kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h
@@ -117,7 +117,7 @@ set( ${target}_SRCS
   kruler.cpp kcursor.cpp klineeditdlg.cpp
   kcharselect.cpp kcolordrag.cpp
   knumvalidator.cpp kdialog.cpp kdialogbase.cpp
-  kjanuswidget.cpp kaboutdialog.cpp
+  kjanuswidget.cpp tdeaboutdialog.cpp
   kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp
   tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp
   ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp
@@ -126,8 +126,8 @@ set( ${target}_SRCS
   kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp
   kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp
   kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp
-  kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp
-  kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
+  kanimwidget.cpp krootpixmap.cpp tdeabouttde.cpp
+  tdeaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
   kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp
   tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp
   kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp
diff --git a/tdeui/MAINTAINERS b/tdeui/MAINTAINERS
index 4e22d00a0..f4e2165fb 100644
--- a/tdeui/MAINTAINERS
+++ b/tdeui/MAINTAINERS
@@ -5,9 +5,9 @@ that class.
 When adding yourself as a maintainer, don't be afraid to reorder the files to a
 more logical grouping.
 
-kaboutapplication.cpp
-kaboutdialog.cpp
-kaboutkde.cpp
+tdeaboutapplication.cpp
+tdeaboutdialog.cpp
+tdeabouttde.cpp
 tdeaction.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
 kanimwidget.cpp		Waldo Bastian <bastian@kde.org>
 karrowbutton.cpp	Frerich Raabe <raabe@kde.org>
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index 4a1b472ff..26a9423cd 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -50,7 +50,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		klineeditdlg.h kinputdialog.h kactivelabel.h \
 		kcharselect.h kcolordrag.h qxembed.h \
 		knumvalidator.h kdialog.h kdialogbase.h \
-		kjanuswidget.h kaboutdialog.h \
+		kjanuswidget.h tdeaboutdialog.h \
 		kauthicon.h kmessagebox.h ksharedpixmap.h \
 		kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h \
 		tdetoolbarradiogroup.h ktextbrowser.h \
@@ -61,7 +61,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h \
 		kpixmapio.h kwordwrap.h \
 		kedittoolbar.h kdockwidget.h kanimwidget.h \
-		krootpixmap.h kaboutkde.h kaboutapplication.h \
+		krootpixmap.h tdeabouttde.h tdeaboutapplication.h \
 		kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h \
 		kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h \
 		kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h \
@@ -98,7 +98,7 @@ libtdeui_la_SOURCES = \
 		kruler.cpp kcursor.cpp klineeditdlg.cpp  \
 		kcharselect.cpp kcolordrag.cpp  \
 		knumvalidator.cpp kdialog.cpp kdialogbase.cpp \
-		kjanuswidget.cpp kaboutdialog.cpp \
+		kjanuswidget.cpp tdeaboutdialog.cpp \
 		kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp \
 		tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp \
 		ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp \
@@ -107,8 +107,8 @@ libtdeui_la_SOURCES = \
 		kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp \
 		kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp \
 		kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp \
-		kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp \
-		kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
+		kanimwidget.cpp krootpixmap.cpp tdeabouttde.cpp \
+		tdeaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
 		kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp \
 		tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp \
 		kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp \
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp
index a30fac7f4..0e5abc5ad 100644
--- a/tdeui/kactivelabel.cpp
+++ b/tdeui/kactivelabel.cpp
@@ -19,7 +19,7 @@
 
 #include "kactivelabel.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <tqsimplerichtext.h>
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index efee22366..91c6aa66c 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -26,8 +26,8 @@
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klineedit.h>
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index ace147496..a623b3efa 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -36,7 +36,7 @@
 #include <tqtooltip.h>
 #include <tqvalidator.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index 0449550fd..7e9353cf4 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -44,7 +44,7 @@
 #include <tqpushbutton.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index 16f16d07e..29292f960 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -45,7 +45,7 @@
 #include <tqspinbox.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index 91cafddbd..98d72030d 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -33,7 +33,7 @@
 
 #include "kdatepicker.h"
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 2fd593493..542f89f08 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/tdeui/kdcopactionproxy.cpp b/tdeui/kdcopactionproxy.cpp
index c8444cfdf..028c90883 100644
--- a/tdeui/kdcopactionproxy.cpp
+++ b/tdeui/kdcopactionproxy.cpp
@@ -20,7 +20,7 @@
 #include "kdcopactionproxy.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kdcoppropertyproxy.h>
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp
index f1e6995ee..d0e7a84cf 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -19,7 +19,7 @@
 
 #include "kdetrayproxy.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <netwm.h>
 #include <X11/Xlib.h>
@@ -182,7 +182,7 @@ void KDETrayProxy::withdrawWindow( Window w )
 #include "kdetrayproxy.moc"
 
 #if 0
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 int main( int argc, char* argv[] )
     {
     TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" );
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index ddac1ddd8..f6b2b8b56 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kwhatsthismanager_p.h>
 #include <kdebug.h>
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 46d0697d5..6656d6803 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 #include <tqfocusdata.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index baff8db25..37cee99fb 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -24,7 +24,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kcmenumngr.h>
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index 92ca542d4..a7db92555 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -31,7 +31,7 @@
 #include <tqhbox.h>
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp
index 040e77c70..1a31bbaa4 100644
--- a/tdeui/keditlistbox.cpp
+++ b/tdeui/keditlistbox.cpp
@@ -31,7 +31,7 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 
 #include "keditlistbox.h"
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index dd6b7d174..41fa063c2 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -27,11 +27,11 @@
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
 
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
-#include <kaboutkde.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeabouttde.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbugreport.h>
 #include <kdialogbase.h>
 #include <khelpmenu.h>
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 3a139985a..bcf9550b4 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h> 
 
 #include <kcursor.h>
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index fc1a04e7e..e9dd9df85 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -33,7 +33,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h> // Access to some static members
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index e0a41ce5d..24191aa45 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -24,7 +24,7 @@
 #include <tqcursor.h>
 #include <tqdrawutil.h>
 #include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalaccel.h>
 #include <klocale.h>
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index b6db9bb71..7faad35c4 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -39,7 +39,7 @@
 #include <tdeaction.h>
 #include <tdeaccelaction.h>
 #include <tdeactionshortcutlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -51,7 +51,7 @@
 #include <tdeshortcut.h>
 #include <tdeshortcutlist.h>
 #include <kxmlguifactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
 
 #ifdef Q_WS_X11
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index dc245cd6f..6b29ac0ca 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -30,7 +30,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <tqcolor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include "kled.h"
 
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index 4e11f5fa3..a1c05aaab 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -40,7 +40,7 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "klineedit.h"
 #include "klineedit.moc"
diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp
index 9551fc1f6..ca4fd8266 100644
--- a/tdeui/klineeditdlg.cpp
+++ b/tdeui/klineeditdlg.cpp
@@ -28,7 +28,7 @@
 
 #include <kbuttonbox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
 
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index 9f21ce300..71158370b 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kmenubar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kmanagerselection.h>
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index 1e3c0bfda..5684c6484 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -31,7 +31,7 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index 02a098283..f88cb5a8a 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "kpanelapplet.h"
 #include "kpanelapplet.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 class KPanelApplet::KPanelAppletPrivate
diff --git a/tdeui/kpanelappmenu.cpp b/tdeui/kpanelappmenu.cpp
index 4cc77b5fe..247d844de 100644
--- a/tdeui/kpanelappmenu.cpp
+++ b/tdeui/kpanelappmenu.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kpanelappmenu.h"
 #include <tqstringlist.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 static int panelmenu_get_seq_id()
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index e2ca0bb80..302b4e679 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -36,11 +36,11 @@
 
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 9b72dcf2c..3f0186e3d 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -34,7 +34,7 @@
 
 #include "kprogress.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <twin.h>
 
diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp
index 4638f78fb..6dda25a33 100644
--- a/tdeui/kprogressbox.cpp
+++ b/tdeui/kprogressbox.cpp
@@ -37,7 +37,7 @@
 #include "ktextedit.h"
 #include "kprogressbox.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <twin.h>
 
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index 35bf0928f..e92fe8583 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kipc.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 class KPushButton::KPushButtonPrivate
 {
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 71b1d86ca..6be62d157 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -14,7 +14,7 @@
 #include <tqrect.h>
 #include <tqimage.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <kpixmapio.h>
 #include <twinmodule.h>
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index 363a9b8b4..d27ae07ca 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 9e860f3cf..c5a4879d8 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -20,7 +20,7 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kseparator.moc"
 
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index b9e0e69c4..33eca17e4 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -22,7 +22,7 @@
 
 #ifdef Q_WS_X11
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krootprop.h>
 #include <ksharedpixmap.h>
 #include <kdebug.h>
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index a0e840e5a..8dd874a9d 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -21,9 +21,9 @@
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index 2367804a8..78f3fd6f6 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -20,7 +20,7 @@
 
 #include <kguiitem.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
 {
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 1d0ce4159..ba938382b 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdespell.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "ksyntaxhighlighter.h"
 
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 572616833..fcd0389da 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -24,9 +24,9 @@
 #include "tdeshortcut.h"
 #include "ksystemtray.h"
 #include "tdepopupmenu.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "klocale.h"
-#include "kaboutdata.h"
+#include "tdeaboutdata.h"
 
 #ifdef Q_WS_X11
 #include <twin.h>
diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp
index 15f14d711..b17e38067 100644
--- a/tdeui/ktextbrowser.cpp
+++ b/tdeui/ktextbrowser.cpp
@@ -19,7 +19,7 @@
 
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <ktextbrowser.h>
 #include <kcursor.h>
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index d52e134b6..44f710fb9 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtextstream.h>
 #include <tqimage.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeui/kwhatsthismanager.cpp b/tdeui/kwhatsthismanager.cpp
index 2f4d1750f..bcf48438c 100644
--- a/tdeui/kwhatsthismanager.cpp
+++ b/tdeui/kwhatsthismanager.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <tqtextedit.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KWhatsThisManager *KWhatsThisManager::s_instance = 0;
 
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index 3eb756678..6fd472ad5 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kxmlguibuilder.h"
 #include "kmenubar.h"
 #include "tdepopupmenu.h"
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index a02718f0a..de015b5a4 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -32,7 +32,7 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <assert.h>
 
diff --git a/tdeui/kaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp
similarity index 98%
rename from tdeui/kaboutapplication.cpp
rename to tdeui/tdeaboutapplication.cpp
index 681b22642..08ee46450 100644
--- a/tdeui/kaboutapplication.cpp
+++ b/tdeui/tdeaboutapplication.cpp
@@ -23,10 +23,10 @@
 // I (espen) prefer that header files are included alphabetically
 
 #include <tqlabel.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kaboutdialog_private.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kurllabel.h>
diff --git a/tdeui/kaboutapplication.h b/tdeui/tdeaboutapplication.h
similarity index 98%
rename from tdeui/kaboutapplication.h
rename to tdeui/tdeaboutapplication.h
index c313460ff..19fa0fe61 100644
--- a/tdeui/kaboutapplication.h
+++ b/tdeui/tdeaboutapplication.h
@@ -23,8 +23,8 @@
 #ifndef _KABOUT_APPLICATION_H_
 #define _KABOUT_APPLICATION_H_
 
-#include <kaboutdata.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutdialog.h>
 
 /**
  * @short Standard "About Application" dialog box.
diff --git a/tdeui/kaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
similarity index 99%
rename from tdeui/kaboutdialog.cpp
rename to tdeui/tdeaboutdialog.cpp
index 7cc1c6327..b46c0b959 100644
--- a/tdeui/kaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -31,13 +31,13 @@
 #include <tqtabwidget.h>
 #include <tqtabbar.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <ktextbrowser.h>
 #include <kurllabel.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <kaboutdialog_private.h>
 #include <kdebug.h>
 
@@ -50,7 +50,7 @@ template class TQPtrList<TDEAboutContributor>;
 
 // ##############################################################
 // MOC OUTPUT FILES:
-#include "kaboutdialog.moc"
+#include "tdeaboutdialog.moc"
 #include "kaboutdialog_private.moc"
 // ##############################################################
 
diff --git a/tdeui/kaboutdialog.h b/tdeui/tdeaboutdialog.h
similarity index 100%
rename from tdeui/kaboutdialog.h
rename to tdeui/tdeaboutdialog.h
diff --git a/tdeui/kaboutkde.cpp b/tdeui/tdeabouttde.cpp
similarity index 98%
rename from tdeui/kaboutkde.cpp
rename to tdeui/tdeabouttde.cpp
index 5ccd8822a..0e7078af4 100644
--- a/tdeui/kaboutkde.cpp
+++ b/tdeui/tdeabouttde.cpp
@@ -20,8 +20,8 @@
  */
 
 // I (espen) prefer that header files are included alphabetically
-#include <kaboutkde.h>
-#include <kapplication.h>
+#include <tdeabouttde.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/tdeui/kaboutkde.h b/tdeui/tdeabouttde.h
similarity index 98%
rename from tdeui/kaboutkde.h
rename to tdeui/tdeabouttde.h
index 8013d093d..a75b92904 100644
--- a/tdeui/kaboutkde.h
+++ b/tdeui/tdeabouttde.h
@@ -22,7 +22,7 @@
 #ifndef _KABOUT_KDE_H_
 #define _KABOUT_KDE_H_
 
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 
 /**
  * @short Standard "About KDE" dialog box,
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index 1cae013a2..d817a5ba4 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -33,7 +33,7 @@
 #include <tdeaccel.h>
 #include <tdeaccelbase.h>
 #include <tdeaccelprivate.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
 #include <tdemainwindow.h>
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index 3b07f56ca..1fc963887 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -42,7 +42,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefontcombo.h>
diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp
index 9181fca89..16104e242 100644
--- a/tdeui/tdeactioncollection.cpp
+++ b/tdeui/tdeactioncollection.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeaccel.h>
 #include <tdeaccelbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqpopupmenu.h>
diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp
index 85a23341e..4e6ce943f 100644
--- a/tdeui/tdecmodule.cpp
+++ b/tdeui/tdecmodule.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfigskeleton.h>
 #include <tdeconfigdialogmanager.h>
 #include <kdebug.h>
diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp
index 2a8398419..15c687e13 100644
--- a/tdeui/tdefontdialog.cpp
+++ b/tdeui/tdefontdialog.cpp
@@ -41,7 +41,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp
index 02ecf2fd1..9f7c23688 100644
--- a/tdeui/tdelistbox.cpp
+++ b/tdeui/tdelistbox.cpp
@@ -21,7 +21,7 @@
 
 #include <kglobalsettings.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h> 
 #include <kdebug.h>
 
diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp
index 158eac5ab..020f18679 100644
--- a/tdeui/tdelistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -30,7 +30,7 @@
 #include <kglobalsettings.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
 
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index b7596c262..01b6a09e0 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -36,7 +36,7 @@
 
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp
index fc864d9fa..8f8a9d40c 100644
--- a/tdeui/tdemainwindowiface.cpp
+++ b/tdeui/tdemainwindowiface.cpp
@@ -20,7 +20,7 @@
 #include "tdemainwindowiface.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopactionproxy.h>
 #include <kdcoppropertyproxy.h>
 #include <tdemainwindow.h>
diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index 62ac6f4ad..46d5c758f 100644
--- a/tdeui/tdepopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -30,7 +30,7 @@
 #include "tdepopupmenu.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 TDEPopupTitle::TDEPopupTitle(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index 73f06581f..fe3593b7e 100644
--- a/tdeui/tdeshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -52,7 +52,7 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index 8eac3bde2..629013121 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -37,7 +37,7 @@
 #include <tqtextcodec.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/tdeui/tdespelldlg.cpp b/tdeui/tdespelldlg.cpp
index ac0ccb984..280ddf861 100644
--- a/tdeui/tdespelldlg.cpp
+++ b/tdeui/tdespelldlg.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdelistbox.h>
 #include <kcombobox.h>
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 02173e41b..a095f1493 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -47,7 +47,7 @@
 #include <klineedit.h>
 #include <kseparator.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kglobal.h>
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index da5fc7b9b..608c31a32 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -38,7 +38,7 @@
 #include <tqpainter.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
index e03880bad..4242a119e 100644
--- a/tdeui/tdetoolbarhandler.cpp
+++ b/tdeui/tdetoolbarhandler.cpp
@@ -19,7 +19,7 @@
 #include "tdetoolbarhandler.h"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
 #include <klocale.h>
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index af7fb41e2..c96d6a4eb 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -16,7 +16,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kiconview.h>
diff --git a/tdeui/tests/kaboutdialogtest.cpp b/tdeui/tests/kaboutdialogtest.cpp
index 0555070a6..c3be2de25 100644
--- a/tdeui/tests/kaboutdialogtest.cpp
+++ b/tdeui/tests/kaboutdialogtest.cpp
@@ -8,10 +8,10 @@
  * $Revision$
  */
 
-#include "kaboutdialog.h"
+#include "tdeaboutdialog.h"
 // #include <kimgio.h>
 #include <tqimage.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp
index dc708f2b5..4672b76ee 100644
--- a/tdeui/tests/kblendtest.cpp
+++ b/tdeui/tests/kblendtest.cpp
@@ -1,5 +1,5 @@
 #include "kblendtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp
index 8f2052b28..c9eb1134b 100644
--- a/tdeui/tests/kbuttonboxtest.cpp
+++ b/tdeui/tests/kbuttonboxtest.cpp
@@ -16,7 +16,7 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kbuttonbox.h"
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp
index 019f6bd43..ccd6cd10a 100644
--- a/tdeui/tests/kcharselecttest.cpp
+++ b/tdeui/tests/kcharselecttest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include "kcharselect.h"
 
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index 23c0b89ea..f45df0de7 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kcolordialog.h"
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp
index 3f61da00f..243de265b 100644
--- a/tdeui/tests/kcolortest.cpp
+++ b/tdeui/tests/kcolortest.cpp
@@ -1,6 +1,6 @@
 
 #include "kcolortest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <stdio.h>
 #include <tqdatetime.h>
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 701710891..225c80c0f 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -6,7 +6,7 @@
 
 #include <assert.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index 617957b4c..12e3835dc 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 /*
diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp
index df8bc7013..abcfeb24a 100644
--- a/tdeui/tests/kdatepicktest.cpp
+++ b/tdeui/tests/kdatepicktest.cpp
@@ -1,6 +1,6 @@
 #include "kdatepicker.h"
 #include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp
index 9b158faf8..721f86492 100644
--- a/tdeui/tests/kdatetimewidgettest.cpp
+++ b/tdeui/tests/kdatetimewidgettest.cpp
@@ -1,5 +1,5 @@
 #include "kdatetimewidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp
index 16521da20..11fb243f3 100644
--- a/tdeui/tests/kdatewidgettest.cpp
+++ b/tdeui/tests/kdatewidgettest.cpp
@@ -1,6 +1,6 @@
 #include "kdatewidget.h"
 #include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index fbf93bfe8..8eab0b125 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -1,5 +1,5 @@
 #include "kdesattest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp
index b1c7d422c..7f8023bd2 100644
--- a/tdeui/tests/kdialogbasetest.cpp
+++ b/tdeui/tests/kdialogbasetest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 
 #include <tqstring.h>
diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp
index fbbb799fc..538e2b888 100644
--- a/tdeui/tests/kdocktest.cpp
+++ b/tdeui/tests/kdocktest.cpp
@@ -1,6 +1,6 @@
 #include "kdocktest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <tqwidget.h>
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index c252c7cf8..a922acf2d 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -20,7 +20,7 @@
 #include <tqpainter.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 //#include <kimgio.h>
 #include <stdlib.h>
 
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index 144391f50..683d42acd 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -15,7 +15,7 @@
 #include "kdockwidgettest.h"
 
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index ea749cd6e..e52d6e671 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -1,6 +1,6 @@
 #include "kdualcolortest.h"
 #include <kdualcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqlayout.h>
 #include <tqpalette.h>
diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp
index 177a8b6ec..5b4e45ddb 100644
--- a/tdeui/tests/keditlistboxtest.cpp
+++ b/tdeui/tests/keditlistboxtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditlistbox.h>
 #include <kcombobox.h>
 
diff --git a/tdeui/tests/kedittest.cpp b/tdeui/tests/kedittest.cpp
index 42d6f659f..f806c3bdf 100644
--- a/tdeui/tests/kedittest.cpp
+++ b/tdeui/tests/kedittest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditcl.h>
 #include <tqpopupmenu.h>
 
diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp
index dcd45673c..4ee8c0f93 100644
--- a/tdeui/tests/kgradienttest.cpp
+++ b/tdeui/tests/kgradienttest.cpp
@@ -1,5 +1,5 @@
 #include "kgradienttest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp
index af7cc60cd..d392fcbc5 100644
--- a/tdeui/tests/khashtest.cpp
+++ b/tdeui/tests/khashtest.cpp
@@ -1,5 +1,5 @@
 #include "khashtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
diff --git a/tdeui/tests/kinputdialogtest.cpp b/tdeui/tests/kinputdialogtest.cpp
index 5db3babff..b40b5c562 100644
--- a/tdeui/tests/kinputdialogtest.cpp
+++ b/tdeui/tests/kinputdialogtest.cpp
@@ -3,7 +3,7 @@
  * License: GPL V2
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
 
diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp
index 12a267a02..71e72fb13 100644
--- a/tdeui/tests/kjanuswidgettest.cpp
+++ b/tdeui/tests/kjanuswidgettest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kjanuswidget.h>
 
 #include <tqstring.h>
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index 48f2f1430..4ba158776 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <stdlib.h>
diff --git a/tdeui/tests/klineeditdlgtest.cpp b/tdeui/tests/klineeditdlgtest.cpp
index 012a22b7f..ecc6ac984 100644
--- a/tdeui/tests/klineeditdlgtest.cpp
+++ b/tdeui/tests/klineeditdlgtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineeditdlg.h>
 
 #include <tqstring.h>
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 5146b7d15..793988968 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -4,9 +4,9 @@
 #include <tqhbox.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index 69f28e8c6..ce333edee 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -8,7 +8,7 @@
 #include <stdio.h>
 
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kglobal.h>
 
diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp
index fad4cd50a..9a333dfda 100644
--- a/tdeui/tests/knuminputtest.cpp
+++ b/tdeui/tests/knuminputtest.cpp
@@ -11,7 +11,7 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 
 #include "knuminputtest.h"
diff --git a/tdeui/tests/kpalettetest.cpp b/tdeui/tests/kpalettetest.cpp
index 8edb97a57..94036244e 100644
--- a/tdeui/tests/kpalettetest.cpp
+++ b/tdeui/tests/kpalettetest.cpp
@@ -1,5 +1,5 @@
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <stdlib.h>
diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp
index 1890ff13e..a14cb3366 100644
--- a/tdeui/tests/kpanelmenutest.cpp
+++ b/tdeui/tests/kpanelmenutest.cpp
@@ -1,5 +1,5 @@
 #include "kpanelmenutest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 
diff --git a/tdeui/tests/kpixmapregionselectordialogtest.cpp b/tdeui/tests/kpixmapregionselectordialogtest.cpp
index 8c5cb545e..28a51a3f7 100644
--- a/tdeui/tests/kpixmapregionselectordialogtest.cpp
+++ b/tdeui/tests/kpixmapregionselectordialogtest.cpp
@@ -1,8 +1,8 @@
 #include "kpixmapregionselectordialog.h"
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <iostream>
 
 static const TDECmdLineOptions options[] =
diff --git a/tdeui/tests/kprogresstest.cpp b/tdeui/tests/kprogresstest.cpp
index c3665865d..6106a236b 100644
--- a/tdeui/tests/kprogresstest.cpp
+++ b/tdeui/tests/kprogresstest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "kprogress.h"
 
diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h
index cf1abc155..0242fb5d7 100644
--- a/tdeui/tests/krulertest.h
+++ b/tdeui/tests/krulertest.h
@@ -3,7 +3,7 @@
 #ifndef krulertest_h
 #define krulertest_h
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqwidget.h>
 #include <tqcheckbox.h>
diff --git a/tdeui/tests/kseparatortest.cpp b/tdeui/tests/kseparatortest.cpp
index 17e965ca8..a791fa930 100644
--- a/tdeui/tests/kseparatortest.cpp
+++ b/tdeui/tests/kseparatortest.cpp
@@ -18,7 +18,7 @@
  */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqwidget.h>
 
diff --git a/tdeui/tests/ksqueezedtextlabeltest.cpp b/tdeui/tests/ksqueezedtextlabeltest.cpp
index a0a0e400f..7c3fd413c 100644
--- a/tdeui/tests/ksqueezedtextlabeltest.cpp
+++ b/tdeui/tests/ksqueezedtextlabeltest.cpp
@@ -1,5 +1,5 @@
 #include "ksqueezedtextlabel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index c06f18b51..82c03e271 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include "kstatusbar.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kmenubar.h>
 #include "kstatusbartest.h"
diff --git a/tdeui/tests/ksystemtraytest.cpp b/tdeui/tests/ksystemtraytest.cpp
index 07572f8d3..27a6629d9 100644
--- a/tdeui/tests/ksystemtraytest.cpp
+++ b/tdeui/tests/ksystemtraytest.cpp
@@ -1,5 +1,5 @@
 #include <ksystemtray.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char **argv)
 {
diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp
index b864017b0..05fe2aeb3 100644
--- a/tdeui/tests/ktabctltest.cpp
+++ b/tdeui/tests/ktabctltest.cpp
@@ -2,7 +2,7 @@
  *
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqobject.h>
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 84a35952f..64d2795fc 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -2,8 +2,8 @@
 #include <tqlayout.h>
 #include <tqdragobject.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
 
diff --git a/tdeui/tests/ktextedittest.cpp b/tdeui/tests/ktextedittest.cpp
index 6af109d5a..6570bf26d 100644
--- a/tdeui/tests/ktextedittest.cpp
+++ b/tdeui/tests/ktextedittest.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktextedit.h>
 
 #include <tqfile.h>
diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp
index f4465fbf7..bbff45648 100644
--- a/tdeui/tests/ktimewidgettest.cpp
+++ b/tdeui/tests/ktimewidgettest.cpp
@@ -1,5 +1,5 @@
 #include "ktimewidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index d9e7448d8..40904000b 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -1,5 +1,5 @@
 #include "kunbalancedgrdtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqstring.h>
diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp
index f103a114f..0635188d0 100644
--- a/tdeui/tests/kwizardtest.cpp
+++ b/tdeui/tests/kwizardtest.cpp
@@ -20,7 +20,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kwizard.h>
 
 int main(int argc, char **argv)
diff --git a/tdeui/tests/kwordwraptest.cpp b/tdeui/tests/kwordwraptest.cpp
index bd51800e8..690fbf157 100644
--- a/tdeui/tests/kwordwraptest.cpp
+++ b/tdeui/tests/kwordwraptest.cpp
@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqwidget.h>
 #include "kwordwrap.h"
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index 89c5caf30..1a79526aa 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -1,5 +1,5 @@
 #include "kxmlguitest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>
diff --git a/tdeui/tests/tdeactiontest.cpp b/tdeui/tests/tdeactiontest.cpp
index d62d9c3fc..dcec16189 100644
--- a/tdeui/tests/tdeactiontest.cpp
+++ b/tdeui/tests/tdeactiontest.cpp
@@ -1,7 +1,7 @@
 
 #include <tqguardedptr.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 
 #include <assert.h>
diff --git a/tdeui/tests/tdefontdialogtest.cpp b/tdeui/tests/tdefontdialogtest.cpp
index 2d4e187b2..ff7ac2840 100644
--- a/tdeui/tests/tdefontdialogtest.cpp
+++ b/tdeui/tests/tdefontdialogtest.cpp
@@ -24,7 +24,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "tdefontdialog.h"
 #include <tdeconfig.h>
 
diff --git a/tdeui/tests/tdelistviewtest.cpp b/tdeui/tests/tdelistviewtest.cpp
index d73baf087..c2a0e78cf 100644
--- a/tdeui/tests/tdelistviewtest.cpp
+++ b/tdeui/tests/tdelistviewtest.cpp
@@ -1,5 +1,5 @@
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 #include <tqvbox.h>
 
diff --git a/tdeui/tests/tdemainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp
index 7b477f8f7..559348ec0 100644
--- a/tdeui/tests/tdemainwindowrestoretest.cpp
+++ b/tdeui/tests/tdemainwindowrestoretest.cpp
@@ -1,7 +1,7 @@
 
 #include "tdemainwindowrestoretest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlabel.h>
 
diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index b83123dde..c8ace159e 100644
--- a/tdeui/tests/tdemainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -1,7 +1,7 @@
 #include <tqtimer.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
 
diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp
index c830525f1..f9a97bad4 100644
--- a/tdeui/tests/tdepopuptest.cpp
+++ b/tdeui/tests/tdepopuptest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqcursor.h>
 #include "tdepopupmenu.h"
diff --git a/tdeui/tests/tdespelltest.cpp b/tdeui/tests/tdespelltest.cpp
index b4b5e571e..5ec103b99 100644
--- a/tdeui/tests/tdespelltest.cpp
+++ b/tdeui/tests/tdespelltest.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "tdespell.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/tdeui/tests/tdetoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp
index ae12e56d8..b919c2725 100644
--- a/tdeui/tests/tdetoolbarlabelactiontest.cpp
+++ b/tdeui/tests/tdetoolbarlabelactiontest.cpp
@@ -18,7 +18,7 @@
 
 #include <tqguardedptr.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <klineedit.h>
 #include <tdelistview.h>
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index d45bc2554..3823ab46f 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <khelpmenu.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmenubar.h>
 #include <tdetoolbarradiogroup.h>
 #include <kiconloader.h>
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index e23cf18da..7ca8fda3f 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kstringhandler.h>
 
 #include <netwm.h> 
-#include <kapplication.h>
-#include <kstyle.h>
+#include <tdeapplication.h>
+#include <tdestyle.h>
 #include <dcopclient.h>
 
 #undef Bool
diff --git a/tdeunittest/modrunner.cpp b/tdeunittest/modrunner.cpp
index f5e29efa1..4caa2d609 100644
--- a/tdeunittest/modrunner.cpp
+++ b/tdeunittest/modrunner.cpp
@@ -26,8 +26,8 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include "runner.h"
diff --git a/tdeunittest/tester.h b/tdeunittest/tester.h
index c193cc158..332381ec8 100644
--- a/tdeunittest/tester.h
+++ b/tdeunittest/tester.h
@@ -134,10 +134,10 @@ SampleTest - 1 test passed, 1 test failed
  * looks like this:
  *
  * @code
- * #include <kaboutdata.h>
- * #include <kapplication.h>
- * #include <kcmdlineargs.h>
- * #include <kcmdlineargs.h>
+ * #include <tdeaboutdata.h>
+ * #include <tdeapplication.h>
+ * #include <tdecmdlineargs.h>
+ * #include <tdecmdlineargs.h>
  * #include <klocale.h>
  * #include <tdeunittest/runnergui.h>
  *
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index 8c09b8be9..9bb067ca0 100644
--- a/tdeutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
@@ -26,8 +26,8 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klibloader.h>
diff --git a/tdeutils/kfind.cpp b/tdeutils/kfind.cpp
index 7b2da6899..99ef317b6 100644
--- a/tdeutils/kfind.cpp
+++ b/tdeutils/kfind.cpp
@@ -21,7 +21,7 @@
 
 #include "kfind.h"
 #include "kfinddialog.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqlabel.h>
diff --git a/tdeutils/kreplace.cpp b/tdeutils/kreplace.cpp
index f825e93cc..0aad733da 100644
--- a/tdeutils/kreplace.cpp
+++ b/tdeutils/kreplace.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <klocale.h>
diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp
index 3627e1777..73f92379f 100644
--- a/tdeutils/tdecmoduleloader.cpp
+++ b/tdeutils/tdecmoduleloader.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 473b8a667..2d3150935 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -35,8 +35,8 @@
 #include <dcopclient.h>
 #include <qxembed.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tdecmodule.h>
 #include <tdecmoduleinfo.h>
 #include <tdecmoduleloader.h>
diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
index 127831b02..5b1bcc339 100644
--- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
@@ -21,7 +21,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdecmoduleproxy.h>
 #include <kdebug.h>
 
diff --git a/tdeutils/tests/kfindtest.cpp b/tdeutils/tests/kfindtest.cpp
index 6c64245dc..c913e5ec6 100644
--- a/tdeutils/tests/kfindtest.cpp
+++ b/tdeutils/tests/kfindtest.cpp
@@ -21,8 +21,8 @@
 #include "../kfinddialog.h"
 #include "kfindtest.h"
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include <stdlib.h>
diff --git a/tdeutils/tests/kreplacetest.cpp b/tdeutils/tests/kreplacetest.cpp
index 26b0f7c9e..19ead8e77 100644
--- a/tdeutils/tests/kreplacetest.cpp
+++ b/tdeutils/tests/kreplacetest.cpp
@@ -19,8 +19,8 @@
 
 #include <assert.h>
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <tqeventloop.h>
 #include <kpushbutton.h>
 #include "../kreplace.h"
diff --git a/tdewallet/backend/tests/backendtest.cpp b/tdewallet/backend/tests/backendtest.cpp
index 4e19ce43f..76d59b153 100644
--- a/tdewallet/backend/tests/backendtest.cpp
+++ b/tdewallet/backend/tests/backendtest.cpp
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 
 #include "tdewalletbackend.h"
diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
index 3512cc799..7668b90a7 100644
--- a/tdewallet/tests/tdewalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -1,9 +1,9 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
index eabb26eaa..a5ba26711 100644
--- a/tdewallet/tests/tdewalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -1,9 +1,9 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/tdewallet/tests/tdewalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp
index 54ffd6a12..4774e289e 100644
--- a/tdewallet/tests/tdewalletsync.cpp
+++ b/tdewallet/tests/tdewalletsync.cpp
@@ -1,9 +1,9 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
index 7a81aa820..62b5d6b39 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -37,13 +37,13 @@ pixmaploader.cpp
 
 #compile in tdefx
 SOURCES += \
-../../../tdefx/kstyle.cpp \
+../../../tdefx/tdestyle.cpp \
 ../../../tdefx/kimageeffect.cpp \
 ../../../tdefx/kpixmapeffect.cpp \
 ../../../tdefx/kpixmap.cpp
 
 system( moc thinkeramik.h -o moc/thinkeramik.moc )
-system( moc ../../../tdefx/kstyle.h -o moc/kstyle.moc )
+system( moc ../../../tdefx/tdestyle.h -o moc/tdestyle.moc )
 
 
 system( bash ./genemb.sh )
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 56db79c55..7e564a250 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -38,9 +38,9 @@ kcalendarsystemgregorian.cpp \
 kcalendarsystemhebrew.cpp \
 kcalendarsystemhijri.cpp \
 kcalendarsystemjalali.cpp \
-kaboutdata.cpp \
+tdeaboutdata.cpp \
 kstringhandler.cpp \
-kcmdlineargs.cpp \
+tdecmdlineargs.cpp \
 kurldrag.cpp \
 kurl.cpp \
 kidna.cpp \
@@ -83,7 +83,7 @@ kuniqueapplication.cpp \
 tdesycoca.cpp \
 tdesycocadict.cpp \
 tdesycocafactory.cpp \
-kapplication.cpp \
+tdeapplication.cpp \
 kapplication_win.cpp \
 kappdcopiface.cpp \
 kprocctrl.cpp \
diff --git a/win/pro_files/tdefx/tdefx.pro b/win/pro_files/tdefx/tdefx.pro
index f37639f92..f88c90381 100644
--- a/win/pro_files/tdefx/tdefx.pro
+++ b/win/pro_files/tdefx/tdefx.pro
@@ -15,7 +15,7 @@ kimageeffect.cpp \
 kpixmapeffect.cpp \
 kpixmapsplitter.cpp \
 kpixmap.cpp \
-kstyle.cpp \
+tdestyle.cpp \
 kdrawutil.cpp \
 kcpuinfo.cpp
 
diff --git a/win/pro_files/tdefx/tdefx_rel.pro b/win/pro_files/tdefx/tdefx_rel.pro
index 0f013895c..358f60dc4 100644
--- a/win/pro_files/tdefx/tdefx_rel.pro
+++ b/win/pro_files/tdefx/tdefx_rel.pro
@@ -10,7 +10,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_TDEFX_LIB
 
-system( moc kstyle.h -o moc/kstyle.moc )
+system( moc tdestyle.h -o moc/tdestyle.moc )
 
 LIBS -= "$(TDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(TDEDIR)\lib\ltdl_$(KDE_VER).lib"
 
@@ -18,7 +18,7 @@ SOURCES = \
 kimageeffect.cpp \
 kpixmapeffect.cpp \
 kpixmap.cpp \
-kstyle.cpp \
+tdestyle.cpp \
 kdrawutil.cpp \
 kcpuinfo.cpp
 
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index 29924203c..b5a506f8b 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -15,9 +15,9 @@ system( bash kdcopidl )
 TARGET		= tdeui$$KDEBUG
 
 SOURCES = \
-kaboutapplication.cpp \
-kaboutdialog.cpp \
-kaboutkde.cpp \
+tdeaboutapplication.cpp \
+tdeaboutdialog.cpp \
+tdeabouttde.cpp \
 tdeactionclasses.cpp \
 tdeactioncollection.cpp \
 tdeaction.cpp \