From ee38b2862bfd887e95cf62fdf244edad40ece7b2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:20:35 -0600
Subject: Rename common header files for consistency with class renaming

---
 kimagemapeditor/drawzone.cpp                             | 2 +-
 kimagemapeditor/kimagemapeditor.cpp                      | 2 +-
 kimagemapeditor/kimedialogs.cpp                          | 2 +-
 kimagemapeditor/kimeshell.cpp                            | 2 +-
 kimagemapeditor/main.cpp                                 | 6 +++---
 klinkstatus/src/engine/linkchecker.cpp                   | 2 +-
 klinkstatus/src/engine/searchmanager.cpp                 | 2 +-
 klinkstatus/src/global.cpp                               | 2 +-
 klinkstatus/src/klinkstatus.h                            | 2 +-
 klinkstatus/src/klinkstatus_part.cpp                     | 4 ++--
 klinkstatus/src/main.cpp                                 | 6 +++---
 klinkstatus/src/parser/htmlparser.cpp                    | 2 +-
 klinkstatus/src/ui/klshistorycombo.cpp                   | 2 +-
 klinkstatus/src/ui/sessionwidget.cpp                     | 2 +-
 klinkstatus/src/ui/tablelinkstatus.cpp                   | 2 +-
 klinkstatus/src/ui/tabwidgetsession.cpp                  | 2 +-
 klinkstatus/src/ui/treeview.cpp                          | 2 +-
 klinkstatus/src/utils/utils.cpp                          | 2 +-
 klinkstatus/src/utils/xsl.cpp                            | 2 +-
 kommander/editor/main.cpp                                | 6 +++---
 kommander/editor/mainwindow.cpp                          | 4 ++--
 kommander/editor/mainwindowactions.cpp                   | 2 +-
 kommander/editor/messagelog.cpp                          | 2 +-
 kommander/executor/instance.cpp                          | 2 +-
 kommander/executor/main.cpp                              | 6 +++---
 kommander/pluginmanager/main.cpp                         | 6 +++---
 kommander/widget/functionlib.cpp                         | 2 +-
 kommander/widget/kommanderfunctions.cpp                  | 2 +-
 kommander/widget/kommanderwidget.cpp                     | 2 +-
 kommander/widgets/aboutdialog.cpp                        | 4 ++--
 kommander/widgets/execbutton.cpp                         | 2 +-
 kxsldbg/kxsldbg.h                                        | 2 +-
 kxsldbg/kxsldbgpart/kxsldbg_part.cpp                     | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp                 | 2 +-
 kxsldbg/main.cpp                                         | 6 +++---
 kxsldbg/xsldbgmain.cpp                                   | 6 +++---
 lib/compatibility/knewstuff/downloaddialog.cpp           | 2 +-
 lib/compatibility/knewstuff/engine.cpp                   | 2 +-
 lib/compatibility/knewstuff/knewstuff.cpp                | 2 +-
 lib/compatibility/knewstuff/uploaddialog.cpp             | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp     | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp       | 2 +-
 quanta/components/csseditor/csseditor.cpp                | 2 +-
 quanta/components/cvsservice/cvsservice.cpp              | 2 +-
 quanta/components/tableeditor/tableeditor.cpp            | 2 +-
 quanta/dialogs/actionconfigdialog.cpp                    | 2 +-
 quanta/dialogs/tagdialogs/tagattr.cpp                    | 2 +-
 quanta/dialogs/tagdialogs/tagimgdlg.cpp                  | 2 +-
 quanta/dialogs/tagdialogs/tagmaildlg.cpp                 | 2 +-
 quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp        | 2 +-
 quanta/messages/messageoutput.cpp                        | 2 +-
 quanta/parsers/parser.cpp                                | 2 +-
 quanta/parts/kafka/undoredo.cpp                          | 2 +-
 quanta/project/project.cpp                               | 2 +-
 quanta/project/projectprivate.cpp                        | 2 +-
 quanta/project/projectupload.cpp                         | 2 +-
 quanta/src/document.cpp                                  | 2 +-
 quanta/src/dtds.cpp                                      | 2 +-
 quanta/src/kqapp.cpp                                     | 2 +-
 quanta/src/main.cpp                                      | 4 ++--
 quanta/src/quanta.cpp                                    | 4 ++--
 quanta/src/quanta_init.cpp                               | 2 +-
 quanta/treeviews/basetreeview.cpp                        | 2 +-
 quanta/treeviews/doctreeview.cpp                         | 2 +-
 quanta/treeviews/projecttreeview.cpp                     | 2 +-
 quanta/treeviews/scripttreeview.cpp                      | 2 +-
 quanta/treeviews/structtreeview.cpp                      | 2 +-
 quanta/treeviews/tagattributeitems.cpp                   | 2 +-
 quanta/treeviews/templatestreeview.cpp                   | 2 +-
 quanta/utility/qpevents.cpp                              | 2 +-
 quanta/utility/quantabookmarks.cpp                       | 2 +-
 quanta/utility/quantacommon.cpp                          | 2 +-
 quanta/utility/tagaction.cpp                             | 2 +-
 quanta/utility/tagactionset.cpp                          | 2 +-
 tdefilereplace/kaddstringdlg.cpp                         | 2 +-
 tdefilereplace/knewprojectdlg.cpp                        | 2 +-
 tdefilereplace/koptionsdlg.cpp                           | 2 +-
 tdefilereplace/main.cpp                                  | 6 +++---
 tdefilereplace/tdefilereplacepart.cpp                    | 4 ++--
 tdefilereplace/tdefilereplaceview.cpp                    | 2 +-
 81 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp
index f1648f97..21f176dc 100644
--- a/kimagemapeditor/drawzone.cpp
+++ b/kimagemapeditor/drawzone.cpp
@@ -26,7 +26,7 @@
 #include <kurldrag.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmimetype.h>
 
 // Local
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 84756747..86b0a4d0 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -48,7 +48,7 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <klineeditdlg.h>
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index 6d3fbbcd..6070edc9 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -37,7 +37,7 @@
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdehtmlview.h>
 #include <tdehtml_part.h>
 #include <ktempfile.h>
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index f27b475c..448d3b37 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -26,7 +26,7 @@
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqhbox.h>
diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp
index be0c7b8a..e19b5522 100644
--- a/kimagemapeditor/main.cpp
+++ b/kimagemapeditor/main.cpp
@@ -15,10 +15,10 @@
 *                                                                         *
 ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include "kimeshell.h"
diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp
index adec81dd..9d2a01ee 100644
--- a/klinkstatus/src/engine/linkchecker.cpp
+++ b/klinkstatus/src/engine/linkchecker.cpp
@@ -33,7 +33,7 @@
 #include <tdeio/scheduler.h>
 #include <tdeio/slave.h>
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdehtml_part.h>
 #include <dom/html_misc.h>
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index 698d4c8e..737645af 100644
--- a/klinkstatus/src/engine/searchmanager.cpp
+++ b/klinkstatus/src/engine/searchmanager.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdehtml_part.h>
diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp
index 66dbf30f..75bf02aa 100644
--- a/klinkstatus/src/global.cpp
+++ b/klinkstatus/src/global.cpp
@@ -17,7 +17,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>
 #include <kprocess.h>
diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h
index fd9a116b..83935d64 100644
--- a/klinkstatus/src/klinkstatus.h
+++ b/klinkstatus/src/klinkstatus.h
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 
 class TDEToggleAction;
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index 62f72fbc..d7732280 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kinstance.h>
 #include <tdeaction.h>
@@ -27,7 +27,7 @@
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/factory.h>
 #include <kstandarddirs.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kbugreport.h>
 #include <tdeconfigdialog.h>
 #include <kglobalsettings.h>
diff --git a/klinkstatus/src/main.cpp b/klinkstatus/src/main.cpp
index 5e75262c..89fddd48 100644
--- a/klinkstatus/src/main.cpp
+++ b/klinkstatus/src/main.cpp
@@ -20,9 +20,9 @@
 
 #include "klinkstatus.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>
 
diff --git a/klinkstatus/src/parser/htmlparser.cpp b/klinkstatus/src/parser/htmlparser.cpp
index 02cce0be..9c8e7370 100644
--- a/klinkstatus/src/parser/htmlparser.cpp
+++ b/klinkstatus/src/parser/htmlparser.cpp
@@ -20,7 +20,7 @@
 
 #include "htmlparser.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index ca526d4e..2733d199 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -12,7 +12,7 @@
 #include "klshistorycombo.h"
 #include "klsconfig.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdecompletionbox.h>
 #include <kdebug.h>
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 3629b70e..a82c5527 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kcombobox.h>
 #include <ksqueezedtextlabel.h>
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index d1609d31..2d2ad497 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -30,7 +30,7 @@
 #include <tqpainter.h>
 #include <tqprocess.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <krun.h>
 #include <kiconloader.h>
diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp
index 7c369d4d..26a5e131 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -32,7 +32,7 @@
 #include <tqiconset.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kstringhandler.h> 
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index bb24ac65..eb56abe1 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <krun.h>
 #include <dcopref.h>
diff --git a/klinkstatus/src/utils/utils.cpp b/klinkstatus/src/utils/utils.cpp
index 58f6207a..18abc6b7 100644
--- a/klinkstatus/src/utils/utils.cpp
+++ b/klinkstatus/src/utils/utils.cpp
@@ -23,7 +23,7 @@
 #include <tqprocess.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 
diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp
index 2ca1a253..496719df 100644
--- a/klinkstatus/src/utils/xsl.cpp
+++ b/klinkstatus/src/utils/xsl.cpp
@@ -40,7 +40,7 @@
 #include <tqevent.h>
 #include <tqmutex.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index aee3a0ab..62db8930 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -14,9 +14,9 @@
  ***************************************************************************/
 
 // KDE includes
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index fe9be401..05a0e1c1 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -72,8 +72,8 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index be1d1590..b7fb6b72 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -59,7 +59,7 @@
 
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index c180c61c..9c3b3c1b 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -16,7 +16,7 @@
 
 #include "messagelog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp
index 47032e99..fbf275a1 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -17,7 +17,7 @@
  ***************************************************************************/
 
  /* KDE INCLUDES */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index 7dc1758a..12f2ab01 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -16,9 +16,9 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#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 <kurl.h>
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index d8857ce1..439828b9 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -16,13 +16,13 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <tqapplication.h>
 #include <tqobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 /* QT INCLUDES */
 #include <tqstringlist.h>
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 18f9a6b8..6e8555e1 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index dc890657..4631af85 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -22,7 +22,7 @@
 #include <tqtextstream.h>
  
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index 12542861..a3442d73 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -18,7 +18,7 @@
  
  /* KDE INCLUDES */
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdialogbase.h>
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index f345806e..7804e439 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -15,8 +15,8 @@
 #include "kommanderplugin.h"
 #include "specials.h"
 
-#include <kaboutdata.h>
-#include <kaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index a9a906f0..f4b73ccc 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h
index 36daab70..b9a919f9 100644
--- a/kxsldbg/kxsldbg.h
+++ b/kxsldbg/kxsldbg.h
@@ -5,7 +5,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <dcopobject.h> 
 #include <dcopclient.h> 
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 7e8244e2..7b69ec0c 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -18,7 +18,7 @@
 
 #include "../kxsldbg.h"
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tqmessagebox.h>
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 88f811b4..6d9fe60e 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -99,7 +99,7 @@
 #include <libxslt/extensions.h>
 #include <libexslt/exsltconfig.h>
 
-#include <kcmdlineargs.h> 
+#include <tdecmdlineargs.h> 
 #include <kglobal.h>
 #include <tqfile.h>
 
diff --git a/kxsldbg/main.cpp b/kxsldbg/main.cpp
index 0875794a..46653c1a 100644
--- a/kxsldbg/main.cpp
+++ b/kxsldbg/main.cpp
@@ -1,7 +1,7 @@
 #include "kxsldbg.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>
 
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index cdf299ef..8c5ee55e 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -34,9 +34,9 @@
 #include "kxsldbgpart/libxsldbg/options.h"
 
 #include <libxslt/xsltutils.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index 196b4832..37a264cf 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -30,7 +30,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/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp
index 12857917..3309569a 100644
--- a/lib/compatibility/knewstuff/engine.cpp
+++ b/lib/compatibility/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/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 7727783b..07034b45 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/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/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 998e9a72..9545bb80 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -32,7 +32,7 @@
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "engine.h"
 #include "entry.h"
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index 6099d0c1..86612830 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index 142213ad..d3bea4c2 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 1aa659a5..96fdf21a 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index b684030d..9b84bd6a 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -24,7 +24,7 @@
 #include <tqtextstream.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index 6681d390..df0e916b 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -23,7 +23,7 @@
 
 //kde includes
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index 9d97c7eb..fe1d201f 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -13,7 +13,7 @@
  ***************************************************************************/
 
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 623b69c1..b9032d6d 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqregexp.h>
 
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kicondialog.h>
diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp
index 08e4a42d..f093ba71 100644
--- a/quanta/dialogs/tagdialogs/tagattr.cpp
+++ b/quanta/dialogs/tagdialogs/tagattr.cpp
@@ -18,7 +18,7 @@
 
 //kde includes
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index 24578a88..9a032000 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -20,7 +20,7 @@
 #include <tqspinbox.h>
 #include <tqimage.h>
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
index 3ed62c57..bf78291d 100644
--- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
@@ -20,7 +20,7 @@
 #include "quantacommon.h"
 
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
index 7f499c14..44d461c4 100644
--- a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
@@ -7,7 +7,7 @@
             regenerated by KDevelop.  All changes will be lost.
 
 **********************************************************************/
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqbuttongroup.h>
 #include "tagquicklistdlg.h"
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 17333aee..5925fd01 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp
index 14e83c89..c5934c81 100644
--- a/quanta/parsers/parser.cpp
+++ b/quanta/parsers/parser.cpp
@@ -54,7 +54,7 @@
 #include "viewmanager.h"
 
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kiconloader.h>
diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp
index a342a23f..20ab8652 100644
--- a/quanta/parts/kafka/undoredo.cpp
+++ b/quanta/parts/kafka/undoredo.cpp
@@ -20,7 +20,7 @@
 //end debug only
 #include <tqtabwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index 30982a8b..596ce6c8 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -28,7 +28,7 @@
 
 // include files for KDE
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kdirwatch.h>
 #include <tdeio/netaccess.h>
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index bbf543ad..defbc145 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -28,7 +28,7 @@
 
 //kde includes
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdirwatch.h>
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index 6d075127..e61f6249 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -34,7 +34,7 @@
 #include <tqtooltip.h>
 
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <tdeio/job.h>
 #include <kmessagebox.h>
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 8365b59d..753fa255 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -32,7 +32,7 @@
 #include <tqradiobutton.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <klocale.h>
 #include <tdeaction.h>
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 642c3da7..a102e506 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 53b73ea2..80232b7f 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -21,7 +21,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kurl.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 932b6d99..dcc10e57 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -19,11 +19,11 @@
 
 // kde includes
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 78be0a06..812afa55 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -49,8 +49,8 @@
 
 
 // include files for KDE
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tdeaccelmanager.h>
 #include <kbugreport.h>
 #include <kcolordialog.h>
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 17d5d15c..fa09db96 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -36,7 +36,7 @@
 // include files for KDE
 #include <dcopclient.h>
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 717e94e7..3fa97e81 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -49,7 +49,7 @@
 #include <ktar.h>
 #include <ktempfile.h>
 #include <ktrader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kprotocolinfo.h>
 
diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp
index 288bf4cc..b6372153 100644
--- a/quanta/treeviews/doctreeview.cpp
+++ b/quanta/treeviews/doctreeview.cpp
@@ -23,7 +23,7 @@
 
 // KDE clases
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 24b802e3..9aa97c1e 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -30,7 +30,7 @@
 #include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
 #include <ktempfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstringhandler.h>
 
 // app includes
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 5154ceee..8c7719cf 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index cccc885f..b9d12626 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -27,7 +27,7 @@
 #include <tqcursor.h> 
 
 // KDE headers
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <klocale.h>
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index 54423ba5..d706dd99 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -22,7 +22,7 @@
 
 //kde includes
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorcombo.h>
 #include <tdelistview.h>
 #include <klocale.h>
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 5f28847e..488c16b6 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -34,7 +34,7 @@
 #include <tqwidgetstack.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index beb21170..0482a84a 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -20,7 +20,7 @@
 #include <tqtextstream.h>
 
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index 873c2843..ba312f80 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -20,7 +20,7 @@
 
 #include "quantabookmarks.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdeaction.h>
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index 5235d5ce..9ebabe86 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 #include <kurl.h>
 #include <kdirwatch.h>
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 1c06b9c1..903f353a 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 //kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <klocale.h>
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 71a737aa..87d88d46 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeactioncollection.h>
 #include <tdeactionclasses.h>
diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp
index a87ff7be..6992ca20 100644
--- a/tdefilereplace/kaddstringdlg.cpp
+++ b/tdefilereplace/kaddstringdlg.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // local
 #include "kaddstringdlg.h"
diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp
index 4e9c9281..10402fa8 100644
--- a/tdefilereplace/knewprojectdlg.cpp
+++ b/tdefilereplace/knewprojectdlg.cpp
@@ -42,7 +42,7 @@
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // local
 #include "knewprojectdlg.h"
diff --git a/tdefilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp
index bd6bcbe8..f18681e0 100644
--- a/tdefilereplace/koptionsdlg.cpp
+++ b/tdefilereplace/koptionsdlg.cpp
@@ -30,7 +30,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 //#include <kdebug.h>
 
 // local
diff --git a/tdefilereplace/main.cpp b/tdefilereplace/main.cpp
index 673b431b..87cba501 100644
--- a/tdefilereplace/main.cpp
+++ b/tdefilereplace/main.cpp
@@ -16,9 +16,9 @@
 
 #include "tdefilereplace.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/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index f0ef5666..5a0e5520 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -22,8 +22,8 @@
 // KDE
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kaboutapplication.h>
-#include <kapplication.h>
+#include <tdeaboutapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kbugreport.h>
 #include <tdeconfig.h>
diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index 84ec2744..7897d7f5 100644
--- a/tdefilereplace/tdefilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -27,7 +27,7 @@
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 //#include <kdebug.h>
-- 
cgit v1.2.1