diff --git a/kcron/cti18n.h b/kcron/cti18n.h
index a5b96ec..2c79e1a 100644
--- a/kcron/cti18n.h
+++ b/kcron/cti18n.h
@@ -22,6 +22,6 @@
 // -GM 11/99
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #endif // CTI18N_H
diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp
index a90a45f..9b70f87 100644
--- a/kcron/ktapp.cpp
+++ b/kcron/ktapp.cpp
@@ -14,7 +14,7 @@
 #include <tdestdaccel.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>       // i18n()
 #include <kstdaction.h>
 #include <tdeaction.h>
diff --git a/kcron/ktprintopt.cpp b/kcron/ktprintopt.cpp
index e754c21..d7c1d87 100644
--- a/kcron/ktprintopt.cpp
+++ b/kcron/ktprintopt.cpp
@@ -17,7 +17,7 @@
 #include <kdialog.h>
 #include <tdeaccel.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "ktprintopt.h"
 
 KTPrintOpt::KTPrintOpt(bool root) :
diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index 99bd359..0ede639 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -21,7 +21,7 @@
 #include <tqpainter.h>
 #include <tqpalette.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp
index 84080ad..9c9f9c4 100644
--- a/kcron/ktvariable.cpp
+++ b/kcron/ktvariable.cpp
@@ -13,7 +13,7 @@
 
 #include <tqlayout.h>
 
-#include <kapplication.h>     // kapp
+#include <tdeapplication.h>     // kapp
 #include <klocale.h>  // i18n()
 #include <kmessagebox.h>
 #include <ktextedit.h>
diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp
index a8709cc..0000bc7 100644
--- a/kcron/ktview.cpp
+++ b/kcron/ktview.cpp
@@ -31,7 +31,7 @@
 #include <tqfile.h>
 #include <tqdatetime.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 
diff --git a/kcron/main.cpp b/kcron/main.cpp
index f642710..b829473 100644
--- a/kcron/main.cpp
+++ b/kcron/main.cpp
@@ -9,11 +9,11 @@
  *   (at your option) any later version.                                   * 
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include "ktapp.h"
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
  
 int main(int argc, char* argv[]) 
 { 
diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp
index c3838d4..2cf2fa3 100644
--- a/kdat/ArchiveInfoWidget.cpp
+++ b/kdat/ArchiveInfoWidget.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index c224c0b..abb554d 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -31,7 +31,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp
index b5311ac..4bb8c72 100644
--- a/kdat/BackupOptDlg.cpp
+++ b/kdat/BackupOptDlg.cpp
@@ -22,7 +22,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "BackupOptDlg.h"
 #include "BackupProfileWidget.h"
diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp
index 7e4a918..71b4e7c 100644
--- a/kdat/BackupProfileInfoWidget.cpp
+++ b/kdat/BackupProfileInfoWidget.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp
index 45acb56..b7600ea 100644
--- a/kdat/BackupProfileWidget.cpp
+++ b/kdat/BackupProfileWidget.cpp
@@ -24,7 +24,7 @@
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "BackupProfile.h"
 #include "BackupProfileWidget.h"
diff --git a/kdat/ErrorHandler.cpp b/kdat/ErrorHandler.cpp
index aee1c58..d20e347 100644
--- a/kdat/ErrorHandler.cpp
+++ b/kdat/ErrorHandler.cpp
@@ -22,7 +22,7 @@
 #include <tqmessagebox.h>
 #include <klocale.h>
 //#include <kstandarddirs.h>
-//#include <kapplication.h>
+//#include <tdeapplication.h>
 
 void error_handler(int err_sig);
 
diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp
index d5ef7bf..144505b 100644
--- a/kdat/FileInfoWidget.cpp
+++ b/kdat/FileInfoWidget.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp
index 223e5e8..8f3e06e 100644
--- a/kdat/FormatOptDlg.cpp
+++ b/kdat/FormatOptDlg.cpp
@@ -25,7 +25,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index 20f2140..f9fc6c7 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -26,7 +26,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index e692279..cb4d6ff 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqtextstream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmenubar.h>
 #include <tdepopupmenu.h>
diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp
index 53166ba..0a9e665 100644
--- a/kdat/LoggerWidget.cpp
+++ b/kdat/LoggerWidget.cpp
@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 #include <tqmultilineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 
 #include "LoggerWidget.h"
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index 035a1c1..67de62f 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "Archive.h"
diff --git a/kdat/Options.cpp b/kdat/Options.cpp
index ff77c30..24ec02c 100644
--- a/kdat/Options.cpp
+++ b/kdat/Options.cpp
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "Options.h"
diff --git a/kdat/OptionsDlg.cpp b/kdat/OptionsDlg.cpp
index f056bbf..ca6a029 100644
--- a/kdat/OptionsDlg.cpp
+++ b/kdat/OptionsDlg.cpp
@@ -29,7 +29,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <knuminput.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 
diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index 9a5950a..e371adf 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -363,7 +363,7 @@ You must still specify the block size.</string>
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in implementation">kapplication.h</include>
+    <include location="global" impldecl="in implementation">tdeapplication.h</include>
     <include location="global" impldecl="in implementation">tdefiledialog.h</include>
     <include location="global" impldecl="in implementation">kmessagebox.h</include>
     <include location="global" impldecl="in implementation">kglobal.h</include>
diff --git a/kdat/Tape.cpp b/kdat/Tape.cpp
index ff35d1a..7a03c6a 100644
--- a/kdat/Tape.cpp
+++ b/kdat/Tape.cpp
@@ -27,7 +27,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "IndexDlg.h"
 #include "KDatMainWindow.h"
diff --git a/kdat/TapeDrive.cpp b/kdat/TapeDrive.cpp
index 2e4c59b..e6b18ff 100644
--- a/kdat/TapeDrive.cpp
+++ b/kdat/TapeDrive.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "KDatMainWindow.h"
diff --git a/kdat/TapeFileInfoWidget.cpp b/kdat/TapeFileInfoWidget.cpp
index 239d7f1..033edc1 100644
--- a/kdat/TapeFileInfoWidget.cpp
+++ b/kdat/TapeFileInfoWidget.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "File.h"
 #include "TapeFileInfoWidget.h"
diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index de496c6..35f5050 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index c402a02..5f2681e 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp
index 6416277..795cf02 100644
--- a/kdat/VerifyOptDlg.cpp
+++ b/kdat/VerifyOptDlg.cpp
@@ -23,7 +23,7 @@
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/kdat/main.cpp b/kdat/main.cpp
index 455c25a..c6c89f8 100644
--- a/kdat/main.cpp
+++ b/kdat/main.cpp
@@ -25,10 +25,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kcrash.h>
 #include <kmessagebox.h>
 
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index 25ba8e1..ee7e08a 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -49,10 +49,10 @@
 #include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kmessagebox.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <dcopclient.h>
 
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h
index 0e56706..f559477 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.h
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.h
@@ -19,7 +19,7 @@
 #define KNETWORKCONFMODULE_H
 
 #include "knetworkconf.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdecmodule.h>
 
 class KNetworkConfModule : public TDECModule
diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp
index c5d8748..1a6b89e 100644
--- a/knetworkconf/knetworkconf/main.cpp
+++ b/knetworkconf/knetworkconf/main.cpp
@@ -17,8 +17,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kuniqueapplication.h>
 #include <dcopclient.h>
diff --git a/kpackage/findf.h b/kpackage/findf.h
index e2aad23..77cd5fb 100644
--- a/kpackage/findf.h
+++ b/kpackage/findf.h
@@ -44,7 +44,7 @@
 #include <tqlayout.h>
 
 // KDE headers
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmenubar.h>
 #include <tdelistview.h>
 #include <kdialogbase.h>
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 71db454..66e2663 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -36,11 +36,11 @@
 #include <tqframe.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
 #include <klocale.h>
diff --git a/kpackage/main.cpp b/kpackage/main.cpp
index 14c6063..dbe2e33 100644
--- a/kpackage/main.cpp
+++ b/kpackage/main.cpp
@@ -35,13 +35,13 @@
 
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <options.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 #include <kpTerm.h>
diff --git a/kpackage/options.h b/kpackage/options.h
index 5eb5d46..375c0c1 100644
--- a/kpackage/options.h
+++ b/kpackage/options.h
@@ -41,7 +41,7 @@
 #include <tqgroupbox.h>
 
 // KDE headers
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 
 #include <kpackage.h>
diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp
index 490bc50..fdedc47 100644
--- a/kpackage/packageProperties.cpp
+++ b/kpackage/packageProperties.cpp
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <kdebug.h>
 
-#include <kapplication.h> 
+#include <tdeapplication.h> 
 
 #include "kpackage.h"
 #include "packageProperties.h"
diff --git a/kpackage/search.h b/kpackage/search.h
index 3fee501..5af5b0b 100644
--- a/kpackage/search.h
+++ b/kpackage/search.h
@@ -39,7 +39,7 @@ class TQLineEdit;
 class TQCheckBox;
 
 // KDE headers
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmenubar.h>
 #include <kdialogbase.h>
 
diff --git a/kpackage/tdeio.cpp b/kpackage/tdeio.cpp
index 111b803..6ecfd34 100644
--- a/kpackage/tdeio.cpp
+++ b/kpackage/tdeio.cpp
@@ -24,7 +24,7 @@
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include "tdeio.h"
 
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 75af033..2ca3f34 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmimemagic.h>
 #include <kservice.h>
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index 6e96046..fc99e4a 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -41,7 +41,7 @@
 #include <tqsplitter.h>
 #include <tqmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kprocess.h>
@@ -51,7 +51,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <kdirwatch.h>
 #include <kcompletion.h>
diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp
index 06c7097..524510e 100644
--- a/ksysv/PreferencesDialog.cpp
+++ b/ksysv/PreferencesDialog.cpp
@@ -15,7 +15,7 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "ksv_conf.h"
diff --git a/ksysv/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp
index 4b7d4ef..64fec66 100644
--- a/ksysv/ServiceDlg.cpp
+++ b/ksysv/ServiceDlg.cpp
@@ -18,7 +18,7 @@
 #include <tqcombobox.h>
 #include <tqstring.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kbuttonbox.h>
 
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index b80f503..1479af6 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -59,7 +59,7 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <khelpmenu.h>
 #include <klocale.h>
@@ -68,7 +68,7 @@
 #include <kedittoolbar.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kcursor.h>
 
 #include "kbusymanager.h"
diff --git a/ksysv/kbusymanager.cpp b/ksysv/kbusymanager.cpp
index ad9c86a..2a5c9f9 100644
--- a/ksysv/kbusymanager.cpp
+++ b/ksysv/kbusymanager.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 class KBusyManager::Private
 {
diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp
index 59a5a3a..0c18b25 100644
--- a/ksysv/kscroller.cpp
+++ b/ksysv/kscroller.cpp
@@ -6,7 +6,7 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kscroller.h"
 
diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp
index ff59c0c..1c07d2a 100644
--- a/ksysv/ksv_conf.cpp
+++ b/ksysv/ksv_conf.cpp
@@ -13,7 +13,7 @@
  ***************************************************************************/
 // KSysV Config Object
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <tdemainwindow.h>
diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp
index 48eb9fd..547dd7c 100644
--- a/ksysv/ksv_core.cpp
+++ b/ksysv/ksv_core.cpp
@@ -15,7 +15,7 @@
 #include <tqpushbutton.h>
 #include <tqstylesheet.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kcompletion.h>
 #include <klocale.h>
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index eebe6fd..d9b2e95 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -44,7 +44,7 @@
 #include <tqcstring.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/ksysv/main.cpp b/ksysv/main.cpp
index f268265..e67e3f7 100644
--- a/ksysv/main.cpp
+++ b/ksysv/main.cpp
@@ -16,8 +16,8 @@
 
 #include <iostream>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index 887bb58..5ec4d7d 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -18,7 +18,7 @@
 #include <tqlabel.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index b9263b4..7f0ff15 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -25,7 +25,7 @@
 #include <tqvalidator.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
diff --git a/kuser/kglobal.cpp b/kuser/kglobal.cpp
index 201bdf7..287f475 100644
--- a/kuser/kglobal.cpp
+++ b/kuser/kglobal.cpp
@@ -18,7 +18,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
  
 #include "kglobal_.h"
 #include "kuserfiles.h"
diff --git a/kuser/kuser.kcfg b/kuser/kuser.kcfg
index 05b21c8..a35fa00 100644
--- a/kuser/kuser.kcfg
+++ b/kuser/kuser.kcfg
@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <include>tqfile.h</include>
-  <include>kapplication.h</include>
+  <include>tdeapplication.h</include>
   <include>config.h</include>
 
   <kcfgfile arg="true">
diff --git a/kuser/main.cpp b/kuser/main.cpp
index 4bc9186..56c3d92 100644
--- a/kuser/main.cpp
+++ b/kuser/main.cpp
@@ -21,11 +21,11 @@
 #include <tqfont.h>
 
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 #include "kglobal_.h"
diff --git a/kuser/misc.h b/kuser/misc.h
index b1f3f95..c3672b3 100644
--- a/kuser/misc.h
+++ b/kuser/misc.h
@@ -24,7 +24,7 @@
 #include <sys/time.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp
index 9597ef2..be98981 100644
--- a/kuser/selectconn.cpp
+++ b/kuser/selectconn.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index 9b443b1..f47bc21 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -32,7 +32,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqlayout.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <unistd.h>
 
 KControl::KControl(TQWidget *parent, const char *name)
diff --git a/secpolicy/main.cpp b/secpolicy/main.cpp
index 459e337..2a11b83 100644
--- a/secpolicy/main.cpp
+++ b/secpolicy/main.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <stdlib.h>
 
diff --git a/secpolicy/secpolicywin.cpp b/secpolicy/secpolicywin.cpp
index 14493dd..f3ad9ce 100644
--- a/secpolicy/secpolicywin.cpp
+++ b/secpolicy/secpolicywin.cpp
@@ -24,7 +24,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmenubar.h>
 #include <kdialog.h>
 #include <dcopclient.h>