Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

49 files changed, 86 insertions, 86 deletions

diff --git a/twin/activation.cpp b/twin/activation.cpp
index ba95cde04..36b9e88f1 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -18,9 +18,9 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <tqpopupmenu.h>
 #include <kxerrorhandler.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "client.h"
 #include "workspace.h"
diff --git a/twin/client.cpp b/twin/client.cpp
index 3efe87f89..957a0b3ba 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqwhatsthis.h>
 #include <twin.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 #include "bridge.h"
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 32a1ec28a..d63d6c093 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -19,7 +19,7 @@
 #include <kicontheme.h>
 #include <kiconeffect.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tqbitmap.h>
 #include <tqlabel.h>
diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp
index ca2e77c4a..77ca65338 100644
--- a/twin/clients/b2/config/config.cpp
+++ b/twin/clients/b2/config/config.cpp
@@ -7,10 +7,10 @@
  */
 
 #include "config.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 extern "C"
diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp
index 8e53dcc75..f479c0c69 100644
--- a/twin/clients/default/config/config.cpp
+++ b/twin/clients/default/config/config.cpp
@@ -8,10 +8,10 @@
  */
 
 #include "config.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqwhatsthis.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpixmap.h>
 #include <tqvbox.h>
 
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 938a9e06d..7892c4adc 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -13,11 +13,11 @@
 #include "kdedefault.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqdrawutil.h>
 #include <tqbitmap.h>
diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp
index 6d4695da2..0f3be48c7 100644
--- a/twin/clients/keramik/config/config.cpp
+++ b/twin/clients/keramik/config/config.cpp
@@ -23,8 +23,8 @@
  * Boston, MA 02110-1301, USA.
  */
  
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 638bcce35..02320d9ad 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconeffect.h>
 
 #include <tqpainter.h>
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index 39bb6d30c..27af172e1 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -2,11 +2,11 @@
 #include <tqdir.h>
 #include <tdeapplication.h>
 #include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
         I18N_NOOP("Installs a KWM theme");
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index d2bf002ed..73c8feaca 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,13 +1,13 @@
 #include <tdeconfig.h>
 #include "kwmthemeclient.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlayout.h>
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 #include <kpixmapeffect.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbitmap.h>
 #include <tqstyle.h>
 #include <tqlabel.h>
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 0f91d9005..34c79b2d6 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -11,8 +11,8 @@
 #include <tqdrawutil.h>
 #include <kpixmapeffect.h>
 #include <kdrawutil.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqbitmap.h>
 
 namespace Laptop {
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 719362d07..18d6870f7 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -3,8 +3,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include "config.h"
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index f58855fe3..68c8716c4 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -2,8 +2,8 @@
 // Melchior FRANZ  <a8603365@unet.univie.ac.at>   configuration options
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqdrawutil.h>
 #include <kpixmapeffect.h>
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index 4477fdd02..04658796c 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -28,8 +28,8 @@
 #include <tqwhatsthis.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "config.h"
 #include "configdialog.h"
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index f48417779..31c9e2ad9 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -20,7 +20,7 @@
   Boston, MA 02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbitmap.h>
 #include <tqdatetime.h>
diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index d3364af14..3ce86239b 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -8,9 +8,9 @@
  */
 
 #include "config.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 extern "C"
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 00aee9c58..511fafa6f 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -16,8 +16,8 @@
 
 #include <tdeconfig.h>
 #include <kdrawutil.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kpixmapeffect.h>
 #include <tqbitmap.h>
 #include <tqdrawutil.h>
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index 790afa461..f3689af52 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -19,7 +19,7 @@
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbitmap.h>
 #include <tqimage.h>
diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp
index 2e26a7c41..e01d1d98e 100644
--- a/twin/clients/test/test.cpp
+++ b/twin/clients/test/test.cpp
@@ -1,7 +1,7 @@
 #include "test.h"
 
 #include <tqtooltip.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 namespace KWinTest
diff --git a/twin/clients/web/WebButton.h b/twin/clients/web/WebButton.h
index d86db6cc6..a5eb8867e 100644
--- a/twin/clients/web/WebButton.h
+++ b/twin/clients/web/WebButton.h
@@ -24,7 +24,7 @@
 
 #include <tqwidget.h>
 #include <tqbitmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "../../lib/kcommondecoration.h"
 
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 8123dbae2..f49052e37 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "workspace.h"
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqpainter.h>
 #include <twin.h>
 
diff --git a/twin/group.cpp b/twin/group.cpp
index fb625b3e4..41c987dbe 100644
--- a/twin/group.cpp
+++ b/twin/group.cpp
@@ -23,7 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "client.h"
 
 #include <assert.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 
 /*
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index 55b5beb56..a7dc8a90d 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -37,8 +37,8 @@
 #include <kdebug.h>
 
 #include <kdialog.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 
 #include <kdecorationfactory.h>
 
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index ebdecca86..954ff1774 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -20,9 +20,9 @@
 #include "preview.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlabel.h>
 #include <tqstyle.h>
 #include <kiconloader.h>
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index 67115d089..8e668e78a 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -49,8 +49,8 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 6710208d7..e63ec54d5 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -22,8 +22,8 @@
 #include <dcopclient.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 9715f4651..8778d915e 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -29,11 +29,11 @@
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kseparator.h>
 
 #include <X11/X.h>
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 91a6232d2..74b8d3140 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -32,17 +32,17 @@
 #include <tqradiobutton.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <tdeapplication.h>
 #include <kdialog.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
 #include <tqtabwidget.h>
 
diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp
index b3646312a..f450938bc 100644
--- a/twin/kcmtwin/twinrules/detectwidget.cpp
+++ b/twin/kcmtwin/twinrules/detectwidget.cpp
@@ -19,7 +19,7 @@
 #include "detectwidget.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <tqlabel.h>
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 033967e6d..b137a7b09 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -18,9 +18,9 @@
 
 #include "kcm.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index cc2b4499b..21cb007ec 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -20,7 +20,7 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 
 #include <X11/Xlib.h>
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index dcf7cd358..334001bf7 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -25,11 +25,11 @@
 #include <kpushbutton.h>
 #include <tqlabel.h>
 #include <twinmodule.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtabwidget.h>
 #include <tqtimer.h>
 
diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp
index 7ea38db64..bf763e7c1 100644
--- a/twin/killer/killer.cpp
+++ b/twin/killer/killer.cpp
@@ -24,9 +24,9 @@ DEALINGS IN THE SOFTWARE.
 
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <unistd.h>
 #include <twin.h>
 #include <X11/Xlib.h>
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 74bf26dc7..997845a5c 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -33,7 +33,7 @@
 
 #include <tdeapplication.h>
 #include <kdecorationfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp
index c9888ff96..b2332c514 100644
--- a/twin/lib/kdecoration.cpp
+++ b/twin/lib/kdecoration.cpp
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <kdebug.h>
 #include <tqapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <assert.h>
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xlib.h>
diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp
index 73e2d9871..2cca5d556 100644
--- a/twin/lib/kdecoration_p.cpp
+++ b/twin/lib/kdecoration_p.cpp
@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
 #include "kdecoration_p.h"
 
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqpalette.h>
 #include <tqapplication.h>
 #include <assert.h>
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index 632539f66..319b7305e 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -27,7 +27,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <assert.h>
 
diff --git a/twin/main.cpp b/twin/main.cpp
index fe87abdea..b3e861307 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -14,8 +14,8 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "main.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <stdlib.h>
 #include <tdecmdlineargs.h>
diff --git a/twin/manage.cpp b/twin/manage.cpp
index 064145218..ec6a5d675 100644
--- a/twin/manage.cpp
+++ b/twin/manage.cpp
@@ -17,8 +17,8 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "client.h"
 
-#include <kstartupinfo.h>
-#include <kglobal.h>
+#include <tdestartupinfo.h>
+#include <tdeglobal.h>
 #include <X11/extensions/shape.h>
 
 #include "notifications.h"
diff --git a/twin/options.cpp b/twin/options.cpp
index c09bbde61..73d416155 100644
--- a/twin/options.cpp
+++ b/twin/options.cpp
@@ -17,8 +17,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqpixmap.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tqtooltip.h>
 
 #include "client.h"
diff --git a/twin/plugins.cpp b/twin/plugins.cpp
index bcba27dc0..10d3012d2 100644
--- a/twin/plugins.cpp
+++ b/twin/plugins.cpp
@@ -11,8 +11,8 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "plugins.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <tqpixmap.h>
 
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index 3f5aa4d90..638bd9354 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -18,15 +18,15 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqlabel.h>
 #include <tqdrawutil.h>
 #include <tqstyle.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <fixx11h.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqapplication.h>
 #include <tqdesktopwidget.h>
 #include <kstringhandler.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // specify externals before namespace
 
diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp
index 2693dcf0e..3c915b8c8 100644
--- a/twin/resumer/resumer.cpp
+++ b/twin/resumer/resumer.cpp
@@ -24,9 +24,9 @@ DEALINGS IN THE SOFTWARE.
 
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <unistd.h>
 #include <twin.h>
 #include <X11/Xlib.h>
diff --git a/twin/rules.cpp b/twin/rules.cpp
index c9eba17ac..fb22b86e7 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <fixx11h.h>
 #include <tdeconfig.h>
 #include <tqregexp.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksimpleconfig.h>
 #include <tqfile.h>
 
diff --git a/twin/sm.cpp b/twin/sm.cpp
index 3a07d7b80..53d2a5f29 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <pwd.h>
 #include <fixx11h.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "workspace.h"
 #include "client.h"
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index 4b9175b48..3d75edef1 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -17,10 +17,10 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqlabel.h>
 #include <tqdrawutil.h>
 #include <tqstyle.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <fixx11h.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqapplication.h>
 #include <tqdesktopwidget.h>
 #include <kstringhandler.h>
@@ -28,7 +28,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kdebug.h>
 #include <kglobalaccel.h>
 #include <kkeynative.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconeffect.h>
 #include <X11/keysym.h>
 #include <X11/keysymdef.h>
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index 7c14ab038..6034a613e 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -22,9 +22,9 @@
 #include <kdebug.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlabel.h>
 #include <tqstyle.h>
 #include <kiconloader.h>
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 292da2b99..e78652918 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -22,9 +22,9 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqslider.h>
 #include <tqtooltip.h>
 #include <tqpopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kglobalaccel.h>
 #include <tdeapplication.h>
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 1bc55d3dd..aeb7ce283 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -14,17 +14,17 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "workspace.h"
 
 #include <tdeapplication.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <fixx11h.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <tqpainter.h>
 #include <tqbitmap.h>
 #include <tqclipboard.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kprocess.h>
 #include <kglobalaccel.h>
 #include <dcopclient.h>