Rename common header files for consistency with class renaming

148 files changed, 185 insertions, 185 deletions

diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index 9b2291a2..d9d5702b 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -13,7 +13,7 @@
 #include <tqtimer.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
diff --git a/blinken/src/blinkengame.cpp b/blinken/src/blinkengame.cpp
index 280efcd8..20284a69 100644
--- a/blinken/src/blinkengame.cpp
+++ b/blinken/src/blinkengame.cpp
@@ -11,7 +11,7 @@
 
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "artsplayer.h"
 #include "blinkengame.h"
diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp
index 50d49bbe..584feeb3 100644
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 2824c217..66f9c4a5 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -12,7 +12,7 @@
 #include <tqtabbar.h>
 #include <tqtabwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/blinken/src/main.cpp b/blinken/src/main.cpp
index 9cb36827..c013c752 100644
--- a/blinken/src/main.cpp
+++ b/blinken/src/main.cpp
@@ -7,9 +7,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index 32f3caa6..3c8bb116 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -26,7 +26,7 @@
 #include <kstandarddirs.h>
 #include <tdeactioncollection.h>
 #include <kcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqfile.h>
 #include <tqlabel.h>
diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp
index 2efda7a4..e7c6b915 100644
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@@ -23,7 +23,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //QT-Includes
 #include <tqlayout.h>
diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp
index ec0c0155..d6b44922 100644
--- a/kalzium/src/eqchemview.cpp
+++ b/kalzium/src/eqchemview.cpp
@@ -28,7 +28,7 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "config.h"
 #include "eqresult.h"
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index cb5cae59..e3c6f8c3 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -44,7 +44,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 #include <kdialogbase.h>
diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp
index a759fee2..df8ae11a 100644
--- a/kalzium/src/kalziumdataobject.cpp
+++ b/kalzium/src/kalziumdataobject.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KalziumDataObject* KalziumDataObject::instance()
 {
diff --git a/kalzium/src/main.cpp b/kalzium/src/main.cpp
index 27be1880..f08c5ffa 100644
--- a/kalzium/src/main.cpp
+++ b/kalzium/src/main.cpp
@@ -17,9 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "config.h"
 #include "kalzium.h"
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 850af0b9..6335d91a 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -33,7 +33,7 @@ using namespace std;
 #include <tqdir.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp
index d922dc30..de318cc6 100644
--- a/kanagram/src/kanagramgame.cpp
+++ b/kanagram/src/kanagramgame.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "kanagramgame.h"
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 623a414d..7122515c 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -18,7 +18,7 @@
 
 #include "keduvocdocument.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp
index 799079a6..88bf7607 100644
--- a/kanagram/src/keduvockvtmlreader.cpp
+++ b/kanagram/src/keduvockvtmlreader.cpp
@@ -16,7 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp
index 00da5276..75481435 100644
--- a/kanagram/src/main.cpp
+++ b/kanagram/src/main.cpp
@@ -18,9 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
diff --git a/kbruch/src/exercisebase.cpp b/kbruch/src/exercisebase.cpp
index 649bb6c8..a57aaf91 100644
--- a/kbruch/src/exercisebase.cpp
+++ b/kbruch/src/exercisebase.cpp
@@ -19,7 +19,7 @@
 #include "exercisebase.moc"
 
 /* these includes are needed for KDE support */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 /* ----- public member functions ----- */
diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp
index 6da65952..68589c07 100644
--- a/kbruch/src/exercisecompare.cpp
+++ b/kbruch/src/exercisecompare.cpp
@@ -19,7 +19,7 @@
 #include "exercisecompare.moc"
 
 /* these includes are needed for KDE support */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 /* these includes are needed for TQt support */
diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp
index cb3843e5..9654d050 100644
--- a/kbruch/src/exerciseconvert.cpp
+++ b/kbruch/src/exerciseconvert.cpp
@@ -19,7 +19,7 @@
 #include "exerciseconvert.moc"
 
 /* these includes are needed for KDE support */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knumvalidator.h>
diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp
index 691c5816..62eeea54 100644
--- a/kbruch/src/exercisefactorize.cpp
+++ b/kbruch/src/exercisefactorize.cpp
@@ -19,7 +19,7 @@
 #include "exercisefactorize.moc"
 
 /* these includes are needed for KDE support */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knumvalidator.h>
diff --git a/kbruch/src/kbruch.cpp b/kbruch/src/kbruch.cpp
index dd942676..44159093 100644
--- a/kbruch/src/kbruch.cpp
+++ b/kbruch/src/kbruch.cpp
@@ -24,9 +24,9 @@
 #include <stdlib.h>
 
 /* these includes are needed for TQt support */
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 /* the main program */
 int main(int argc, char * argv[])
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index b0b8ee98..5230281c 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -19,7 +19,7 @@
 #include <config.h>
 
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp
index 7189aca7..b4b13476 100644
--- a/kbruch/src/taskview.cpp
+++ b/kbruch/src/taskview.cpp
@@ -21,7 +21,7 @@
 /* these includes are needed for KDE support */
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knumvalidator.h>
 
 /* these includes are needed for TQt support */
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index c79beadc..bf3a96d5 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -20,7 +20,7 @@
 #include "keduca_part.h"
 #include "../libkeduca/kgallerydialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h
index 130d15be..6687db4d 100644
--- a/keduca/keduca/keduca.h
+++ b/keduca/keduca/keduca.h
@@ -24,7 +24,7 @@
 #endif
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/part.h>
 #include <tdeaction.h>
diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp
index 2f54eb71..21bb99fb 100644
--- a/keduca/keduca/keduca_part.cpp
+++ b/keduca/keduca/keduca_part.cpp
@@ -26,7 +26,7 @@
 #include "settings.h"
 #include "configdialogbase.h"
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeparts/genericfactory.h>
 #include <kstdaction.h>
 #include <tdeconfigdialog.h>
diff --git a/keduca/keduca/main.cpp b/keduca/keduca/main.cpp
index 09a02531..6911fa53 100644
--- a/keduca/keduca/main.cpp
+++ b/keduca/keduca/main.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 #include <tqfileinfo.h>
diff --git a/keduca/keducabuilder/main.cpp b/keduca/keducabuilder/main.cpp
index e9d74a66..47da9c31 100644
--- a/keduca/keducabuilder/main.cpp
+++ b/keduca/keducabuilder/main.cpp
@@ -15,9 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 #include <tqfileinfo.h>
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index 16a5ad60..f3642b19 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -11,7 +11,7 @@
 #include <stdlib.h> // for RAND_MAX
 
 #include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 
diff --git a/kgeography/src/main.cpp b/kgeography/src/main.cpp
index 48b21c3b..e324fdf3 100644
--- a/kgeography/src/main.cpp
+++ b/kgeography/src/main.cpp
@@ -8,9 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "kgeography.h"
 
diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp
index 0ab2b85b..99861e4a 100644
--- a/kgeography/src/map.cpp
+++ b/kgeography/src/map.cpp
@@ -10,7 +10,7 @@
 
 #include <stdlib.h> // for RAND_MAX
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include <tqfile.h>
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index c40a6dbd..578ef8b4 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -11,7 +11,7 @@
 #include <math.h> // for rint
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include <tqcursor.h>
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index cda2beee..3844c809 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -31,7 +31,7 @@
 #include <tqpainter.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp
index 3cf188e2..c9271080 100644
--- a/khangman/khangman/khangmanview.cpp
+++ b/khangman/khangman/khangmanview.cpp
@@ -15,7 +15,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kaudioplayer.h>
 #include <kdebug.h>
 #include <klineedit.h>
diff --git a/khangman/khangman/khnewstuff.cpp b/khangman/khangman/khnewstuff.cpp
index d7da3f96..94ce24e5 100644
--- a/khangman/khangman/khnewstuff.cpp
+++ b/khangman/khangman/khnewstuff.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp
index ac4733f0..b7a0fae5 100644
--- a/khangman/khangman/main.cpp
+++ b/khangman/khangman/main.cpp
@@ -19,9 +19,9 @@
 #include "khangman.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>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/kig/kig/aboutdata.h b/kig/kig/aboutdata.h
index 950e5797..a20371a7 100644
--- a/kig/kig/aboutdata.h
+++ b/kig/kig/aboutdata.h
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "config.h"
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index 5f92aaf7..d2073bb3 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
diff --git a/kig/kig/kig.h b/kig/kig/kig.h
index 50e1e9ef..db2a3c33 100644
--- a/kig/kig/kig.h
+++ b/kig/kig/kig.h
@@ -35,7 +35,7 @@
 #define KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <dcopclient.h>
 
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 022c50e0..2cbf135a 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -44,7 +44,7 @@
 #include <functional>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index 02b3869d..954c96fc 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kcursor.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
diff --git a/kig/kig/main.cpp b/kig/kig/main.cpp
index a99ff122..72a92148 100644
--- a/kig/kig/main.cpp
+++ b/kig/kig/main.cpp
@@ -21,8 +21,8 @@
 #include "kig.h"
 
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <klibloader.h>
 #include <kdebug.h>
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc
index f4ed323e..1dab83d7 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@@ -23,7 +23,7 @@
 #include "edittype.h"
 #include "edittype.moc"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kicondialog.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc
index 662e3a0d..c6b8f36c 100644
--- a/kig/modes/macrowizard.cc
+++ b/kig/modes/macrowizard.cc
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m )
   : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m )
diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc
index d562bbf3..c92068de 100644
--- a/kig/modes/textlabelwizard.cc
+++ b/kig/modes/textlabelwizard.cc
@@ -22,7 +22,7 @@
 #include "linkslabel.h"
 
 #include <tqtextedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlayout.h>
 
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index 82b280fa..8660eaba 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -28,7 +28,7 @@
 #include "../misc/guiaction.h"
 #include "../misc/object_constructor.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc
index 425094c2..c82c2047 100644
--- a/kig/objects/text_type.cc
+++ b/kig/objects/text_type.cc
@@ -33,7 +33,7 @@
 #include <tqclipboard.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <cmath>
 
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index a9f83390..6341e469 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -28,7 +28,7 @@
 // make it still work on old kde 3.1...
 #include <tdeaction.h>
 //
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <tdepopupmenu.h>
 #include <ktextedit.h>
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index d952285d..d9521aba 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -20,7 +20,7 @@
 **/
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index 0a76d8ec..c4b2c901 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -20,7 +20,7 @@
 **/
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdelistview.h>
diff --git a/kiten/main.cpp b/kiten/main.cpp
index abda8624..621fdf03 100644
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@@ -19,9 +19,9 @@
  USA
 **/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqsqlpropertymap.h>
 
diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp
index cba25ffc..1c79dbaa 100644
--- a/kiten/optiondialog.cpp
+++ b/kiten/optiondialog.cpp
@@ -20,7 +20,7 @@
 **/
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqvgroupbox.h>
 #include <tdefontdialog.h>
 #include <tqtextcodec.h>
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 49f300f0..36350bcf 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -19,7 +19,7 @@
  USA
 **/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index 506cde60..bb420b9c 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -20,7 +20,7 @@
 **/
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
 #include <klocale.h>
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index b6fdaddb..f57b0d82 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -15,7 +15,7 @@
 
 #include <tqradiobutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp
index ef42f25e..2bc49bb5 100644
--- a/klatin/klatin/klatingrammar.cpp
+++ b/klatin/klatin/klatingrammar.cpp
@@ -16,7 +16,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp
index e7d06e88..46e5e744 100644
--- a/klatin/klatin/klatinverbs.cpp
+++ b/klatin/klatin/klatinverbs.cpp
@@ -16,7 +16,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index d8844647..ad5c38c3 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -17,7 +17,7 @@
 #include <tqlabel.h>
 #include <tqlistview.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/klatin/klatin/main.cpp b/klatin/klatin/main.cpp
index 08d7d9f2..01dca2a2 100644
--- a/klatin/klatin/main.cpp
+++ b/klatin/klatin/main.cpp
@@ -13,9 +13,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "klatin.h"
 
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index 533a7714..3afd5036 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -30,7 +30,7 @@
 
 //KDE includes
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
diff --git a/klettres/klettres/klettresview.cpp b/klettres/klettres/klettresview.cpp
index 5988a4dc..8c8d8252 100644
--- a/klettres/klettres/klettresview.cpp
+++ b/klettres/klettres/klettresview.cpp
@@ -24,7 +24,7 @@
 #include <tqwhatsthis.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/klettres/klettres/klnewstuff.cpp b/klettres/klettres/klnewstuff.cpp
index b2a8a50d..fb04be11 100644
--- a/klettres/klettres/klnewstuff.cpp
+++ b/klettres/klettres/klnewstuff.cpp
@@ -20,7 +20,7 @@
 #include <ktar.h>
 #include <tqdir.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include "klnewstuff.h"
 #include "prefs.h"
diff --git a/klettres/klettres/main.cpp b/klettres/klettres/main.cpp
index 9be82e0b..5e62b9b3 100644
--- a/klettres/klettres/main.cpp
+++ b/klettres/klettres/main.cpp
@@ -22,9 +22,9 @@
 /* Please save with utf8 encoding, thanks  */
 /*****************************************************/
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include "klettres.h"
 #include "version.h"
diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp
index 3602e325..c9f417c3 100644
--- a/kmplot/kmplot/FktDlg.cpp
+++ b/kmplot/kmplot/FktDlg.cpp
@@ -28,7 +28,7 @@
 // #include <tqpopupmenu.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index c2172ee8..d7992fae 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -29,8 +29,8 @@
 
 // KDE includes
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
@@ -767,7 +767,7 @@ void MainDlg::resetZoom()
 
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 TDEInstance*  KmPlotPartFactory::s_instance = 0L;
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index be828f76..b580dace 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -34,7 +34,7 @@
 
 // KDE includes
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp
index 0f86d52f..7e3f9501 100644
--- a/kmplot/kmplot/editfunction.cpp
+++ b/kmplot/kmplot/editfunction.cpp
@@ -36,7 +36,7 @@
 
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <klineedit.h>
diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp
index a91d3ad1..57e3b1e2 100644
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp
index 0bfe1007..8e38d6f6 100644
--- a/kmplot/kmplot/keditparametric.cpp
+++ b/kmplot/kmplot/keditparametric.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp
index c329e320..91c123b0 100644
--- a/kmplot/kmplot/keditpolar.cpp
+++ b/kmplot/kmplot/keditpolar.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kmplot/kmplot/kmplot.h b/kmplot/kmplot/kmplot.h
index fc756f00..4bb4a26e 100644
--- a/kmplot/kmplot/kmplot.h
+++ b/kmplot/kmplot/kmplot.h
@@ -30,8 +30,8 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeparts/mainwindow.h>
 
 #include "kmplotIface.h"
diff --git a/kmplot/kmplot/main.cpp b/kmplot/kmplot/main.cpp
index 1e0577a6..74c43088 100644
--- a/kmplot/kmplot/main.cpp
+++ b/kmplot/kmplot/main.cpp
@@ -33,9 +33,9 @@
 
 
 // KDE includes
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 
 
diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp
index 7b5317dc..d5142d64 100644
--- a/kmplot/kmplot/xparser.cpp
+++ b/kmplot/kmplot/xparser.cpp
@@ -25,7 +25,7 @@
 
 // KDE includes
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kpercentage/kpercentage/kpercentage.h b/kpercentage/kpercentage/kpercentage.h
index 46b11e2e..8cd64c03 100644
--- a/kpercentage/kpercentage/kpercentage.h
+++ b/kpercentage/kpercentage/kpercentage.h
@@ -30,7 +30,7 @@
 #include <tqspinbox.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 
 // local includes
diff --git a/kpercentage/kpercentage/main.cpp b/kpercentage/kpercentage/main.cpp
index 0d60eb2c..a83bca4e 100644
--- a/kpercentage/kpercentage/main.cpp
+++ b/kpercentage/kpercentage/main.cpp
@@ -20,8 +20,8 @@
  ***************************************************************************/
 
 // KDE includes
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 // local includes
 #include "kpercentage.h"
diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp
index 441c71c3..346beec9 100644
--- a/kstars/kstars/addlinkdialog.cpp
+++ b/kstars/kstars/addlinkdialog.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index 28599439..6f09eafe 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -21,7 +21,7 @@
 #include <tqimage.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kactivelabel.h>
diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp
index 560cf82f..1ca5fc14 100644
--- a/kstars/kstars/fitsimage.cpp
+++ b/kstars/kstars/fitsimage.cpp
@@ -25,7 +25,7 @@
 #include <tdeaccel.h>
 #include <kdebug.h>
 #include <tdetoolbar.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmap.h> 
 #include <ktempfile.h>
 #include <kimageeffect.h> 
diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp
index 6a4d7fcd..518db5a1 100644
--- a/kstars/kstars/fitsprocess.cpp
+++ b/kstars/kstars/fitsprocess.cpp
@@ -21,7 +21,7 @@
  #include <kdebug.h>
  #include <klocale.h>
  #include <kprogress.h>
- #include <kapplication.h>
+ #include <tdeapplication.h>
  
  #include <tqimage.h>
  
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index 19056236..56cb6157 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -25,7 +25,7 @@
 #include <tdeaccel.h>
 #include <kdebug.h>
 #include <tdetoolbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmap.h> 
 #include <ktempfile.h>
 #include <kimageeffect.h> 
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index b14a00a9..31a58f79 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include "imageviewer.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *parent, const char *name)
 	: TDEMainWindow (parent, name), imageURL (*url), fileIsImage (false),
diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp
index e3388984..4b697237 100644
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@@ -66,7 +66,7 @@
 #include <kled.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdelistview.h>
diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp
index 9408f57e..fc257575 100644
--- a/kstars/kstars/indimenu.cpp
+++ b/kstars/kstars/indimenu.cpp
@@ -43,7 +43,7 @@
 #include <klineedit.h>
 #include <tdelistbox.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdelistview.h>
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index b5fe7085..f9cde0eb 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -47,7 +47,7 @@
  #include <klineedit.h>
  #include <kstatusbar.h>
  #include <kmessagebox.h>
- #include <kapplication.h>
+ #include <tdeapplication.h>
  #include <kprogress.h>
  #include <kurl.h>
  #include <kdirlister.h>
diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp
index 22bc486f..df192c41 100644
--- a/kstars/kstars/ksnewstuff.cpp
+++ b/kstars/kstars/ksnewstuff.cpp
@@ -18,7 +18,7 @@
 #include <tdeversion.h>
 #if KDE_IS_VERSION( 3, 2, 90 )
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h
index fffc4eba..038483cc 100644
--- a/kstars/kstars/kstars.h
+++ b/kstars/kstars/kstars.h
@@ -22,7 +22,7 @@
 #endif
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqwidget.h>
 
diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp
index 73e85d6c..ceb941b6 100644
--- a/kstars/kstars/kstarsdata.cpp
+++ b/kstars/kstars/kstarsdata.cpp
@@ -19,7 +19,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp
index ade62236..60b9eaae 100644
--- a/kstars/kstars/kstarssplash.cpp
+++ b/kstars/kstars/kstarssplash.cpp
@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 #include <klocale.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kstarssplash.h"
 #include "ksutils.h"
diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp
index 8c6dcc34..c367c845 100644
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp
index 72af66e6..fcfa3680 100644
--- a/kstars/kstars/skymap.cpp
+++ b/kstars/kstars/skymap.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index 6241b3c3..b6d1dbdf 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -24,7 +24,7 @@
 #include <tqrect.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h
index 6165055c..6d56bdd7 100644
--- a/kstars/kstars/tools/astrocalc.h
+++ b/kstars/kstars/tools/astrocalc.h
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <kdialogbase.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "dms.h"
 
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index ad6942bf..425a9513 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -37,7 +37,7 @@
 #include "kstars.h"
 #include "kstarsdata.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 LCGenerator::LCGenerator( TQWidget* parent)
     : KDialogBase( parent, "lcgenerator", false, i18n( "AAVSO Light Curve Generator"),0) , Hostprefix("http://www.aavso.org/cgi-bin/kstar.pl"), JDCutOff(2437600)
diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp
index a0ca39e1..cf1c886a 100644
--- a/kstars/kstars/tools/modcalcangdist.cpp
+++ b/kstars/kstars/tools/modcalcangdist.cpp
@@ -28,7 +28,7 @@
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 
-//#include <kapplication.h> ..already included in modcalcapcoord.h
+//#include <tdeapplication.h> ..already included in modcalcapcoord.h
 
 modCalcAngDist::modCalcAngDist(TQWidget *parentSplit, const char *name) : modCalcAngDistDlg(parentSplit,name) {
 
diff --git a/kstars/kstars/tools/modcalcangdist.h b/kstars/kstars/tools/modcalcangdist.h
index 616d922b..0d938b58 100644
--- a/kstars/kstars/tools/modcalcangdist.h
+++ b/kstars/kstars/tools/modcalcangdist.h
@@ -19,7 +19,7 @@
 #define MODCALCANGDIST_H
 
 #include "modcalcangdistdlg.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 /** Module to compute the angular distance between two points in the sky 
   *@author Pablo de Vicente
diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp
index 275f3e76..578f3e56 100644
--- a/kstars/kstars/tools/modcalcapcoord.cpp
+++ b/kstars/kstars/tools/modcalcapcoord.cpp
@@ -35,7 +35,7 @@
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 
-//#include <kapplication.h> ..already included in modcalcapcoord.h
+//#include <tdeapplication.h> ..already included in modcalcapcoord.h
 
 modCalcApCoord::modCalcApCoord(TQWidget *parentSplit, const char *name) : modCalcApCoordDlg(parentSplit,name) {
 
diff --git a/kstars/kstars/tools/modcalcapcoord.h b/kstars/kstars/tools/modcalcapcoord.h
index 84724dfe..f99bc418 100644
--- a/kstars/kstars/tools/modcalcapcoord.h
+++ b/kstars/kstars/tools/modcalcapcoord.h
@@ -19,7 +19,7 @@
 #define MODCALCAPCOORD_H
 
 #include "modcalcapcoorddlg.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 /** Module to compute the equatorial coordinates for a given date and time
  * from a given epoch or equinox
diff --git a/kstars/kstars/tools/modcalcazel.h b/kstars/kstars/tools/modcalcazel.h
index ee921a24..c6b0ad25 100644
--- a/kstars/kstars/tools/modcalcazel.h
+++ b/kstars/kstars/tools/modcalcazel.h
@@ -18,7 +18,7 @@
 #ifndef MODCALCAZEL_H
 #define MODCALCAZEL_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "modcalcazeldlg.h"
 
diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp
index 97346c94..07c97d6e 100644
--- a/kstars/kstars/tools/modcalcdaylength.cpp
+++ b/kstars/kstars/tools/modcalcdaylength.cpp
@@ -28,7 +28,7 @@
 #include "kstarsdatetime.h"
 #include "libtdeedu/extdate/extdatetimeedit.h"
 
-#include <kapplication.h> 
+#include <tdeapplication.h> 
 
 modCalcDayLength::modCalcDayLength(TQWidget *parentSplit, const char *name) : modCalcDayLengthDlg(parentSplit,name) {
 	showCurrentDate();
diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp
index 9a572f98..d2852dd9 100644
--- a/kstars/kstars/tools/modcalceclipticcoords.cpp
+++ b/kstars/kstars/tools/modcalceclipticcoords.cpp
@@ -30,7 +30,7 @@
 #include <tqtextstream.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 
diff --git a/kstars/kstars/tools/modcalcequinox.h b/kstars/kstars/tools/modcalcequinox.h
index 6bb45fce..03fdf30d 100644
--- a/kstars/kstars/tools/modcalcequinox.h
+++ b/kstars/kstars/tools/modcalcequinox.h
@@ -18,7 +18,7 @@
 #ifndef MODCALCEQUINOX_H
 #define MODCALCEQUINOX_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "modcalcequinoxdlg.h"
 
diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp
index ddfaba40..4d2bee71 100644
--- a/kstars/kstars/tools/modcalcgalcoord.cpp
+++ b/kstars/kstars/tools/modcalcgalcoord.cpp
@@ -29,7 +29,7 @@
 #include <tqtextstream.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 
diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp
index 37e6ffbe..cf4ce051 100644
--- a/kstars/kstars/tools/modcalcgeodcoord.cpp
+++ b/kstars/kstars/tools/modcalcgeodcoord.cpp
@@ -29,7 +29,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knumvalidator.h>
 #include <klocale.h>
 #include <klineedit.h>
diff --git a/kstars/kstars/tools/modcalcjd.h b/kstars/kstars/tools/modcalcjd.h
index b80ee8d1..3fb80ccb 100644
--- a/kstars/kstars/tools/modcalcjd.h
+++ b/kstars/kstars/tools/modcalcjd.h
@@ -20,7 +20,7 @@
 
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "modcalcjddlg.h"
 
 /**
diff --git a/kstars/kstars/tools/modcalcplanets.h b/kstars/kstars/tools/modcalcplanets.h
index 26461db1..0eaf8776 100644
--- a/kstars/kstars/tools/modcalcplanets.h
+++ b/kstars/kstars/tools/modcalcplanets.h
@@ -18,7 +18,7 @@
 #ifndef MODCALCPLANETS_H
 #define MODCALCPLANETS_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "modcalcplanetsdlg.h"
 #include "geolocation.h"
diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp
index 335d773b..4f5c7bb3 100644
--- a/kstars/kstars/tools/modcalcprec.cpp
+++ b/kstars/kstars/tools/modcalcprec.cpp
@@ -27,7 +27,7 @@
 #include <tqtextstream.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 
diff --git a/kstars/kstars/tools/modcalcsidtime.h b/kstars/kstars/tools/modcalcsidtime.h
index 9aa159ac..83740efa 100644
--- a/kstars/kstars/tools/modcalcsidtime.h
+++ b/kstars/kstars/tools/modcalcsidtime.h
@@ -19,7 +19,7 @@
 #define MODCALCSIDTIME_H
 
 #include "modcalcsidtimedlg.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 /**
   * Class which implements the KStars calculator module to compute Universal
diff --git a/kstars/kstars/tools/modcalcvlsr.h b/kstars/kstars/tools/modcalcvlsr.h
index f948e93a..182fc690 100644
--- a/kstars/kstars/tools/modcalcvlsr.h
+++ b/kstars/kstars/tools/modcalcvlsr.h
@@ -18,7 +18,7 @@
 #ifndef MODCALCVLSR_H
 #define MODCALCVLSR_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "modcalcvlsrdlg.h"
 
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index e2648969..7b58b411 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -22,7 +22,7 @@
 #include <tqvaluevector.h>
 
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 
 class TQLabel;
diff --git a/ktouch/src/main.cpp b/ktouch/src/main.cpp
index 7f8fbcf1..c8b74b57 100644
--- a/ktouch/src/main.cpp
+++ b/ktouch/src/main.cpp
@@ -11,8 +11,8 @@
  ***************************************************************************/
 
 #include "ktouch.h"
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include <kdebug.h>
 
diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp
index fcc6322d..b5ea954c 100644
--- a/kturtle/src/dialogs.cpp
+++ b/kturtle/src/dialogs.cpp
@@ -16,7 +16,7 @@
  */
  
 
-#include <kapplication.h>   
+#include <tdeapplication.h>   
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp
index dd8ae8f2..b834f887 100644
--- a/kturtle/src/executer.cpp
+++ b/kturtle/src/executer.cpp
@@ -25,7 +25,7 @@
 
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 436d0084..9a9b374a 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
diff --git a/kturtle/src/main.cpp b/kturtle/src/main.cpp
index 581cb701..e9d8f69e 100644
--- a/kturtle/src/main.cpp
+++ b/kturtle/src/main.cpp
@@ -16,9 +16,9 @@
  */
 
  
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "kturtle.h"
 
diff --git a/kverbos/kverbos/kfeedercontrol.cpp b/kverbos/kverbos/kfeedercontrol.cpp
index 749debe5..614a9699 100644
--- a/kverbos/kverbos/kfeedercontrol.cpp
+++ b/kverbos/kverbos/kfeedercontrol.cpp
@@ -17,7 +17,7 @@
 
 #include "kfeedercontrol.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 KFeederControl::KFeederControl(int ID, bool splash, bool automatic)
diff --git a/kverbos/kverbos/kstartuplogo.cpp b/kverbos/kverbos/kstartuplogo.cpp
index e074f605..1a376f54 100644
--- a/kverbos/kverbos/kstartuplogo.cpp
+++ b/kverbos/kverbos/kstartuplogo.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "kstartuplogo.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h
index fd1a744c..a052d9ed 100644
--- a/kverbos/kverbos/kverbos.h
+++ b/kverbos/kverbos/kverbos.h
@@ -26,7 +26,7 @@
 // include files for TQt
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
 
diff --git a/kverbos/kverbos/main.cpp b/kverbos/kverbos/main.cpp
index bc0033f5..23eebb5c 100644
--- a/kverbos/kverbos/main.cpp
+++ b/kverbos/kverbos/main.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "kverbos.h"
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index 3ef07c2b..5def838a 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -30,7 +30,7 @@
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <dcopclient.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
index a49fd65e..e928c578 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
@@ -27,7 +27,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "DocPropDlg.h"
 #include <langset.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
index 76013ebf..0900145d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
@@ -32,7 +32,7 @@
 #include <tqvaluelist.h>
 #include <tqtabwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index 3143007e..c499bf55 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -25,7 +25,7 @@
 
 #include "LessOptPage.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 6732540b..1bd2bb8d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -27,7 +27,7 @@
 
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
index 96f71bd4..6ef9175c 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
@@ -26,7 +26,7 @@
 #include "TitlePage.h"
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include <tqlineedit.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index 39db6421..ec15df05 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -25,7 +25,7 @@
 
 #include "TypeOptPage.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index accc2bc5..fb2a5709 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -25,7 +25,7 @@
 
 #include "UsageOptPage.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
index 7e79a1ee..9b983386 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 457daa7b..4fa57bad 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -30,7 +30,7 @@
 #include <tqlineedit.h>
 
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twinmodule.h>
 
 #include <langset.h>
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index df9ae70b..b8b191c1 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -35,7 +35,7 @@
 #include <tqpainter.h>
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
 #include <kmenubar.h>
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index bca7dcd9..cc0e9d17 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -26,7 +26,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index b3353ded..bc179283 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprinter.h>
 
 #include <tqlayout.h>
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
index 649825d4..30b451b4 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index 4a3bdb7b..7a0d5a50 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -27,7 +27,7 @@
 #include "QueryManager.h"
 #include "UsageManager.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
index 72020b94..84c800d3 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "kvoctraindoc.h"
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
index 7cce072b..38e773a7 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@@ -22,7 +22,7 @@
  ***************************************************************************/
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index b2f0f038..ee4eaa14 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -28,7 +28,7 @@
 
 #include "kvoctraindoc.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index 8cd24b51..8ea6b762 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -25,8 +25,8 @@
 #include "kvoctrain.h"
 #include "kvoctraincore.h"
 
-# include <kcmdlineargs.h>
-# include <kaboutdata.h>
+# include <tdecmdlineargs.h>
+# include <tdeaboutdata.h>
 # include <klocale.h>
 
 int main(int argc, char* argv[]) {
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
index 69deae26..713cce35 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
@@ -29,7 +29,7 @@
 #include <kv_resource.h>
 #include <langset.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kprogress.h>
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
index 37200164..33df5b81 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
@@ -30,7 +30,7 @@
 
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>
 
 #include <tqtimer.h>
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
index c3bda4e8..973f8606 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
@@ -27,7 +27,7 @@
 
 #include <kv_resource.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index efc2a136..25720d33 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -30,7 +30,7 @@
 
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>
 
 #include <tqcheckbox.h>
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index d23be59d..a823d638 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -32,7 +32,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kprogress.h>
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
index 72d749a2..54a2c865 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
@@ -27,7 +27,7 @@
 
 #include <kv_resource.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kprogress.h>
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index 99017a6a..c1d114d5 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -33,7 +33,7 @@ using namespace std;
 
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #define KVD_VERS_PREFIX " v"     //#include "kvoctraindoc.h"
 #define TQM_VERB         "v"      //#include "QueryManager.h"
diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h
index 56d305ff..fe8d4bc3 100644
--- a/kwordquiz/src/kwordquiz.h
+++ b/kwordquiz/src/kwordquiz.h
@@ -27,7 +27,7 @@
 #include <tqsignalmapper.h>
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
 #include <kdirwatch.h>
diff --git a/kwordquiz/src/main.cpp b/kwordquiz/src/main.cpp
index de9d7a9a..c92c2310 100644
--- a/kwordquiz/src/main.cpp
+++ b/kwordquiz/src/main.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "kwordquiz.h"
 #include "version.h"
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index 3957b73f..5ee38007 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -43,7 +43,7 @@
 //#include "extdatepicker.h"
 #include "extdatetbl.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include "tdepopupmenu.h"
diff --git a/libtdeedu/extdate/main.cpp b/libtdeedu/extdate/main.cpp
index 7bf65058..53e8d92f 100644
--- a/libtdeedu/extdate/main.cpp
+++ b/libtdeedu/extdate/main.cpp
@@ -1,7 +1,7 @@
 #include "testwidget.h"
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 static const char description[] = I18N_NOOP("ExtDatePicker test program");
 static const char notice[] = I18N_NOOP("Compares KDatePicker and ExtDatePicker");