Rename common header files for consistency with class renaming

124 files changed, 156 insertions, 156 deletions

diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index b8e11ed32..85d2fc9b4 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -53,7 +53,7 @@ install( FILES
     klineeditdlg.h kinputdialog.h kactivelabel.h
     kcharselect.h kcolordrag.h qxembed.h
     knumvalidator.h kdialog.h kdialogbase.h
-    kjanuswidget.h kaboutdialog.h
+    kjanuswidget.h tdeaboutdialog.h
     kauthicon.h kmessagebox.h ksharedpixmap.h
     kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h
     tdetoolbarradiogroup.h ktextbrowser.h
@@ -64,7 +64,7 @@ install( FILES
     kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h
     kpixmapio.h kwordwrap.h
     kedittoolbar.h kdockwidget.h kanimwidget.h
-    krootpixmap.h kaboutkde.h kaboutapplication.h
+    krootpixmap.h tdeabouttde.h tdeaboutapplication.h
     kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h
     kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h
     kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h
@@ -117,7 +117,7 @@ set( ${target}_SRCS
   kruler.cpp kcursor.cpp klineeditdlg.cpp
   kcharselect.cpp kcolordrag.cpp
   knumvalidator.cpp kdialog.cpp kdialogbase.cpp
-  kjanuswidget.cpp kaboutdialog.cpp
+  kjanuswidget.cpp tdeaboutdialog.cpp
   kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp
   tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp
   ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp
@@ -126,8 +126,8 @@ set( ${target}_SRCS
   kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp
   kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp
   kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp
-  kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp
-  kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
+  kanimwidget.cpp krootpixmap.cpp tdeabouttde.cpp
+  tdeaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
   kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp
   tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp
   kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp
diff --git a/tdeui/MAINTAINERS b/tdeui/MAINTAINERS
index 4e22d00a0..f4e2165fb 100644
--- a/tdeui/MAINTAINERS
+++ b/tdeui/MAINTAINERS
@@ -5,9 +5,9 @@ that class.
 When adding yourself as a maintainer, don't be afraid to reorder the files to a
 more logical grouping.
 
-kaboutapplication.cpp
-kaboutdialog.cpp
-kaboutkde.cpp
+tdeaboutapplication.cpp
+tdeaboutdialog.cpp
+tdeabouttde.cpp
 tdeaction.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
 kanimwidget.cpp		Waldo Bastian <bastian@kde.org>
 karrowbutton.cpp	Frerich Raabe <raabe@kde.org>
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index 4a1b472ff..26a9423cd 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -50,7 +50,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		klineeditdlg.h kinputdialog.h kactivelabel.h \
 		kcharselect.h kcolordrag.h qxembed.h \
 		knumvalidator.h kdialog.h kdialogbase.h \
-		kjanuswidget.h kaboutdialog.h \
+		kjanuswidget.h tdeaboutdialog.h \
 		kauthicon.h kmessagebox.h ksharedpixmap.h \
 		kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h \
 		tdetoolbarradiogroup.h ktextbrowser.h \
@@ -61,7 +61,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h \
 		kpixmapio.h kwordwrap.h \
 		kedittoolbar.h kdockwidget.h kanimwidget.h \
-		krootpixmap.h kaboutkde.h kaboutapplication.h \
+		krootpixmap.h tdeabouttde.h tdeaboutapplication.h \
 		kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h \
 		kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h \
 		kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h \
@@ -98,7 +98,7 @@ libtdeui_la_SOURCES = \
 		kruler.cpp kcursor.cpp klineeditdlg.cpp  \
 		kcharselect.cpp kcolordrag.cpp  \
 		knumvalidator.cpp kdialog.cpp kdialogbase.cpp \
-		kjanuswidget.cpp kaboutdialog.cpp \
+		kjanuswidget.cpp tdeaboutdialog.cpp \
 		kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp \
 		tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp \
 		ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp \
@@ -107,8 +107,8 @@ libtdeui_la_SOURCES = \
 		kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp \
 		kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp \
 		kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp \
-		kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp \
-		kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
+		kanimwidget.cpp krootpixmap.cpp tdeabouttde.cpp \
+		tdeaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
 		kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp \
 		tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp \
 		kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp \
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp
index a30fac7f4..0e5abc5ad 100644
--- a/tdeui/kactivelabel.cpp
+++ b/tdeui/kactivelabel.cpp
@@ -19,7 +19,7 @@
 
 #include "kactivelabel.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <tqsimplerichtext.h>
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index efee22366..91c6aa66c 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -26,8 +26,8 @@
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klineedit.h>
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index ace147496..a623b3efa 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -36,7 +36,7 @@
 #include <tqtooltip.h>
 #include <tqvalidator.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index 0449550fd..7e9353cf4 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -44,7 +44,7 @@
 #include <tqpushbutton.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index 16f16d07e..29292f960 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -45,7 +45,7 @@
 #include <tqspinbox.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index 91cafddbd..98d72030d 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -33,7 +33,7 @@
 
 #include "kdatepicker.h"
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 2fd593493..542f89f08 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/tdeui/kdcopactionproxy.cpp b/tdeui/kdcopactionproxy.cpp
index c8444cfdf..028c90883 100644
--- a/tdeui/kdcopactionproxy.cpp
+++ b/tdeui/kdcopactionproxy.cpp
@@ -20,7 +20,7 @@
 #include "kdcopactionproxy.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kdcoppropertyproxy.h>
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp
index f1e6995ee..d0e7a84cf 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -19,7 +19,7 @@
 
 #include "kdetrayproxy.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <netwm.h>
 #include <X11/Xlib.h>
@@ -182,7 +182,7 @@ void KDETrayProxy::withdrawWindow( Window w )
 #include "kdetrayproxy.moc"
 
 #if 0
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 int main( int argc, char* argv[] )
     {
     TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" );
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index ddac1ddd8..f6b2b8b56 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kwhatsthismanager_p.h>
 #include <kdebug.h>
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 46d0697d5..6656d6803 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 #include <tqfocusdata.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index baff8db25..37cee99fb 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -24,7 +24,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kcmenumngr.h>
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index 92ca542d4..a7db92555 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -31,7 +31,7 @@
 #include <tqhbox.h>
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp
index 040e77c70..1a31bbaa4 100644
--- a/tdeui/keditlistbox.cpp
+++ b/tdeui/keditlistbox.cpp
@@ -31,7 +31,7 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 
 #include "keditlistbox.h"
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index dd6b7d174..41fa063c2 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -27,11 +27,11 @@
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
 
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
-#include <kaboutkde.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeabouttde.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbugreport.h>
 #include <kdialogbase.h>
 #include <khelpmenu.h>
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 3a139985a..bcf9550b4 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h> 
 
 #include <kcursor.h>
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index fc1a04e7e..e9dd9df85 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -33,7 +33,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h> // Access to some static members
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index e0a41ce5d..24191aa45 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -24,7 +24,7 @@
 #include <tqcursor.h>
 #include <tqdrawutil.h>
 #include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalaccel.h>
 #include <klocale.h>
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index b6db9bb71..7faad35c4 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -39,7 +39,7 @@
 #include <tdeaction.h>
 #include <tdeaccelaction.h>
 #include <tdeactionshortcutlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -51,7 +51,7 @@
 #include <tdeshortcut.h>
 #include <tdeshortcutlist.h>
 #include <kxmlguifactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
 
 #ifdef Q_WS_X11
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index dc245cd6f..6b29ac0ca 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -30,7 +30,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <tqcolor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include "kled.h"
 
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index 4e11f5fa3..a1c05aaab 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -40,7 +40,7 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "klineedit.h"
 #include "klineedit.moc"
diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp
index 9551fc1f6..ca4fd8266 100644
--- a/tdeui/klineeditdlg.cpp
+++ b/tdeui/klineeditdlg.cpp
@@ -28,7 +28,7 @@
 
 #include <kbuttonbox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
 
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index 9f21ce300..71158370b 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kmenubar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kmanagerselection.h>
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index 1e3c0bfda..5684c6484 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -31,7 +31,7 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index 02a098283..f88cb5a8a 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "kpanelapplet.h"
 #include "kpanelapplet.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 class KPanelApplet::KPanelAppletPrivate
diff --git a/tdeui/kpanelappmenu.cpp b/tdeui/kpanelappmenu.cpp
index 4cc77b5fe..247d844de 100644
--- a/tdeui/kpanelappmenu.cpp
+++ b/tdeui/kpanelappmenu.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kpanelappmenu.h"
 #include <tqstringlist.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 static int panelmenu_get_seq_id()
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index e2ca0bb80..302b4e679 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -36,11 +36,11 @@
 
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 9b72dcf2c..3f0186e3d 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -34,7 +34,7 @@
 
 #include "kprogress.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <twin.h>
 
diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp
index 4638f78fb..6dda25a33 100644
--- a/tdeui/kprogressbox.cpp
+++ b/tdeui/kprogressbox.cpp
@@ -37,7 +37,7 @@
 #include "ktextedit.h"
 #include "kprogressbox.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <twin.h>
 
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index 35bf0928f..e92fe8583 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kipc.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 class KPushButton::KPushButtonPrivate
 {
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 71b1d86ca..6be62d157 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -14,7 +14,7 @@
 #include <tqrect.h>
 #include <tqimage.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <kpixmapio.h>
 #include <twinmodule.h>
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index 363a9b8b4..d27ae07ca 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 9e860f3cf..c5a4879d8 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -20,7 +20,7 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kseparator.moc"
 
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index b9e0e69c4..33eca17e4 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -22,7 +22,7 @@
 
 #ifdef Q_WS_X11
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krootprop.h>
 #include <ksharedpixmap.h>
 #include <kdebug.h>
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index a0e840e5a..8dd874a9d 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -21,9 +21,9 @@
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index 2367804a8..78f3fd6f6 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -20,7 +20,7 @@
 
 #include <kguiitem.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
 {
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 1d0ce4159..ba938382b 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdespell.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "ksyntaxhighlighter.h"
 
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 572616833..fcd0389da 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -24,9 +24,9 @@
 #include "tdeshortcut.h"
 #include "ksystemtray.h"
 #include "tdepopupmenu.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "klocale.h"
-#include "kaboutdata.h"
+#include "tdeaboutdata.h"
 
 #ifdef Q_WS_X11
 #include <twin.h>
diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp
index 15f14d711..b17e38067 100644
--- a/tdeui/ktextbrowser.cpp
+++ b/tdeui/ktextbrowser.cpp
@@ -19,7 +19,7 @@
 
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <ktextbrowser.h>
 #include <kcursor.h>
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index d52e134b6..44f710fb9 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtextstream.h>
 #include <tqimage.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeui/kwhatsthismanager.cpp b/tdeui/kwhatsthismanager.cpp
index 2f4d1750f..bcf48438c 100644
--- a/tdeui/kwhatsthismanager.cpp
+++ b/tdeui/kwhatsthismanager.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <tqtextedit.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KWhatsThisManager *KWhatsThisManager::s_instance = 0;
 
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index 3eb756678..6fd472ad5 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kxmlguibuilder.h"
 #include "kmenubar.h"
 #include "tdepopupmenu.h"
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index a02718f0a..de015b5a4 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -32,7 +32,7 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <assert.h>
 
diff --git a/tdeui/kaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp
index 681b22642..08ee46450 100644
--- a/tdeui/kaboutapplication.cpp
+++ b/tdeui/tdeaboutapplication.cpp
@@ -23,10 +23,10 @@
 // I (espen) prefer that header files are included alphabetically
 
 #include <tqlabel.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kaboutdialog_private.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kurllabel.h>
diff --git a/tdeui/kaboutapplication.h b/tdeui/tdeaboutapplication.h
index c313460ff..19fa0fe61 100644
--- a/tdeui/kaboutapplication.h
+++ b/tdeui/tdeaboutapplication.h
@@ -23,8 +23,8 @@
 #ifndef _KABOUT_APPLICATION_H_
 #define _KABOUT_APPLICATION_H_
 
-#include <kaboutdata.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutdialog.h>
 
 /**
  * @short Standard "About Application" dialog box.
diff --git a/tdeui/kaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
index 7cc1c6327..b46c0b959 100644
--- a/tdeui/kaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -31,13 +31,13 @@
 #include <tqtabwidget.h>
 #include <tqtabbar.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <ktextbrowser.h>
 #include <kurllabel.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <kaboutdialog_private.h>
 #include <kdebug.h>
 
@@ -50,7 +50,7 @@ template class TQPtrList<TDEAboutContributor>;
 
 // ##############################################################
 // MOC OUTPUT FILES:
-#include "kaboutdialog.moc"
+#include "tdeaboutdialog.moc"
 #include "kaboutdialog_private.moc"
 // ##############################################################
 
diff --git a/tdeui/kaboutdialog.h b/tdeui/tdeaboutdialog.h
index fbb19b98e..fbb19b98e 100644
--- a/tdeui/kaboutdialog.h
+++ b/tdeui/tdeaboutdialog.h
diff --git a/tdeui/kaboutkde.cpp b/tdeui/tdeabouttde.cpp
index 5ccd8822a..0e7078af4 100644
--- a/tdeui/kaboutkde.cpp
+++ b/tdeui/tdeabouttde.cpp
@@ -20,8 +20,8 @@
  */
 
 // I (espen) prefer that header files are included alphabetically
-#include <kaboutkde.h>
-#include <kapplication.h>
+#include <tdeabouttde.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/tdeui/kaboutkde.h b/tdeui/tdeabouttde.h
index 8013d093d..a75b92904 100644
--- a/tdeui/kaboutkde.h
+++ b/tdeui/tdeabouttde.h
@@ -22,7 +22,7 @@
 #ifndef _KABOUT_KDE_H_
 #define _KABOUT_KDE_H_
 
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 
 /**
  * @short Standard "About KDE" dialog box,
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index 1cae013a2..d817a5ba4 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -33,7 +33,7 @@
 #include <tdeaccel.h>
 #include <tdeaccelbase.h>
 #include <tdeaccelprivate.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
 #include <tdemainwindow.h>
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index 3b07f56ca..1fc963887 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -42,7 +42,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefontcombo.h>
diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp
index 9181fca89..16104e242 100644
--- a/tdeui/tdeactioncollection.cpp
+++ b/tdeui/tdeactioncollection.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeaccel.h>
 #include <tdeaccelbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqpopupmenu.h>
diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp
index 85a23341e..4e6ce943f 100644
--- a/tdeui/tdecmodule.cpp
+++ b/tdeui/tdecmodule.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfigskeleton.h>
 #include <tdeconfigdialogmanager.h>
 #include <kdebug.h>
diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp
index 2a8398419..15c687e13 100644
--- a/tdeui/tdefontdialog.cpp
+++ b/tdeui/tdefontdialog.cpp
@@ -41,7 +41,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp
index 02ecf2fd1..9f7c23688 100644
--- a/tdeui/tdelistbox.cpp
+++ b/tdeui/tdelistbox.cpp
@@ -21,7 +21,7 @@
 
 #include <kglobalsettings.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h> 
 #include <kdebug.h>
 
diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp
index 158eac5ab..020f18679 100644
--- a/tdeui/tdelistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -30,7 +30,7 @@
 #include <kglobalsettings.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
 
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index b7596c262..01b6a09e0 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -36,7 +36,7 @@
 
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp
index fc864d9fa..8f8a9d40c 100644
--- a/tdeui/tdemainwindowiface.cpp
+++ b/tdeui/tdemainwindowiface.cpp
@@ -20,7 +20,7 @@
 #include "tdemainwindowiface.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopactionproxy.h>
 #include <kdcoppropertyproxy.h>
 #include <tdemainwindow.h>
diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index 62ac6f4ad..46d5c758f 100644
--- a/tdeui/tdepopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -30,7 +30,7 @@
 #include "tdepopupmenu.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 TDEPopupTitle::TDEPopupTitle(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index 73f06581f..fe3593b7e 100644
--- a/tdeui/tdeshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -52,7 +52,7 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index 8eac3bde2..629013121 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -37,7 +37,7 @@
 #include <tqtextcodec.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/tdeui/tdespelldlg.cpp b/tdeui/tdespelldlg.cpp
index ac0ccb984..280ddf861 100644
--- a/tdeui/tdespelldlg.cpp
+++ b/tdeui/tdespelldlg.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdelistbox.h>
 #include <kcombobox.h>
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 02173e41b..a095f1493 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -47,7 +47,7 @@
 #include <klineedit.h>
 #include <kseparator.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kglobal.h>
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index da5fc7b9b..608c31a32 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -38,7 +38,7 @@
 #include <tqpainter.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
index e03880bad..4242a119e 100644
--- a/tdeui/tdetoolbarhandler.cpp
+++ b/tdeui/tdetoolbarhandler.cpp
@@ -19,7 +19,7 @@
 #include "tdetoolbarhandler.h"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
 #include <klocale.h>
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index af7fb41e2..c96d6a4eb 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -16,7 +16,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kiconview.h>
diff --git a/tdeui/tests/kaboutdialogtest.cpp b/tdeui/tests/kaboutdialogtest.cpp
index 0555070a6..c3be2de25 100644
--- a/tdeui/tests/kaboutdialogtest.cpp
+++ b/tdeui/tests/kaboutdialogtest.cpp
@@ -8,10 +8,10 @@
  * $Revision$
  */
 
-#include "kaboutdialog.h"
+#include "tdeaboutdialog.h"
 // #include <kimgio.h>
 #include <tqimage.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp
index dc708f2b5..4672b76ee 100644
--- a/tdeui/tests/kblendtest.cpp
+++ b/tdeui/tests/kblendtest.cpp
@@ -1,5 +1,5 @@
 #include "kblendtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp
index 8f2052b28..c9eb1134b 100644
--- a/tdeui/tests/kbuttonboxtest.cpp
+++ b/tdeui/tests/kbuttonboxtest.cpp
@@ -16,7 +16,7 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kbuttonbox.h"
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp
index 019f6bd43..ccd6cd10a 100644
--- a/tdeui/tests/kcharselecttest.cpp
+++ b/tdeui/tests/kcharselecttest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include "kcharselect.h"
 
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index 23c0b89ea..f45df0de7 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kcolordialog.h"
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp
index 3f61da00f..243de265b 100644
--- a/tdeui/tests/kcolortest.cpp
+++ b/tdeui/tests/kcolortest.cpp
@@ -1,6 +1,6 @@
 
 #include "kcolortest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <stdio.h>
 #include <tqdatetime.h>
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 701710891..225c80c0f 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -6,7 +6,7 @@
 
 #include <assert.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index 617957b4c..12e3835dc 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 /*
diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp
index df8bc7013..abcfeb24a 100644
--- a/tdeui/tests/kdatepicktest.cpp
+++ b/tdeui/tests/kdatepicktest.cpp
@@ -1,6 +1,6 @@
 #include "kdatepicker.h"
 #include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp
index 9b158faf8..721f86492 100644
--- a/tdeui/tests/kdatetimewidgettest.cpp
+++ b/tdeui/tests/kdatetimewidgettest.cpp
@@ -1,5 +1,5 @@
 #include "kdatetimewidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp
index 16521da20..11fb243f3 100644
--- a/tdeui/tests/kdatewidgettest.cpp
+++ b/tdeui/tests/kdatewidgettest.cpp
@@ -1,6 +1,6 @@
 #include "kdatewidget.h"
 #include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index fbf93bfe8..8eab0b125 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -1,5 +1,5 @@
 #include "kdesattest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp
index b1c7d422c..7f8023bd2 100644
--- a/tdeui/tests/kdialogbasetest.cpp
+++ b/tdeui/tests/kdialogbasetest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 
 #include <tqstring.h>
diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp
index fbbb799fc..538e2b888 100644
--- a/tdeui/tests/kdocktest.cpp
+++ b/tdeui/tests/kdocktest.cpp
@@ -1,6 +1,6 @@
 #include "kdocktest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <tqwidget.h>
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index c252c7cf8..a922acf2d 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -20,7 +20,7 @@
 #include <tqpainter.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 //#include <kimgio.h>
 #include <stdlib.h>
 
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index 144391f50..683d42acd 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -15,7 +15,7 @@
 #include "kdockwidgettest.h"
 
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index ea749cd6e..e52d6e671 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -1,6 +1,6 @@
 #include "kdualcolortest.h"
 #include <kdualcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqlayout.h>
 #include <tqpalette.h>
diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp
index 177a8b6ec..5b4e45ddb 100644
--- a/tdeui/tests/keditlistboxtest.cpp
+++ b/tdeui/tests/keditlistboxtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditlistbox.h>
 #include <kcombobox.h>
 
diff --git a/tdeui/tests/kedittest.cpp b/tdeui/tests/kedittest.cpp
index 42d6f659f..f806c3bdf 100644
--- a/tdeui/tests/kedittest.cpp
+++ b/tdeui/tests/kedittest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditcl.h>
 #include <tqpopupmenu.h>
 
diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp
index dcd45673c..4ee8c0f93 100644
--- a/tdeui/tests/kgradienttest.cpp
+++ b/tdeui/tests/kgradienttest.cpp
@@ -1,5 +1,5 @@
 #include "kgradienttest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp
index af7cc60cd..d392fcbc5 100644
--- a/tdeui/tests/khashtest.cpp
+++ b/tdeui/tests/khashtest.cpp
@@ -1,5 +1,5 @@
 #include "khashtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
diff --git a/tdeui/tests/kinputdialogtest.cpp b/tdeui/tests/kinputdialogtest.cpp
index 5db3babff..b40b5c562 100644
--- a/tdeui/tests/kinputdialogtest.cpp
+++ b/tdeui/tests/kinputdialogtest.cpp
@@ -3,7 +3,7 @@
  * License: GPL V2
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
 
diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp
index 12a267a02..71e72fb13 100644
--- a/tdeui/tests/kjanuswidgettest.cpp
+++ b/tdeui/tests/kjanuswidgettest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kjanuswidget.h>
 
 #include <tqstring.h>
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index 48f2f1430..4ba158776 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <stdlib.h>
diff --git a/tdeui/tests/klineeditdlgtest.cpp b/tdeui/tests/klineeditdlgtest.cpp
index 012a22b7f..ecc6ac984 100644
--- a/tdeui/tests/klineeditdlgtest.cpp
+++ b/tdeui/tests/klineeditdlgtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineeditdlg.h>
 
 #include <tqstring.h>
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 5146b7d15..793988968 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -4,9 +4,9 @@
 #include <tqhbox.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index 69f28e8c6..ce333edee 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -8,7 +8,7 @@
 #include <stdio.h>
 
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kglobal.h>
 
diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp
index fad4cd50a..9a333dfda 100644
--- a/tdeui/tests/knuminputtest.cpp
+++ b/tdeui/tests/knuminputtest.cpp
@@ -11,7 +11,7 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 
 #include "knuminputtest.h"
diff --git a/tdeui/tests/kpalettetest.cpp b/tdeui/tests/kpalettetest.cpp
index 8edb97a57..94036244e 100644
--- a/tdeui/tests/kpalettetest.cpp
+++ b/tdeui/tests/kpalettetest.cpp
@@ -1,5 +1,5 @@
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <stdlib.h>
diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp
index 1890ff13e..a14cb3366 100644
--- a/tdeui/tests/kpanelmenutest.cpp
+++ b/tdeui/tests/kpanelmenutest.cpp
@@ -1,5 +1,5 @@
 #include "kpanelmenutest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 
diff --git a/tdeui/tests/kpixmapregionselectordialogtest.cpp b/tdeui/tests/kpixmapregionselectordialogtest.cpp
index 8c5cb545e..28a51a3f7 100644
--- a/tdeui/tests/kpixmapregionselectordialogtest.cpp
+++ b/tdeui/tests/kpixmapregionselectordialogtest.cpp
@@ -1,8 +1,8 @@
 #include "kpixmapregionselectordialog.h"
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <iostream>
 
 static const TDECmdLineOptions options[] =
diff --git a/tdeui/tests/kprogresstest.cpp b/tdeui/tests/kprogresstest.cpp
index c3665865d..6106a236b 100644
--- a/tdeui/tests/kprogresstest.cpp
+++ b/tdeui/tests/kprogresstest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "kprogress.h"
 
diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h
index cf1abc155..0242fb5d7 100644
--- a/tdeui/tests/krulertest.h
+++ b/tdeui/tests/krulertest.h
@@ -3,7 +3,7 @@
 #ifndef krulertest_h
 #define krulertest_h
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqwidget.h>
 #include <tqcheckbox.h>
diff --git a/tdeui/tests/kseparatortest.cpp b/tdeui/tests/kseparatortest.cpp
index 17e965ca8..a791fa930 100644
--- a/tdeui/tests/kseparatortest.cpp
+++ b/tdeui/tests/kseparatortest.cpp
@@ -18,7 +18,7 @@
  */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqwidget.h>
 
diff --git a/tdeui/tests/ksqueezedtextlabeltest.cpp b/tdeui/tests/ksqueezedtextlabeltest.cpp
index a0a0e400f..7c3fd413c 100644
--- a/tdeui/tests/ksqueezedtextlabeltest.cpp
+++ b/tdeui/tests/ksqueezedtextlabeltest.cpp
@@ -1,5 +1,5 @@
 #include "ksqueezedtextlabel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index c06f18b51..82c03e271 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include "kstatusbar.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kmenubar.h>
 #include "kstatusbartest.h"
diff --git a/tdeui/tests/ksystemtraytest.cpp b/tdeui/tests/ksystemtraytest.cpp
index 07572f8d3..27a6629d9 100644
--- a/tdeui/tests/ksystemtraytest.cpp
+++ b/tdeui/tests/ksystemtraytest.cpp
@@ -1,5 +1,5 @@
 #include <ksystemtray.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char **argv)
 {
diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp
index b864017b0..05fe2aeb3 100644
--- a/tdeui/tests/ktabctltest.cpp
+++ b/tdeui/tests/ktabctltest.cpp
@@ -2,7 +2,7 @@
  *
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqobject.h>
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 84a35952f..64d2795fc 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -2,8 +2,8 @@
 #include <tqlayout.h>
 #include <tqdragobject.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
 
diff --git a/tdeui/tests/ktextedittest.cpp b/tdeui/tests/ktextedittest.cpp
index 6af109d5a..6570bf26d 100644
--- a/tdeui/tests/ktextedittest.cpp
+++ b/tdeui/tests/ktextedittest.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktextedit.h>
 
 #include <tqfile.h>
diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp
index f4465fbf7..bbff45648 100644
--- a/tdeui/tests/ktimewidgettest.cpp
+++ b/tdeui/tests/ktimewidgettest.cpp
@@ -1,5 +1,5 @@
 #include "ktimewidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index d9e7448d8..40904000b 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -1,5 +1,5 @@
 #include "kunbalancedgrdtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqstring.h>
diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp
index f103a114f..0635188d0 100644
--- a/tdeui/tests/kwizardtest.cpp
+++ b/tdeui/tests/kwizardtest.cpp
@@ -20,7 +20,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kwizard.h>
 
 int main(int argc, char **argv)
diff --git a/tdeui/tests/kwordwraptest.cpp b/tdeui/tests/kwordwraptest.cpp
index bd51800e8..690fbf157 100644
--- a/tdeui/tests/kwordwraptest.cpp
+++ b/tdeui/tests/kwordwraptest.cpp
@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqwidget.h>
 #include "kwordwrap.h"
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index 89c5caf30..1a79526aa 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -1,5 +1,5 @@
 #include "kxmlguitest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>
diff --git a/tdeui/tests/tdeactiontest.cpp b/tdeui/tests/tdeactiontest.cpp
index d62d9c3fc..dcec16189 100644
--- a/tdeui/tests/tdeactiontest.cpp
+++ b/tdeui/tests/tdeactiontest.cpp
@@ -1,7 +1,7 @@
 
 #include <tqguardedptr.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 
 #include <assert.h>
diff --git a/tdeui/tests/tdefontdialogtest.cpp b/tdeui/tests/tdefontdialogtest.cpp
index 2d4e187b2..ff7ac2840 100644
--- a/tdeui/tests/tdefontdialogtest.cpp
+++ b/tdeui/tests/tdefontdialogtest.cpp
@@ -24,7 +24,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "tdefontdialog.h"
 #include <tdeconfig.h>
 
diff --git a/tdeui/tests/tdelistviewtest.cpp b/tdeui/tests/tdelistviewtest.cpp
index d73baf087..c2a0e78cf 100644
--- a/tdeui/tests/tdelistviewtest.cpp
+++ b/tdeui/tests/tdelistviewtest.cpp
@@ -1,5 +1,5 @@
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 #include <tqvbox.h>
 
diff --git a/tdeui/tests/tdemainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp
index 7b477f8f7..559348ec0 100644
--- a/tdeui/tests/tdemainwindowrestoretest.cpp
+++ b/tdeui/tests/tdemainwindowrestoretest.cpp
@@ -1,7 +1,7 @@
 
 #include "tdemainwindowrestoretest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlabel.h>
 
diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index b83123dde..c8ace159e 100644
--- a/tdeui/tests/tdemainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -1,7 +1,7 @@
 #include <tqtimer.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
 
diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp
index c830525f1..f9a97bad4 100644
--- a/tdeui/tests/tdepopuptest.cpp
+++ b/tdeui/tests/tdepopuptest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqcursor.h>
 #include "tdepopupmenu.h"
diff --git a/tdeui/tests/tdespelltest.cpp b/tdeui/tests/tdespelltest.cpp
index b4b5e571e..5ec103b99 100644
--- a/tdeui/tests/tdespelltest.cpp
+++ b/tdeui/tests/tdespelltest.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "tdespell.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/tdeui/tests/tdetoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp
index ae12e56d8..b919c2725 100644
--- a/tdeui/tests/tdetoolbarlabelactiontest.cpp
+++ b/tdeui/tests/tdetoolbarlabelactiontest.cpp
@@ -18,7 +18,7 @@
 
 #include <tqguardedptr.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <klineedit.h>
 #include <tdelistview.h>
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index d45bc2554..3823ab46f 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <khelpmenu.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmenubar.h>
 #include <tdetoolbarradiogroup.h>
 #include <kiconloader.h>
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index e23cf18da..7ca8fda3f 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kstringhandler.h>
 
 #include <netwm.h> 
-#include <kapplication.h>
-#include <kstyle.h>
+#include <tdeapplication.h>
+#include <tdestyle.h>
 #include <dcopclient.h>
 
 #undef Bool