Rename common header files for consistency with class renaming

103 files changed, 148 insertions, 148 deletions

diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp
index 9e7e95e6..70a983f6 100644
--- a/kcoloredit/kcolorchooser.cpp
+++ b/kcoloredit/kcolorchooser.cpp
@@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <iostream>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "kcolordialog.h"
diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h
index 81e8b200..9da41fc3 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
 
diff --git a/kcoloredit/main.cpp b/kcoloredit/main.cpp
index f20effea..accb3f0c 100644
--- a/kcoloredit/main.cpp
+++ b/kcoloredit/main.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index cfdbcfe5..ffc5a372 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -28,7 +28,7 @@
 #include <tqurl.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kmimemagic.h>
 #include <kglobal.h>
diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp
index a3574162..e5204a89 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index 06a7cc83..382a5ae2 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -1,8 +1,8 @@
 #include <config.h>
 #include <tdeaction.h>
-#include <kaboutdata.h>
-#include <kaboutdialog.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutdialog.h>
+#include <tdeapplication.h>
 #include <kbugreport.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index f258e324..c9c9b2d8 100644
--- a/kdvi/main.cpp
+++ b/kdvi/main.cpp
@@ -2,12 +2,12 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqdir.h>
 
 #include <stdlib.h>
diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp
index 1b61e4a5..8b51c739 100644
--- a/kdvi/optionDialogSpecialWidget.cpp
+++ b/kdvi/optionDialogSpecialWidget.cpp
@@ -11,7 +11,7 @@
 
 #include <kdebug.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp
index 40ae2a41..3f91f483 100644
--- a/kfax/faxinput.cpp
+++ b/kfax/faxinput.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
 #include "faxexpand.h"
 #include <tqstring.h>
 #include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index ecb8c285..dbe908fe 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -40,7 +40,7 @@
 #include <tqbitmap.h>
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
@@ -49,7 +49,7 @@
 #include <tdeconfig.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
diff --git a/kfax/kfax.h b/kfax/kfax.h
index 2371c92c..07a6a784 100644
--- a/kfax/kfax.h
+++ b/kfax/kfax.h
@@ -28,7 +28,7 @@
 #ifndef _KFAX_H_
 #define _KFAX_H_
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqptrlist.h>
 #include <kurl.h>
diff --git a/kfax/viewfax.cpp b/kfax/viewfax.cpp
index e0531352..45d059d1 100644
--- a/kfax/viewfax.cpp
+++ b/kfax/viewfax.cpp
@@ -43,7 +43,7 @@
 #include <tqprinter.h>
 #include <tqstring.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include "kfax.h"
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index 9a7162c6..f47903b5 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -2,12 +2,12 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqdir.h>
 
 #include <stdlib.h>
diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp
index 20931fca..ea4109a1 100644
--- a/kghostview/displayoptions.cpp
+++ b/kghostview/displayoptions.cpp
@@ -18,7 +18,7 @@
 #include "displayoptions.h"
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 
 namespace {
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index a9c46dc6..cb18e23c 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -20,7 +20,7 @@
 
 #include <tqlistbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinstance.h>
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index ff5162ca..79da9b2d 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
@@ -37,7 +37,7 @@
 #include <tdestdaccel.h>
 #include <ktempfile.h>
 #include <tdeio/scheduler.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 
 #include "kgv_view.h"
diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp
index 738fba57..713feb4b 100644
--- a/kghostview/kgvfactory.cpp
+++ b/kghostview/kgvfactory.cpp
@@ -20,7 +20,7 @@
 #include <tdeparts/factory.h>
 #include <tdeparts/part.h>
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include "kgv_view.h"
 
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 17544d6a..78702ba6 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klibloader.h>
diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp
index a5e66757..71ab8b85 100644
--- a/kghostview/kpswidget.cpp
+++ b/kghostview/kpswidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kghostview/main.cpp b/kghostview/main.cpp
index e3621342..41bcabf9 100644
--- a/kghostview/main.cpp
+++ b/kghostview/main.cpp
@@ -18,9 +18,9 @@
 
 #include <tqdir.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kurl.h>
 
diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp
index da36ce06..84165e40 100644
--- a/kghostview/viewcontrol.cpp
+++ b/kghostview/viewcontrol.cpp
@@ -21,7 +21,7 @@
 #include "viewcontrol.moc"
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kseparator.h>
 
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index d425263e..cb188501 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeaccel.h>
 #include <kbuttonbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
 #include <tdefiledialog.h>
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index 3023f7d2..58c97b4b 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -29,7 +29,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "knew.h"
 
diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp
index 942b115c..93a8ce69 100644
--- a/kiconedit/main.cpp
+++ b/kiconedit/main.cpp
@@ -23,8 +23,8 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include "kiconedit.h"
diff --git a/kiconedit/properties.cpp b/kiconedit/properties.cpp
index e1bb5a87..4a90d7fe 100644
--- a/kiconedit/properties.cpp
+++ b/kiconedit/properties.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "properties.h"
 
diff --git a/kiconedit/utils.h b/kiconedit/utils.h
index 5c3f19c0..83108b33 100644
--- a/kiconedit/utils.h
+++ b/kiconedit/utils.h
@@ -31,7 +31,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #define OPAQUE_MASK 0xff000000
 
diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp
index 6fe6587f..ac254b2b 100644
--- a/kmrml/kmrml/kcontrol/indextest.cpp
+++ b/kmrml/kmrml/kcontrol/indextest.cpp
@@ -2,7 +2,7 @@
 #include <kmrml_config.h>
 #include "indextest.moc"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index 5d2ee154..03aa2bb4 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -19,8 +19,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>
diff --git a/kmrml/kmrml/lib/mrml_utils.cpp b/kmrml/kmrml/lib/mrml_utils.cpp
index 80c44489..314bbc7b 100644
--- a/kmrml/kmrml/lib/mrml_utils.cpp
+++ b/kmrml/kmrml/lib/mrml_utils.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kstaticdeleter.h>
 
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index a1df0d6a..ab2731d0 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -27,8 +27,8 @@
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdatastream.h>
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 1d7f464a..8b524929 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -18,7 +18,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <klocale.h>
diff --git a/kolourpaint/kolourpaint.cpp b/kolourpaint/kolourpaint.cpp
index 3c09535c..55cf59dc 100644
--- a/kolourpaint/kolourpaint.cpp
+++ b/kolourpaint/kolourpaint.cpp
@@ -29,9 +29,9 @@
 #include <tqfile.h>
 
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kimageio.h>
 #include <klocale.h>
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index be02660d..a192eac1 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -36,7 +36,7 @@
 #include <tqdatetime.h>
 
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 8f06efa2..ea00194d 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -34,7 +34,7 @@
 #include <tqtimer.h>
 
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index 65eda702..ef602955 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -35,7 +35,7 @@
 #include <tqsize.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index 201302e8..d60bf3dd 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -31,7 +31,7 @@
 #include <dcopclient.h>
 #include <tdeaction.h>
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp
index 2a0e60f8..525f474d 100644
--- a/kolourpaint/kpmainwindow_image.cpp
+++ b/kolourpaint/kpmainwindow_image.cpp
@@ -33,7 +33,7 @@
 #include <tqsize.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index 70521a94..5c4c33db 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -29,7 +29,7 @@
 #include <kpmainwindow.h>
 
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 84445585..a76ec58d 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -29,7 +29,7 @@
 #include <kpmainwindow.h>
 
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp
index ced91646..e8c25a30 100644
--- a/kolourpaint/kpmainwindow_tools.cpp
+++ b/kolourpaint/kpmainwindow_tools.cpp
@@ -28,7 +28,7 @@
 
 #include <kpmainwindow.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index b8757d10..d700f427 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -35,7 +35,7 @@
 #include <tqtimer.h>
 
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index 03cc651a..7018c68f 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -41,7 +41,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index 61df72e5..27f66d08 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -36,7 +36,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 31c96809..d0bcf731 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -50,7 +50,7 @@
 #include <tqwhatsthis.h>
 #include <tqwmatrix.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 26103e0e..bdc4877b 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -40,7 +40,7 @@
 #include <tqtooltip.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolordialog.h>
 #include <kcolordrag.h>
 #include <tdeconfig.h>
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index fa123d29..e70be6db 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -37,7 +37,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index ebe78c0c..85f932fe 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -31,7 +31,7 @@
 #include <tdeio/job.h>
 #include <tdeio/previewjob.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp
index d5e9cad0..f2eb41b6 100644
--- a/kooka/kocrgocr.cpp
+++ b/kooka/kocrgocr.cpp
@@ -31,7 +31,7 @@
 #include <tqfileinfo.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 2d306b07..bc1b6def 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -35,7 +35,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index 394548bc..ad4b39cd 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/kooka/kooka.h b/kooka/kooka.h
index f689ce5f..7c44f748 100644
--- a/kooka/kooka.h
+++ b/kooka/kooka.h
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kdockwidget.h>
 #include <tdeparts/dockmainwindow.h>
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index 23ebdb2d..21f670b9 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -57,7 +57,7 @@
 
 #include <kurl.h>
 #include <krun.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 5ae8f1ba..efcb76d6 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <kprocess.h>
 #include <stdlib.h>
diff --git a/kooka/main.cpp b/kooka/main.cpp
index 997dba64..48b32420 100644
--- a/kooka/main.cpp
+++ b/kooka/main.cpp
@@ -29,10 +29,10 @@
 #include <tqdict.h>
 #include <tqpixmap.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>
 #include <kglobal.h>
 #include <kimageio.h>
diff --git a/kpdf/conf/dlggeneral.ui.h b/kpdf/conf/dlggeneral.ui.h
index c7b9b6ec..3a12c7c9 100644
--- a/kpdf/conf/dlggeneral.ui.h
+++ b/kpdf/conf/dlggeneral.ui.h
@@ -10,7 +10,7 @@
 ** destructor.
 *****************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <config.h>
 
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp
index 8b1a2184..d00b5d97 100644
--- a/kpdf/core/document.cpp
+++ b/kpdf/core/document.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kfinddialog.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kuserprofile.h>
 #include <krun.h>
 #include <kstandarddirs.h>
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 817da45c..0b29a624 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -16,7 +16,7 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqregexp.h>
 #include <tqvariant.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <klocale.h>
 #include <kpassdlg.h>
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 2cb3aa77..2c600317 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -34,7 +34,7 @@
 #include <tqwhatsthis.h>
 #include <dcopobject.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdirwatch.h>
 #include <kinstance.h>
diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp
index 7e491cce..09ba5613 100644
--- a/kpdf/shell/main.cpp
+++ b/kpdf/shell/main.cpp
@@ -13,9 +13,9 @@
  ***************************************************************************/
 
 #include "shell.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/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index 47e500ea..6e85080d 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -21,7 +21,7 @@
 #include <tqcursor.h>
 #include <tqtimer.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 12bfc100..a385bf93 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -37,7 +37,7 @@
 #include <tdefiledialog.h>
 #include <kimageeffect.h>
 #include <kimageio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 // system includes
diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index ce657882..91a9de8d 100644
--- a/kpdf/ui/pageviewutils.cpp
+++ b/kpdf/ui/pageviewutils.cpp
@@ -12,7 +12,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <kiconloader.h>
 
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index f51ea189..2928d387 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -16,7 +16,7 @@
 #include <tqtooltip.h>
 #include <tdeaccel.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <tdetoolbar.h>
 #include <kdebug.h>
diff --git a/kpovmodeler/main.cpp b/kpovmodeler/main.cpp
index bcc8b4e5..d9789b65 100644
--- a/kpovmodeler/main.cpp
+++ b/kpovmodeler/main.cpp
@@ -17,9 +17,9 @@
 
 
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 
 #include "pmshell.h"
 #include "pmfactory.h"
diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp
index 971fcdde..06d744b6 100644
--- a/kpovmodeler/pmfactory.cpp
+++ b/kpovmodeler/pmfactory.cpp
@@ -18,7 +18,7 @@
 
 #include <klocale.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "pmfactory.h"
 #include "pmpart.h"
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index f6435872..28fd6f36 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <kurl.h>
 #include <tdeparts/part.h>
diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp
index 8235e161..be8e2d0a 100644
--- a/kpovmodeler/pmpovrayrenderwidget.cpp
+++ b/kpovmodeler/pmpovrayrenderwidget.cpp
@@ -35,7 +35,7 @@
 #undef KDE_NO_COMPAT
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 TQString PMPovrayRenderWidget::s_povrayCommand = c_defaultPovrayCommand;
 TQStringList PMPovrayRenderWidget::s_libraryPaths;
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index f2faceed..28c4251d 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -25,7 +25,7 @@
 #include <kiconloader.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <tdepopupmenu.h>
 #include <tqtimer.h>
 
diff --git a/kruler/klineal.h b/kruler/klineal.h
index 566bd92e..f9c7f8af 100644
--- a/kruler/klineal.h
+++ b/kruler/klineal.h
@@ -18,7 +18,7 @@
 #ifndef KLINEAL_H
 #define KLINEAL_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdemainwindow.h>
 
diff --git a/kruler/main.cpp b/kruler/main.cpp
index 9b835be7..e7165eb2 100644
--- a/kruler/main.cpp
+++ b/kruler/main.cpp
@@ -3,8 +3,8 @@
 #include "config.h"
 #endif
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "klineal.h"
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index e62ce162..15a3407c 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -17,7 +17,7 @@
 #include <kimagefilepreview.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprinter.h>
 #include <tdeio/netaccess.h>
 #include <ksavefile.h>
diff --git a/ksnapshot/main.cpp b/ksnapshot/main.cpp
index 72d3e3c4..f3dde8e0 100644
--- a/ksnapshot/main.cpp
+++ b/ksnapshot/main.cpp
@@ -21,11 +21,11 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageio.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
 
 #include "ksnapshot.h"
diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp
index d6f5ed6c..e981ac34 100644
--- a/ksvg/plugin/ksvg_factory.cpp
+++ b/ksvg/plugin/ksvg_factory.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 001d2b05..fbbb3e78 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <ksimpleconfig.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 
 #include "ksvg_widget.h"
 #include "ksvg_factory.h"
diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp
index 02e6cf95..21d687be 100644
--- a/ksvg/plugin/svgcreator.cpp
+++ b/ksvg/plugin/svgcreator.cpp
@@ -27,7 +27,7 @@
 #include "KSVGCanvas.h"
 #include "CanvasFactory.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "SVGSVGElementImpl.h"
 #include "SVGDocumentImpl.h"
diff --git a/ksvg/test/external/printnodetest.cpp b/ksvg/test/external/printnodetest.cpp
index 94206b19..5310ac68 100644
--- a/ksvg/test/external/printnodetest.cpp
+++ b/ksvg/test/external/printnodetest.cpp
@@ -3,10 +3,10 @@
 #include <SVGDocument.h>
 #include <SVGWindow.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 #include "printnodetest.moc"
diff --git a/ksvg/test/external/svgdisplay.cc b/ksvg/test/external/svgdisplay.cc
index fe14aa4a..ec4b94f1 100644
--- a/ksvg/test/external/svgdisplay.cc
+++ b/ksvg/test/external/svgdisplay.cc
@@ -1,7 +1,7 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include "SVGTestWidget.h"
 
 static TDECmdLineOptions options[] =
diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp
index d24c833d..7b8a5909 100644
--- a/kuickshow/src/filefinder.cpp
+++ b/kuickshow/src/filefinder.cpp
@@ -18,7 +18,7 @@
 
 #include <tqkeycode.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <tdecompletionbox.h>
diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp
index 1308885a..377e6f57 100644
--- a/kuickshow/src/generalwidget.cpp
+++ b/kuickshow/src/generalwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqtooltip.h>
 #include <tqvgroupbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kdialog.h>
 #include <kiconloader.h>
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index dae0fc3c..49468533 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -36,7 +36,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index c9bffe25..4a3d85a3 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -28,11 +28,11 @@
 #include <tqsize.h>
 #include <tqstring.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdeversion.h>
diff --git a/kuickshow/src/main.cpp b/kuickshow/src/main.cpp
index e8df1417..14f1bc6b 100644
--- a/kuickshow/src/main.cpp
+++ b/kuickshow/src/main.cpp
@@ -18,9 +18,9 @@
 
 #include <tqstring.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 33ba9c81..2ff3e52c 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -28,7 +28,7 @@
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/plugin.h>
 #include <tdeparts/part.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kimageio.h>
diff --git a/kview/kview.h b/kview/kview.h
index 2a024026..24b94a00 100644
--- a/kview/kview.h
+++ b/kview/kview.h
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 
 namespace KParts {
diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp
index f4cebb29..0f7af338 100644
--- a/kview/kviewcanvas/test/main.cpp
+++ b/kview/kviewcanvas/test/main.cpp
@@ -1,7 +1,7 @@
 #include "test.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/kview/kviewcanvas/test/test.h b/kview/kviewcanvas/test/test.h
index 7a3f80ed..e88ebd15 100644
--- a/kview/kviewcanvas/test/test.h
+++ b/kview/kviewcanvas/test/test.h
@@ -5,7 +5,7 @@
 #include <config.h>
 #endif 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
  
 namespace KImageViewer { class Canvas; };
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index b2fbe46e..59ef17b7 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -45,7 +45,7 @@
 #include <tdeparts/plugin.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageio.h>
 #include <tdestdaccel.h>
 #include <kdirwatch.h>
diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp
index 5cf59deb..2dc70dcf 100644
--- a/kview/kviewviewer/test/main.cpp
+++ b/kview/kviewviewer/test/main.cpp
@@ -1,7 +1,7 @@
 #include "test.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/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp
index dfcdc918..f4a286ec 100644
--- a/kview/kviewviewer/test/test.cpp
+++ b/kview/kviewviewer/test/test.cpp
@@ -9,7 +9,7 @@
 #include <klibloader.h>
 #include <kmessagebox.h>
 #include <tdeparts/componentfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqimage.h>
 
diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h
index b3a24c91..608ca4e9 100644
--- a/kview/kviewviewer/test/test.h
+++ b/kview/kviewviewer/test/test.h
@@ -5,7 +5,7 @@
 #include <config.h>
 #endif 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 
 namespace KParts { class ReadWritePart; }
diff --git a/kview/main.cpp b/kview/main.cpp
index 2b232ef0..fa9c0578 100644
--- a/kview/main.cpp
+++ b/kview/main.cpp
@@ -18,9 +18,9 @@
 
 #include "kview.h"
 #include "version.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[] = I18N_NOOP( "TDE Image Viewer" );
diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp
index 29d1d9aa..92472029 100644
--- a/kview/modules/browser/kviewbrowser.cpp
+++ b/kview/modules/browser/kviewbrowser.cpp
@@ -30,7 +30,7 @@
 #include <kimageviewer/viewer.h>
 #include <kimageviewer/canvas.h>
 #include <tdeparts/browserextension.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageio.h>
 
 typedef KGenericFactory<KViewBrowser> KViewBrowserFactory;
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 18d6f1a1..e2f2ef87 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp
index 5f1fc597..509bab71 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/kviewshell/documentWidget.h b/kviewshell/documentWidget.h
index 87fb4098..d9b2839c 100644
--- a/kviewshell/documentWidget.h
+++ b/kviewshell/documentWidget.h
@@ -177,7 +177,7 @@ private:
   static TQColor backgroundColorForCorners;
 
   /** The following tables store grey values for roundish shadow
-      corners. They were shamelessly stolen from tdelibs/tdefx/kstyle.cpp. */
+      corners. They were shamelessly stolen from tdelibs/tdefx/tdestyle.cpp. */
   static const int bottom_right_corner[16];
   static const int bottom_left_corner[16];
   static const int shadow_strip[4];
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index 9cfbfa80..1b028c81 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -8,10 +8,10 @@
 #include <tqprinter.h>
 #include <tqprintdialog.h>
 
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index 1975a6ea..855019e9 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -14,7 +14,7 @@
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp
index a62b52e6..aa6dd7be 100644
--- a/kviewshell/main.cpp
+++ b/kviewshell/main.cpp
@@ -2,13 +2,13 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqdir.h>
 
 #include <stdlib.h>
diff --git a/kviewshell/martdelist.cpp b/kviewshell/martdelist.cpp
index 883f74ea..7adb4a23 100644
--- a/kviewshell/martdelist.cpp
+++ b/kviewshell/martdelist.cpp
@@ -29,7 +29,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <tdepopupmenu.h>
diff --git a/kviewshell/pageSizeDialog.cpp b/kviewshell/pageSizeDialog.cpp
index 75c4409d..02cc9c04 100644
--- a/kviewshell/pageSizeDialog.cpp
+++ b/kviewshell/pageSizeDialog.cpp
@@ -9,7 +9,7 @@
 
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp
index 0b2b83fd..07e433d4 100644
--- a/kviewshell/tdemultipage.cpp
+++ b/kviewshell/tdemultipage.cpp
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp
index 2caa054a..61094f1b 100644
--- a/libkscan/devselector.cpp
+++ b/libkscan/devselector.cpp
@@ -30,7 +30,7 @@
 #include <tqstrlist.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index 5dfa43b7..5bc13aeb 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -29,8 +29,8 @@
 #include <tqpainter.h>
 
 #include <klocale.h>
-#include <kstyle.h>
-#include <kapplication.h>
+#include <tdestyle.h>
+#include <tdeapplication.h>
 
 #include <kpixmapio.h>
 #include <kdebug.h>