From d1a3a8be39153e02cd555cb7e3bafcab2cb4530c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:54:15 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kcron/ctcron.cpp                                 | 4 ++--
 kcron/cti18n.h                                   | 2 +-
 kcron/ktapp.cpp                                  | 6 +++---
 kcron/kticon.cpp                                 | 2 +-
 kcron/ktlistcron.cpp                             | 2 +-
 kcron/ktlisttask.cpp                             | 2 +-
 kcron/ktlisttasks.cpp                            | 4 ++--
 kcron/ktlistvar.cpp                              | 2 +-
 kcron/ktlistvars.cpp                             | 4 ++--
 kcron/ktprint.cpp                                | 2 +-
 kcron/ktprintopt.cpp                             | 2 +-
 kcron/kttask.cpp                                 | 4 ++--
 kcron/ktvariable.cpp                             | 4 ++--
 kcron/ktview.cpp                                 | 4 ++--
 kcron/main.cpp                                   | 2 +-
 kdat/ArchiveInfoWidget.cpp                       | 2 +-
 kdat/BackupDlg.cpp                               | 4 ++--
 kdat/BackupOptDlg.cpp                            | 2 +-
 kdat/BackupProfileInfoWidget.cpp                 | 2 +-
 kdat/BackupProfileManager.cpp                    | 2 +-
 kdat/BackupProfileWidget.cpp                     | 2 +-
 kdat/ErrorHandler.cpp                            | 4 ++--
 kdat/FileInfoWidget.cpp                          | 4 ++--
 kdat/FormatOptDlg.cpp                            | 4 ++--
 kdat/ImageCache.cpp                              | 2 +-
 kdat/IndexDlg.cpp                                | 4 ++--
 kdat/KDatMainWindow.cpp                          | 8 ++++----
 kdat/LoggerWidget.cpp                            | 4 ++--
 kdat/Node.cpp                                    | 2 +-
 kdat/OptionsDlg.cpp                              | 4 ++--
 kdat/OptionsDlgWidget.ui                         | 4 ++--
 kdat/Tape.cpp                                    | 4 ++--
 kdat/TapeDrive.cpp                               | 4 ++--
 kdat/TapeFileInfoWidget.cpp                      | 2 +-
 kdat/TapeInfoWidget.cpp                          | 4 ++--
 kdat/TapeManager.cpp                             | 2 +-
 kdat/Util.cpp                                    | 4 ++--
 kdat/VerifyDlg.cpp                               | 2 +-
 kdat/VerifyOptDlg.cpp                            | 2 +-
 kdat/main.cpp                                    | 4 ++--
 knetworkconf/knetworkconf/kadddevicecontainer.h  | 4 ++--
 knetworkconf/knetworkconf/kadddnsserverdlg.ui.h  | 2 +-
 knetworkconf/knetworkconf/kaddknownhostdlg.ui.h  | 2 +-
 knetworkconf/knetworkconf/knetworkconf.h         | 4 ++--
 knetworkconf/knetworkconf/knetworkconfigparser.h | 4 ++--
 knetworkconf/knetworkconf/knetworkconfmodule.cpp | 2 +-
 knetworkconf/knetworkconf/main.cpp               | 6 +++---
 kpackage/cache.cpp                               | 2 +-
 kpackage/debAptInterface.cpp                     | 2 +-
 kpackage/debDpkgInterface.cpp                    | 4 ++--
 kpackage/debInterface.cpp                        | 4 ++--
 kpackage/fbsdInterface.cpp                       | 4 ++--
 kpackage/findf.cpp                               | 2 +-
 kpackage/findf.h                                 | 2 +-
 kpackage/gentooInterface.cpp                     | 2 +-
 kpackage/kissInterface.cpp                       | 4 ++--
 kpackage/kpTerm.cpp                              | 2 +-
 kpackage/kpTerm.h                                | 2 +-
 kpackage/kpackage.cpp                            | 4 ++--
 kpackage/kplview.cpp                             | 2 +-
 kpackage/main.cpp                                | 4 ++--
 kpackage/managementWidget.cpp                    | 2 +-
 kpackage/options.cpp                             | 2 +-
 kpackage/packageDisplay.cpp                      | 4 ++--
 kpackage/packageInfo.cpp                         | 4 ++--
 kpackage/packageProperties.h                     | 2 +-
 kpackage/pkgInterface.cpp                        | 4 ++--
 kpackage/pkgInterface.h                          | 2 +-
 kpackage/pkgOptions.cpp                          | 6 +++---
 kpackage/procbuf.cpp                             | 2 +-
 kpackage/rpmInterface.cpp                        | 4 ++--
 kpackage/search.cpp                              | 2 +-
 kpackage/search.h                                | 2 +-
 kpackage/slackInterface.cpp                      | 4 ++--
 kpackage/updateLoc.cpp                           | 4 ++--
 kpackage/utils.cpp                               | 4 ++--
 ksysv/IOCore.cpp                                 | 2 +-
 ksysv/OldView.cpp                                | 6 +++---
 ksysv/PreferencesDialog.cpp                      | 4 ++--
 ksysv/Properties.cpp                             | 2 +-
 ksysv/RunlevelAuthIcon.cpp                       | 2 +-
 ksysv/ServiceDlg.cpp                             | 2 +-
 ksysv/TopWidget.cpp                              | 8 ++++----
 ksysv/configwizard.ui                            | 2 +-
 ksysv/ksv_conf.cpp                               | 4 ++--
 ksysv/ksv_core.cpp                               | 6 +++---
 ksysv/ksvdraglist.cpp                            | 4 ++--
 ksysv/lookandfeelconfig.ui                       | 2 +-
 ksysv/main.cpp                                   | 4 ++--
 ksysv/miscconfig.ui                              | 2 +-
 ksysv/pathconfig.ui                              | 2 +-
 ksysv/trash.cpp                                  | 4 ++--
 kuser/Makefile.am                                | 2 +-
 kuser/addUser.cpp                                | 2 +-
 kuser/delUser.cpp                                | 2 +-
 kuser/editDefaults.cpp                           | 6 +++---
 kuser/editDefaults.h                             | 2 +-
 kuser/editGroup.cpp                              | 4 ++--
 kuser/kgroupfiles.cpp                            | 2 +-
 kuser/kgroupldap.cpp                             | 2 +-
 kuser/kgroupldap.h                               | 4 ++--
 kuser/kgroupsystem.cpp                           | 2 +-
 kuser/kuser.cpp                                  | 2 +-
 kuser/kuserfiles.cpp                             | 2 +-
 kuser/kuserldap.cpp                              | 2 +-
 kuser/kuserldap.h                                | 4 ++--
 kuser/kusersystem.cpp                            | 2 +-
 kuser/main.cpp                                   | 2 +-
 kuser/mainView.cpp                               | 2 +-
 kuser/mainWidget.cpp                             | 2 +-
 kuser/misc.cpp                                   | 2 +-
 kuser/misc.h                                     | 2 +-
 kuser/propdlg.cpp                                | 2 +-
 kuser/pwddlg.cpp                                 | 2 +-
 kuser/selectconn.cpp                             | 4 ++--
 lilo-config/kde-qt-common/ui.h                   | 4 ++--
 lilo-config/kde/kcontrol.cpp                     | 4 ++--
 secpolicy/main.cpp                               | 2 +-
 secpolicy/pamview.cpp                            | 6 +++---
 secpolicy/secpolicywin.cpp                       | 6 +++---
 tdefile-plugins/deb/tdefile_deb.cpp              | 2 +-
 121 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp
index 538ec34..6dbbad5 100644
--- a/kcron/ctcron.cpp
+++ b/kcron/ctcron.cpp
@@ -25,8 +25,8 @@
 #include <tqfile.h>
 
 #include <kprocess.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 #include <iostream>
 
diff --git a/kcron/cti18n.h b/kcron/cti18n.h
index 2c79e1a..7cea13a 100644
--- a/kcron/cti18n.h
+++ b/kcron/cti18n.h
@@ -21,7 +21,7 @@
 // Regardless, please don't introduce any other TQt or KDE dependencies here.
 // -GM 11/99
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #endif // CTI18N_H
diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp
index 9b70f87..6db4cb3 100644
--- a/kcron/ktapp.cpp
+++ b/kcron/ktapp.cpp
@@ -10,12 +10,12 @@
  ***************************************************************************/
 
 #include "ktapp.h"
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdestdaccel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>       // i18n()
+#include <tdelocale.h>       // i18n()
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
diff --git a/kcron/kticon.cpp b/kcron/kticon.cpp
index ef6b861..479d697 100644
--- a/kcron/kticon.cpp
+++ b/kcron/kticon.cpp
@@ -13,7 +13,7 @@
  
 #include <tqimage.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 TQPixmap KTIcon::getMiniIcon(const TQString& name)
diff --git a/kcron/ktlistcron.cpp b/kcron/ktlistcron.cpp
index 9379c3d..1a78c96 100644
--- a/kcron/ktlistcron.cpp
+++ b/kcron/ktlistcron.cpp
@@ -12,7 +12,7 @@
 #include "ktlistcron.h"
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ctcron.h"
 
diff --git a/kcron/ktlisttask.cpp b/kcron/ktlisttask.cpp
index 17a1378..e86b497 100644
--- a/kcron/ktlisttask.cpp
+++ b/kcron/ktlisttask.cpp
@@ -9,7 +9,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>  // i18n()
+#include <tdelocale.h>  // i18n()
 
 #include "cttask.h"
 
diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp
index 9be9231..65e909b 100644
--- a/kcron/ktlisttasks.cpp
+++ b/kcron/ktlisttasks.cpp
@@ -13,8 +13,8 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>  // i18n()
-#include <kglobalsettings.h>
+#include <tdelocale.h>  // i18n()
+#include <tdeglobalsettings.h>
 
 #include "ctcron.h"
 #include "cttask.h"
diff --git a/kcron/ktlistvar.cpp b/kcron/ktlistvar.cpp
index e6c4f6a..3805658 100644
--- a/kcron/ktlistvar.cpp
+++ b/kcron/ktlistvar.cpp
@@ -12,7 +12,7 @@
 #include "ktlistvar.h"
 #include "ktprint.h"
 
-#include <klocale.h>  // i18n()
+#include <tdelocale.h>  // i18n()
 
 #include "ctvariable.h"
 
diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp
index f5ccf95..1369507 100644
--- a/kcron/ktlistvars.cpp
+++ b/kcron/ktlistvars.cpp
@@ -14,8 +14,8 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>  // i18n()
-#include <kglobalsettings.h>
+#include <tdelocale.h>  // i18n()
+#include <tdeglobalsettings.h>
 
 #include "ctcron.h"
 #include "ctvariable.h"
diff --git a/kcron/ktprint.cpp b/kcron/ktprint.cpp
index b1de5c6..56d7070 100644
--- a/kcron/ktprint.cpp
+++ b/kcron/ktprint.cpp
@@ -16,7 +16,7 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <ktprintopt.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ktprint.h"
 
 const int KTPrint::alignTextLeft             (1000);
diff --git a/kcron/ktprintopt.cpp b/kcron/ktprintopt.cpp
index d7c1d87..a6a12c6 100644
--- a/kcron/ktprintopt.cpp
+++ b/kcron/ktprintopt.cpp
@@ -16,7 +16,7 @@
 
 #include <kdialog.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include "ktprintopt.h"
 
diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index 0ede639..b0e3cce 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -23,9 +23,9 @@
 
 #include <tdeapplication.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp
index 9c9f9c4..34b35ee 100644
--- a/kcron/ktvariable.cpp
+++ b/kcron/ktvariable.cpp
@@ -14,8 +14,8 @@
 #include <tqlayout.h>
 
 #include <tdeapplication.h>     // kapp
-#include <klocale.h>  // i18n()
-#include <kmessagebox.h>
+#include <tdelocale.h>  // i18n()
+#include <tdemessagebox.h>
 #include <ktextedit.h>
 
 #include "ctvariable.h"
diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp
index 0000bc7..2cab70b 100644
--- a/kcron/ktview.cpp
+++ b/kcron/ktview.cpp
@@ -32,8 +32,8 @@
 #include <tqdatetime.h>
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include "cthost.h"
 #include "ctcron.h"
diff --git a/kcron/main.cpp b/kcron/main.cpp
index b829473..a9358e6 100644
--- a/kcron/main.cpp
+++ b/kcron/main.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ktapp.h"
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp
index 2cf2fa3..c28d49f 100644
--- a/kdat/ArchiveInfoWidget.cpp
+++ b/kdat/ArchiveInfoWidget.cpp
@@ -31,7 +31,7 @@
 #include "Options.h"
 #include "Tape.h"
 #include "Util.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ArchiveInfoWidget.moc"
 
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index abb554d..381bcf7 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -33,7 +33,7 @@
 
 #include <tdeapplication.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
@@ -45,7 +45,7 @@
 #include "TapeDrive.h"
 #include "TarParser.h"
 #include "Util.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "BackupDlg.moc"
 
diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp
index 4bb8c72..23dc6d2 100644
--- a/kdat/BackupOptDlg.cpp
+++ b/kdat/BackupOptDlg.cpp
@@ -26,7 +26,7 @@
 
 #include "BackupOptDlg.h"
 #include "BackupProfileWidget.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "BackupOptDlg.moc"
 
diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp
index 71b4e7c..3b347d3 100644
--- a/kdat/BackupProfileInfoWidget.cpp
+++ b/kdat/BackupProfileInfoWidget.cpp
@@ -32,7 +32,7 @@
 #include "BackupProfileWidget.h"
 #include "KDatMainWindow.h"
 #include "Options.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "BackupProfileInfoWidget.moc"
 
diff --git a/kdat/BackupProfileManager.cpp b/kdat/BackupProfileManager.cpp
index eebf88b..1432169 100644
--- a/kdat/BackupProfileManager.cpp
+++ b/kdat/BackupProfileManager.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "BackupProfileManager.h"
diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp
index b7600ea..2675adf 100644
--- a/kdat/BackupProfileWidget.cpp
+++ b/kdat/BackupProfileWidget.cpp
@@ -29,7 +29,7 @@
 #include "BackupProfile.h"
 #include "BackupProfileWidget.h"
 #include "Util.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "BackupProfileWidget.moc"
 
diff --git a/kdat/ErrorHandler.cpp b/kdat/ErrorHandler.cpp
index d20e347..5f31028 100644
--- a/kdat/ErrorHandler.cpp
+++ b/kdat/ErrorHandler.cpp
@@ -18,9 +18,9 @@
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 //#include <kstandarddirs.h>
 //#include <tdeapplication.h>
 
diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp
index 144505b..7a6fb3a 100644
--- a/kdat/FileInfoWidget.cpp
+++ b/kdat/FileInfoWidget.cpp
@@ -28,8 +28,8 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "FileInfoWidget.h"
 #include "Util.h"
diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp
index 8f3e06e..14be994 100644
--- a/kdat/FormatOptDlg.cpp
+++ b/kdat/FormatOptDlg.cpp
@@ -26,8 +26,8 @@
 #include <kstdguiitem.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "Options.h"
 #include "FormatOptDlg.h"
diff --git a/kdat/ImageCache.cpp b/kdat/ImageCache.cpp
index b155392..c645cb6 100644
--- a/kdat/ImageCache.cpp
+++ b/kdat/ImageCache.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <tqpixmap.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "ImageCache.h"
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index f9fc6c7..4c9ff2f 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -27,8 +27,8 @@
 #include <kstdguiitem.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "LoggerWidget.h"
 #include "Options.h"
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index cb4d6ff..2ef0f76 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -31,12 +31,12 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
@@ -67,7 +67,7 @@
 #include "VerifyOptDlg.h"
 #include "kdat.h"
 #include "ktreeview.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqsplitter.h>
 #include <kstatusbar.h>
 
diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp
index 0a9e665..3df963c 100644
--- a/kdat/LoggerWidget.cpp
+++ b/kdat/LoggerWidget.cpp
@@ -24,8 +24,8 @@
 #include <tdefiledialog.h>
 
 #include "LoggerWidget.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "LoggerWidget.moc"
 
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index 67de62f..e8322e2 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -36,7 +36,7 @@
 #include "Range.h"
 #include "Tape.h"
 #include "TapeManager.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Node.moc"
 
diff --git a/kdat/OptionsDlg.cpp b/kdat/OptionsDlg.cpp
index ca6a029..3f29fae 100644
--- a/kdat/OptionsDlg.cpp
+++ b/kdat/OptionsDlg.cpp
@@ -30,8 +30,8 @@
 #include <klineedit.h>
 #include <knuminput.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "OptionsDlg.moc"
 OptionsDlg::OptionsDlg( TQWidget* parent, const char* name )
diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index e371adf..b157424 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -365,8 +365,8 @@ You must still specify the block size.</string>
 <includes>
     <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>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdeglobal.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">OptionsDlgWidget.ui.h</include>
 </includes>
diff --git a/kdat/Tape.cpp b/kdat/Tape.cpp
index 7a03c6a..e3b4b1a 100644
--- a/kdat/Tape.cpp
+++ b/kdat/Tape.cpp
@@ -24,8 +24,8 @@
 
 #include <tqfile.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/kdat/TapeDrive.cpp b/kdat/TapeDrive.cpp
index e6b18ff..6fb1777 100644
--- a/kdat/TapeDrive.cpp
+++ b/kdat/TapeDrive.cpp
@@ -26,9 +26,9 @@
 
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "KDatMainWindow.h"
 #include "Options.h"
diff --git a/kdat/TapeFileInfoWidget.cpp b/kdat/TapeFileInfoWidget.cpp
index 033edc1..36a4581 100644
--- a/kdat/TapeFileInfoWidget.cpp
+++ b/kdat/TapeFileInfoWidget.cpp
@@ -26,7 +26,7 @@
 #include "File.h"
 #include "TapeFileInfoWidget.h"
 #include "Util.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "TapeFileInfoWidget.moc"
 
diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index 35f5050..b0e8199 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -25,8 +25,8 @@
 #include <tqlineedit.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kdat/TapeManager.cpp b/kdat/TapeManager.cpp
index 386627d..b3fa058 100644
--- a/kdat/TapeManager.cpp
+++ b/kdat/TapeManager.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqfile.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "TapeManager.h"
diff --git a/kdat/Util.cpp b/kdat/Util.cpp
index b52f984..428d714 100644
--- a/kdat/Util.cpp
+++ b/kdat/Util.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <tqstringlist.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "Util.h"
 
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index 5f2681e..c43fa00 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -30,7 +30,7 @@
 
 #include <tdeapplication.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp
index 795cf02..499027b 100644
--- a/kdat/VerifyOptDlg.cpp
+++ b/kdat/VerifyOptDlg.cpp
@@ -29,7 +29,7 @@
 #include <kstdguiitem.h>
 
 #include "VerifyOptDlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "VerifyOptDlg.moc"
 
diff --git a/kdat/main.cpp b/kdat/main.cpp
index c6c89f8..a2d55ea 100644
--- a/kdat/main.cpp
+++ b/kdat/main.cpp
@@ -26,11 +26,11 @@
 #include <tqdir.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kcrash.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <signal.h>
 
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h
index 4491991..80e954e 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.h
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.h
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include "kadddevicedlg.h"
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
index dd6057f..3eba8a6 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 #include "kaddressvalidator.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 bool _modified2;
 bool addingAlias;
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
index 1ace4eb..bbf6e8f 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
@@ -9,7 +9,7 @@
 #include "kaddressvalidator.h"
 #include "kadddnsserverdlg.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 bool _modifiedhost;
 
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index ee7e08a..b215847 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -48,9 +48,9 @@
 #include <klineedit.h>
 #include <tdelistbox.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaboutapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h
index 8e95737..461241d 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.h
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.h
@@ -31,8 +31,8 @@
 #include <stdlib.h>
 
 #include <kapp.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqobject.h>
 #include <tqdir.h>
 #include <tqfile.h>
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
index 93a930c..f2e7e8d 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmodule.h>
 #include <tqlayout.h> 
 #include <version.h>
diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp
index 1a6b89e..8411d76 100644
--- a/knetworkconf/knetworkconf/main.cpp
+++ b/knetworkconf/knetworkconf/main.cpp
@@ -16,13 +16,13 @@
  ***************************************************************************/
 #include <unistd.h>
 #include <sys/types.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kuniqueapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
 
 //#include "knetworkconf.h"
diff --git a/kpackage/cache.cpp b/kpackage/cache.cpp
index 69ef37b..bcd45e0 100644
--- a/kpackage/cache.cpp
+++ b/kpackage/cache.cpp
@@ -31,7 +31,7 @@
 #include "kpackage.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 extern Opts *opts;
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index b673b4f..d3451b7 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -27,7 +27,7 @@
 #include "../config.h"
 #include <stdlib.h>
 
-#include "klocale.h"
+#include "tdelocale.h"
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdebug.h>
diff --git a/kpackage/debDpkgInterface.cpp b/kpackage/debDpkgInterface.cpp
index 62f199a..cb58908 100644
--- a/kpackage/debDpkgInterface.cpp
+++ b/kpackage/debDpkgInterface.cpp
@@ -35,7 +35,7 @@
 #include <iostream>
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -47,7 +47,7 @@
 #include "utils.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 extern TDEApplication *app;
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index 70acb23..dddbe4f 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -35,7 +35,7 @@
 #include <iostream>
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -47,7 +47,7 @@
 #include "utils.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern TDEApplication *app;
 
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 167ec1b..b6d3605 100644
--- a/kpackage/fbsdInterface.cpp
+++ b/kpackage/fbsdInterface.cpp
@@ -37,8 +37,8 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp
index 6712d4b..bcb936f 100644
--- a/kpackage/findf.cpp
+++ b/kpackage/findf.cpp
@@ -29,7 +29,7 @@
 #include <tqlineedit.h>
 #include <tqpainter.h> 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
diff --git a/kpackage/findf.h b/kpackage/findf.h
index 77cd5fb..44bd9cd 100644
--- a/kpackage/findf.h
+++ b/kpackage/findf.h
@@ -45,7 +45,7 @@
 
 // KDE headers
 #include <tdeapplication.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdelistview.h>
 #include <kdialogbase.h>
 
diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp
index 448b74c..9e02035 100644
--- a/kpackage/gentooInterface.cpp
+++ b/kpackage/gentooInterface.cpp
@@ -23,7 +23,7 @@
 #include "kpackage.h"
 #include "cache.h"
 #include "kpTerm.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kfilterdev.h>
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index e98d385..a882d5f 100644
--- a/kpackage/kissInterface.cpp
+++ b/kpackage/kissInterface.cpp
@@ -38,7 +38,7 @@
 #include <tqfileinfo.h>
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "packageInfo.h"
@@ -49,7 +49,7 @@
 #include "utils.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 extern TDEApplication *app;
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index aaaae29..4f49dc4 100644
--- a/kpackage/kpTerm.cpp
+++ b/kpackage/kpTerm.cpp
@@ -29,7 +29,7 @@
 
 #include <tqvbox.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 
 #include <kpTerm.h>
diff --git a/kpackage/kpTerm.h b/kpackage/kpTerm.h
index 0f63dfd..66b7bea 100644
--- a/kpackage/kpTerm.h
+++ b/kpackage/kpTerm.h
@@ -36,7 +36,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kpackage.h>
 #include <kpPty.h>
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 66e2663..2ba15bf 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -43,9 +43,9 @@
 #include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
diff --git a/kpackage/kplview.cpp b/kpackage/kplview.cpp
index afd03f0..3c38fa6 100644
--- a/kpackage/kplview.cpp
+++ b/kpackage/kplview.cpp
@@ -30,7 +30,7 @@
 #include <tqheader.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // kpackage.headers
 #include "kpackage.h"
diff --git a/kpackage/main.cpp b/kpackage/main.cpp
index dbe2e33..396fe7b 100644
--- a/kpackage/main.cpp
+++ b/kpackage/main.cpp
@@ -36,8 +36,8 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <options.h>
 
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index 8856276..649d24e 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -32,7 +32,7 @@
 #include <tqsplitter.h>
 #include <tqtoolbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdelistviewsearchline.h>
 #include <tdeaction.h>
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index 41b2377..3edf36f 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -34,7 +34,7 @@
 
 #include <tqvbox.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
 #include <tqframe.h>
diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp
index f416f21..57d1ed7 100644
--- a/kpackage/packageDisplay.cpp
+++ b/kpackage/packageDisplay.cpp
@@ -39,7 +39,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <krun.h>
 #include <kopenwith.h>
 
@@ -50,7 +50,7 @@
 #include "pkgInterface.h"
 #include "utils.h"
 #include "options.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern Opts *opts;
 
diff --git a/kpackage/packageInfo.cpp b/kpackage/packageInfo.cpp
index b5a3a52..7dcbf9f 100644
--- a/kpackage/packageInfo.cpp
+++ b/kpackage/packageInfo.cpp
@@ -40,8 +40,8 @@
 #include <ctype.h>
 
 // KDE headers
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // kpackage headers
diff --git a/kpackage/packageProperties.h b/kpackage/packageProperties.h
index 4b332c1..75a6ee8 100644
--- a/kpackage/packageProperties.h
+++ b/kpackage/packageProperties.h
@@ -41,7 +41,7 @@
 #include <tqregexp.h>
 
 // KDE Headers
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextbrowser.h>
 
 // kpackage Headers
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index f5f31dc..c32bef4 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -24,8 +24,8 @@
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/kpackage/pkgInterface.h b/kpackage/pkgInterface.h
index 8b4c779..05d4089 100644
--- a/kpackage/pkgInterface.h
+++ b/kpackage/pkgInterface.h
@@ -33,7 +33,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "packageInfo.h"
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index b17d9f5..acf9c4f 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -29,9 +29,9 @@
 // qt headers
 #include <tqlabel.h>
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdelistview.h>
 #include <kseparator.h>
 #include <kdebug.h>
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 8da355a..122bf18 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -28,7 +28,7 @@
 #include "procbuf.h"
 #include <kprocess.h>
 #include "kpackage.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <kdebug.h>
 
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index 8096a78..a881c44 100644
--- a/kpackage/rpmInterface.cpp
+++ b/kpackage/rpmInterface.cpp
@@ -32,8 +32,8 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "kpPty.h"
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index a2cf9ff..aeab3ee 100644
--- a/kpackage/search.cpp
+++ b/kpackage/search.cpp
@@ -29,7 +29,7 @@
 #include "kpackage.h"
 #include "managementWidget.h"
 #include "search.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
diff --git a/kpackage/search.h b/kpackage/search.h
index 5af5b0b..0fc2b4d 100644
--- a/kpackage/search.h
+++ b/kpackage/search.h
@@ -40,7 +40,7 @@ class TQCheckBox;
 
 // KDE headers
 #include <tdeapplication.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kdialogbase.h>
 
 class Search : public KDialogBase
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index 33120c2..84e07a6 100644
--- a/kpackage/slackInterface.cpp
+++ b/kpackage/slackInterface.cpp
@@ -39,7 +39,7 @@
 #include <tqregexp.h>
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -52,7 +52,7 @@
 #include "procbuf.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #define DIR "/var/log/packages/"
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 9338a3d..4bee494 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -34,8 +34,8 @@
 
 #include <tqvbox.h>
 #include <tqscrollview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/kpackage/utils.cpp b/kpackage/utils.cpp
index 679b037..a4ca350 100644
--- a/kpackage/utils.cpp
+++ b/kpackage/utils.cpp
@@ -26,8 +26,8 @@
 
 #include "../config.h"
 #include <kpackage.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "utils.h"
 #include "kplview.h"
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 2ca3f34..0520706 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimemagic.h>
 #include <kservice.h>
 #include <kuserprofile.h>
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index fc99e4a..7adc21c 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -48,9 +48,9 @@
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <kdirwatch.h>
diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp
index 524510e..8189924 100644
--- a/ksysv/PreferencesDialog.cpp
+++ b/ksysv/PreferencesDialog.cpp
@@ -11,12 +11,12 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kcolorbutton.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "ksv_conf.h"
 // #include "ksvcolorconfig.h"
diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp
index aee06bf..6b7b378 100644
--- a/ksysv/Properties.cpp
+++ b/ksysv/Properties.cpp
@@ -10,7 +10,7 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 
diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp
index bac5b30..6199e16 100644
--- a/ksysv/RunlevelAuthIcon.cpp
+++ b/ksysv/RunlevelAuthIcon.cpp
@@ -8,7 +8,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ksv_core.h"
 #include "RunlevelAuthIcon.h"
diff --git a/ksysv/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp
index 64fec66..4721cb6 100644
--- a/ksysv/ServiceDlg.cpp
+++ b/ksysv/ServiceDlg.cpp
@@ -19,7 +19,7 @@
 #include <tqstring.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbuttonbox.h>
 
 #include "ksvdraglist.h"
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 1479af6..6ca4157 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -54,16 +54,16 @@
 #include <kresolver.h>
 #include <tdetoolbar.h>
 #include <kkeydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kcompletion.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <khelpmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <kedittoolbar.h>
 #include <kiconloader.h>
diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui
index 2594b01..ce58190 100644
--- a/ksysv/configwizard.ui
+++ b/ksysv/configwizard.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI>
 <class>ConfigWizard</class>
 <author>Peter Putzer</author>
-<include location="global">klocale.h</include>
+<include location="global">tdelocale.h</include>
 <pixmapfunction>DesktopIcon</pixmapfunction>
 <widget>
     <class>TQWizard</class>
diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp
index 1c07d2a..dfe13fd 100644
--- a/ksysv/ksv_conf.cpp
+++ b/ksysv/ksv_conf.cpp
@@ -14,8 +14,8 @@
 // KSysV Config Object
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdemainwindow.h>
 #include <tdeconfig.h>
 
diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp
index 547dd7c..caf0dfe 100644
--- a/ksysv/ksv_core.cpp
+++ b/ksysv/ksv_core.cpp
@@ -16,10 +16,10 @@
 #include <tqstylesheet.h>
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcompletion.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "ksv_conf.h"
 #include "ksvdraglist.h"
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index d9b2e95..4401a01 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -46,8 +46,8 @@
 
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kdltooltip.h"
diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui
index 9a902a5..1deec4b 100644
--- a/ksysv/lookandfeelconfig.ui
+++ b/ksysv/lookandfeelconfig.ui
@@ -488,7 +488,7 @@
     <tabstop>mChangedSelected</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="protected">chooseNumberFont()</slot>
diff --git a/ksysv/main.cpp b/ksysv/main.cpp
index e67e3f7..f7e4df2 100644
--- a/ksysv/main.cpp
+++ b/ksysv/main.cpp
@@ -18,8 +18,8 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "ksvapplication.h"
diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui
index ca19113..3ee6b0f 100644
--- a/ksysv/miscconfig.ui
+++ b/ksysv/miscconfig.ui
@@ -177,7 +177,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="protected">slotChanged()</slot>
diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui
index 78ed2c2..6f2a263 100644
--- a/ksysv/pathconfig.ui
+++ b/ksysv/pathconfig.ui
@@ -278,7 +278,7 @@
     <tabstop>mBrowseRunlevel</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index 5ec4d7d..dcd4a88 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -20,8 +20,8 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "ksvdraglist.h"
diff --git a/kuser/Makefile.am b/kuser/Makefile.am
index 6b1222a..af78434 100644
--- a/kuser/Makefile.am
+++ b/kuser/Makefile.am
@@ -14,7 +14,7 @@ kuser_SOURCES	=	\
 	kuser.cpp kgroup.cpp main.cpp mainView.cpp \
 	propdlg.cpp misc.cpp pwddlg.cpp \
 	addUser.cpp editDefaults.cpp \
-	kglobal.cpp sid.cpp\
+	tdeglobal.cpp sid.cpp\
 	kuserfiles.cpp kgroupfiles.cpp kuserldap.cpp kgroupldap.cpp \
 	kusersystem.cpp kgroupsystem.cpp selectconn.cpp\
 	sha1.cpp kuserprefs.kcfgc \
diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 24181b9..06f716a 100644
--- a/kuser/addUser.cpp
+++ b/kuser/addUser.cpp
@@ -35,7 +35,7 @@
 #include "misc.h"
 
 #include "addUser.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 addUser::addUser( KU::KUser *AUser, bool useprivategroup,
   TQWidget *parent, const char *name ) :
diff --git a/kuser/delUser.cpp b/kuser/delUser.cpp
index b1ee7e0..800c88c 100644
--- a/kuser/delUser.cpp
+++ b/kuser/delUser.cpp
@@ -22,7 +22,7 @@
 #include <tqvbox.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 delUser::delUser(KU::KUser *AUser, TQWidget *parent, const char *name) 
  : KDialogBase( parent, name, true, i18n("Delete User"),
diff --git a/kuser/editDefaults.cpp b/kuser/editDefaults.cpp
index 5b4b7c8..7b77f4f 100644
--- a/kuser/editDefaults.cpp
+++ b/kuser/editDefaults.cpp
@@ -22,12 +22,12 @@
 
 #include <ktabwidget.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
-#include <kabc/ldapconfigwidget.h>
-#include <kabc/ldapurl.h>
+#include <tdeabc/ldapconfigwidget.h>
+#include <tdeabc/ldapurl.h>
 
 #include "editDefaults.h"
 #include "generalsettings.h"
diff --git a/kuser/editDefaults.h b/kuser/editDefaults.h
index 0c39f67..90d37e7 100644
--- a/kuser/editDefaults.h
+++ b/kuser/editDefaults.h
@@ -24,7 +24,7 @@
 #include <tqmemarray.h>
 #include <tdeconfigdialog.h>
 #include <kprogress.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldif.h>
 #include "ldapsamba.h"
 
 class LdapSamba;
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index 7f0ff15..c9ca5a3 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -26,10 +26,10 @@
 #include <tqwhatsthis.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kglobal_.h"
 #include "editGroup.h"
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index 8285d02..b827a89 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -36,7 +36,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kglobal_.h"
 #include "kgroupfiles.h"
diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp
index 80e6cf8..2419c23 100644
--- a/kuser/kgroupldap.cpp
+++ b/kuser/kgroupldap.cpp
@@ -20,7 +20,7 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kglobal_.h"
 #include "kgroupldap.h"
diff --git a/kuser/kgroupldap.h b/kuser/kgroupldap.h
index 6695619..120eed1 100644
--- a/kuser/kgroupldap.h
+++ b/kuser/kgroupldap.h
@@ -26,8 +26,8 @@
 #include <tqptrlist.h>
 
 #include <kprogress.h>
-#include <kabc/ldapurl.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldapurl.h>
+#include <tdeabc/ldif.h>
 #include <tdeio/job.h>
 
 #include "kgroup.h"
diff --git a/kuser/kgroupsystem.cpp b/kuser/kgroupsystem.cpp
index f30176f..63473ab 100644
--- a/kuser/kgroupsystem.cpp
+++ b/kuser/kgroupsystem.cpp
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kglobal_.h"
 #include "kgroupsystem.h"
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index c1abe52..d0d7f4d 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -38,7 +38,7 @@
 #include "kuser.h"
 #include "misc.h"
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index 5ccfe58..4cf59c8 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -41,7 +41,7 @@
 #include "kuserfiles.h"
 #include "misc.h"
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include "editDefaults.h"
 
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index c274031..e6378d8 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/tdentlm.h>
 
 #include "kglobal_.h"
diff --git a/kuser/kuserldap.h b/kuser/kuserldap.h
index e39c131..445cfb7 100644
--- a/kuser/kuserldap.h
+++ b/kuser/kuserldap.h
@@ -26,8 +26,8 @@
 #include <tqptrlist.h>
 
 #include <kprogress.h>
-#include <kabc/ldapurl.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldapurl.h>
+#include <tdeabc/ldif.h>
 #include <tdeio/job.h>
 
 #include "kuser.h"
diff --git a/kuser/kusersystem.cpp b/kuser/kusersystem.cpp
index 8c67fcb..89a0c7d 100644
--- a/kuser/kusersystem.cpp
+++ b/kuser/kusersystem.cpp
@@ -27,7 +27,7 @@
 
 #include <tqstring.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "kglobal_.h"
diff --git a/kuser/main.cpp b/kuser/main.cpp
index 56c3d92..af623ce 100644
--- a/kuser/main.cpp
+++ b/kuser/main.cpp
@@ -23,7 +23,7 @@
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp
index fc2d32a..eae6ef8 100644
--- a/kuser/mainView.cpp
+++ b/kuser/mainView.cpp
@@ -28,7 +28,7 @@
 #include <kinputdialog.h>
 #include <tdetoolbar.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "misc.h"
diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp
index fd46949..a306a6d 100644
--- a/kuser/mainWidget.cpp
+++ b/kuser/mainWidget.cpp
@@ -24,7 +24,7 @@
 #include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 
 #include <kdebug.h>
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index c16f563..84ffa81 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -30,7 +30,7 @@
 #endif
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "misc.h"
 #include "kglobal_.h"
diff --git a/kuser/misc.h b/kuser/misc.h
index c3672b3..4f5ca9a 100644
--- a/kuser/misc.h
+++ b/kuser/misc.h
@@ -23,7 +23,7 @@
 
 #include <sys/time.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqwidget.h>
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index 8ce7e6a..3e82282 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -28,7 +28,7 @@
 #include <tqfile.h>
 
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqvalidator.h>
diff --git a/kuser/pwddlg.cpp b/kuser/pwddlg.cpp
index 631c860..0989afc 100644
--- a/kuser/pwddlg.cpp
+++ b/kuser/pwddlg.cpp
@@ -20,7 +20,7 @@
 
 #include <tqgrid.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "pwddlg.h"
 #include "misc.h"
diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp
index be98981..30066f0 100644
--- a/kuser/selectconn.cpp
+++ b/kuser/selectconn.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 
 #include "kglobal_.h"
diff --git a/lilo-config/kde-qt-common/ui.h b/lilo-config/kde-qt-common/ui.h
index 1fb2573..b35a07d 100644
--- a/lilo-config/kde-qt-common/ui.h
+++ b/lilo-config/kde-qt-common/ui.h
@@ -33,8 +33,8 @@
 #define _UI_H
 
 #ifdef USE_KDE
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <ktabctl.h>
 #include <kdialog.h>
 #include <tdefiledialog.h>
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index f47bc21..bcce8aa 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -29,8 +29,8 @@
 #include "kcontrol.moc"
 #include <mainwidget.h>
 #include <ui.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tdeaboutdata.h>
 #include <unistd.h>
diff --git a/secpolicy/main.cpp b/secpolicy/main.cpp
index 2a11b83..7f5a8ee 100644
--- a/secpolicy/main.cpp
+++ b/secpolicy/main.cpp
@@ -24,7 +24,7 @@
 
 #include <kuniqueapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 #include "secpolicywin.h"
diff --git a/secpolicy/pamview.cpp b/secpolicy/pamview.cpp
index 869855b..45116c8 100644
--- a/secpolicy/pamview.cpp
+++ b/secpolicy/pamview.cpp
@@ -31,9 +31,9 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "ppitem.h"
 #include "pamview.h"
diff --git a/secpolicy/secpolicywin.cpp b/secpolicy/secpolicywin.cpp
index f3ad9ce..60ec46a 100644
--- a/secpolicy/secpolicywin.cpp
+++ b/secpolicy/secpolicywin.cpp
@@ -22,10 +22,10 @@
  *
  */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kdialog.h>
 #include <dcopclient.h>
 #include <tqpopupmenu.h>
diff --git a/tdefile-plugins/deb/tdefile_deb.cpp b/tdefile-plugins/deb/tdefile_deb.cpp
index 0fb86ee..0b868d6 100644
--- a/tdefile-plugins/deb/tdefile_deb.cpp
+++ b/tdefile-plugins/deb/tdefile_deb.cpp
@@ -20,7 +20,7 @@
 #include <config.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
-- 
cgit v1.2.3