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

---
 kcontrol/access/kaccess.cpp                           | 6 +++---
 kcontrol/arts/arts.cpp                                | 2 +-
 kcontrol/arts/krichtextlabel.cpp                      | 2 +-
 kcontrol/background/bgadvanced.cpp                    | 4 ++--
 kcontrol/background/bgdialog.cpp                      | 4 ++--
 kcontrol/background/bgmonitor.cpp                     | 2 +-
 kcontrol/background/bgrender.cpp                      | 2 +-
 kcontrol/background/bgsettings.cpp                    | 2 +-
 kcontrol/background/bgwallpaper.cpp                   | 2 +-
 kcontrol/bell/bell.cpp                                | 2 +-
 kcontrol/clock/dtime.cpp                              | 4 ++--
 kcontrol/clock/tzone.cpp                              | 6 +++---
 kcontrol/colors/colorscm.cpp                          | 4 ++--
 kcontrol/colors/widgetcanvas.cpp                      | 6 +++---
 kcontrol/componentchooser/componentchooser.cpp        | 6 +++---
 kcontrol/componentchooser/kcm_componentchooser.cpp    | 2 +-
 kcontrol/crypto/certexport.cpp                        | 4 ++--
 kcontrol/crypto/crypto.cpp                            | 6 +++---
 kcontrol/crypto/kdatetimedlg.cpp                      | 2 +-
 kcontrol/css/kcmcss.cpp                               | 2 +-
 kcontrol/displayconfig/displayconfig.cpp              | 6 +++---
 kcontrol/dnssd/kcmdnssd.cpp                           | 6 +++---
 kcontrol/ebrowsing/filteropts.cpp                     | 2 +-
 kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp          | 6 +++---
 kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp    | 4 ++--
 kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp  | 4 ++--
 kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp | 6 +++---
 kcontrol/energy/energy.cpp                            | 2 +-
 kcontrol/filetypes/filegroupdetails.cpp               | 2 +-
 kcontrol/filetypes/filetypedetails.cpp                | 2 +-
 kcontrol/filetypes/filetypesview.cpp                  | 2 +-
 kcontrol/filetypes/kservicelistwidget.cpp             | 4 ++--
 kcontrol/filetypes/kserviceselectdlg.cpp              | 2 +-
 kcontrol/filetypes/newtypedlg.cpp                     | 2 +-
 kcontrol/fonts/fonts.cpp                              | 4 ++--
 kcontrol/fonts/kxftconfig.cpp                         | 2 +-
 kcontrol/hwmanager/deviceiconview.cpp                 | 4 ++--
 kcontrol/hwmanager/devicepropsdlg.cpp                 | 4 ++--
 kcontrol/hwmanager/hwmanager.cpp                      | 6 +++---
 kcontrol/iccconfig/iccconfig.cpp                      | 6 +++---
 kcontrol/icons/icons.cpp                              | 4 ++--
 kcontrol/icons/iconthemes.cpp                         | 4 ++--
 kcontrol/info/info.cpp                                | 2 +-
 kcontrol/info/memory.cpp                              | 2 +-
 kcontrol/info/opengl.cpp                              | 4 ++--
 kcontrol/input/core/themepage.cpp                     | 6 +++---
 kcontrol/input/logitechmouse.cpp                      | 4 ++--
 kcontrol/input/main.cpp                               | 4 ++--
 kcontrol/input/mouse.cpp                              | 2 +-
 kcontrol/input/mouse.h                                | 2 +-
 kcontrol/input/xcursor/previewwidget.cpp              | 4 ++--
 kcontrol/input/xcursor/themepage.cpp                  | 6 +++---
 kcontrol/ioslaveinfo/kcmioslaveinfo.cpp               | 4 ++--
 kcontrol/joystick/caldialog.cpp                       | 4 ++--
 kcontrol/joystick/joydevice.cpp                       | 2 +-
 kcontrol/joystick/joystick.cpp                        | 4 ++--
 kcontrol/joystick/joywidget.cpp                       | 4 ++--
 kcontrol/kcontrol/aboutwidget.cpp                     | 4 ++--
 kcontrol/kcontrol/dockcontainer.cpp                   | 4 ++--
 kcontrol/kcontrol/helpwidget.cpp                      | 2 +-
 kcontrol/kcontrol/kcrootonly.cpp                      | 2 +-
 kcontrol/kcontrol/main.cpp                            | 2 +-
 kcontrol/kcontrol/moduleiconview.cpp                  | 2 +-
 kcontrol/kcontrol/modulemenu.cpp                      | 4 ++--
 kcontrol/kcontrol/modules.cpp                         | 2 +-
 kcontrol/kcontrol/moduletreeview.cpp                  | 2 +-
 kcontrol/kcontrol/proxywidget.cpp                     | 2 +-
 kcontrol/kcontrol/searchwidget.cpp                    | 2 +-
 kcontrol/kcontrol/toplevel.cpp                        | 2 +-
 kcontrol/kded/kcmkded.cpp                             | 2 +-
 kcontrol/keys/commandShortcuts.cpp                    | 4 ++--
 kcontrol/keys/keyconfig.cpp                           | 4 ++--
 kcontrol/keys/main.cpp                                | 2 +-
 kcontrol/keys/modifiers.cpp                           | 4 ++--
 kcontrol/keys/shortcuts.cpp                           | 4 ++--
 kcontrol/keys/treeview.cpp                            | 2 +-
 kcontrol/kicker/advancedDialog.cpp                    | 2 +-
 kcontrol/kicker/applettab_impl.cpp                    | 4 ++--
 kcontrol/kicker/extensionInfo.cpp                     | 2 +-
 kcontrol/kicker/hidingconfig.cpp                      | 2 +-
 kcontrol/kicker/hidingtab_impl.cpp                    | 2 +-
 kcontrol/kicker/lookandfeelconfig.cpp                 | 2 +-
 kcontrol/kicker/lookandfeeltab_impl.cpp               | 4 ++--
 kcontrol/kicker/menuconfig.cpp                        | 2 +-
 kcontrol/kicker/menutab_impl.cpp                      | 4 ++--
 kcontrol/kicker/positionconfig.cpp                    | 2 +-
 kcontrol/kicker/positiontab_impl.cpp                  | 2 +-
 kcontrol/konq/behaviour.cpp                           | 2 +-
 kcontrol/konq/browser.cpp                             | 2 +-
 kcontrol/konq/desktop.cpp                             | 4 ++--
 kcontrol/konq/desktopbehavior_impl.cpp                | 4 ++--
 kcontrol/konq/fontopts.cpp                            | 2 +-
 kcontrol/konq/previews.cpp                            | 4 ++--
 kcontrol/konq/rootopts.cpp                            | 6 +++---
 kcontrol/konqhtml/advancedTabDialog.cpp               | 2 +-
 kcontrol/konqhtml/appearance.cpp                      | 4 ++--
 kcontrol/konqhtml/domainlistview.cpp                  | 4 ++--
 kcontrol/konqhtml/filteropts.cpp                      | 4 ++--
 kcontrol/konqhtml/htmlopts.cpp                        | 4 ++--
 kcontrol/konqhtml/javaopts.cpp                        | 2 +-
 kcontrol/konqhtml/jsopts.cpp                          | 2 +-
 kcontrol/konqhtml/jspolicies.cpp                      | 2 +-
 kcontrol/konqhtml/khttpoptdlg.cpp                     | 4 ++--
 kcontrol/konqhtml/nsconfigwidget.ui                   | 2 +-
 kcontrol/konqhtml/pluginopts.cpp                      | 4 ++--
 kcontrol/konqhtml/policydlg.cpp                       | 4 ++--
 kcontrol/konsole/kcmkonsole.cpp                       | 2 +-
 kcontrol/konsole/schemaeditor.cpp                     | 4 ++--
 kcontrol/konsole/sessioneditor.cpp                    | 4 ++--
 kcontrol/krdb/krdb.cpp                                | 6 +++---
 kcontrol/kthememanager/knewthemedlg.cpp               | 2 +-
 kcontrol/kthememanager/ktheme.cpp                     | 4 ++--
 kcontrol/kthememanager/kthememanager.cpp              | 8 ++++----
 kcontrol/locale/klocalesample.cpp                     | 2 +-
 kcontrol/locale/localeother.cpp                       | 2 +-
 kcontrol/locale/toplevel.cpp                          | 2 +-
 kcontrol/nics/nic.cpp                                 | 2 +-
 kcontrol/performance/kcmperformance.cpp               | 2 +-
 kcontrol/performance/konqueror.cpp                    | 2 +-
 kcontrol/performance/system.cpp                       | 2 +-
 kcontrol/privacy/kprivacymanager.cpp                  | 2 +-
 kcontrol/privacy/privacy.cpp                          | 6 +++---
 kcontrol/randr/configdialog.cpp                       | 2 +-
 kcontrol/randr/ktimerdialog.cpp                       | 2 +-
 kcontrol/randr/main.cpp                               | 4 ++--
 kcontrol/randr/tderandrmodule.cpp                     | 4 ++--
 kcontrol/randr/tderandrtray.cpp                       | 6 +++---
 kcontrol/samba/kcmsambaimports.cpp                    | 2 +-
 kcontrol/samba/kcmsambalog.cpp                        | 4 ++--
 kcontrol/samba/kcmsambastatistics.cpp                 | 4 ++--
 kcontrol/samba/ksmbstatus.cpp                         | 2 +-
 kcontrol/screensaver/advanceddialog.cpp               | 2 +-
 kcontrol/screensaver/saverconfig.cpp                  | 2 +-
 kcontrol/smartcard/smartcard.cpp                      | 6 +++---
 kcontrol/style/kcmstyle.cpp                           | 4 ++--
 kcontrol/style/keramik/keramitdeconf.cpp              | 4 ++--
 kcontrol/style/main.cpp                               | 4 ++--
 kcontrol/style/menupreview.cpp                        | 2 +-
 kcontrol/style/styleconfdialog.cpp                    | 2 +-
 kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp      | 4 ++--
 kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp    | 6 +++---
 kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp      | 2 +-
 kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp   | 4 ++--
 kcontrol/tdefontinst/lib/FcEngine.cpp                 | 2 +-
 kcontrol/tdefontinst/lib/KfiConstants.h               | 2 +-
 kcontrol/tdefontinst/tdefontinst/FontEngine.cpp       | 2 +-
 kcontrol/tdefontinst/tdefontinst/XConfig.cpp          | 2 +-
 kcontrol/tdefontinst/tdeio/KioFonts.cpp               | 4 ++--
 kcontrol/tdefontinst/tdeio/KioFonts.h                 | 2 +-
 kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp      | 4 ++--
 kcontrol/tdefontinst/viewpart/FontPreview.cpp         | 2 +-
 kcontrol/tdefontinst/viewpart/FontViewPart.cpp        | 4 ++--
 kcontrol/tdefontinst/viewpart/FontViewerApp.cpp       | 4 ++--
 kcontrol/tdeio/cache.cpp                              | 2 +-
 kcontrol/tdeio/fakeuaprovider.cpp                     | 2 +-
 kcontrol/tdeio/kcookiesmain.cpp                       | 4 ++--
 kcontrol/tdeio/kcookiesmanagement.cpp                 | 4 ++--
 kcontrol/tdeio/kcookiespolicies.cpp                   | 4 ++--
 kcontrol/tdeio/kenvvarproxydlg.cpp                    | 4 ++--
 kcontrol/tdeio/kmanualproxydlg.cpp                    | 4 ++--
 kcontrol/tdeio/kproxydlg.cpp                          | 4 ++--
 kcontrol/tdeio/kproxydlgbase.h                        | 2 +-
 kcontrol/tdeio/ksaveioconfig.cpp                      | 4 ++--
 kcontrol/tdeio/ksaveioconfig.h                        | 2 +-
 kcontrol/tdeio/main.cpp                               | 2 +-
 kcontrol/tdeio/main.h                                 | 2 +-
 kcontrol/tdeio/netpref.cpp                            | 2 +-
 kcontrol/tdeio/policydlg.cpp                          | 2 +-
 kcontrol/tdeio/smbrodlg.cpp                           | 4 ++--
 kcontrol/tdeio/socks.cpp                              | 2 +-
 kcontrol/tdeio/uagentproviderdlg.cpp                  | 2 +-
 kcontrol/tdeio/useragentdlg.cpp                       | 4 ++--
 kcontrol/tdm/background.cpp                           | 2 +-
 kcontrol/tdm/main.cpp                                 | 2 +-
 kcontrol/tdm/tdm-appear.cpp                           | 4 ++--
 kcontrol/tdm/tdm-conv.cpp                             | 2 +-
 kcontrol/tdm/tdm-font.cpp                             | 2 +-
 kcontrol/tdm/tdm-shut.cpp                             | 2 +-
 kcontrol/tdm/tdm-users.cpp                            | 4 ++--
 kcontrol/usbview/usbdevices.cpp                       | 4 ++--
 kcontrol/view1394/view1394.cpp                        | 4 ++--
 kcontrol/xinerama/kcmxinerama.cpp                     | 8 ++++----
 182 files changed, 296 insertions(+), 296 deletions(-)

(limited to 'kcontrol')

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 161f4c319..5a8206809 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -8,15 +8,15 @@
 #include <tqlabel.h>
 
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kaudioplayer.h>
 #include <knotifyclient.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <netwm.h>
 #include <tdeshortcut.h>
 #include <kkeynative.h>
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 1332f60c0..d2428783b 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -42,7 +42,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <krichtextlabel.h>
 #include <ksimpleconfig.h>
diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp
index 6543b3690..c2fb6e916 100644
--- a/kcontrol/arts/krichtextlabel.cpp
+++ b/kcontrol/arts/krichtextlabel.cpp
@@ -22,7 +22,7 @@
 #include <tqstylesheet.h>
 #include <tqsimplerichtext.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 static TQString qrichtextify( const TQString& text )
 {
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index bfe3eff28..697836797 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -34,8 +34,8 @@
 
 #include <tdeconfig.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpixmap.h>
 #include <kstandarddirs.h>
 #include <twin.h>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index ff200149a..d8d6efaa0 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -44,10 +44,10 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index f78a7b616..b9283360a 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 4f7a6be2c..08cb3055f 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -27,7 +27,7 @@
 #include <kimageeffect.h>
 #include <kprocess.h>
 #include <kpixmapio.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kcursor.h>
 #include <kmimetype.h>
 #include <tdefilemetainfo.h>
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index cb6cf956d..d36d7f140 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -23,7 +23,7 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <krandomsequence.h>
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index 1edf37a8d..460c9c56c 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -29,7 +29,7 @@
 
 #include <tdefiledialog.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
 
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 5878f4a68..5022ab420 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -29,7 +29,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <knotifyclient.h>
 #include <knuminput.h>
 
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index f46031640..d469b1ff9 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -33,9 +33,9 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
 
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 4af720b04..518c6663d 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -29,8 +29,8 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 #include <tdeio/netaccess.h>
 
@@ -39,7 +39,7 @@
 #include "tzone.moc"
 
 #if defined(USE_SOLARIS)
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 1572f4b7b..45e3932da 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -26,11 +26,11 @@
 #include <kcursor.h>
 #include <tdefiledialog.h>
 #include <kgenericfactory.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <kipc.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 684e9d6d3..b08ef6135 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -15,9 +15,9 @@
 
 #include <kcolordrag.h>
 #include <kpixmapeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 
 #include "widgetcanvas.h"
@@ -280,7 +280,7 @@ void WidgetCanvas::drawSampleWidgets()
 
     TDEConfig * c = new TDEConfig("kcmfonts");
 
-    // Keep in sync with kglobalsettings.
+    // Keep in sync with tdeglobalsettings.
 
     TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
     windowFontGuess.setPixelSize(12);
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index b650cff2e..9de1a1a7b 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -28,10 +28,10 @@
 #include <dcopclient.h>
 
 #include <tdeapplication.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <kipc.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kopenwith.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index c1c5728e4..30750bdd5 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -16,7 +16,7 @@
 #include <tqlayout.h>
 
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kcm_componentchooser.h"
 #include "kcm_componentchooser.moc"
diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp
index 4a6bda892..034d69897 100644
--- a/kcontrol/crypto/certexport.cpp
+++ b/kcontrol/crypto/certexport.cpp
@@ -31,9 +31,9 @@
 #include <tqvbuttongroup.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksslall.h>
 
 
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 8e97a7c4b..70344e16a 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -56,11 +56,11 @@
 #include <kdialog.h>
 #include <tdefiledialog.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocess.h>
 #include <kpushbutton.h>
diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp
index 872ffc304..f7cd9d1cb 100644
--- a/kcontrol/crypto/kdatetimedlg.cpp
+++ b/kcontrol/crypto/kdatetimedlg.cpp
@@ -25,7 +25,7 @@
 #include "kdatetimedlg.h"
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdatepicker.h>
 #include <kpushbutton.h>
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index 931c0eb07..e2e043f76 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -11,7 +11,7 @@
 #include <kdialogbase.h>
 #include <tdefontdialog.h>
 #include <kgenericfactory.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 11d494bbf..fd503d2cb 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -34,10 +34,10 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index 1f130f468..4bb73aa63 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -32,15 +32,15 @@
 #include <tqcursor.h>
 #include <tqbuttongroup.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeparts/genericfactory.h>
 #include <kprocess.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
 #include <ksimpleconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kcmdnssd.h"
 #include <dnssd/settings.h>
diff --git a/kcontrol/ebrowsing/filteropts.cpp b/kcontrol/ebrowsing/filteropts.cpp
index d2f0f66f8..80916f069 100644
--- a/kcontrol/ebrowsing/filteropts.cpp
+++ b/kcontrol/ebrowsing/filteropts.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "filteropts.h"
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 121037bd9..d9930224e 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -28,15 +28,15 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
index e0acab4e4..f6227b90f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
@@ -21,10 +21,10 @@
 #include <unistd.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "ikwsopts.h"
 #include "kuriikwsfiltereng.h"
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
index c42a6be0c..78f84780c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
@@ -22,9 +22,9 @@
 #include <unistd.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "ikwsopts.h"
 #include "kuriikwsfiltereng.h"
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index 543c39634..a1f6ca619 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -22,12 +22,12 @@
 #include <tqwhatsthis.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "searchproviderdlg_ui.h"
 #include "searchproviderdlg.h"
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 19c46e235..fa3afe74f 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -31,7 +31,7 @@
 #include <kcursor.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <krun.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index eb57f50ac..7000a97e5 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -22,7 +22,7 @@
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
     : TQWidget( parent, name )
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index 92a4f47ac..c4f3ce7bb 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -10,7 +10,7 @@
 #include <kicondialog.h>
 #include <klineedit.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kservicelistwidget.h"
 #include "filetypedetails.h"
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index f4011f3bf..58bbbbd09 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -15,7 +15,7 @@
 #include <kipc.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "newtypedlg.h"
diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp
index e8193f278..d0463d7ad 100644
--- a/kcontrol/filetypes/kservicelistwidget.cpp
+++ b/kcontrol/filetypes/kservicelistwidget.cpp
@@ -26,8 +26,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kopenwith.h>
 
diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp
index b0cf1e3b1..f8c4f0dd4 100644
--- a/kcontrol/filetypes/kserviceselectdlg.cpp
+++ b/kcontrol/filetypes/kserviceselectdlg.cpp
@@ -20,7 +20,7 @@
 #include "kserviceselectdlg.moc"
 #include "kservicelistwidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvbox.h>
 #include <tqlabel.h>
diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp
index ee0e3eab8..dbb37344c 100644
--- a/kcontrol/filetypes/newtypedlg.cpp
+++ b/kcontrol/filetypes/newtypedlg.cpp
@@ -4,7 +4,7 @@
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include "newtypedlg.h"
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 3f202c020..2489b80c6 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <kipc.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kprocio.h>
 #include <ksimpleconfig.h>
@@ -522,7 +522,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
 
   TQValueList<TQFont> defaultFontList;
 
-  // Keep in sync with tdelibs/tdecore/kglobalsettings.cpp
+  // Keep in sync with tdelibs/tdecore/tdeglobalsettings.cpp
 
   TQFont f0("Sans Serif", 10);
   TQFont f1("Monospace", 10);
diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp
index 124d33d2f..459c7b88a 100644
--- a/kcontrol/fonts/kxftconfig.cpp
+++ b/kcontrol/fonts/kxftconfig.cpp
@@ -26,7 +26,7 @@
 #include <tqregexp.h>
 #include <tqfile.h>
 #include <tqpaintdevice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klargefile.h>
 #include <tqdir.h>
 #include <tqsettings.h>
diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp
index 0255c01c1..cea27b161 100644
--- a/kcontrol/hwmanager/deviceiconview.cpp
+++ b/kcontrol/hwmanager/deviceiconview.cpp
@@ -21,11 +21,11 @@
 #include <tqheader.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kservicegroup.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kdebug.h>
 
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 2eb1dfa3f..5483b2d26 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -34,11 +34,11 @@
 
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "devicepropsdlg.h"
 
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index bc3970e93..4ccb8ce8f 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -32,10 +32,10 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 4a72e29f7..b7c51c281 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -32,10 +32,10 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index f98aa270f..56df77a51 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -25,9 +25,9 @@
 #include <kiconeffect.h>
 #include <kiconloader.h>
 #include <kipc.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <dcopclient.h>
 
 #include "icons.h"
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 078224dc2..fe0a59ee7 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -30,14 +30,14 @@
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #undef Unsorted
 #include <kipc.h>
 
 #include <tdelistview.h>
 #include <kurlrequesterdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kiconloader.h>
 
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index 666b914ab..2d79f4f54 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index d6cd750ec..76d68d675 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -29,7 +29,7 @@
 #include <tqdrawutil.h>
 #include <tqtooltip.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdialog.h>
 #include <kseparator.h>
 
diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp
index 061e368e6..a38aee93b 100644
--- a/kcontrol/info/opengl.cpp
+++ b/kcontrol/info/opengl.cpp
@@ -29,8 +29,8 @@
 #include <tqfile.h>
 #include <tqstring.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <X11/Xlib.h>
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index bb8e7ca0c..24b43d829 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -19,14 +19,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kprocess.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
 #include <kdialog.h>
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index 39b8948ae..0e2f6f1d3 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -31,8 +31,8 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <config.h>
 
diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index 38bded500..254f2ee5c 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -25,8 +25,8 @@
 #  include <config.h>
 #endif
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <dcopref.h>
 #include <tqfile.h>
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 33409a422..49b67c98d 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -56,7 +56,7 @@
 #include <tqtabwidget.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index 853a4e73a..01f6c1071 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -40,7 +40,7 @@
 
 #include <tdeapplication.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <knuminput.h>
 
 #include <config.h>
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index 326178a7a..2f0ea6edc 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqwidget.h>
 #include <tqpainter.h>
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqcursor.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 72a25ce96..d84d470b1 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -20,14 +20,14 @@
 #  include <config.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 #include <tdelistview.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequesterdlg.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index 719c5abf8..b64d5a4d2 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -36,10 +36,10 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 
diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp
index 978919caf..877befb62 100644
--- a/kcontrol/joystick/caldialog.cpp
+++ b/kcontrol/joystick/caldialog.cpp
@@ -27,8 +27,8 @@
 #include <tqapplication.h>
 #include <tqvbox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 //--------------------------------------------------------------
diff --git a/kcontrol/joystick/joydevice.cpp b/kcontrol/joystick/joydevice.cpp
index 6453bdf6f..3c4aeac3f 100644
--- a/kcontrol/joystick/joydevice.cpp
+++ b/kcontrol/joystick/joydevice.cpp
@@ -21,7 +21,7 @@
 
 #include "joydevice.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <sys/types.h>
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 853169443..009795db0 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -21,8 +21,8 @@
 
 #include <tdeaboutdata.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "joystick.h"
 #include "joywidget.h"
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index d6533aefb..8e1ff5586 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -34,9 +34,9 @@
 #include <tqfontmetrics.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 //--------------------------------------------------------------
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index fbce1e3e3..d6a0e06dd 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -24,12 +24,12 @@
 #include <tqfile.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtml_part.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index 9ecd5339c..dd1835e9d 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -26,8 +26,8 @@
 #include <tqpushbutton.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index 93c96722c..0e8cc4844 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -19,7 +19,7 @@
 
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp
index e99cfa799..13d1cf32e 100644
--- a/kcontrol/kcontrol/kcrootonly.cpp
+++ b/kcontrol/kcontrol/kcrootonly.cpp
@@ -19,7 +19,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcrootonly.h"
 
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index d9557517b..17b8ae8e0 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -37,7 +37,7 @@
 #include <tdecmdlineargs.h>
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index 76402e18d..45be8a1ac 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -21,7 +21,7 @@
 #include <tqheader.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kservicegroup.h>
 #include <kiconloader.h>
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index f899eb4c7..f203e6b57 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -27,8 +27,8 @@ that is intentional :-]
 #include <tqpoint.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kservicegroup.h>
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index c4f7b2a87..302949025 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -29,7 +29,7 @@
 #include <kservicegroup.h>
 #include <kprocess.h>
 #include <qxembed.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index df69395ee..501d69349 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqbitmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index a5b25d20c..7aa2383b1 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -21,7 +21,7 @@
 
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdecmodule.h>
 #include <kseparator.h>
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index e53c899da..995d162e3 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -25,7 +25,7 @@
 
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistbox.h>
 
 #include "searchwidget.h"
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index ff49603da..a93122a26 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -23,7 +23,7 @@
 #include <tdeconfig.h>
 #include <kbugreport.h>
 #include <tdeaboutapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
 #include <tdeaction.h>
 #include <twin.h>
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index 66c7207a5..425d58823 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -35,7 +35,7 @@
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 0ab7f1205..4ae379a50 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -29,11 +29,11 @@
 
 #include <kactivelabel.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 #include <khotkeys.h>
 #include <kkeybutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static bool treeFilled = false;
 CommandShortcutsModule::CommandShortcutsModule( TQWidget *parent, const char *name )
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 74f9d5446..9785d22da 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -19,10 +19,10 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 736a937bd..c9aa14813 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 
 #include "commandShortcuts.h"
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index ce39b0bf3..39dfb7010 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -12,8 +12,8 @@
 #include <kdialog.h>
 #include <kkeynative.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #define XK_MISCELLANY
 #define XK_XKB_KEYS
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index d81fe74ca..e7f599dda 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -36,8 +36,8 @@
 #include <kipc.h>
 #include <kkeynative.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeshortcutlist.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 361c1cfb8..36d0e3bf4 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -26,7 +26,7 @@
 #include <tqcursor.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kservicegroup.h>
 
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index a56625e4a..f2ba15680 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -25,7 +25,7 @@
 #include <tqslider.h>
 
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "advancedDialog.h"
 #include "advancedOptions.h"
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index 85f582ca4..c2f488550 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -28,8 +28,8 @@
 #include <tqfileinfo.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <tdelistview.h>
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index 037159d93..a773e063d 100644
--- a/kcontrol/kicker/extensionInfo.cpp
+++ b/kcontrol/kicker/extensionInfo.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "extensionInfo.h"
 
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index 810024479..e1e71dc86 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "hidingtab_impl.h"
diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp
index 3bde445b8..8c340bd5d 100644
--- a/kcontrol/kicker/hidingtab_impl.cpp
+++ b/kcontrol/kicker/hidingtab_impl.cpp
@@ -23,7 +23,7 @@
 
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "main.h"
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index 49c0cf56a..af451421e 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "lookandfeeltab_impl.h"
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index 73367d24d..674b1cd04 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -29,8 +29,8 @@
 #include <kiconeffect.h>
 #include <kimageio.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <kickerSettings.h>
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index b477cd76d..26624ff92 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kickerSettings.h"
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index e3fc24ec9..2c259829f 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -32,8 +32,8 @@
 #include <kdesktopfile.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 #include <tdefontrequester.h>
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index 4eafcf677..a65a32341 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "positiontab_impl.h"
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index ba392bcb2..63cdb35a9 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kpanelextension.h>
 #include <kpixmap.h>
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 23f0748a9..a8f1e28c8 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -31,7 +31,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeio/uiserver_stub.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konq_defaults.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index 96f370d77..dc6c20b73 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -20,7 +20,7 @@
 #include <tqtabwidget.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <fixx11h.h>
 #include <tdecmoduleloader.h>
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 5c41bacec..973d94047 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -25,9 +25,9 @@
 #include <tqslider.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <klineedit.h>
 #include <knuminput.h>
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 2825de22f..d9920e8ad 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -32,8 +32,8 @@
 #include <tqwhatsthis.h>
 #include <tdelistview.h>
 #include <kservice.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kmimetype.h>
 #include <ktrader.h>
 #include <tdeapplication.h>
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index edba20dc6..9a325966e 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <tdefontcombo.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konq_defaults.h> // include default values directly from konqueror
 
 #include "fontopts.h"
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 90ac4bef8..107270eca 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -29,9 +29,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kprotocolinfo.h>
 
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index c1bfa5a48..216c7518f 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -27,12 +27,12 @@
 #include <kcustommenueditor.h>
 #include <kdebug.h>
 #include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kipc.h>
 #include <tdelistview.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <ktrader.h>
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index ba6e1b452..f8ca88c4c 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include "advancedTabDialog.h"
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index ad584f7e6..30272c3f6 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -13,9 +13,9 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdefontcombo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtmldefaults.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #if defined Q_WS_X11 && !defined K_WS_QTONLY
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 87daeea69..fcddac791 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -25,8 +25,8 @@
 
 #include <tdeconfig.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "domainlistview.h"
 #include "policies.h"
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 232a3169b..3ae9091a0 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -17,8 +17,8 @@
 */
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 #include <dcopclient.h>
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 2fe6eb963..0fb7f6021 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -15,8 +15,8 @@
 #include "advancedTabDialog.h"
 
 #include <konq_defaults.h> // include default values directly from konqueror
-#include <kglobalsettings.h> // get default for DEFAULT_CHANGECURSOR
-#include <klocale.h>
+#include <tdeglobalsettings.h> // get default for DEFAULT_CHANGECURSOR
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <knuminput.h>
 #include <kseparator.h>
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index f5cc93f12..e21910594 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -16,7 +16,7 @@
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtml_settings.h>
 #include <knuminput.h>
 
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index adb00bd94..da5af132d 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -26,7 +26,7 @@
 #include "htmlopts.h"
 #include "policydlg.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jsopts.h"
 
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index bdaa506cb..1debc0ace 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jspolicies.h"
 
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index 6e79a59ec..7272e6e93 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -3,8 +3,8 @@
 
 #include <tqlayout.h> //CT
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include "khttpoptdlg.h"
 
 
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index b784048e5..f3525430e 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -256,7 +256,7 @@
     </vbox>
 </widget>
 <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">kurlrequester.h</include>
     <include location="global" impldecl="in declaration">tdelistbox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index d30a67264..f8e1ad10a 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -20,8 +20,8 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp
index 4f1529ed8..d38524e61 100644
--- a/kcontrol/konqhtml/policydlg.cpp
+++ b/kcontrol/konqhtml/policydlg.cpp
@@ -7,9 +7,9 @@
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbuttonbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqpushbutton.h>
 
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 97eeb6d42..cdda274ba 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdefontdialog.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "schemaeditor.h"
 #include "sessioneditor.h"
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index 0594e7d9d..66b07e59f 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -34,11 +34,11 @@
 //#include <errno.h>
 
 #include <tqslider.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <tqtoolbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksharedpixmap.h>
 #include <kimageeffect.h>
 #include <tqimage.h>
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index d0f4f822a..86c9dd825 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -23,11 +23,11 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kicondialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kiconloader.h>
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 565e0e478..1f5d9a99d 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -32,12 +32,12 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kprocio.h>
 #include <ksavefile.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdestyle.h>
 
 #include "krdb.h"
diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp
index 8ba59b680..ee18c31c7 100644
--- a/kcontrol/kthememanager/knewthemedlg.cpp
+++ b/kcontrol/kthememanager/knewthemedlg.cpp
@@ -22,7 +22,7 @@
 #include <tqlineedit.h>
 #include <tqtextedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name )
     : KDialogBase(parent, name, true, i18n("New Theme"), Ok|Cancel, Ok)
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 87d17806c..974ad88b6 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -31,12 +31,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <tdeconfig.h>
 #include <kdatastream.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <kipc.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index bcd73f186..aa04d8e56 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -27,13 +27,13 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservicegroup.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index 91c978a6d..9903965e8 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "klocalesample.h"
 #include "klocalesample.moc"
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 66b95e50c..6cb8e9a8d 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -27,7 +27,7 @@
 #include <tqprinter.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index e74330c30..a7a85e72f 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kservice.h>
 
diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp
index 53e9ef3d7..26a270a08 100644
--- a/kcontrol/nics/nic.cpp
+++ b/kcontrol/nics/nic.cpp
@@ -33,7 +33,7 @@
 #include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqlayout.h>
 #include <tqlistview.h>
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index 3795cc39a..93c5019a6 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -19,7 +19,7 @@
 #include <tqlayout.h>
 #include <tqtabwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "kcmperformance.h"
diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp
index 46dd70774..8cd82699b 100644
--- a/kcontrol/performance/konqueror.cpp
+++ b/kcontrol/performance/konqueror.cpp
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KCMPerformance
 {
diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp
index 57d50ee14..3e9c16051 100644
--- a/kcontrol/performance/system.cpp
+++ b/kcontrol/performance/system.cpp
@@ -22,7 +22,7 @@
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KCMPerformance
 {
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 4336b6058..c52c1b5c4 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tderecentdocument.h>
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 52dac1921..535aa21cf 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -29,10 +29,10 @@
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktextedit.h>
 
 #include "privacy.h"
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index 1d7ffcc41..5ed71aa6d 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <twinmodule.h>
 #include <kregexpeditorinterface.h>
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index baada1f1f..1aa0f58df 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -29,7 +29,7 @@
 #include <twin.h>
 #include <kiconloader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "ktimerdialog.h"
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index 4cd5967f4..af2e8b270 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -19,10 +19,10 @@
 #include <stdlib.h>
 #include <kdebug.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "tderandrapp.h"
 
diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp
index 9da8a569b..11263bbf4 100644
--- a/kcontrol/randr/tderandrmodule.cpp
+++ b/kcontrol/randr/tderandrmodule.cpp
@@ -33,8 +33,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "tderandrmodule.h"
 #include "tderandrmodule.moc"
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 247f669c4..e4372d77b 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -26,12 +26,12 @@
 #include <kdebug.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <cstdlib>
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index caa785605..c25867fa5 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include <stdio.h>
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index b6bceb31f..c25a01113 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -25,9 +25,9 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcmsambalog.h"
 #include "kcmsambalog.moc"
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index b4b32611c..3b77dbc9f 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -32,8 +32,8 @@
 #include <tqpushbutton.h>
 #include <tqregexp.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index cd5457de1..abd423d13 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "ksmbstatus.h"
diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp
index 507255eea..7a28178d5 100644
--- a/kcontrol/screensaver/advanceddialog.cpp
+++ b/kcontrol/screensaver/advanceddialog.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tqcombobox.h>
 #include <kdebug.h>
diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp
index 4c6e3a36e..75ee227f1 100644
--- a/kcontrol/screensaver/saverconfig.cpp
+++ b/kcontrol/screensaver/saverconfig.cpp
@@ -1,5 +1,5 @@
 #include <kdesktopfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "saverconfig.h"
 
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index 8c57cb73e..f0891db16 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -35,10 +35,10 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 
 #include "smartcard.h"
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 1b2477398..f6925a0ba 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -43,14 +43,14 @@
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kipc.h>
 #include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <klibloader.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <tdestyle.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/style/keramik/keramitdeconf.cpp b/kcontrol/style/keramik/keramitdeconf.cpp
index 742842876..6b73662df 100644
--- a/kcontrol/style/keramik/keramitdeconf.cpp
+++ b/kcontrol/style/keramik/keramitdeconf.cpp
@@ -25,8 +25,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqlayout.h>
 #include <tqsettings.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "keramitdeconf.h"
 
diff --git a/kcontrol/style/main.cpp b/kcontrol/style/main.cpp
index 334229f4e..7748e9ea7 100644
--- a/kcontrol/style/main.cpp
+++ b/kcontrol/style/main.cpp
@@ -1,5 +1,5 @@
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "kcmstyle.h"
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index ecb26816a..9b5edb672 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -24,7 +24,7 @@
 
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kimageeffect.h>
 #include <kiconloader.h>
 
diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp
index 1623a3a21..8cb426b3f 100644
--- a/kcontrol/style/styleconfdialog.cpp
+++ b/kcontrol/style/styleconfdialog.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "styleconfdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName):
   KDialogBase(parent, "StyleConfigDialog",
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index fb2c07163..9f939324a 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -42,7 +42,7 @@
 #include <tqsettings.h>
 #include <tdeaboutdata.h>
 #include <kgenericfactory.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kprinter.h>
 #include "Misc.h"
 #include "KFileFontIconView.h"
@@ -52,7 +52,7 @@
 #include <tdetoolbarbutton.h>
 #include <tdestdaccel.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 #include <tdeio/job.h>
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
index 55143369f..e393e238b 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
@@ -40,10 +40,10 @@
 #include <tqpixmap.h>
 #include <tdeapplication.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kurldrag.h>
diff --git a/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp
index afd9fa204..7e64e059d 100644
--- a/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp
@@ -30,7 +30,7 @@
 #include <tqlayout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KFI
 {
diff --git a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
index e555dc7fd..4840b7219 100644
--- a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
@@ -33,9 +33,9 @@
 #include <tqcheckbox.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 8ac8f4fb4..ab89689d9 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -5,7 +5,7 @@
 #include <tqtextstream.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeio/netaccess.h>
 #include <math.h>
 #include "FcEngine.h"
diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h
index d7f5ef03f..5e8633539 100644
--- a/kcontrol/tdefontinst/lib/KfiConstants.h
+++ b/kcontrol/tdefontinst/lib/KfiConstants.h
@@ -1,7 +1,7 @@
 #ifndef __KFI_CONSTANTS_H__
 #define __KFI_CONSTANTS_H__
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define KFI_CATALOGUE                "tdefontinst"
 
diff --git a/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp b/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp
index 4fe823c23..0cb0fa776 100644
--- a/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp
+++ b/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp
@@ -29,7 +29,7 @@
 
 #include "FontEngine.h"
 #include "Misc.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/kcontrol/tdefontinst/tdefontinst/XConfig.cpp b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp
index 7572e3894..bb6e49d5e 100644
--- a/kcontrol/tdefontinst/tdefontinst/XConfig.cpp
+++ b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <sys/types.h>
 #include <signal.h>
 
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index f42d50c0b..949b0d4cb 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -51,14 +51,14 @@
 #include <tdeio/connection.h>
 #include <tqtextstream.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tqdir.h>
 #include <tqdatastream.h>
 #include <tqregexp.h>
 #include <kinstance.h>
 #include <klargefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdesu/su.h>
 #include <kprocess.h>
 #include <kdebug.h>
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.h b/kcontrol/tdefontinst/tdeio/KioFonts.h
index ec8c69c4e..4f3c465d2 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.h
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.h
@@ -33,7 +33,7 @@
 #include <time.h>
 #include <tdeio/slavebase.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <tqmap.h>
diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
index aaf85e940..a053393f4 100644
--- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
@@ -32,8 +32,8 @@
 #include <tqbitmap.h>
 #include <tqpainter.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 extern "C"
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index 151dfc888..41367d586 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -28,7 +28,7 @@
 
 #include "FontPreview.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <stdlib.h>
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index d04d1b3dc..2f289649b 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -31,7 +31,7 @@
 #include "Misc.h"
 #include "KfiConstants.h"
 #include "KfiPrint.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqframe.h>
@@ -46,7 +46,7 @@
 #include <tqtimer.h>
 #include <tdeio/netaccess.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index 45aeffe88..df1fa92d2 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -31,8 +31,8 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
 
diff --git a/kcontrol/tdeio/cache.cpp b/kcontrol/tdeio/cache.cpp
index 990770a2a..42c0fc28f 100644
--- a/kcontrol/tdeio/cache.cpp
+++ b/kcontrol/tdeio/cache.cpp
@@ -28,7 +28,7 @@
 #include <tqradiobutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <knuminput.h>
 
diff --git a/kcontrol/tdeio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp
index e13c680b8..b48d19738 100644
--- a/kcontrol/tdeio/fakeuaprovider.cpp
+++ b/kcontrol/tdeio/fakeuaprovider.cpp
@@ -21,7 +21,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "fakeuaprovider.h"
diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp
index 24aff4fe0..417eb9e46 100644
--- a/kcontrol/tdeio/kcookiesmain.cpp
+++ b/kcontrol/tdeio/kcookiesmain.cpp
@@ -6,9 +6,9 @@
 #include <tqlayout.h>
 #include <tqtabwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <dcopref.h>
 
diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp
index 0fc8e9941..1a9314d91 100644
--- a/kcontrol/tdeio/kcookiesmanagement.cpp
+++ b/kcontrol/tdeio/kcookiesmanagement.cpp
@@ -31,13 +31,13 @@
 
 #include <kidna.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopref.h>
 
 #include "kcookiesmain.h"
diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp
index 7e9b39f65..a39773cf1 100644
--- a/kcontrol/tdeio/kcookiespolicies.cpp
+++ b/kcontrol/tdeio/kcookiespolicies.cpp
@@ -34,10 +34,10 @@
 
 #include <kiconloader.h>
 #include <kidna.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <dcopref.h>
 
diff --git a/kcontrol/tdeio/kenvvarproxydlg.cpp b/kcontrol/tdeio/kenvvarproxydlg.cpp
index 22accb4e9..e8d1c0e47 100644
--- a/kcontrol/tdeio/kenvvarproxydlg.cpp
+++ b/kcontrol/tdeio/kenvvarproxydlg.cpp
@@ -28,9 +28,9 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "envvarproxy_ui.h"
 #include "kenvvarproxydlg.h"
diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp
index 9a3bf46c7..6c1786aff 100644
--- a/kcontrol/tdeio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
@@ -27,13 +27,13 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
 #include <kicontheme.h>
 #include <kurifilter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeio/ioslave_defaults.h>
diff --git a/kcontrol/tdeio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp
index a165f9576..7bd082eda 100644
--- a/kcontrol/tdeio/kproxydlg.cpp
+++ b/kcontrol/tdeio/kproxydlg.cpp
@@ -28,9 +28,9 @@
 #include <tqradiobutton.h>
 #include <tqtabwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "ksaveioconfig.h"
 #include "kenvvarproxydlg.h"
diff --git a/kcontrol/tdeio/kproxydlgbase.h b/kcontrol/tdeio/kproxydlgbase.h
index 06ffa8753..8454f2f38 100644
--- a/kcontrol/tdeio/kproxydlgbase.h
+++ b/kcontrol/tdeio/kproxydlgbase.h
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 
 #include <kdialogbase.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 class KProxyData
 {
diff --git a/kcontrol/tdeio/ksaveioconfig.cpp b/kcontrol/tdeio/ksaveioconfig.cpp
index 845184158..8ab676ada 100644
--- a/kcontrol/tdeio/ksaveioconfig.cpp
+++ b/kcontrol/tdeio/ksaveioconfig.cpp
@@ -19,8 +19,8 @@
 
 #include <dcopref.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <tdeio/ioslave_defaults.h>
 
diff --git a/kcontrol/tdeio/ksaveioconfig.h b/kcontrol/tdeio/ksaveioconfig.h
index f14e98e22..6bfe9e1f4 100644
--- a/kcontrol/tdeio/ksaveioconfig.h
+++ b/kcontrol/tdeio/ksaveioconfig.h
@@ -20,7 +20,7 @@
 #ifndef KSAVEIO_CONFIG_H_
 #define KSAVEIO_CONFIG_H_
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 class TQWidget;
 class KSaveIOConfigPrivate;
diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp
index 3fe2fd8a0..878624393 100644
--- a/kcontrol/tdeio/main.cpp
+++ b/kcontrol/tdeio/main.cpp
@@ -26,7 +26,7 @@
 #include <tqtabwidget.h>
 
 #include <tdecmoduleloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcookiesmain.h"
 #include "netpref.h"
diff --git a/kcontrol/tdeio/main.h b/kcontrol/tdeio/main.h
index a208b942a..23451b2b7 100644
--- a/kcontrol/tdeio/main.h
+++ b/kcontrol/tdeio/main.h
@@ -22,7 +22,7 @@
 #define MYMAIN_H
 
 #include <tdecmodule.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TQTabWidget;
 
diff --git a/kcontrol/tdeio/netpref.cpp b/kcontrol/tdeio/netpref.cpp
index ea3de857c..acde5635e 100644
--- a/kcontrol/tdeio/netpref.cpp
+++ b/kcontrol/tdeio/netpref.cpp
@@ -5,7 +5,7 @@
 
 #include <tdeio/ioslave_defaults.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
 
diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp
index 44862f51e..c45dd837e 100644
--- a/kcontrol/tdeio/policydlg.cpp
+++ b/kcontrol/tdeio/policydlg.cpp
@@ -24,7 +24,7 @@
 
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "policydlg.h"
 #include "policydlg_ui.h"
diff --git a/kcontrol/tdeio/smbrodlg.cpp b/kcontrol/tdeio/smbrodlg.cpp
index 617c27b98..ccb070e33 100644
--- a/kcontrol/tdeio/smbrodlg.cpp
+++ b/kcontrol/tdeio/smbrodlg.cpp
@@ -22,9 +22,9 @@
 #include <tqlabel.h>
 #include <tqtextcodec.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <kdialog.h>
diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp
index bf0e6410d..91d8cfd5c 100644
--- a/kcontrol/tdeio/socks.cpp
+++ b/kcontrol/tdeio/socks.cpp
@@ -27,7 +27,7 @@
 
 #include <tdefiledialog.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksocks.h>
 #include <tdeapplication.h>
 
diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp
index 9e945948d..5e5cbd233 100644
--- a/kcontrol/tdeio/uagentproviderdlg.cpp
+++ b/kcontrol/tdeio/uagentproviderdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kurllabel.h>
diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index c325d2bce..7b1f4b3d7 100644
--- a/kcontrol/tdeio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -33,9 +33,9 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <tdeio/http_slave_defaults.h>
 
diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp
index 4078bd393..139ae90b7 100644
--- a/kcontrol/tdm/background.cpp
+++ b/kcontrol/tdm/background.cpp
@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "../background/bgsettings.h"
 #include "../background/bgdialog.h"
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 43671c0ee..4a2c8e3ec 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -28,7 +28,7 @@
 #include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <kimageio.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurldrag.h>
 
 #include "tdm-appear.h"
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 3457a2308..91d65ccd7 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -35,11 +35,11 @@
 #include <tqcheckbox.h>
 #include <tqstyle.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kimageio.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kiconloader.h>
diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp
index 105630f40..06a1b0443 100644
--- a/kcontrol/tdm/tdm-conv.cpp
+++ b/kcontrol/tdm/tdm-conv.cpp
@@ -33,7 +33,7 @@
 
 #include <kdialog.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdm-conv.h"
 
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index c0e317180..65dbea179 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -32,7 +32,7 @@
 #include <kdialog.h>
 #include <ksimpleconfig.h>
 #include <tdefontrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdm-font.h"
 
diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp
index 434b55ae2..80f96e134 100644
--- a/kcontrol/tdm/tdm-shut.cpp
+++ b/kcontrol/tdm/tdm-shut.cpp
@@ -30,7 +30,7 @@
 #include <ksimpleconfig.h>
 #include <karrowbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kurlrequester.h>
 
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index 65d57a894..d39d4048e 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -33,9 +33,9 @@
 #include <kimageio.h>
 #include <kimagefilepreview.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurldrag.h>
 
 #include "tdm-users.h"
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 466fd9a98..ac7f1ce9c 100644
--- a/kcontrol/usbview/usbdevices.cpp
+++ b/kcontrol/usbview/usbdevices.cpp
@@ -19,8 +19,8 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "usbdb.h"
 #include "usbdevices.h"
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index 09214adbd..74bba77f2 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -24,8 +24,8 @@
 #include <tqtextstream.h>
 
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "view1394.h"
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index 7e43d9e9b..d32adc1b8 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -25,10 +25,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <twin.h>
 
 #include <tqcheckbox.h>
-- 
cgit v1.2.3