Rename common header files for consistency with class renaming

167 files changed, 210 insertions, 210 deletions

diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index c9701385..1606873e 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -31,7 +31,7 @@
 #include <tqgroupbox.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
 #include <kdebug.h>
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 1226d972..0015f688 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <tdepopupmenu.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
 #include <kdialogbase.h>
diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp
index 81039078..cf1e37d6 100644
--- a/buildtools/autotools/autotoolsaction.cpp
+++ b/buildtools/autotools/autotoolsaction.cpp
@@ -16,7 +16,7 @@
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 1f63b870..889e68b3 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -14,7 +14,7 @@
 #include "customprojectpart.h"
 
 #include <tqapplication.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqpopupmenu.h>
diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp
index 1ddcac63..2b7028e7 100644
--- a/buildtools/lib/parsers/qmake/tests/runner.cpp
+++ b/buildtools/lib/parsers/qmake/tests/runner.cpp
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kurl.h>
 
 static const TDECmdLineOptions options[] =
diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp
index 2a83c5d1..b3f31ce9 100644
--- a/buildtools/lib/widgets/addfilesdialog.cpp
+++ b/buildtools/lib/widgets/addfilesdialog.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqcombobox.h>
 
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 6a84b9fc..50e12595 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -32,7 +32,7 @@
 #include <tdeparts/part.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 19b74609..0e0ca572 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -77,7 +77,7 @@
 #include "scope.h"
 #include "createscopedlg.h"
 #include "disablesubprojectdlg.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     : TQVBox( 0, "troll project widget" ), m_shownSubproject( 0 ), m_rootSubproject( 0 ),
diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook
index 78a9f60c..920ba3b0 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/kde_app_devel/index.docbook
@@ -566,7 +566,7 @@ In the following, you will see that writing a KDE application is not much more d
 Qt application. For the use of KDE's features, you just have to use some other classes, and you're almost 
 done. As an example, we'll discuss the changed version of the Qt example from above: 
 <programlisting>
-#include &lt;kapplication.h>
+#include &lt;tdeapplication.h>
 #include &lt;qpushbutton.h>
 
 int main( int argc, char **argv )
diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp
index a8f87b00..ae253456 100644
--- a/editors/editor-chooser/editorchooser_widget.cpp
+++ b/editors/editor-chooser/editorchooser_widget.cpp
@@ -2,7 +2,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 #include <kservice.h>
 #include <kdebug.h>
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index f5c44a07..758dd1f4 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -237,7 +237,7 @@ void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act
 
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 TDEInstance*  KDevDesignerPartFactory::s_instance = 0L;
diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp
index ec37a25c..7aa004d7 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/kdevdesigner/designer/metadatabase.cpp
@@ -37,7 +37,7 @@
 #include "kdevdesigner_part.h"
 
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 #include <tqapplication.h>
diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h
index 76397bec..a497dc5c 100644
--- a/kdevdesigner/src/kdevdesigner.h
+++ b/kdevdesigner/src/kdevdesigner.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <kxmlguiclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 
 class TDEToggleAction;
diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp
index 1c3921ea..b26498a6 100644
--- a/kdevdesigner/src/main.cpp
+++ b/kdevdesigner/src/main.cpp
@@ -21,9 +21,9 @@
 
 #include <kxmlguiclient.h>
 #include "kdevdesigner.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index 4c035cb2..a215a89b 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -8,7 +8,7 @@
 #include <tqwhatsthis.h>
 
 #include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstatusbar.h>
diff --git a/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h
index 546c160f..cd22ba1f 100644
--- a/languages/ada/configproblemreporter.ui.h
+++ b/languages/ada/configproblemreporter.ui.h
@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 void ConfigureProblemReporter::init()
 {
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index f95b9e2c..15a87ef3 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <tdeconfig.h>
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 29cd5c80..848623c8 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -9,7 +9,7 @@
 #include <tqstringlist.h>
 #include <tqtextstream.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 
 #include <kiconloader.h>
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
index 32f32c65..a631186c 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
@@ -2,7 +2,7 @@
 
 #include "%{APPNAMELC}.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 %{APPNAME}::%{APPNAME}() : DCOPObject("serviceInterface")
 {
diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp
index 78aac7c8..5bdeec39 100644
--- a/languages/cpp/app_templates/dcopservice/main.cpp
+++ b/languages/cpp/app_templates/dcopservice/main.cpp
@@ -1,8 +1,8 @@
 %{CPP_TEMPLATE}
 
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <dcopclient.h>
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h
index 9f281120..5f39dd11 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/kapp/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
diff --git a/languages/cpp/app_templates/kapp/app_client.cpp b/languages/cpp/app_templates/kapp/app_client.cpp
index 4098f8a8..ce92c875 100644
--- a/languages/cpp/app_templates/kapp/app_client.cpp
+++ b/languages/cpp/app_templates/kapp/app_client.cpp
@@ -1,6 +1,6 @@
 %{CPP_TEMPLATE}
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqdatastream.h>
 #include <tqstring.h>
diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp
index ba2e08fa..294a7490 100644
--- a/languages/cpp/app_templates/kapp/main.cpp
+++ b/languages/cpp/app_templates/kapp/main.cpp
@@ -1,10 +1,10 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp
index f376b31f..5c83921b 100644
--- a/languages/cpp/app_templates/kde4app/main.cpp
+++ b/languages/cpp/app_templates/kde4app/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <KDE/TDELocale>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp
index 7164b7bb..aed5e904 100644
--- a/languages/cpp/app_templates/kdedcop/main.cpp
+++ b/languages/cpp/app_templates/kdedcop/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index b0a33d94..0d6a5775 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -12,7 +12,7 @@
 #include <kdevproject.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //#include "%{APPNAMELC}_widget.h"
 #include "%{APPNAMELC}_part.h"
diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp
index 8722d845..f141c87f 100644
--- a/languages/cpp/app_templates/khello/main.cpp
+++ b/languages/cpp/app_templates/khello/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp
index 354de69f..f9e68a34 100644
--- a/languages/cpp/app_templates/khello2/main.cpp
+++ b/languages/cpp/app_templates/khello2/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp
index 78558f78..cb7b4ecd 100644
--- a/languages/cpp/app_templates/kicker/applet.cpp
+++ b/languages/cpp/app_templates/kicker/applet.cpp
@@ -4,7 +4,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "%{APPNAMELC}.h"
diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp
index e057db20..5c0d534f 100644
--- a/languages/cpp/app_templates/kmake/app.cpp
+++ b/languages/cpp/app_templates/kmake/app.cpp
@@ -1,7 +1,7 @@
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include "mainviewimp.h"
 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
index 20893271..8a141a5e 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
@@ -6,7 +6,7 @@
 #ifndef %{APPNAME}_ABOUTDATA
 #define %{APPNAME}_ABOUTDATA
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program");
diff --git a/languages/cpp/app_templates/kofficepart/main.cpp b/languages/cpp/app_templates/kofficepart/main.cpp
index b2621a03..98369dde 100644
--- a/languages/cpp/app_templates/kofficepart/main.cpp
+++ b/languages/cpp/app_templates/kofficepart/main.cpp
@@ -6,7 +6,7 @@
 #include <koApplication.h>
 #include <koDocument.h>
 #include <koMainWindow.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include "%{APPNAMELC}_aboutdata.h"
diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h
index c64525c6..b9101033 100644
--- a/languages/cpp/app_templates/kpartapp/app.h
+++ b/languages/cpp/app_templates/kpartapp/app.h
@@ -6,7 +6,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 
 class TDEToggleAction;
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 9fb19b18..937a7702 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -145,7 +145,7 @@ void %{APPNAME}Part::fileSaveAs()
 
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 TDEInstance*  %{APPNAME}PartFactory::s_instance = 0L;
diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp
index d951ad29..755813f0 100644
--- a/languages/cpp/app_templates/kpartapp/main.cpp
+++ b/languages/cpp/app_templates/kpartapp/main.cpp
@@ -1,8 +1,8 @@
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h
index f66896e9..8fb9d688 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.h
+++ b/languages/cpp/app_templates/kscons_kxt/app.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp
index 510803cd..b257c85f 100644
--- a/languages/cpp/app_templates/kscons_kxt/main.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 4dcd8df5..20f5f3fb 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
 #include <klibloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 #include <tdeactionclasses.h>
 #include <kglobal.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
index 6819937d..288395db 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
@@ -5,7 +5,7 @@
 
 #include <tqvaluelist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemdimainfrm.h>
 #include <kurl.h>
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
index d3e49880..253f45dc 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include <kurl.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include "%{APPNAMELC}tdemdi.h"
diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h
index 049e8ecb..7b6305ea 100644
--- a/languages/cpp/app_templates/kxt/app.h
+++ b/languages/cpp/app_templates/kxt/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp
index 7174b8ac..928ddc33 100644
--- a/languages/cpp/app_templates/kxt/main.cpp
+++ b/languages/cpp/app_templates/kxt/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/tdecmodule/module.h b/languages/cpp/app_templates/tdecmodule/module.h
index 0e07a6e1..44ed3540 100644
--- a/languages/cpp/app_templates/tdecmodule/module.h
+++ b/languages/cpp/app_templates/tdecmodule/module.h
@@ -4,7 +4,7 @@
 #define _%{APPNAMEUC}_H_
 
 #include <tdecmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 class %{APPNAME}: public TDECModule
 {
diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h
index cdcce5a5..b090428f 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.h
+++ b/languages/cpp/app_templates/tdeconfig35/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
diff --git a/languages/cpp/app_templates/tdeconfig35/main.cpp b/languages/cpp/app_templates/tdeconfig35/main.cpp
index 7174b8ac..928ddc33 100644
--- a/languages/cpp/app_templates/tdeconfig35/main.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/tdeioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp
index 683d959e..d8c7fcb4 100644
--- a/languages/cpp/app_templates/tdeioslave/slave.cpp
+++ b/languages/cpp/app_templates/tdeioslave/slave.cpp
@@ -11,7 +11,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kinstance.h>
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
index 21d6db32..f1e4fb3e 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <tqcheckbox.h>
 #include <tqcolor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index 48eb7bb9..8bfc3bba 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -17,7 +17,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tdetexteditor/editinterface.h>
 
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index a19d3289..8ea05cb8 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -30,7 +30,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index c9e23652..2b42ce89 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -11,7 +11,7 @@
 #include <kdevproject.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index df89a03c..3b867dc8 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -39,7 +39,7 @@ email                : david.nolden.tdevelop@art-master.de
 
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdemainwindow.h>
diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp
index c8ffb1de..10ec75bc 100644
--- a/languages/cpp/cppsupport_utils.cpp
+++ b/languages/cpp/cppsupport_utils.cpp
@@ -1,6 +1,6 @@
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index a1ef51e6..3d435843 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -72,7 +72,7 @@
 #include <tqvbox.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 08fbf15e..6349971c 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -28,7 +28,7 @@
 #include <tdelistbox.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index e0fafa95..3ff54246 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -31,7 +31,7 @@
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>
 #include <kstringhandler.h>
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index e5081fbd..2588892c 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -24,7 +24,7 @@
 #include "settings.h"
 #include "mi/miparser.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index 5ae42d54..bc36f191 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -66,7 +66,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "stty.h"
 
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 5dab0174..7df6b64c 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -37,7 +37,7 @@
 
 #include <tqpoint.h>
 #include <tqclipboard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include <cctype>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
index bc46d5b7..7ce54167 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
@@ -14,7 +14,7 @@
 
 #include <tdelistbox.h>
 #include <kcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
@@ -66,7 +66,7 @@ void SettingsDialog::slotSelectionChanged( TQListBoxItem* )
 
 bool SettingsDialog::isValidKDELibsDir( const TQString & path ) const
 {
-	return TQFile::exists( path + "/kapplication.h" );
+	return TQFile::exists( path + "/tdeapplication.h" );
 }
 
 TQString SettingsDialog::kdeDir( ) const
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index 349fc2ab..bc26f64a 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 3b229744..110d8005 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -17,7 +17,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kinputdialog.h>
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index dbd05de9..66774f06 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -24,7 +24,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index 29173e45..707ec24d 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -28,7 +28,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index b03bb05e..dd2325d1 100644
--- a/languages/java/configproblemreporter.ui.h
+++ b/languages/java/configproblemreporter.ui.h
@@ -6,7 +6,7 @@
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 void ConfigureProblemReporter::init()
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index b4919837..7217e3fd 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -42,7 +42,7 @@
 #include <tqvbox.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 4570efc7..42a044ff 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index 1780a04e..c2314350 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -16,7 +16,7 @@
 #include <tqstringlist.h>
 #include <tqtextstream.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 
 #include <kiconloader.h>
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 300991d8..a6f3f916 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -37,7 +37,7 @@
 #include <kdevproject.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kjsembed/kjsembedpart.h>
 #include <kjsembed/jsconsolewidget.h>
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index 0d8c049b..14f58b35 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 
 #include <antlr/ASTFactory.hpp>
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index 5ddc8dc4..c3feb684 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <tdeconfig.h>
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index 4da9949f..4b670d81 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -17,7 +17,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kinputdialog.h>
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 0703ff3c..704afb0d 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp
index 7a95bc98..92d2fc4c 100644
--- a/languages/php/phpfile.cpp
+++ b/languages/php/phpfile.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h
index 3cc571fa..ac5a4525 100644
--- a/languages/php/phpfile.h
+++ b/languages/php/phpfile.h
@@ -19,7 +19,7 @@
 #ifndef PHPFILE_H
 #define PHPFILE_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqfileinfo.h>
diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp
index a0f1179e..6b725dc8 100644
--- a/languages/php/phpparser.cpp
+++ b/languages/php/phpparser.cpp
@@ -20,7 +20,7 @@
 #include "phpsupportpart.h"
 #include <urlutil.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdevcore.h>
 #include <kdevproject.h>
 #include <codemodel.h>
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index e240a813..48d9e5f2 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -33,7 +33,7 @@
 #include <tqthread.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdehtmlview.h>
 #include <klocale.h>
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index afdf16ca..9cb0257a 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 6293aaf0..2994387a 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -34,7 +34,7 @@
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>
 #include <kstringhandler.h>
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index 5f1aacfe..3bb6392b 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -37,7 +37,7 @@
 #include "domutil.h"
 #include "settings.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp
index 6027e9a2..28fc9b95 100644
--- a/languages/ruby/debugger/stty.cpp
+++ b/languages/ruby/debugger/stty.cpp
@@ -65,7 +65,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "stty.h"
 
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 044614b6..83945d3e 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -40,7 +40,7 @@
 
 #include <tqpoint.h>
 #include <tqclipboard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // **************************************************************************
 // **************************************************************************
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 35358313..c3bfff85 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -30,7 +30,7 @@
 #include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klibloader.h>
 
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 5b0d6d20..087aedba 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -5,7 +5,7 @@
 #include <tqsqldatabase.h>
 #include <tqsqlrecord.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp
index fa2b0c3d..0afbcc81 100644
--- a/lib/interfaces/katedocumentmanagerinterface.cpp
+++ b/lib/interfaces/katedocumentmanagerinterface.cpp
@@ -20,7 +20,7 @@
 #include "kdevpartcontroller.h"
 #include <kurl.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 #include <kate/document.h>
 #include <kurl.h>
diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h
index 24e3204a..bd5d40b0 100644
--- a/lib/interfaces/kdevgenericfactory.h
+++ b/lib/interfaces/kdevgenericfactory.h
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 /**
 @file kdevgenericfactory.h
diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/kdevplugininfo.h
index 2b665e16..40693db1 100644
--- a/lib/interfaces/kdevplugininfo.h
+++ b/lib/interfaces/kdevplugininfo.h
@@ -21,7 +21,7 @@
 
 #include <tqvariant.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 /**
 @file kdevplugininfo.h
diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index 50bd159a..20242f1a 100644
--- a/lib/util/tdescriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -20,7 +20,7 @@
 #include "tdescriptactionmanager.h"
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 8b841371..ec876712 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -47,7 +47,7 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <tdefile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 
 #include <ktrader.h>
diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp
index 1f8c3ff7..05fb0901 100644
--- a/parts/astyle/astyle_adaptor.cpp
+++ b/parts/astyle/astyle_adaptor.cpp
@@ -8,7 +8,7 @@
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index f9d95ed6..26a8e151 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -22,7 +22,7 @@
 #include <kdevpartcontroller.h>
 #include <kdevplugininfo.h>
 #include <configwidgetproxy.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp
index 0cb26abb..a70c6771 100644
--- a/parts/astyle/astyle_widget.cpp
+++ b/parts/astyle/astyle_widget.cpp
@@ -8,7 +8,7 @@
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdevcore.h>
 
diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp
index 5fe6a4aa..c5ef7191 100644
--- a/parts/bookmarks/bookmarks_config.cpp
+++ b/parts/bookmarks/bookmarks_config.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "bookmarks_config.h"
 
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 939dbdaf..67223be8 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdetexteditor/viewcursorinterface.h>
 
 #include <kcomboview.h>
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index bc36002f..95c710c4 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kstringhandler.h>
 #include <kdialogbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
 
diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index 8f108efb..b45a41be 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -16,7 +16,7 @@
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <kdevproject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
 #include <tdeconfig.h>
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index b2ea542c..1715402b 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kdevproject.h>
 #include <kdevpartcontroller.h>
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index fea6b497..a7ab3077 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -16,7 +16,7 @@
 #include <tqfile.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kservice.h>
 #include <ktempfile.h>
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index f0559510..097d1243 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <tdefontcombo.h>
 #include <tdehtml_part.h>
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 10419a3b..ce93d565 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -29,7 +29,7 @@
 #include <tqtabwidget.h>
 #include <tqapplication.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index c591d84e..e0fb4065 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include <kdevcore.h>
diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp
index 61990e9a..4772f27b 100644
--- a/parts/documentation/find_documentation_options.cpp
+++ b/parts/documentation/find_documentation_options.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal)
     :FindDocumentationOptionsBase(parent,name, modal),
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 587f635d..c23784a3 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -20,7 +20,7 @@
 #include "docchmplugin.h"
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdelistview.h>
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index 317bdf8b..c187b462 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -20,7 +20,7 @@
 #include "doccustomplugin.h"
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdelistview.h>
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index c3865940..1c151777 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -27,7 +27,7 @@
 #include <tqdialog.h>
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index 2d9a4731..2a06f76c 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -20,7 +20,7 @@
 #include "docdjvuplugin.h"
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdelistview.h>
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index 3309622e..c4ae9306 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -29,7 +29,7 @@
 #include <tqvaluestack.h>
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index 2e21d5c3..7cc7e47c 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -27,7 +27,7 @@
 #include <tqdialog.h>
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdelistview.h>
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index 9f9ec045..7d9ef39c 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -20,7 +20,7 @@
 #include "docpdbplugin.h"
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdelistview.h>
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index b8fe76b4..639232d2 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -20,7 +20,7 @@
 #include "docpdfplugin.h"
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdelistview.h>
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 58d2dd4e..8736a549 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -26,7 +26,7 @@
 #include <tqdialog.h>
 
 #include <kurl.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdelistview.h>
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 08a46136..1d208ca5 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kglobal.h>
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index 11e5e93e..f985bf43 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 extern "C"
 {
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index f33823c3..8c45aea6 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 4213ffd1..a416fdc5 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -24,9 +24,9 @@
 #include <tqtimer.h>
 #include <tqlabel.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/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 9b99c83a..192a22f5 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <tdepopupmenu.h>
 #include <kmessagebox.h>
diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp
index 90475668..b112f4cf 100644
--- a/parts/filelist/projectviewconfig.cpp
+++ b/parts/filelist/projectviewconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name)
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index d7b9d885..86998619 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -49,7 +49,7 @@
 #include <kxmlguibuilder.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index ca0f1265..3e8d1f6b 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -8,7 +8,7 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <tdeconfig.h>
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index f19ec2d3..df40ab2a 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -51,7 +51,7 @@
 #include <tdetexteditor/document.h>
 
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 74e6bf03..7bd26a0f 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -21,7 +21,7 @@
 #include <tdefiledialog.h>
 #include <kbuttonbox.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdeconfig.h>
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 4a326343..7c21cab2 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -17,7 +17,7 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "kdevcore.h"
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index d8fa152a..cabc11f4 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -20,7 +20,7 @@
 #include <tdeparts/part.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kdevproject.h"
 #include "kdevcore.h"
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index b38586a7..b2dba9d6 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
 #include <klineedit.h>
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 54e13fb8..4b247eed 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -30,7 +30,7 @@
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include <tqmessagebox.h>
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index a677b292..fd7da41d 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -12,7 +12,7 @@
 //BEGIN Includes
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
 #include <klibloader.h>
diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp
index e1bbf414..6a3376f2 100644
--- a/parts/scripting/scriptingglobalconfig.cpp
+++ b/parts/scripting/scriptingglobalconfig.cpp
@@ -22,7 +22,7 @@
 
 #include "scriptingpart.h"
 #include <keditlistbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name)
     : scriptingGlobalConfigBase(parent, name), m_part(part)
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index a4ff3fd3..a2b8d1a3 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -35,7 +35,7 @@
 #include <kdevcore.h>
 #include <kdevmainwindow.h>
 #include <configwidgetproxy.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include "scriptingglobalconfig.h"
 #include "tdescriptactionmanager.h"
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index fe7bdc30..ba30761f 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -12,7 +12,7 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqvbox.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index 24c3fe68..cb66d60e 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -4,9 +4,9 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 64ffb187..4affd6dc 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -33,7 +33,7 @@
 #include <tqtooltip.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <kdesktopfile.h>
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index b7df4eb4..1d1b4505 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -8,7 +8,7 @@
 #include <tqwhatsthis.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index 213ff02f..9d6e0f95 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -7,7 +7,7 @@
 #include <tqpushbutton.h>
 #include <tqheader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <kdialog.h>
 #include <kiconloader.h>
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index c2d88499..cc43c689 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -18,7 +18,7 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/src/Mainpage.dox b/src/Mainpage.dox
index 77b1b015..3fcece64 100644
--- a/src/Mainpage.dox
+++ b/src/Mainpage.dox
@@ -17,9 +17,9 @@ Example:
     @code
     #include <config.h>
     
-    #include <kaboutdata.h>
-    #include <kapplication.h>
-    #include <kcmdlineargs.h>
+    #include <tdeaboutdata.h>
+    #include <tdeapplication.h>
+    #include <tdecmdlineargs.h>
     #include <klocale.h>
     #include <dcopclient.h>
     
diff --git a/src/core.cpp b/src/core.cpp
index 332e37b7..bdac9e49 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1,7 +1,7 @@
 #include <tqtimer.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <tdemainwindow.h>
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index e3e28df4..82c5260b 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -5,7 +5,7 @@
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tdeparts/part.h>
 
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index 445130e2..91548490 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -31,7 +31,7 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefontrequester.h>
 
 #include <kdevplugin.h>
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index b16c1675..6ba3ecd1 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdevplugin.h>
 #include "domutil.h"
 
diff --git a/src/main.cpp b/src/main.cpp
index d8103e3a..37f178df 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,8 +1,8 @@
 #include <config.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index cce003f0..334aa8f1 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -1,8 +1,8 @@
 #include <config.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 51241534..6370dfdf 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -24,9 +24,9 @@
 
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <tdeparts/mainwindow.h>
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index 5010a8ae..05a4d26f 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -37,7 +37,7 @@
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tdeparts/factory.h>
 
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 9b9c8337..332147e3 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -32,7 +32,7 @@
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "buttonbar.h"
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 2b046b14..6e90e6b3 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -33,7 +33,7 @@
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "buttonbar.h"
 #include "button.h"
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 1cdd0551..da13b636 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -20,7 +20,7 @@
 #include "dmainwindow.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index e56a83f8..56610b46 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 DTabWidget::DTabWidget(TQWidget *parent, const char *name)
     :KTabWidget(parent, name), m_closeButton(0)
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index c3f366ab..cc3c699e 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -14,7 +14,7 @@
 #include <kmimetype.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krun.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 20acba3d..8a3da03f 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -1,8 +1,8 @@
 #include <tqfile.h>
 #include <tqvbox.h>
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <klibloader.h>
 #include <kservice.h>
 #include <ktrader.h>
@@ -14,7 +14,7 @@
 #include <assert.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp
index 9cf33899..2f896b51 100644
--- a/src/pluginselectdialog.cpp
+++ b/src/pluginselectdialog.cpp
@@ -15,7 +15,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurllabel.h>
 
 #include "kdevplugin.h"
diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp
index c004b421..4111961b 100644
--- a/src/profileengine/editor/main.cpp
+++ b/src/profileengine/editor/main.cpp
@@ -17,9 +17,9 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "profileeditor.h"
 
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index f28195e4..5190fb7c 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -19,8 +19,8 @@ class TQDomDocument;
 #include <tdemainwindow.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 380dc52c..fae441a7 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -32,7 +32,7 @@
 #include <kedittoolbar.h>
 #include <tdetexteditor/view.h>
 #include <tdetexteditor/document.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurldrag.h>
 #include <tdeconfig.h>
 
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 2e41e1dc..129d869c 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -1,5 +1,5 @@
 #include <kxmlguiclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 
diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index 848d7394..9bc186a5 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kdevcore.h"
 #include "kdevmakefrontend.h"
diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp
index df9fc10b..02f3a904 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -14,7 +14,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index 49fc31d3..c34c5083 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -22,7 +22,7 @@
 #include <tdefiledialog.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 
 #include <dcopref.h>
diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp
index 18850643..575396b5 100644
--- a/vcs/cvsservice/commitdlg.cpp
+++ b/vcs/cvsservice/commitdlg.cpp
@@ -17,7 +17,7 @@
 #include <tqtextedit.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index aaf197b0..75fda6f6 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <tdeaction.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 // Because of KShellProcess::quote()
 #include <kprocess.h>
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index f2dedc09..05de2c19 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -14,7 +14,7 @@
 #include <tqdir.h>
 #include<tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index 43d80d85..bb9aa69c 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -16,7 +16,7 @@
 #include <tqfile.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kservice.h>
 #include <ktempfile.h>
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index 6df262b0..6f741bf4 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -27,7 +27,7 @@
 #include <tqtextstream.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kprocess.h>
diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp
index abfa1683..0d2f91a9 100644
--- a/vcs/perforce/commitdlg.cpp
+++ b/vcs/perforce/commitdlg.cpp
@@ -18,7 +18,7 @@
 #include <tqpushbutton.h>
 #include <tqregexp.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index bd19bb54..d6b9c98b 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -20,7 +20,7 @@
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kurl.h>
 #include <tdeparts/part.h>
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index 112990bf..61c814de 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index 6a5ed571..f9344172 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -35,7 +35,7 @@
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <ktempfile.h>
 #include <kprocess.h>
@@ -47,9 +47,9 @@
 #include <klocale.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 using namespace TDEIO;
 using namespace SvnGlobal;
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index 98de5478..9d5ef406 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -24,7 +24,7 @@
 #include <tqdir.h>
 #include <kdevproject.h>
 #include <unistd.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdevmainwindow.h>
 #include <tdemainwindow.h>
 #include <tqregexp.h>
diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp
index 21ef2d2f..ce6b08be 100644
--- a/vcs/subversion/svn_tdeio.cpp
+++ b/vcs/subversion/svn_tdeio.cpp
@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kinstance.h>