Rename additional header files to avoid conflicts with KDE4

113 files changed, 184 insertions, 184 deletions

diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index 85d2fc9b4..8cff8df1c 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -43,7 +43,7 @@ install( FILES
     kcolordialog.h tdeselect.h
     kdatepik.h kdatepicker.h kdatetbl.h tdefontdialog.h tdepopupmenu.h
     tdefontrequester.h ktabctl.h kstatusbar.h
-    tdemainwindow.h tdemainwindowiface.h tdetoolbar.h kmenubar.h
+    tdemainwindow.h tdemainwindowiface.h tdetoolbar.h tdemenubar.h
     knuminput.h kseparator.h klineedit.h
     krestrictedline.h kcolorbutton.h kcolorbtn.h
     ksystemtray.h kdockwindow.h kbuttonbox.h
@@ -54,7 +54,7 @@ install( FILES
     kcharselect.h kcolordrag.h qxembed.h
     knumvalidator.h kdialog.h kdialogbase.h
     kjanuswidget.h tdeaboutdialog.h
-    kauthicon.h kmessagebox.h ksharedpixmap.h
+    kauthicon.h tdemessagebox.h ksharedpixmap.h
     kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h
     tdetoolbarradiogroup.h ktextbrowser.h
     tdeaction.h tdeactioncollection.h tdeactionclasses.h khelpmenu.h kswitchlanguagedialog.h
@@ -103,7 +103,7 @@ set( ${target}_SRCS
   qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp
   tdepopupmenu.cpp tdetoolbar.cpp tdeaction.cpp kstdaction.cpp
   tdeactioncollection.cpp tdeactionclasses.cpp
-  kurllabel.cpp kmenubar.cpp kinputdialog.cpp
+  kurllabel.cpp tdemenubar.cpp kinputdialog.cpp
   knuminput.cpp klineedit.cpp tdelistview.cpp kprogress.cpp
   kprogressbox.cpp kcolordialog.cpp tdeselect.cpp kdatepicker.cpp
   kdatetbl.cpp tdefontrequester.cpp tdefontdialog.cpp ktabctl.cpp
@@ -118,7 +118,7 @@ set( ${target}_SRCS
   kcharselect.cpp kcolordrag.cpp
   knumvalidator.cpp kdialog.cpp kdialogbase.cpp
   kjanuswidget.cpp tdeaboutdialog.cpp
-  kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp
+  kauthicon.cpp tdemessagebox.cpp kdualcolorbutton.cpp
   tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp
   ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp
   kcmenumngr.cpp kpanelmenu.cpp
diff --git a/tdeui/MAINTAINERS b/tdeui/MAINTAINERS
index f4e2165fb..2caa911a2 100644
--- a/tdeui/MAINTAINERS
+++ b/tdeui/MAINTAINERS
@@ -54,8 +54,8 @@ tdelistbox.cpp
 tdelistview.cpp
 tdemainwindow.cpp
 tdemainwindowiface.cpp
-kmenubar.cpp
-kmessagebox.cpp		Waldo Bastian <bastian@kde.org>
+tdemenubar.cpp
+tdemessagebox.cpp		Waldo Bastian <bastian@kde.org>
 knuminput.cpp           Dirk Mueller <mueller@kde.org>
 knumvalidator.cpp
 kpanelapplet.cpp
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index 26a9423cd..eac8cde0e 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -40,7 +40,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kcolordialog.h tdeselect.h \
 		kdatepik.h kdatepicker.h kdatetbl.h tdefontdialog.h tdepopupmenu.h \
 		tdefontrequester.h ktabctl.h kstatusbar.h \
-		tdemainwindow.h tdemainwindowiface.h tdetoolbar.h kmenubar.h \
+		tdemainwindow.h tdemainwindowiface.h tdetoolbar.h tdemenubar.h \
 		knuminput.h kseparator.h klineedit.h \
 		krestrictedline.h kcolorbutton.h kcolorbtn.h \
 		ksystemtray.h kdockwindow.h kbuttonbox.h \
@@ -51,7 +51,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kcharselect.h kcolordrag.h qxembed.h \
 		knumvalidator.h kdialog.h kdialogbase.h \
 		kjanuswidget.h tdeaboutdialog.h \
-		kauthicon.h kmessagebox.h ksharedpixmap.h \
+		kauthicon.h tdemessagebox.h ksharedpixmap.h \
 		kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h \
 		tdetoolbarradiogroup.h ktextbrowser.h \
 		tdeaction.h tdeactioncollection.h tdeactionclasses.h khelpmenu.h kswitchlanguagedialog.h \
@@ -84,7 +84,7 @@ libtdeui_la_SOURCES = \
 		qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp \
 		tdepopupmenu.cpp tdetoolbar.cpp tdeaction.cpp kstdaction.cpp \
 		tdeactioncollection.cpp tdeactionclasses.cpp \
-		kurllabel.cpp kmenubar.cpp kinputdialog.cpp \
+		kurllabel.cpp tdemenubar.cpp kinputdialog.cpp \
 		knuminput.cpp klineedit.cpp tdelistview.cpp kprogress.cpp \
 		kprogressbox.cpp kcolordialog.cpp tdeselect.cpp kdatepicker.cpp \
 		kdatetbl.cpp tdefontrequester.cpp tdefontdialog.cpp ktabctl.cpp \
@@ -99,7 +99,7 @@ libtdeui_la_SOURCES = \
 		kcharselect.cpp kcolordrag.cpp  \
 		knumvalidator.cpp kdialog.cpp kdialogbase.cpp \
 		kjanuswidget.cpp tdeaboutdialog.cpp \
-		kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp \
+		kauthicon.cpp tdemessagebox.cpp kdualcolorbutton.cpp \
 		tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp \
 		ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp \
 		kcmenumngr.cpp kpanelmenu.cpp \
diff --git a/tdeui/kauthicon.cpp b/tdeui/kauthicon.cpp
index d4c18a114..d45217d9b 100644
--- a/tdeui/kauthicon.cpp
+++ b/tdeui/kauthicon.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kauthicon.h"
 
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 91c6aa66c..3e49e112c 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -31,8 +31,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
@@ -50,7 +50,7 @@
 #include "kdepackages.h"
 #include <kcombobox.h>
 #include <config.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqtextstream.h>
 #include <tqfile.h>
 
diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp
index 6351c512d..faa26e95e 100644
--- a/tdeui/kbuttonbox.cpp
+++ b/tdeui/kbuttonbox.cpp
@@ -50,7 +50,7 @@
  */
 
 #include "kbuttonbox.moc"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kguiitem.h>
 #include <kpushbutton.h>
 #include <tqptrlist.h>
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index a623b3efa..5561e5883 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KCharSelect::KCharSelectPrivate
 {
diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp
index b0f261890..60e250575 100644
--- a/tdeui/kcmenumngr.cpp
+++ b/tdeui/kcmenumngr.cpp
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqpopupmenu.h>
 #include "kcmenumngr.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "tdeconfig.h"
 #include "tdeshortcut.h"
 
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index 993530497..5a42406a0 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -25,7 +25,7 @@
 #include <tqapplication.h>
 #include <tqclipboard.h>
 #include <tqstyle.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdestdaccel.h>
 #include "kcolordialog.h"
 #include "kcolorbutton.h"
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index 7e9353cf4..87d5de32a 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -46,12 +46,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kpalette.h>
 #include <kimageeffect.h>
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index 29292f960..458fb50a8 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -47,13 +47,13 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kpalette.h>
 #include <kimageeffect.h>
diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index 3ddb4390b..cfef5fd5b 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -31,7 +31,7 @@
 #include <kicontheme.h>
 #include <tdelistviewsearchline.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kpixmapprovider.h>
 #include <tdestdaccel.h>
diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp
index e039a03ca..994d1262e 100644
--- a/tdeui/kcommand.cpp
+++ b/tdeui/kcommand.cpp
@@ -23,7 +23,7 @@
 #include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 KCommand::~KCommand()
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index 3cc224f4a..17f523d86 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 #include <tqwidget.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tqscrollview.h>
 
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index 98d72030d..99f1ce4af 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -32,10 +32,10 @@
 #include <tqtimer.h>
 
 #include "kdatepicker.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdetoolbar.h>
 #include <klineedit.h>
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 542f89f08..56edf9a5c 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -33,11 +33,11 @@
 //      dateSelected(TQDate)
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <kcalendarsystem.h>
diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp
index 2f240a256..e9185a9c1 100644
--- a/tdeui/kdatewidget.cpp
+++ b/tdeui/kdatewidget.cpp
@@ -23,8 +23,8 @@
 #include <tqlineedit.h>
 
 #include "knuminput.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 #include "kcalendarsystem.h"
 //#include "kdatepicker.h"
 #include "kdialog.h"
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index f6b2b8b56..86f7f7476 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -25,8 +25,8 @@
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqobjectlist.h>
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 6656d6803..890f79179 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -34,11 +34,11 @@
 #include <tqfocusdata.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kseparator.h>
 #include <kurllabel.h>
 #include <kdebug.h>
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index a761f43c6..bf99c6801 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -34,13 +34,13 @@
 
 #ifndef NO_KDE2
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdepopupmenu.h>
 #include <twin.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp
index f0cd5cae1..532e4aaaa 100644
--- a/tdeui/kdualcolorbutton.cpp
+++ b/tdeui/kdualcolorbutton.cpp
@@ -21,7 +21,7 @@
 #include "kcolordrag.h"
 #include "dcolorarrow.xbm"
 #include "dcolorreset.xpm"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqpainter.h>
 #include <tqbitmap.h>
 #include <tqdrawutil.h>
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index 37cee99fb..a550a7af1 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -29,8 +29,8 @@
 #include <kdebug.h>
 #include <kcmenumngr.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <kurldrag.h>
 
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index a7db92555..4749a471f 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -34,9 +34,9 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp
index 1a31bbaa4..6f22b091a 100644
--- a/tdeui/keditlistbox.cpp
+++ b/tdeui/keditlistbox.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <knotifyclient.h>
 
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index e1abdc875..639b22926 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -33,11 +33,11 @@
 
 #include <tdeaction.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kxmlguifactory.h>
 #include <kseparator.h>
 #include <tdeconfig.h>
diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h
index bb1233de3..538275f3d 100644
--- a/tdeui/kguiitem.h
+++ b/tdeui/kguiitem.h
@@ -27,7 +27,7 @@
 #include <tqpixmap.h>
 #include <tqvaluelist.h>
 #include <kicontheme.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 /**
  * @short An abstract class for GUI data such as ToolTip and Icon.
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 41fa063c2..08755b860 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -36,8 +36,8 @@
 #include <kdialogbase.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index bcf9550b4..7273cbe13 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -27,8 +27,8 @@
 #include "kwordwrap.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <kipc.h> 
 
diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp
index 33df94a6a..7082fc910 100644
--- a/tdeui/kiconviewsearchline.cpp
+++ b/tdeui/kiconviewsearchline.cpp
@@ -27,7 +27,7 @@
 #include "kiconviewsearchline.h"
 
 #include <tqiconview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtimer.h>
 #include <kdebug.h>
 
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index e9dd9df85..c3a8838e9 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -35,9 +35,9 @@
 
 #include <tdeapplication.h>
 #include <kdialog.h> // Access to some static members
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kseparator.h>
 #include <kdebug.h>
 #include "kjanuswidget.h"
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index 24191aa45..9b530b751 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index 7faad35c4..35fe0e45f 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -42,12 +42,12 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kglobalaccel.h>
 #include <kiconloader.h>
 #include <tdelistviewsearchline.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeshortcut.h>
 #include <tdeshortcutlist.h>
 #include <kxmlguifactory.h>
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index a1c05aaab..588746ec1 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <tqtooltip.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp
index ca4fd8266..8fc0a9a4f 100644
--- a/tdeui/klineeditdlg.cpp
+++ b/tdeui/klineeditdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqfiledialog.h>
 
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index 71158370b..0a5fe0188 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -33,10 +33,10 @@
 #include <tqtimer.h>
 
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <kmenubar.h>
+#include <tdeglobalsettings.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kmanagerselection.h>
 
@@ -568,4 +568,4 @@ void KMenuBar::drawContents( TQPainter* p )
 void KMenuBar::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kmenubar.moc"
+#include "tdemenubar.moc"
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index 5684c6484..3208e94d8 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -37,13 +37,13 @@
 #include <kdialogbase.h>
 #include <kguiitem.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kstdguiitem.h>
 #include <kactivelabel.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp
index f6c3d9dd7..40f87da29 100644
--- a/tdeui/knuminput.cpp
+++ b/tdeui/knuminput.cpp
@@ -44,8 +44,8 @@
 #include <tqspinbox.h>
 #include <tqstyle.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kdialog.h"
diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp
index ce5c66842..6cf486ad1 100644
--- a/tdeui/knumvalidator.cpp
+++ b/tdeui/knumvalidator.cpp
@@ -26,8 +26,8 @@
 #include <tqstring.h>
 
 #include "knumvalidator.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 ///////////////////////////////////////////////////////////////
diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp
index 184e83422..287208b66 100644
--- a/tdeui/kpanelmenu.cpp
+++ b/tdeui/kpanelmenu.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tqtimer.h>
 
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index 302b4e679..64904c581 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -34,12 +34,12 @@
 #include <tqptrdict.h>
 #include <tqtimer.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaboutdialog.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp
index 8892ce153..ba3459b45 100644
--- a/tdeui/kpassivepopup.cpp
+++ b/tdeui/kpassivepopup.cpp
@@ -22,7 +22,7 @@
 #include <kdialog.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index 7ce3a1be2..02054aad3 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -18,7 +18,7 @@
 #include <tqcolor.h>
 #include <tqglobal.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/tdeui/kpixmapregionselectordialog.cpp b/tdeui/kpixmapregionselectordialog.cpp
index c394af0f3..8228cd2f1 100644
--- a/tdeui/kpixmapregionselectordialog.cpp
+++ b/tdeui/kpixmapregionselectordialog.cpp
@@ -21,7 +21,7 @@
 #include <kdialogbase.h>
 #include <tqdialog.h>
 #include <tqdesktopwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent,
diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp
index bd82cae72..21ac875db 100644
--- a/tdeui/kpixmapregionselectorwidget.cpp
+++ b/tdeui/kpixmapregionselectorwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqlayout.h>
 #include <kimageeffect.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <stdlib.h>
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 3f0186e3d..8fb050a11 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -35,7 +35,7 @@
 #include "kprogress.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 
 KProgress::KProgress(TQWidget *parent, const char *name, WFlags f)
diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp
index 6dda25a33..2472207f4 100644
--- a/tdeui/kprogressbox.cpp
+++ b/tdeui/kprogressbox.cpp
@@ -38,7 +38,7 @@
 #include "kprogressbox.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 
 struct KProgressBoxDialog::KProgressBoxDialogPrivate
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index e92fe8583..6f994dbe3 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -25,9 +25,9 @@
 
 #include "config.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kipc.h> 
 #include <tdeapplication.h>
 
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index d27ae07ca..a9958dea9 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -30,9 +30,9 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp
index 997de84b3..40cbb8ee4 100644
--- a/tdeui/kscrollview.cpp
+++ b/tdeui/kscrollview.cpp
@@ -25,7 +25,7 @@
 #include "kscrollview.h"
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 struct KScrollView::KScrollViewPrivate {
     KScrollViewPrivate() : dx(0), dy(0), ddx(0), ddy(0), rdx(0), rdy(0), scrolling(false) {}
diff --git a/tdeui/ksplashscreen.cpp b/tdeui/ksplashscreen.cpp
index a45a579bb..82234bd94 100644
--- a/tdeui/ksplashscreen.cpp
+++ b/tdeui/ksplashscreen.cpp
@@ -18,8 +18,8 @@
 */
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include <tqpixmap.h>
 
diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp
index 134d7f1a5..daa22f46b 100644
--- a/tdeui/kstatusbar.cpp
+++ b/tdeui/kstatusbar.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id,
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index 8dd874a9d..652534601 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -25,9 +25,9 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 #include <tdemainwindow.h>
 #include "kstdaction_p.h"
diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h
index a5449d8e7..4a8fee92e 100644
--- a/tdeui/kstdaction_p.h
+++ b/tdeui/kstdaction_p.h
@@ -19,7 +19,7 @@
 #ifndef _KSTDACTION_PRIVATE_H_
 #define _KSTDACTION_PRIVATE_H_
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 
 namespace KStdAction
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index 78f3fd6f6..80bf54bce 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -19,7 +19,7 @@
 #include "kstdguiitem.h"
 
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index c9bb7552a..c82ffb83d 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -28,8 +28,8 @@
 
 #include <klanguagebutton.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index ba938382b..f7627621c 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -26,10 +26,10 @@
 #include <tqsyntaxhighlighter.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdespell.h>
 #include <tdeapplication.h>
 
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index fcd0389da..5004d4bf1 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -20,12 +20,12 @@
 
 #include "config.h"
 #include "tdeaction.h"
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
 #include "tdeshortcut.h"
 #include "ksystemtray.h"
 #include "tdepopupmenu.h"
 #include "tdeapplication.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tdeaboutdata.h"
 
 #ifdef Q_WS_X11
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index 711515985..f7e81c9b1 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -18,7 +18,7 @@
 #ifndef KSYSTEMTRAY_H
 #define KSYSTEMTRAY_H
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlabel.h>
 
 class TDEActionCollection;
diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp
index 2e2fbe301..911162f14 100644
--- a/tdeui/ktabbar.cpp
+++ b/tdeui/ktabbar.cpp
@@ -26,9 +26,9 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ktabbar.h"
 #include "ktabwidget.h"
diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp
index b17e38067..a4b716db7 100644
--- a/tdeui/ktextbrowser.cpp
+++ b/tdeui/ktextbrowser.cpp
@@ -20,7 +20,7 @@
 
 #include <tqpopupmenu.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ktextbrowser.h>
 #include <kcursor.h>
 #include <kurl.h>
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index fb0e607fa..445540099 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -26,10 +26,10 @@
 #include <ksyntaxhighlighter.h>
 #include <tdespell.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdestdaccel.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KTextEdit::KTextEditPrivate
 {
diff --git a/tdeui/ktimezonewidget.cpp b/tdeui/ktimezonewidget.cpp
index c7046231f..f6488847f 100644
--- a/tdeui/ktimezonewidget.cpp
+++ b/tdeui/ktimezonewidget.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <tdefile.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktimezones.h>
 #include <ktimezonewidget.h>
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 44f710fb9..b3e7d832b 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -37,16 +37,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <ktextbrowser.h>
 #include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #ifdef Q_WS_X11
 #include <twin.h>
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index 0a95a2c70..749b4f5b5 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -27,7 +27,7 @@
 #include <tqapplication.h>
 
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "kurllabel.h"
 
diff --git a/tdeui/kwhatsthismanager.cpp b/tdeui/kwhatsthismanager.cpp
index bcf48438c..46643f6f0 100644
--- a/tdeui/kwhatsthismanager.cpp
+++ b/tdeui/kwhatsthismanager.cpp
@@ -21,7 +21,7 @@
 #include <tqvariant.h>
 #include <kdebug.h>
 #include <tqtextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 KWhatsThisManager *KWhatsThisManager::s_instance = 0;
diff --git a/tdeui/kwizard.cpp b/tdeui/kwizard.cpp
index 0e378dbf2..b8fa1e88a 100644
--- a/tdeui/kwizard.cpp
+++ b/tdeui/kwizard.cpp
@@ -22,8 +22,8 @@
 #include <tqpushbutton.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kstdguiitem.h>
 
 #include "kwizard.h"
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index 6fd472ad5..ff4083779 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -20,14 +20,14 @@
 
 #include "tdeapplication.h"
 #include "kxmlguibuilder.h"
-#include "kmenubar.h"
+#include "tdemenubar.h"
 #include "tdepopupmenu.h"
 #include "tdetoolbar.h"
 #include "kstatusbar.h"
 #include "tdemainwindow.h"
 #include "tdeaction.h"
-#include "kglobalsettings.h"
-#include <klocale.h>
+#include "tdeglobalsettings.h"
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tqobjectlist.h>
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 0a2aae41d..87015bfd5 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -35,7 +35,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kkeydialog.h>
diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp
index ffe9ffab1..699f9579d 100644
--- a/tdeui/kxmlguifactory_p.cpp
+++ b/tdeui/kxmlguifactory_p.cpp
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <assert.h>
diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp
index 08ee46450..ef9efb181 100644
--- a/tdeui/tdeaboutapplication.cpp
+++ b/tdeui/tdeaboutapplication.cpp
@@ -27,8 +27,8 @@
 #include <kaboutdialog_private.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 #include <kactivelabel.h>
 #include "ktextedit.h"
diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
index b46c0b959..895247161 100644
--- a/tdeui/tdeaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -32,9 +32,9 @@
 #include <tqtabbar.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <ktextbrowser.h>
 #include <kurllabel.h>
 #include <tdeaboutdialog.h>
diff --git a/tdeui/tdeabouttde.cpp b/tdeui/tdeabouttde.cpp
index 0e7078af4..d5f45c85a 100644
--- a/tdeui/tdeabouttde.cpp
+++ b/tdeui/tdeabouttde.cpp
@@ -22,7 +22,7 @@
 // I (espen) prefer that header files are included alphabetically
 #include <tdeabouttde.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index d817a5ba4..6f29ab848 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -37,7 +37,7 @@
 #include <kdebug.h>
 #include <kguiitem.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index 1fc963887..4b589f166 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -47,9 +47,9 @@
 #include <kdebug.h>
 #include <tdefontcombo.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp
index 3ef22a45f..c3c7329b8 100644
--- a/tdeui/tdeactionselector.cpp
+++ b/tdeui/tdeactionselector.cpp
@@ -19,7 +19,7 @@
 
 #include "tdeactionselector.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h> // for spacingHint()
 #include <kdebug.h>
diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp
index 4e6ce943f..c6b7d3726 100644
--- a/tdeui/tdecmodule.cpp
+++ b/tdeui/tdecmodule.cpp
@@ -27,9 +27,9 @@
 #include <tdeconfigskeleton.h>
 #include <tdeconfigdialogmanager.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdecmodule.h"
 #include "tdecmodule.moc"
diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp
index 53a8c71fb..96c9c1794 100644
--- a/tdeui/tdecompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <knotifyclient.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "tdecompletionbox.h"
 
diff --git a/tdeui/tdeconfigdialog.cpp b/tdeui/tdeconfigdialog.cpp
index c8e848fa3..df43defc5 100644
--- a/tdeui/tdeconfigdialog.cpp
+++ b/tdeui/tdeconfigdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeconfigskeleton.h>
 #include <tdeconfigdialogmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/tdeui/tdefontcombo.cpp b/tdeui/tdefontcombo.cpp
index fc9ae830b..cb250385f 100644
--- a/tdeui/tdefontcombo.cpp
+++ b/tdeui/tdefontcombo.cpp
@@ -24,7 +24,7 @@
 
 #include <kcharsets.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdefontdialog.h>
 
 #include "tdefontcombo.h"
diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp
index 15c687e13..75f4599e0 100644
--- a/tdeui/tdefontdialog.cpp
+++ b/tdeui/tdefontdialog.cpp
@@ -45,11 +45,11 @@
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tqlineedit.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <knuminput.h>
diff --git a/tdeui/tdefontrequester.cpp b/tdeui/tdefontrequester.cpp
index 64eba5701..459938d12 100644
--- a/tdeui/tdefontrequester.cpp
+++ b/tdeui/tdefontrequester.cpp
@@ -26,7 +26,7 @@
 #include <tqwhatsthis.h>
 
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TDEFontRequester::TDEFontRequester( TQWidget *parent, const char *name,
     bool onlyFixed ) : TQWidget( parent, name ),
diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp
index 9f7c23688..0e4c5d520 100644
--- a/tdeui/tdelistbox.cpp
+++ b/tdeui/tdelistbox.cpp
@@ -19,7 +19,7 @@
 
 #include <tqtimer.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcursor.h>
 #include <tdeapplication.h>
 #include <kipc.h> 
diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp
index 020f18679..4750a7138 100644
--- a/tdeui/tdelistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -27,7 +27,7 @@
 #include <tqstyle.h>
 #include <tqpainter.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdeapplication.h>
diff --git a/tdeui/tdelistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp
index 20d78add2..b74b4d1c1 100644
--- a/tdeui/tdelistviewsearchline.cpp
+++ b/tdeui/tdelistviewsearchline.cpp
@@ -23,7 +23,7 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqapplication.h>
 #include <tqtimer.h>
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 01b6a09e0..ba9c51556 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -40,13 +40,13 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <twin.h>
 #include <kedittoolbar.h>
 #include <tdemainwindow.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #if defined Q_WS_X11
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index fe3593b7e..35a7706c7 100644
--- a/tdeui/tdeshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -55,10 +55,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kkeynative.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 
diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index 629013121..031011f0a 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -38,9 +38,9 @@
 #include <tqtimer.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "tdespell.h"
 #include "tdespelldlg.h"
 #include <twin.h>
diff --git a/tdeui/tdespelldlg.cpp b/tdeui/tdespelldlg.cpp
index 280ddf861..9e8206505 100644
--- a/tdeui/tdespelldlg.cpp
+++ b/tdeui/tdespelldlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistbox.h>
 #include <kcombobox.h>
 #include <tdelistview.h>
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index a095f1493..a3ced3a19 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -46,11 +46,11 @@
 #include <tdemainwindow.h>
 #include <klineedit.h>
 #include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h
index 37e22c9bb..857673f28 100644
--- a/tdeui/tdetoolbar.h
+++ b/tdeui/tdetoolbar.h
@@ -33,7 +33,7 @@
 #include <tqframe.h>
 #include <tqiconset.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TQDomElement;
 class TQSize;
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index 608c31a32..abf23ffc7 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -40,8 +40,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
 
diff --git a/tdeui/tdetoolbarbutton.h b/tdeui/tdetoolbarbutton.h
index 49e906e6e..c73c1145a 100644
--- a/tdeui/tdetoolbarbutton.h
+++ b/tdeui/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
index 4242a119e..da621fadd 100644
--- a/tdeui/tdetoolbarhandler.cpp
+++ b/tdeui/tdetoolbarhandler.cpp
@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <assert.h>
 
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index c96d6a4eb..c3b6d1ddc 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -17,7 +17,7 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kiconview.h>
 #include <tdelistview.h>
diff --git a/tdeui/tests/kaboutdialogtest.cpp b/tdeui/tests/kaboutdialogtest.cpp
index c3be2de25..e0680b52f 100644
--- a/tdeui/tests/kaboutdialogtest.cpp
+++ b/tdeui/tests/kaboutdialogtest.cpp
@@ -12,7 +12,7 @@
 // #include <kimgio.h>
 #include <tqimage.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp
index ccd6cd10a..5ee4ee381 100644
--- a/tdeui/tests/kcharselecttest.cpp
+++ b/tdeui/tests/kcharselecttest.cpp
@@ -1,5 +1,5 @@
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kcharselect.h"
 
 int main (int argc,char **argv)
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index f45df0de7..dbe39484c 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -20,7 +20,7 @@
 #include <tdeapplication.h>
 #include "kcolordialog.h"
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 int main( int argc, char *argv[] )
 {
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 225c80c0f..d2b59a4c2 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -9,7 +9,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <ksimpleconfig.h>
 
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index 12e3835dc..261534465 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './kcompletiontest.ui'
 **
diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp
index abcfeb24a..8bdab90a4 100644
--- a/tdeui/tests/kdatepicktest.cpp
+++ b/tdeui/tests/kdatepicktest.cpp
@@ -1,7 +1,7 @@
 #include "kdatepicker.h"
 #include <tqlineedit.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp
index 721f86492..f94a2a9f7 100644
--- a/tdeui/tests/kdatetimewidgettest.cpp
+++ b/tdeui/tests/kdatetimewidgettest.cpp
@@ -1,6 +1,6 @@
 #include "kdatetimewidget.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp
index 11fb243f3..22340b4c9 100644
--- a/tdeui/tests/kdatewidgettest.cpp
+++ b/tdeui/tests/kdatewidgettest.cpp
@@ -1,7 +1,7 @@
 #include "kdatewidget.h"
 #include <tqlineedit.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index 683d42acd..aacac19a0 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -18,7 +18,7 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdetoolbar.h>
 #include <tqvbox.h>
 
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index e52d6e671..512bfc610 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -1,7 +1,7 @@
 #include "kdualcolortest.h"
 #include <kdualcolorbutton.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqpalette.h>
 
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 793988968..20e9b6ca8 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -9,9 +9,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdecompletionbox.h>
 
 #include "klineedittest.h"
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index ce333edee..2a56a7ead 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -1,4 +1,4 @@
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
 
 #include <tqdialog.h>
 #include <tqlayout.h>
@@ -10,7 +10,7 @@
 #include <kstatusbar.h>
 #include <tdeapplication.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class ExampleWidget : public QLabel
 {
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 82c03e271..0a8c6d10c 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -12,7 +12,7 @@
 #include "kstatusbar.h"
 #include <tdeapplication.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include "kstatusbartest.h"
 
 testWindow::testWindow (TQWidget *, const char *name)
diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h
index 34dd6df81..712f24352 100644
--- a/tdeui/tests/kstatusbartest.h
+++ b/tdeui/tests/kstatusbartest.h
@@ -1,7 +1,7 @@
 #ifndef test_kstatusbar_h
 #define test_kstatusbar_h
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tqpopupmenu.h>
 #include <kstatusbar.h>
 #include <tdemainwindow.h>
diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp
index bbff45648..731dc3219 100644
--- a/tdeui/tests/ktimewidgettest.cpp
+++ b/tdeui/tests/ktimewidgettest.cpp
@@ -1,6 +1,6 @@
 #include "ktimewidget.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index c8ace159e..b19818d4c 100644
--- a/tdeui/tests/tdemainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -3,7 +3,7 @@
 
 #include <tdeapplication.h>
 #include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include "tdemainwindowtest.h"
 
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 3823ab46f..77e01d289 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -13,14 +13,14 @@
 #include <kcombobox.h>
 #include <khelpmenu.h>
 #include <tdecmdlineargs.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdetoolbarradiogroup.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <tqmultilineedit.h>
 #include "twindowtest.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 //#include <dclock.h>
diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h
index 83a0d75bf..d1d9d460e 100644
--- a/tdeui/tests/twindowtest.h
+++ b/tdeui/tests/twindowtest.h
@@ -4,7 +4,7 @@
 #include <tqpopupmenu.h>
 #include <tqtimer.h>
 #include <tqprogressbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index 7ca8fda3f..bc2df2f66 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <twin.h> 
 #include <twinmodule.h> 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 
 #include <netwm.h>