diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a9f23a4d..ac1ecf1a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -953,7 +953,7 @@ add_subdirectory( kinit )
 add_subdirectory( tdeprint )
 add_subdirectory( kab )
 add_subdirectory( tderesources )
-add_subdirectory( kabc )
+add_subdirectory( tdeabc )
 add_subdirectory( arts )
 add_subdirectory( interfaces )
 add_subdirectory( kate )
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index b375854de..322efffb2 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -204,9 +204,9 @@ must have created a TDEApplication object before the methods can be used.<P>
 <TR>
   <TD COLSPAN="2">
     <PRE>
-      #include &lt;kglobal.h&gt;
+      #include &lt;tdeglobal.h&gt;
       #include &lt;tdeconfig.h&gt;      // Needed to use TDEConfig
-      #include &lt;klocale.h&gt;      // Needed to use TDELocale
+      #include &lt;tdelocale.h&gt;      // Needed to use TDELocale
       #include &lt;kiconloader.h&gt;  // Needed to use TDEIconLoader
     </PRE>
   </TD>
diff --git a/Mainpage.dox b/Mainpage.dox
index 15904678c..702510fc5 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -49,8 +49,8 @@
         *   (<a target="_top" href="interfaces/html/classes.html">classes</a>)\n
 	*   <i>Defines interfaces for common components so that new implementations
 	*   can be dropped in.</i>
-	* - <a target="_top" href="kabc/html/index.html"><b>kabc</b></a>
-        *   (<a target="_top" href="kabc/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeabc/html/index.html"><b>kabc</b></a>
+        *   (<a target="_top" href="tdeabc/html/classes.html">classes</a>)\n
 	*   <i>Access to the Trinity address book.</i>
 	* - <a target="_top" href="tderesources/html/index.html"><b>tderesources</b></a>
         *   (<a target="_top" href="tderesources/html/classes.html">classes</a>)\n
diff --git a/Makefile.am.in b/Makefile.am.in
index 83d0901fa..2ebb4f8c6 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -39,7 +39,7 @@ potdir = $(kde_includes)
 pot_DATA = kde.pot
 
 messages:
-	cd kabc/scripts && perl ./makeaddressee
+	cd tdeabc/scripts && perl ./makeaddressee
 	find . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
 	mfs=`find . -name Makefile.am | xargs egrep -l '^messages:'` ;\
 	for dir in $$mfs; do \
diff --git a/arts/kde/kaudioplaystream.cpp b/arts/kde/kaudioplaystream.cpp
index 52743a67e..0ef5b8332 100644
--- a/arts/kde/kaudioplaystream.cpp
+++ b/arts/kde/kaudioplaystream.cpp
@@ -26,7 +26,7 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp
index 0d180d1f1..0c11bcf04 100644
--- a/arts/kde/kaudiorecordstream.cpp
+++ b/arts/kde/kaudiorecordstream.cpp
@@ -29,7 +29,7 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc
index 70c4b7918..647c2f320 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cc
@@ -3,7 +3,7 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index 01ce8f3f1..ed9a3fadf 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -2,7 +2,7 @@
 #include <kmedia2.h>
 #include <tdecmdlineargs.h>
 #include <connect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include "qiomanager.h"
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index df6ed645f..93bfac388 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -2,7 +2,7 @@
 #include <kmedia2.h>
 #include <tdecmdlineargs.h>
 #include <connect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <stdsynthmodule.h>
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index 389228d99..c03a18c21 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -27,7 +27,7 @@
 #endif
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kvideowidget.h"
 
 
diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp
index d134aeca4..d5e8c8642 100644
--- a/arts/kde/mcop-dcop/kmcop.cpp
+++ b/arts/kde/mcop-dcop/kmcop.cpp
@@ -20,7 +20,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 #include <tqvaluelist.h>
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 3d0e45d02..313a7a993 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -52,9 +52,9 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <kiconloader.h>
 #include <kmacroexpander.h>
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index 4eb62f1fb..eaa5c8e2c 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -31,11 +31,11 @@ Gnome, etc. and used instead.
 
 #include <tqregexp.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 
 // command line options
diff --git a/configure.in.in b/configure.in.in
index 651d6f2eb..c414bafdb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -249,7 +249,7 @@ AC_SUBST(LIBRESOLV)
 AC_SUBST(LIBICE)
 
 AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
-AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
+AC_SUBST(LIB_KABC, '$(top_builddir)/tdeabc/libkabc.la')
 AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
 AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
 AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index c4d77c61e..fb2db0eb4 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kdcopservicestarter.h> 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kiconloader.h>
 #include <kservice.h>
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 7dd746c4f..370805a74 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -5,10 +5,10 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemediaplayer/player.h>
 #include <kmimetype.h>
 #include <tdeparts/componentfactory.h>
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index ad6c8df20..803feb3a6 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -21,8 +21,8 @@
 #include <tdeapplication.h>
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kstandarsdirs.h>
diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index 42e20cd5b..a0dfbe921 100644
--- a/interfaces/tdescript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -5,8 +5,8 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 //using namespace KScriptInterface;
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index 0808a84f3..ca0176ce7 100644
--- a/interfaces/tdetexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -90,7 +90,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK tdeui-shared kabc-shared tdeparts-shared
+  LINK tdeui-shared tdeabc-shared tdeparts-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index b535b39cc..4b1590abe 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -46,7 +46,7 @@ servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetextedit
 kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
 kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
 
-templateinterface.lo: $(top_builddir)/kabc/addressee.h
+templateinterface.lo: $(top_builddir)/tdeabc/addressee.h
 
 include ../../admin/Doxyfile.am
 
diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index aed904c54..1eddfb8d6 100644
--- a/interfaces/tdetexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -6,7 +6,7 @@
 #include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tdeapplication.h>
 #include <tqlayout.h>
diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp
index ecc34c7e2..01e0c292f 100644
--- a/interfaces/tdetexteditor/templateinterface.cpp
+++ b/interfaces/tdetexteditor/templateinterface.cpp
@@ -22,11 +22,11 @@
 #include <addressee.h>
 #include <addresseedialog.h>
 #include <tqstring.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcalendarsystem.h>
 #include <unistd.h>
 
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index bcce6fdbc..8130f85d6 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -8,7 +8,7 @@
 #include <tdeapplication.h>
 #include <tqdir.h>
 #include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cassert>
 #include "main.h"
 #include "main.moc"
diff --git a/kab/addressbook.cc b/kab/addressbook.cc
index ab73111be..852f56d57 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cc
@@ -22,11 +22,11 @@
 #include <tqstringlist.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 extern "C" {
 #include <sys/stat.h>
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 05cffe946..7f2159e24 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -18,8 +18,8 @@
 
 #include "kabapi.h"
 #include <tdelistbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index d904e16ce..9bbe317df 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -27,7 +27,7 @@
 #include "katejscript.h"
 #include "kateview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index 5a1a085c2..f29ec9915 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -23,7 +23,7 @@
 #include "katedocument.h"
 #include "kateview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 7d930570d..61f81fadf 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -31,7 +31,7 @@
 #include "kateautoindent.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <tqpopupmenu.h>
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index ad8943328..09dd46f13 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -32,7 +32,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kshellcompletion.h>
 
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 9c8e0856f..ed4eaacd2 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -29,9 +29,9 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcharsets.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kfinddialog.h>
 #include <kreplacedialog.h>
 #include <kinstance.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 03257735c..1b8ce89eb 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -53,15 +53,15 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefontdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeybutton.h>
 #include <kkeydialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetypechooser.h>
 #include <knuminput.h>
 #include <tdeparts/componentfactory.h>
@@ -72,7 +72,7 @@
 #include <krun.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 1928ec225..e42bfb0bd 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -49,24 +49,24 @@
 
 #include <tdeparts/event.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <kxmlguifactory.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klibloader.h>
 #include <kdirwatch.h>
 #include <twin.h>
 #include <kencodingfiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index a2a2c6408..adc0dc92a 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -38,7 +38,7 @@
 #include <dcopobject.h>
 
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqintdict.h>
 #include <tqmap.h>
diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp
index e50906b0d..b2e43758f 100644
--- a/kate/part/katedocumenthelpers.cpp
+++ b/kate/part/katedocumenthelpers.cpp
@@ -25,7 +25,7 @@
 #include "kateview.h"
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
 : KParts::BrowserExtension( doc, "katepartbrowserextension" ),
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index eb760aaff..d6a9e0d59 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -34,7 +34,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kvmallocator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdirwatch.h>
 #include <kstaticdeleter.h>
 
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index f0b01ef2d..281bf7e2d 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqregexp.h>
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp
index 29955d7e2..c00953469 100644
--- a/kate/part/katefont.cpp
+++ b/kate/part/katefont.cpp
@@ -21,7 +21,7 @@
 
 #include "katefont.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqfontinfo.h>
 
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index f6d5ae315..119b718fb 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -33,16 +33,16 @@
 #include "kateconfig.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kregexp.h>
 #include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <tdeapplication.h>
 
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index f3a5cd548..cab335312 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -35,8 +35,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <kjs/function_object.h>
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index 46cf531a7..375b0b7d4 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -32,8 +32,8 @@
 #include <kstandarddirs.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C" {
 #include <lua.h> 
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 6f22b2407..e66119747 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kdialog.h> // for spacingHint()
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kurl.h>
 #include <kuser.h> // for loginName
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 388513f17..5b71c92e8 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -27,7 +27,7 @@
 #include "kateview.h"
 #include "katerenderer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
@@ -35,7 +35,7 @@
 #include <tdefontdialog.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kcolordialog.h>
 #include <tdeapplication.h>
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 9d0dc896b..930e4d906 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -31,9 +31,9 @@
 #include "kateconfig.h"
 #include "katehighlight.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
 #include <kfinddialog.h>
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index fc7e943cf..494e52894 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -31,7 +31,7 @@
 #include <tdespell.h>
 #include <ksconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KateSpell::KateSpell( KateView* view )
   : TQObject( view )
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index d90f5de73..700daa9da 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <tqfile.h>
diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp
index 6c701e1ed..005892607 100644
--- a/kate/part/katetextline.cpp
+++ b/kate/part/katetextline.cpp
@@ -23,7 +23,7 @@
 #include "katetextline.h"
 #include "katerenderer.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqregexp.h>
 
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 92d1bb97e..821cb0faf 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -57,10 +57,10 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kxmlguifactory.h>
@@ -68,7 +68,7 @@
 #include <klibloader.h>
 #include <kencodingfiledialog.h>
 #include <tdemultipledrag.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksavefile.h>
 
 #include <tqfont.h>
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index e8df70aa8..dd52451b0 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -33,10 +33,10 @@
 #include "kateviewinternal.h"
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <tdepopupmenu.h>
 
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index a687c5523..c2b0ca4db 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -38,7 +38,7 @@
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 
 #include <tqstyle.h>
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index a503020c3..1b6decfe3 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -45,7 +45,7 @@
 #include <tdeio/job.h>
 #include <tdemainwindow.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqcolor.h>
 #include <tqcursor.h>
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 495233d40..3f87f1580 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -34,7 +34,7 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kmimetypechooser.h>
 #include <kprocess.h>
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 567262a64..e2e3d354a 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -28,10 +28,10 @@
 #include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <tqfile.h>
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index a36c9dc60..7cb01ccc9 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -21,7 +21,7 @@
 #include <tqstyle.h>
 #include <tqpopupmenu.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index d3b762b8e..e14cd9249 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -29,7 +29,7 @@
 #include <tdepopupmenu.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 //END includes
 
 
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 4a3d34207..26dce06d0 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <knotifyclient.h>
 #include <tdeparts/part.h>
diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp
index 267af31f6..b5873cad8 100644
--- a/kded/kbuildimageiofactory.cpp
+++ b/kded/kbuildimageiofactory.cpp
@@ -20,10 +20,10 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 #include <kimageiofactory.h>
diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp
index f3fe698d4..921e55ab9 100644
--- a/kded/kbuildprotocolinfofactory.cpp
+++ b/kded/kbuildprotocolinfofactory.cpp
@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 KBuildProtocolInfoFactory::KBuildProtocolInfoFactory() :
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 7d9406d36..6f127caf2 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -23,10 +23,10 @@
 #include "kresourcelist.h"
 #include "kmimetype.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <assert.h>
 
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index 76f27ba57..3903a6b39 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 KBuildServiceGroupFactory::KBuildServiceGroupFactory() :
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index 351b7847a..da2863347 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <kdesktopfile.h>
 
diff --git a/kded/kded.cpp b/kded/kded.cpp
index b6e6b523f..947d3b816 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -38,8 +38,8 @@
 #include <kuniqueapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 7585e0ad0..c78152b97 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -30,9 +30,9 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <kde_file.h>
diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp
index 4ad6bc3db..4cf7a843e 100644
--- a/kded/tde-menu.cpp
+++ b/kded/tde-menu.cpp
@@ -26,8 +26,8 @@
 #include "tdeaboutdata.h"
 #include "tdeapplication.h"
 #include "tdecmdlineargs.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 #include "kservice.h"
 #include "kservicegroup.h"
 #include "kstandarddirs.h"
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index aa03c2c94..4325162f7 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -42,12 +42,12 @@
 #include <assert.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kcrash.h>
@@ -55,7 +55,7 @@
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
                         // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
 # include <tqlabel.h>
-# include <kmessagebox.h>
+# include <tdemessagebox.h>
   bool silent;
   bool showprogress;
 #endif
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index e2dc603ba..408c6af9a 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h> // getenv
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kservice.h>
 #include <kde_file.h>
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index a0a6f29df..19768e7ef 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -61,6 +61,6 @@ add_custom_command( OUTPUT kdewidgets.cpp
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
 )
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index c81df5394..81b5ba82a 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -272,7 +272,7 @@ Group=Display (KDE)
 ConstructorArgs=(parent, 210, 16)
 
 [KABC::LdapConfigWidget]
-IncludeFile=kabc/ldapconfigwidget.h
+IncludeFile=tdeabc/ldapconfigwidget.h
 ToolTip=A widget which allows the user to set up LDAP connection parameters
 Group=Input (KDE)
 ConstructorArgs=(KABC::LdapConfigWidget::W_ALL, parent, name)
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index 30758f69e..aa5ade889 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -261,7 +261,7 @@ Group=Display (KDE)
 ConstructorArgs=(parent, 210, 16)
 
 [KABC::AddressLineEdit]
-IncludeFile=kabc/addresslineedit.h
+IncludeFile=tdeabc/addresslineedit.h
 ToolTip=A lineedit with LDAP and kabc completion.
 Group=Input (KDE)
 ConstructorArgs=(parent, true, name)
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index d0a1b7323..51f0b913a 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -19,7 +19,7 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <stdlib.h>
 #include <kdebug.h>
diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp
index d9f306b43..7b9d2a36e 100644
--- a/kdoctools/tdeio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index 2eb03cfbc..498e6b2c8 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -12,7 +12,7 @@
 #include <xslt.h>
 #include <kinstance.h>
 #include "tdeio_help.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <kfilterbase.h>
 #include <kfilterdev.h>
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index d174bf893..22251002c 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqdatastream.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <math.h> // sqrtf
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index d839ffe30..bcf916836 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -6,7 +6,7 @@
 #include <tqpainter.h>
 #include <tqprinter.h>
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include "eps.h"
 
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index c28cb799b..563c151a2 100644
--- a/kimgio/exr.cpp
+++ b/kimgio/exr.cpp
@@ -35,7 +35,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/kimgio/gimp.h b/kimgio/gimp.h
index 114ffdc0f..7da1a45f8 100644
--- a/kimgio/gimp.h
+++ b/kimgio/gimp.h
@@ -21,7 +21,7 @@
  *
  */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 /*
  * These are the constants and functions I extracted from The GIMP source
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index 82cba5c12..5f1832f02 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -14,7 +14,7 @@
 #include <tqdatastream.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 typedef TQ_UINT8 uchar;
 
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
index 2200c948c..5de8fff8e 100644
--- a/kimgio/jp2.cpp
+++ b/kimgio/jp2.cpp
@@ -12,7 +12,7 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqcolor.h>
 #include <tqcstring.h>
 #include <tqfile.h>
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 4e4ad1f56..ccdbd3d97 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeconfig.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <stdlib.h>
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index f6b4a3e59..1dc03002d 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -54,11 +54,11 @@
 #include <tqfont.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
@@ -68,7 +68,7 @@
 #endif
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#include <kstartupinfo.h> // schroder
+#include <tdestartupinfo.h> // schroder
 #endif
 
 #include <tdeversion.h>
diff --git a/kinit/tdelauncher.cpp b/kinit/tdelauncher.cpp
index 7b75bfaf5..f7ca08678 100644
--- a/kinit/tdelauncher.cpp
+++ b/kinit/tdelauncher.cpp
@@ -32,16 +32,16 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#include <kstartupinfo.h> // schroder
+#include <tdestartupinfo.h> // schroder
 #endif
 
 
diff --git a/kinit/tdelauncher_main.cpp b/kinit/tdelauncher_main.cpp
index d59cfb86f..747050668 100644
--- a/kinit/tdelauncher_main.cpp
+++ b/kinit/tdelauncher_main.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <tqcstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdelauncher_cmds.h"
 
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index ccbde83d6..8c31712cb 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -21,12 +21,12 @@
 #include "downloaddialog.h"
 #include "downloaddialog.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp
index a22750f8b..2b33e85f5 100644
--- a/knewstuff/engine.cpp
+++ b/knewstuff/engine.cpp
@@ -25,8 +25,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "knewstuff.h"
diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp
index 56dd375f4..00f7df522 100644
--- a/knewstuff/entry.cpp
+++ b/knewstuff/entry.cpp
@@ -23,8 +23,8 @@
 #include <tqptrdict.h>
 #include <tqwindowdefs.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KNS;
 
diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp
index dfe86a2a4..0702f16bb 100644
--- a/knewstuff/ghns.cpp
+++ b/knewstuff/ghns.cpp
@@ -28,7 +28,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kdialog.h>
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index 07034b454..b652ba4a8 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -21,7 +21,7 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "engine.h"
diff --git a/knewstuff/knewstuffbutton.cpp b/knewstuff/knewstuffbutton.cpp
index 3ad0d6ac6..3baa83397 100644
--- a/knewstuff/knewstuffbutton.cpp
+++ b/knewstuff/knewstuffbutton.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "downloaddialog.h"
 #include "knewstuffbutton.h"
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp
index aa94559b9..ef6a37456 100644
--- a/knewstuff/knewstuffgeneric.cpp
+++ b/knewstuff/knewstuffgeneric.cpp
@@ -24,11 +24,11 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 
 #include "entry.h"
diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp
index b61924243..67374800e 100644
--- a/knewstuff/knewstuffsecure.cpp
+++ b/knewstuff/knewstuffsecure.cpp
@@ -18,10 +18,10 @@
 //kde includes
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>
diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp
index d5da6bdde..20f1668f7 100644
--- a/knewstuff/provider.cpp
+++ b/knewstuff/provider.cpp
@@ -21,9 +21,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqptrdict.h>
 #include <tqwindowdefs.h>
diff --git a/knewstuff/providerdialog.cpp b/knewstuff/providerdialog.cpp
index ddc0b2ef3..f71558ecd 100644
--- a/knewstuff/providerdialog.cpp
+++ b/knewstuff/providerdialog.cpp
@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "engine.h"
 #include "provider.h"
diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp
index d9ad85a7c..d161c2969 100644
--- a/knewstuff/security.cpp
+++ b/knewstuff/security.cpp
@@ -22,9 +22,9 @@
  //kde includes
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocio.h>
 
diff --git a/knewstuff/tdehotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp
index 87d735330..fb9e92a9b 100644
--- a/knewstuff/tdehotnewstuff.cpp
+++ b/knewstuff/tdehotnewstuff.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 
diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp
index 82b6d18f7..3494c5230 100644
--- a/knewstuff/testnewstuff.cpp
+++ b/knewstuff/testnewstuff.cpp
@@ -27,7 +27,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kdialog.h>
diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp
index 98f8f60c7..f4b3dd50e 100644
--- a/knewstuff/uploaddialog.cpp
+++ b/knewstuff/uploaddialog.cpp
@@ -27,10 +27,10 @@
 #include <ktextedit.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kuser.h>
diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp
index 9de7f1bfd..f271113ca 100644
--- a/kstyles/highcontrast/config/highcontrastconfig.cpp
+++ b/kstyles/highcontrast/config/highcontrastconfig.cpp
@@ -28,8 +28,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 "highcontrastconfig.h"
 
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index 5c083632e..a169de874 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -24,7 +24,7 @@
 
 #include "klegacystyle.h"
 #include "klegacystyle.moc"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #define INCLUDE_MENUITEM_DEF
diff --git a/kstyles/klegacy/plugin.cpp b/kstyles/klegacy/plugin.cpp
index 5d3a58492..558b54e73 100644
--- a/kstyles/klegacy/plugin.cpp
+++ b/kstyles/klegacy/plugin.cpp
@@ -1,5 +1,5 @@
 #include "klegacystyle.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C" {
     TDEStyle* allocate();
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 4cc374e5d..a164821b1 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -53,7 +53,7 @@ Port version 0.9.7
 #include <tqpalette.h>
 #include <tqtabbar.h>
 #include <tqtoolbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdrawutil.h>
 #include <tqdrawutil.h>
 #include <tqprogressbar.h>
diff --git a/kstyles/plastik/config/plastitdeconf.cpp b/kstyles/plastik/config/plastitdeconf.cpp
index 8d3e4acfd..38cda2426 100644
--- a/kstyles/plastik/config/plastitdeconf.cpp
+++ b/kstyles/plastik/config/plastitdeconf.cpp
@@ -30,8 +30,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqsettings.h>
 #include <tqcolor.h>
 #include <tqgroupbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <kdemacros.h>
 
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index 274c2d335..3ce63dfdf 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/kstyles/web/plugin.cpp b/kstyles/web/plugin.cpp
index 6ab10ebd8..bd4371ce3 100644
--- a/kstyles/web/plugin.cpp
+++ b/kstyles/web/plugin.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include "webstyle.h"
 
 extern "C"
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index d96688ee0..b3b461954 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -34,7 +34,7 @@
 
 #include <tdeapplication.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/libtdemid/deviceman.cc b/libtdemid/deviceman.cc
index b8210af6d..fec0ff090 100644
--- a/libtdemid/deviceman.cc
+++ b/libtdemid/deviceman.cc
@@ -67,7 +67,7 @@
 
 #if 1
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #endif
 
diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp
index f9d8ccb17..073d7845d 100644
--- a/libtdescreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -24,8 +24,8 @@
 #include <signal.h>
 
 #include <tqdialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp
index c37214ecd..f36220886 100644
--- a/networkstatus/connectionmanager.cpp
+++ b/networkstatus/connectionmanager.cpp
@@ -20,8 +20,8 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 
 #include "clientiface_stub.h"
diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp
index 957d6f739..a77f1c1fd 100644
--- a/networkstatus/networkstatusindicator.cpp
+++ b/networkstatus/networkstatusindicator.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "connectionmanager.h"
 
diff --git a/kabc/CMakeLists.txt b/tdeabc/CMakeLists.txt
similarity index 95%
rename from kabc/CMakeLists.txt
rename to tdeabc/CMakeLists.txt
index 57c4741fe..e0ec832d0 100644
--- a/kabc/CMakeLists.txt
+++ b/tdeabc/CMakeLists.txt
@@ -53,14 +53,14 @@ install( FILES
     ldapclient.h addresseelist.h locknull.h ldif.h
     ldapurl.h ldapconfigwidget.h sortmode.h
     ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
 
 
 ##### other data ################################
 
 install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
-install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
+install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/tdeabc )
 
 
 ##### generated files ###########################
@@ -80,9 +80,9 @@ add_custom_command(
 )
 
 
-##### kabc ######################################
+##### tdeabc ######################################
 
-set( target kabc )
+set( target tdeabc )
 
 set( ${target}_SRCS
   address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp
@@ -118,6 +118,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kab-static kabc-shared
+  LINK kab-static tdeabc-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kabc/HACKING b/tdeabc/HACKING
similarity index 100%
rename from kabc/HACKING
rename to tdeabc/HACKING
diff --git a/kabc/HOWTO b/tdeabc/HOWTO
similarity index 97%
rename from kabc/HOWTO
rename to tdeabc/HOWTO
index 7b41371b0..3941b2033 100644
--- a/kabc/HOWTO
+++ b/tdeabc/HOWTO
@@ -96,7 +96,7 @@ a special class KABC::StdAddressBook, which loads all resources of the standard
 address book of the user automatically. You can use it the following way:
 
 
-     #include <kabc/stdaddressbook.h>
+     #include <tdeabc/stdaddressbook.h>
 
  1:  KABC::AddressBook *ab = KABC::StdAddressBook::self();
  2:  KABC::AddressBook::Iterator it;
@@ -125,8 +125,8 @@ class KABC::AddressBook and handle the resource stuff manually.
 The following code will create a file resource and save a contact into it:
 
 
-     #include <kabc/addressbook.h>
-     #include <kabc/resourcefile.h>
+     #include <tdeabc/addressbook.h>
+     #include <tdeabc/resourcefile.h>
 
  1:  KABC::AddressBook ab;
  2:
@@ -320,8 +320,8 @@ track of all available distribution lists and the latter one is the
 representation of one list.
 
 
-     #include <kabc/distributionlist.h>
-     #include <kabc/stdaddressbook.h>
+     #include <tdeabc/distributionlist.h>
+     #include <tdeabc/stdaddressbook.h>
 
  1:  KABC::DistributionListManager manager( KABC::StdAddressBook::self() );
  2:
@@ -344,7 +344,7 @@ In the first line a KABC::DistributionListManager is created. The manager takes
 a pointer to a KABC::AddressBook, because he has to resolve the stored uids to
 currently available email addresses.
 In line 4 the manager loads all distribution lists from the central config file
-$HOME/.trinity/share/apps/kabc/distlists.
+$HOME/.trinity/share/apps/tdeabc/distlists.
 The next line queries the names of all available distribution lists, which are
 used in line 9 to retrieve a pointer to the specific list.
 Now that you have a KABC::DistributionList object, you can performe the
@@ -357,13 +357,13 @@ following actions on it:
 
 In line 12 we query all email addresses of every resource and print them out.
 
-<kabc/distributionlist.h> contains also the declaration for the class
+<tdeabc/distributionlist.h> contains also the declaration for the class
 KABC::DistributionListWatcher. This class exists only once per application and
 its only job is to emit a signal as soon as the distribution list file has
 changed. So to make your application aware of changes use the following code:
 
 
-     #include <kabc/distributionlist.h>
+     #include <tdeabc/distributionlist.h>
 
  1:  connect( KABC::DistributionListWatcher::self(), SIGNAL( changed() ),
  2:           this, SLOT( slotDistributionListChanged() ) );
diff --git a/kabc/Makefile.am b/tdeabc/Makefile.am
similarity index 100%
rename from kabc/Makefile.am
rename to tdeabc/Makefile.am
diff --git a/kabc/README b/tdeabc/README
similarity index 100%
rename from kabc/README
rename to tdeabc/README
diff --git a/kabc/README.AddressFormat b/tdeabc/README.AddressFormat
similarity index 100%
rename from kabc/README.AddressFormat
rename to tdeabc/README.AddressFormat
diff --git a/kabc/TODO b/tdeabc/TODO
similarity index 100%
rename from kabc/TODO
rename to tdeabc/TODO
diff --git a/kabc/address.cpp b/tdeabc/address.cpp
similarity index 98%
rename from kabc/address.cpp
rename to tdeabc/address.cpp
index 46b483b43..112a70617 100644
--- a/kabc/address.cpp
+++ b/tdeabc/address.cpp
@@ -22,7 +22,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
@@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname )
     return it.data();
 
   TQString mapfile = TDEGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+          TQString::fromLatin1( "tdeabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
     return TQString::null;
 
   TQString mapfile = TDEGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+          TQString::fromLatin1( "tdeabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
diff --git a/kabc/address.h b/tdeabc/address.h
similarity index 100%
rename from kabc/address.h
rename to tdeabc/address.h
diff --git a/kabc/addressbook.cpp b/tdeabc/addressbook.cpp
similarity index 99%
rename from kabc/addressbook.cpp
rename to tdeabc/addressbook.cpp
index 8e1eca333..50cd9c8a6 100644
--- a/kabc/addressbook.cpp
+++ b/tdeabc/addressbook.cpp
@@ -24,9 +24,9 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "errorhandler.h"
diff --git a/kabc/addressbook.h b/tdeabc/addressbook.h
similarity index 100%
rename from kabc/addressbook.h
rename to tdeabc/addressbook.h
diff --git a/kabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp
similarity index 99%
rename from kabc/addresseedialog.cpp
rename to tdeabc/addresseedialog.cpp
index c8a1bf51e..2b8bc91e6 100644
--- a/kabc/addresseedialog.cpp
+++ b/tdeabc/addresseedialog.cpp
@@ -23,7 +23,7 @@
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "stdaddressbook.h"
diff --git a/kabc/addresseedialog.h b/tdeabc/addresseedialog.h
similarity index 100%
rename from kabc/addresseedialog.h
rename to tdeabc/addresseedialog.h
diff --git a/kabc/addresseehelper.cpp b/tdeabc/addresseehelper.cpp
similarity index 99%
rename from kabc/addresseehelper.cpp
rename to tdeabc/addresseehelper.cpp
index 5b8998852..e8faeb897 100644
--- a/kabc/addresseehelper.cpp
+++ b/tdeabc/addresseehelper.cpp
@@ -20,7 +20,7 @@
 #include <tqapplication.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "addresseehelper.h"
 
diff --git a/kabc/addresseehelper.h b/tdeabc/addresseehelper.h
similarity index 100%
rename from kabc/addresseehelper.h
rename to tdeabc/addresseehelper.h
diff --git a/kabc/addresseelist.cpp b/tdeabc/addresseelist.cpp
similarity index 100%
rename from kabc/addresseelist.cpp
rename to tdeabc/addresseelist.cpp
diff --git a/kabc/addresseelist.h b/tdeabc/addresseelist.h
similarity index 100%
rename from kabc/addresseelist.h
rename to tdeabc/addresseelist.h
diff --git a/kabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp
similarity index 99%
rename from kabc/addresslineedit.cpp
rename to tdeabc/addresslineedit.cpp
index a61e7a5c9..dc7a889a1 100644
--- a/kabc/addresslineedit.cpp
+++ b/tdeabc/addresslineedit.cpp
@@ -40,8 +40,8 @@
 #include <tdestdaccel.h>
 #include <kurldrag.h>
 
-#include <kabc/stdaddressbook.h>
-#include <kabc/distributionlist.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/distributionlist.h>
 #include "ldapclient.h"
 
 #include <kdebug.h>
diff --git a/kabc/addresslineedit.h b/tdeabc/addresslineedit.h
similarity index 100%
rename from kabc/addresslineedit.h
rename to tdeabc/addresslineedit.h
diff --git a/kabc/agent.cpp b/tdeabc/agent.cpp
similarity index 100%
rename from kabc/agent.cpp
rename to tdeabc/agent.cpp
diff --git a/kabc/agent.h b/tdeabc/agent.h
similarity index 100%
rename from kabc/agent.h
rename to tdeabc/agent.h
diff --git a/kabc/countrytransl.map b/tdeabc/countrytransl.map
similarity index 100%
rename from kabc/countrytransl.map
rename to tdeabc/countrytransl.map
diff --git a/kabc/distributionlist.cpp b/tdeabc/distributionlist.cpp
similarity index 97%
rename from kabc/distributionlist.cpp
rename to tdeabc/distributionlist.cpp
index bb89b6d00..ee058ecdf 100644
--- a/kabc/distributionlist.cpp
+++ b/tdeabc/distributionlist.cpp
@@ -185,7 +185,7 @@ TQStringList DistributionListManager::listNames()
 
 bool DistributionListManager::load()
 {
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
 
   TQMap<TQString,TQString> entryMap = cfg.entryMap( "DistributionLists" );
   cfg.setGroup( "DistributionLists" );
@@ -233,7 +233,7 @@ bool DistributionListManager::save()
 {
   kdDebug(5700) << "DistListManager::save()" << endl;
 
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
 
   cfg.deleteGroup( "DistributionLists" );
   cfg.setGroup( "DistributionLists" );
@@ -273,7 +273,7 @@ DistributionListWatcher::DistributionListWatcher()
  : TQObject( tqApp, "DistributionListWatcher" )
 {
   mDirWatch = new KDirWatch;
-  mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
+  mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) );
   
   connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) );
   mDirWatch->startScan();
diff --git a/kabc/distributionlist.h b/tdeabc/distributionlist.h
similarity index 100%
rename from kabc/distributionlist.h
rename to tdeabc/distributionlist.h
diff --git a/kabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp
similarity index 99%
rename from kabc/distributionlistdialog.cpp
rename to tdeabc/distributionlistdialog.cpp
index b00b14d42..8cd22e8fd 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/tdeabc/distributionlistdialog.cpp
@@ -27,9 +27,9 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "addressbook.h"
 #include "addresseedialog.h"
diff --git a/kabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h
similarity index 100%
rename from kabc/distributionlistdialog.h
rename to tdeabc/distributionlistdialog.h
diff --git a/kabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp
similarity index 99%
rename from kabc/distributionlisteditor.cpp
rename to tdeabc/distributionlisteditor.cpp
index 573f0970a..5c26c8121 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/tdeabc/distributionlisteditor.cpp
@@ -26,7 +26,7 @@
 #include <tqradiobutton.h>
 
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "addressbook.h"
diff --git a/kabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h
similarity index 100%
rename from kabc/distributionlisteditor.h
rename to tdeabc/distributionlisteditor.h
diff --git a/kabc/errorhandler.cpp b/tdeabc/errorhandler.cpp
similarity index 96%
rename from kabc/errorhandler.cpp
rename to tdeabc/errorhandler.cpp
index d8ab650c7..d2245e44f 100644
--- a/kabc/errorhandler.cpp
+++ b/tdeabc/errorhandler.cpp
@@ -21,8 +21,8 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqapplication.h>
 
diff --git a/kabc/errorhandler.h b/tdeabc/errorhandler.h
similarity index 100%
rename from kabc/errorhandler.h
rename to tdeabc/errorhandler.h
diff --git a/kabc/field.h b/tdeabc/field.h
similarity index 100%
rename from kabc/field.h
rename to tdeabc/field.h
diff --git a/kabc/format.h b/tdeabc/format.h
similarity index 100%
rename from kabc/format.h
rename to tdeabc/format.h
diff --git a/kabc/formatfactory.cpp b/tdeabc/formatfactory.cpp
similarity index 98%
rename from kabc/formatfactory.cpp
rename to tdeabc/formatfactory.cpp
index 17e7b0f33..0795957a2 100644
--- a/kabc/formatfactory.cpp
+++ b/tdeabc/formatfactory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
@@ -56,7 +56,7 @@ FormatFactory::FormatFactory()
   info->descriptionLabel = i18n( "vCard Format" );
   mFormatList.insert( "vcard", info );
 
-  const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
+  const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"tdeabc/formats/*.desktop", true, true );
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
   {
     KSimpleConfig config( *it, true );
diff --git a/kabc/formatfactory.h b/tdeabc/formatfactory.h
similarity index 100%
rename from kabc/formatfactory.h
rename to tdeabc/formatfactory.h
diff --git a/kabc/formatplugin.h b/tdeabc/formatplugin.h
similarity index 100%
rename from kabc/formatplugin.h
rename to tdeabc/formatplugin.h
diff --git a/kabc/formats/CMakeLists.txt b/tdeabc/formats/CMakeLists.txt
similarity index 89%
rename from kabc/formats/CMakeLists.txt
rename to tdeabc/formats/CMakeLists.txt
index 60ea1c3fd..d7a9e0fc9 100644
--- a/kabc/formats/CMakeLists.txt
+++ b/tdeabc/formats/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES binary.desktop DESTINATION ${DATA_INSTALL_DIR}/kabc/formats )
+install( FILES binary.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeabc/formats )
 
 
 ##### kabcformat_binary #########################
@@ -42,6 +42,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kabc/formats/Makefile.am b/tdeabc/formats/Makefile.am
similarity index 85%
rename from kabc/formats/Makefile.am
rename to tdeabc/formats/Makefile.am
index 57c2caaa3..d769d88d7 100644
--- a/kabc/formats/Makefile.am
+++ b/tdeabc/formats/Makefile.am
@@ -6,7 +6,7 @@ kabcformat_binary_la_SOURCES = binaryformat.cpp
 kabcformat_binary_la_LDFLAGS =  -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                 -no-undefined
 kabcformat_binary_la_LIBADD  = $(LIB_KABC) $(LIB_QT) $(LIB_TDECORE)
-kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 # these are the headers for your project
 noinst_HEADERS = binaryformat.h
@@ -17,6 +17,6 @@ METASOURCES = AUTO
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kabcformat_binary.pot
 
-linkdir = $(kde_datadir)/kabc/formats
+linkdir = $(kde_datadir)/tdeabc/formats
 link_DATA = binary.desktop
 EXTRA_DIST = $(link_DATA)
diff --git a/kabc/formats/binary.desktop b/tdeabc/formats/binary.desktop
similarity index 100%
rename from kabc/formats/binary.desktop
rename to tdeabc/formats/binary.desktop
diff --git a/kabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp
similarity index 93%
rename from kabc/formats/binaryformat.cpp
rename to tdeabc/formats/binaryformat.cpp
index a82a017a3..f37146e57 100644
--- a/kabc/formats/binaryformat.cpp
+++ b/tdeabc/formats/binaryformat.cpp
@@ -22,7 +22,7 @@
 #include <tqimage.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"
@@ -172,7 +172,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
 
   if ( photo.isIntern() ) {
     TQImage img;
-    if ( !img.load( locateLocal( "data", "kabc/photos/" ) + addressee.uid() ) )
+    if ( !img.load( locateLocal( "data", "tdeabc/photos/" ) + addressee.uid() ) )
       kdDebug(5700) << "No photo available for '" << addressee.uid() << "'." << endl;
 
     addressee.setPhoto( img );
@@ -180,7 +180,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
 
   if ( logo.isIntern() ) {
     TQImage img;
-    if ( !img.load( locateLocal( "data", "kabc/logos/" ) + addressee.uid() ) )
+    if ( !img.load( locateLocal( "data", "tdeabc/logos/" ) + addressee.uid() ) )
       kdDebug(5700) << "No logo available for '" << addressee.uid() << "'." << endl;
 
     addressee.setLogo( img );
@@ -201,7 +201,7 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stre
 
   if ( photo.isIntern() ) {
     TQImage img = photo.data();
-    TQString fileName = locateLocal( "data", "kabc/photos/" ) + addressee.uid();
+    TQString fileName = locateLocal( "data", "tdeabc/photos/" ) + addressee.uid();
 
     if ( !img.save( fileName, "PNG" ) )
       kdDebug(5700) << "Unable to save photo for '" << addressee.uid() << "'." << endl;
@@ -209,7 +209,7 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stre
 
   if ( logo.isIntern() ) {
     TQImage img = logo.data();
-    TQString fileName = locateLocal( "data", "kabc/logos/" ) + addressee.uid();
+    TQString fileName = locateLocal( "data", "tdeabc/logos/" ) + addressee.uid();
 
     if ( !img.save( fileName, "PNG" ) )
       kdDebug(5700) << "Unable to save logo for '" << addressee.uid() << "'." << endl;
diff --git a/kabc/formats/binaryformat.h b/tdeabc/formats/binaryformat.h
similarity index 100%
rename from kabc/formats/binaryformat.h
rename to tdeabc/formats/binaryformat.h
diff --git a/kabc/geo.cpp b/tdeabc/geo.cpp
similarity index 100%
rename from kabc/geo.cpp
rename to tdeabc/geo.cpp
diff --git a/kabc/geo.h b/tdeabc/geo.h
similarity index 100%
rename from kabc/geo.h
rename to tdeabc/geo.h
diff --git a/kabc/kabc_manager.desktop b/tdeabc/kabc_manager.desktop
similarity index 100%
rename from kabc/kabc_manager.desktop
rename to tdeabc/kabc_manager.desktop
diff --git a/kabc/key.cpp b/tdeabc/key.cpp
similarity index 99%
rename from kabc/key.cpp
rename to tdeabc/key.cpp
index 7c66579b3..08d9c6872 100644
--- a/kabc/key.cpp
+++ b/tdeabc/key.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "key.h"
 
diff --git a/kabc/key.h b/tdeabc/key.h
similarity index 100%
rename from kabc/key.h
rename to tdeabc/key.h
diff --git a/kabc/ldapclient.cpp b/tdeabc/ldapclient.cpp
similarity index 100%
rename from kabc/ldapclient.cpp
rename to tdeabc/ldapclient.cpp
diff --git a/kabc/ldapclient.h b/tdeabc/ldapclient.h
similarity index 100%
rename from kabc/ldapclient.h
rename to tdeabc/ldapclient.h
diff --git a/kabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp
similarity index 99%
rename from kabc/ldapconfigwidget.cpp
rename to tdeabc/ldapconfigwidget.cpp
index 5996477a0..fa092754e 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/tdeabc/ldapconfigwidget.cpp
@@ -29,10 +29,10 @@
 #include <tqhbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaccelmanager.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kprogress.h>
diff --git a/kabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h
similarity index 99%
rename from kabc/ldapconfigwidget.h
rename to tdeabc/ldapconfigwidget.h
index 01074292e..7071bce10 100644
--- a/kabc/ldapconfigwidget.h
+++ b/tdeabc/ldapconfigwidget.h
@@ -25,8 +25,8 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-#include <kabc/ldapurl.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldapurl.h>
+#include <tdeabc/ldif.h>
 #include <tdeio/job.h>
 
 class TQGridLayout;
diff --git a/kabc/ldapurl.cpp b/tdeabc/ldapurl.cpp
similarity index 100%
rename from kabc/ldapurl.cpp
rename to tdeabc/ldapurl.cpp
diff --git a/kabc/ldapurl.h b/tdeabc/ldapurl.h
similarity index 100%
rename from kabc/ldapurl.h
rename to tdeabc/ldapurl.h
diff --git a/kabc/ldif.cpp b/tdeabc/ldif.cpp
similarity index 100%
rename from kabc/ldif.cpp
rename to tdeabc/ldif.cpp
diff --git a/kabc/ldif.h b/tdeabc/ldif.h
similarity index 100%
rename from kabc/ldif.h
rename to tdeabc/ldif.h
diff --git a/kabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp
similarity index 99%
rename from kabc/ldifconverter.cpp
rename to tdeabc/ldifconverter.cpp
index 4bf989395..dcab83a40 100644
--- a/kabc/ldifconverter.cpp
+++ b/tdeabc/ldifconverter.cpp
@@ -38,7 +38,7 @@
 #include <tqregexp.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 
diff --git a/kabc/ldifconverter.h b/tdeabc/ldifconverter.h
similarity index 100%
rename from kabc/ldifconverter.h
rename to tdeabc/ldifconverter.h
diff --git a/kabc/lock.cpp b/tdeabc/lock.cpp
similarity index 95%
rename from kabc/lock.cpp
rename to tdeabc/lock.cpp
index 8f64a3c23..a78cb4c5b 100644
--- a/kabc/lock.cpp
+++ b/tdeabc/lock.cpp
@@ -22,9 +22,9 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfile.h>
 
@@ -48,7 +48,7 @@ Lock::~Lock()
 
 TQString Lock::locksDir()
 {
-  return locateLocal( "data", "kabc/lock/" );
+  return locateLocal( "data", "tdeabc/lock/" );
 }
 
 bool Lock::readLockFile( const TQString &filename, int &pid, TQString &app )
@@ -104,14 +104,14 @@ bool Lock::lock()
       identifier.replace( '_', '/' );
 
       mError = i18n("The address book '%1' is locked by application '%2'.\nIf you believe this is incorrect, just remove the lock file from '%3'")
-               .arg( identifier ).arg( app ).arg( locateLocal( "data", "kabc/lock/*.lock" ) );
+               .arg( identifier ).arg( app ).arg( locateLocal( "data", "tdeabc/lock/*.lock" ) );
       return false;
     }
   }
 
   TQString lockUniqueName;
   lockUniqueName = mIdentifier + kapp->randomString( 8 );
-  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
+  mLockUniqueName = locateLocal( "data", "tdeabc/lock/" + lockUniqueName );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
diff --git a/kabc/lock.h b/tdeabc/lock.h
similarity index 100%
rename from kabc/lock.h
rename to tdeabc/lock.h
diff --git a/kabc/locknull.cpp b/tdeabc/locknull.cpp
similarity index 98%
rename from kabc/locknull.cpp
rename to tdeabc/locknull.cpp
index 234c2c214..5f3ee06c7 100644
--- a/kabc/locknull.cpp
+++ b/tdeabc/locknull.cpp
@@ -21,7 +21,7 @@
 
 #include "locknull.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 using namespace KABC;
diff --git a/kabc/locknull.h b/tdeabc/locknull.h
similarity index 100%
rename from kabc/locknull.h
rename to tdeabc/locknull.h
diff --git a/kabc/phonenumber.cpp b/tdeabc/phonenumber.cpp
similarity index 99%
rename from kabc/phonenumber.cpp
rename to tdeabc/phonenumber.cpp
index adf8566f1..fd2468c73 100644
--- a/kabc/phonenumber.cpp
+++ b/tdeabc/phonenumber.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "phonenumber.h"
 
diff --git a/kabc/phonenumber.h b/tdeabc/phonenumber.h
similarity index 100%
rename from kabc/phonenumber.h
rename to tdeabc/phonenumber.h
diff --git a/kabc/picture.cpp b/tdeabc/picture.cpp
similarity index 100%
rename from kabc/picture.cpp
rename to tdeabc/picture.cpp
diff --git a/kabc/picture.h b/tdeabc/picture.h
similarity index 100%
rename from kabc/picture.h
rename to tdeabc/picture.h
diff --git a/kabc/plugin.cpp b/tdeabc/plugin.cpp
similarity index 100%
rename from kabc/plugin.cpp
rename to tdeabc/plugin.cpp
diff --git a/kabc/plugin.h b/tdeabc/plugin.h
similarity index 100%
rename from kabc/plugin.h
rename to tdeabc/plugin.h
diff --git a/kabc/plugins/CMakeLists.txt b/tdeabc/plugins/CMakeLists.txt
similarity index 100%
rename from kabc/plugins/CMakeLists.txt
rename to tdeabc/plugins/CMakeLists.txt
diff --git a/kabc/plugins/Makefile.am b/tdeabc/plugins/Makefile.am
similarity index 100%
rename from kabc/plugins/Makefile.am
rename to tdeabc/plugins/Makefile.am
diff --git a/kabc/plugins/dir/CMakeLists.txt b/tdeabc/plugins/dir/CMakeLists.txt
similarity index 98%
rename from kabc/plugins/dir/CMakeLists.txt
rename to tdeabc/plugins/dir/CMakeLists.txt
index 737d1144e..fd4161342 100644
--- a/kabc/plugins/dir/CMakeLists.txt
+++ b/tdeabc/plugins/dir/CMakeLists.txt
@@ -53,7 +53,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am
similarity index 93%
rename from kabc/plugins/dir/Makefile.am
rename to tdeabc/plugins/dir/Makefile.am
index 4b61d2828..94ddad3cc 100644
--- a/kabc/plugins/dir/Makefile.am
+++ b/tdeabc/plugins/dir/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libkabc_dir.la
 libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
 libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
 libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
-libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_dir.la
 kabc_dir_la_SOURCES = resourcedirplugin.cpp
diff --git a/kabc/plugins/dir/dir.desktop b/tdeabc/plugins/dir/dir.desktop
similarity index 100%
rename from kabc/plugins/dir/dir.desktop
rename to tdeabc/plugins/dir/dir.desktop
diff --git a/kabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp
similarity index 99%
rename from kabc/plugins/dir/resourcedir.cpp
rename to tdeabc/plugins/dir/resourcedir.cpp
index 936eea6e4..53f178a6d 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/tdeabc/plugins/dir/resourcedir.cpp
@@ -32,8 +32,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 
diff --git a/kabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h
similarity index 98%
rename from kabc/plugins/dir/resourcedir.h
rename to tdeabc/plugins/dir/resourcedir.h
index f62ee91ba..dc3bdbd23 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/tdeabc/plugins/dir/resourcedir.h
@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 class TQTimer;
 
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp
similarity index 99%
rename from kabc/plugins/dir/resourcedirconfig.cpp
rename to tdeabc/plugins/dir/resourcedirconfig.cpp
index 819d75d96..2807872f8 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/tdeabc/plugins/dir/resourcedirconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
diff --git a/kabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h
similarity index 100%
rename from kabc/plugins/dir/resourcedirconfig.h
rename to tdeabc/plugins/dir/resourcedirconfig.h
diff --git a/kabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp
similarity index 100%
rename from kabc/plugins/dir/resourcedirplugin.cpp
rename to tdeabc/plugins/dir/resourcedirplugin.cpp
diff --git a/kabc/plugins/evolution/Makefile.am b/tdeabc/plugins/evolution/Makefile.am
similarity index 79%
rename from kabc/plugins/evolution/Makefile.am
rename to tdeabc/plugins/evolution/Makefile.am
index fd7b9be3b..2c22cf376 100644
--- a/kabc/plugins/evolution/Makefile.am
+++ b/tdeabc/plugins/evolution/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la
 kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
 
 kabc_evo_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_evo_la_LIBADD	= ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
+kabc_evo_la_LIBADD	= ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../tdeabc/vcardparser/libvcards.la
 
 METASOURCES = AUTO
 
diff --git a/kabc/plugins/evolution/README b/tdeabc/plugins/evolution/README
similarity index 100%
rename from kabc/plugins/evolution/README
rename to tdeabc/plugins/evolution/README
diff --git a/kabc/plugins/evolution/dbwrapper.cpp b/tdeabc/plugins/evolution/dbwrapper.cpp
similarity index 100%
rename from kabc/plugins/evolution/dbwrapper.cpp
rename to tdeabc/plugins/evolution/dbwrapper.cpp
diff --git a/kabc/plugins/evolution/dbwrapper.h b/tdeabc/plugins/evolution/dbwrapper.h
similarity index 100%
rename from kabc/plugins/evolution/dbwrapper.h
rename to tdeabc/plugins/evolution/dbwrapper.h
diff --git a/kabc/plugins/evolution/evolution.desktop b/tdeabc/plugins/evolution/evolution.desktop
similarity index 100%
rename from kabc/plugins/evolution/evolution.desktop
rename to tdeabc/plugins/evolution/evolution.desktop
diff --git a/kabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp
similarity index 97%
rename from kabc/plugins/evolution/resourceevo.cpp
rename to tdeabc/plugins/evolution/resourceevo.cpp
index 415e9928a..e6545f738 100644
--- a/kabc/plugins/evolution/resourceevo.cpp
+++ b/tdeabc/plugins/evolution/resourceevo.cpp
@@ -1,12 +1,12 @@
 #include <tqdir.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <stdio.h>
 
-#include <kabc/vcardparser/vcardtool.h>
+#include <tdeabc/vcardparser/vcardtool.h>
 
 #include "dbwrapper.h"
 #include "resourceevo.h"
diff --git a/kabc/plugins/evolution/resourceevo.h b/tdeabc/plugins/evolution/resourceevo.h
similarity index 100%
rename from kabc/plugins/evolution/resourceevo.h
rename to tdeabc/plugins/evolution/resourceevo.h
diff --git a/kabc/plugins/file/CMakeLists.txt b/tdeabc/plugins/file/CMakeLists.txt
similarity index 98%
rename from kabc/plugins/file/CMakeLists.txt
rename to tdeabc/plugins/file/CMakeLists.txt
index f8847d7e9..6c17d2dc7 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/tdeabc/plugins/file/CMakeLists.txt
@@ -53,7 +53,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am
similarity index 87%
rename from kabc/plugins/file/Makefile.am
rename to tdeabc/plugins/file/Makefile.am
index b1530d97d..d00ffea3f 100644
--- a/kabc/plugins/file/Makefile.am
+++ b/tdeabc/plugins/file/Makefile.am
@@ -7,14 +7,14 @@ lib_LTLIBRARIES = libkabc_file.la
 libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
 libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
-libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 
 kde_module_LTLIBRARIES = kabc_file.la
 kabc_file_la_SOURCES = resourcefileplugin.cpp
 kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
 kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE)
-kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 METASOURCES = AUTO
 
diff --git a/kabc/plugins/file/file.desktop b/tdeabc/plugins/file/file.desktop
similarity index 100%
rename from kabc/plugins/file/file.desktop
rename to tdeabc/plugins/file/file.desktop
diff --git a/kabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp
similarity index 96%
rename from kabc/plugins/file/resourcefile.cpp
rename to tdeabc/plugins/file/resourcefile.cpp
index 7c99782c3..b29cf33c3 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/tdeabc/plugins/file/resourcefile.cpp
@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 
@@ -365,9 +365,9 @@ void ResourceFile::fileChanged()
 
 void ResourceFile::removeAddressee( const Addressee &addr )
 {
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/photos/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/logos/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/sounds/" ) + addr.uid() ) );
 
   mAddrMap.erase( addr.uid() );
 }
diff --git a/kabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h
similarity index 99%
rename from kabc/plugins/file/resourcefile.h
rename to tdeabc/plugins/file/resourcefile.h
index 3d2efe85f..a77f55798 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/tdeabc/plugins/file/resourcefile.h
@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 namespace KABC {
 
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp
similarity index 99%
rename from kabc/plugins/file/resourcefileconfig.cpp
rename to tdeabc/plugins/file/resourcefileconfig.cpp
index 92b07594f..7c3f4da15 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/tdeabc/plugins/file/resourcefileconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
diff --git a/kabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h
similarity index 100%
rename from kabc/plugins/file/resourcefileconfig.h
rename to tdeabc/plugins/file/resourcefileconfig.h
diff --git a/kabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp
similarity index 100%
rename from kabc/plugins/file/resourcefileplugin.cpp
rename to tdeabc/plugins/file/resourcefileplugin.cpp
diff --git a/kabc/plugins/ldaptdeio/CMakeLists.txt b/tdeabc/plugins/ldaptdeio/CMakeLists.txt
similarity index 98%
rename from kabc/plugins/ldaptdeio/CMakeLists.txt
rename to tdeabc/plugins/ldaptdeio/CMakeLists.txt
index 75098cc9d..820f6e017 100644
--- a/kabc/plugins/ldaptdeio/CMakeLists.txt
+++ b/tdeabc/plugins/ldaptdeio/CMakeLists.txt
@@ -53,7 +53,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am
similarity index 93%
rename from kabc/plugins/ldaptdeio/Makefile.am
rename to tdeabc/plugins/ldaptdeio/Makefile.am
index 9c2d31ad7..bc81d13d8 100644
--- a/kabc/plugins/ldaptdeio/Makefile.am
+++ b/tdeabc/plugins/ldaptdeio/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libkabc_ldaptdeio.la
 libkabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
 libkabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libkabc_ldaptdeio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_ldaptdeio.la
 kabc_ldaptdeio_la_SOURCES = resourceldaptdeioplugin.cpp
diff --git a/kabc/plugins/ldaptdeio/ldaptdeio.desktop b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
similarity index 100%
rename from kabc/plugins/ldaptdeio/ldaptdeio.desktop
rename to tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
similarity index 99%
rename from kabc/plugins/ldaptdeio/resourceldaptdeio.cpp
rename to tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index b28289ecb..ea1a4294c 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeio.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -25,18 +25,18 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <stdlib.h>
 #include <tdeio/netaccess.h>
-#include <kabc/ldif.h>
-#include <kabc/ldapurl.h>
+#include <tdeabc/ldif.h>
+#include <tdeabc/ldapurl.h>
 
 #include "resourceldaptdeio.h"
 #include "resourceldaptdeioconfig.h"
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
similarity index 98%
rename from kabc/plugins/ldaptdeio/resourceldaptdeio.h
rename to tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
index 5c9282b9c..bf1b70ec0 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeio.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
@@ -22,8 +22,8 @@
 #ifndef KABC_RESOURCELDAP_H
 #define KABC_RESOURCELDAP_H
 
-#include <kabc/resource.h>
-#include <kabc/ldif.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/ldif.h>
 #include <tdeio/job.h>
 
 class TDEConfig;
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
similarity index 99%
rename from kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
rename to tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index f53ee7d30..a6af7d065 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -33,9 +33,9 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include "resourceldaptdeio.h"
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
similarity index 97%
rename from kabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
rename to tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
index 0fde41d64..121cf639e 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
@@ -28,8 +28,8 @@
 
 #include <kdialogbase.h>
 #include <tderesources/configwidget.h>
-#include <kabc/ldif.h>
-#include <kabc/ldapconfigwidget.h>
+#include <tdeabc/ldif.h>
+#include <tdeabc/ldapconfigwidget.h>
 
 
 class TQCheckBox;
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
similarity index 96%
rename from kabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
rename to tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
index ac08e8e2b..6d173eb51 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
@@ -21,8 +21,8 @@
 #include "resourceldaptdeio.h"
 #include "resourceldaptdeioconfig.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KABC;
 
diff --git a/kabc/plugins/net/CMakeLists.txt b/tdeabc/plugins/net/CMakeLists.txt
similarity index 98%
rename from kabc/plugins/net/CMakeLists.txt
rename to tdeabc/plugins/net/CMakeLists.txt
index e92fbfc32..cc9564995 100644
--- a/kabc/plugins/net/CMakeLists.txt
+++ b/tdeabc/plugins/net/CMakeLists.txt
@@ -53,7 +53,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am
similarity index 86%
rename from kabc/plugins/net/Makefile.am
rename to tdeabc/plugins/net/Makefile.am
index ca0ece015..c2ded1b44 100644
--- a/kabc/plugins/net/Makefile.am
+++ b/tdeabc/plugins/net/Makefile.am
@@ -6,8 +6,8 @@ noinst_HEADERS = resourcenetconfig.h
 lib_LTLIBRARIES = libkabc_net.la
 libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
 libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_net_la_LIBADD	= $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
-libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_net_la_LIBADD	= $(top_builddir)/tdeabc/libkabc.la $(LIB_KIO)
+libkabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_net.la
 kabc_net_la_SOURCES = resourcenetplugin.cpp
diff --git a/kabc/plugins/net/net.desktop b/tdeabc/plugins/net/net.desktop
similarity index 100%
rename from kabc/plugins/net/net.desktop
rename to tdeabc/plugins/net/net.desktop
diff --git a/kabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp
similarity index 99%
rename from kabc/plugins/net/resourcenet.cpp
rename to tdeabc/plugins/net/resourcenet.cpp
index 9ef909904..5a46890d8 100644
--- a/kabc/plugins/net/resourcenet.cpp
+++ b/tdeabc/plugins/net/resourcenet.cpp
@@ -23,9 +23,9 @@
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksavefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 
 #include "addressbook.h"
diff --git a/kabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h
similarity index 98%
rename from kabc/plugins/net/resourcenet.h
rename to tdeabc/plugins/net/resourcenet.h
index 940627ecb..49707081e 100644
--- a/kabc/plugins/net/resourcenet.h
+++ b/tdeabc/plugins/net/resourcenet.h
@@ -25,7 +25,7 @@
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 class TQFile;
 class TQTimer;
diff --git a/kabc/plugins/net/resourcenetconfig.cpp b/tdeabc/plugins/net/resourcenetconfig.cpp
similarity index 99%
rename from kabc/plugins/net/resourcenetconfig.cpp
rename to tdeabc/plugins/net/resourcenetconfig.cpp
index b441fbd98..8d5903f8b 100644
--- a/kabc/plugins/net/resourcenetconfig.cpp
+++ b/tdeabc/plugins/net/resourcenetconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "formatfactory.h"
diff --git a/kabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
similarity index 100%
rename from kabc/plugins/net/resourcenetconfig.h
rename to tdeabc/plugins/net/resourcenetconfig.h
diff --git a/kabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp
similarity index 100%
rename from kabc/plugins/net/resourcenetplugin.cpp
rename to tdeabc/plugins/net/resourcenetplugin.cpp
diff --git a/kabc/plugins/sql/Makefile.am b/tdeabc/plugins/sql/Makefile.am
similarity index 100%
rename from kabc/plugins/sql/Makefile.am
rename to tdeabc/plugins/sql/Makefile.am
diff --git a/kabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp
similarity index 99%
rename from kabc/plugins/sql/resourcesql.cpp
rename to tdeabc/plugins/sql/resourcesql.cpp
index 150fe54eb..e3744eeec 100644
--- a/kabc/plugins/sql/resourcesql.cpp
+++ b/tdeabc/plugins/sql/resourcesql.cpp
@@ -22,9 +22,9 @@
 #include <tqsqlcursor.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resourcesql.h"
 #include "resourcesqlconfig.h"
diff --git a/kabc/plugins/sql/resourcesql.h b/tdeabc/plugins/sql/resourcesql.h
similarity index 100%
rename from kabc/plugins/sql/resourcesql.h
rename to tdeabc/plugins/sql/resourcesql.h
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/tdeabc/plugins/sql/resourcesqlconfig.cpp
similarity index 99%
rename from kabc/plugins/sql/resourcesqlconfig.cpp
rename to tdeabc/plugins/sql/resourcesqlconfig.cpp
index f62890c3d..2f5b9d5b7 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/tdeabc/plugins/sql/resourcesqlconfig.cpp
@@ -24,7 +24,7 @@
 #include <tqvbox.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resource.h"
 #include "resourcesqlconfig.h"
diff --git a/kabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h
similarity index 100%
rename from kabc/plugins/sql/resourcesqlconfig.h
rename to tdeabc/plugins/sql/resourcesqlconfig.h
diff --git a/kabc/plugins/sql/sql.desktop b/tdeabc/plugins/sql/sql.desktop
similarity index 100%
rename from kabc/plugins/sql/sql.desktop
rename to tdeabc/plugins/sql/sql.desktop
diff --git a/kabc/resource.cpp b/tdeabc/resource.cpp
similarity index 99%
rename from kabc/resource.cpp
rename to tdeabc/resource.cpp
index 57c8588e8..9613d90b5 100644
--- a/kabc/resource.cpp
+++ b/tdeabc/resource.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resource.h"
 
diff --git a/kabc/resource.h b/tdeabc/resource.h
similarity index 100%
rename from kabc/resource.h
rename to tdeabc/resource.h
diff --git a/kabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp
similarity index 99%
rename from kabc/resourceselectdialog.cpp
rename to tdeabc/resourceselectdialog.cpp
index 3b6e25752..92f770ed4 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/tdeabc/resourceselectdialog.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <kstdguiitem.h>
diff --git a/kabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h
similarity index 100%
rename from kabc/resourceselectdialog.h
rename to tdeabc/resourceselectdialog.h
diff --git a/kabc/scripts/Makefile.am b/tdeabc/scripts/Makefile.am
similarity index 100%
rename from kabc/scripts/Makefile.am
rename to tdeabc/scripts/Makefile.am
diff --git a/kabc/scripts/addressee.src.cpp b/tdeabc/scripts/addressee.src.cpp
similarity index 99%
rename from kabc/scripts/addressee.src.cpp
rename to tdeabc/scripts/addressee.src.cpp
index 9aff3a708..7514b4a1d 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/tdeabc/scripts/addressee.src.cpp
@@ -25,7 +25,7 @@
 #include <ksharedptr.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "addresseehelper.h"
 #include "field.h"
diff --git a/kabc/scripts/addressee.src.h b/tdeabc/scripts/addressee.src.h
similarity index 100%
rename from kabc/scripts/addressee.src.h
rename to tdeabc/scripts/addressee.src.h
diff --git a/kabc/scripts/createisomap.pl b/tdeabc/scripts/createisomap.pl
similarity index 100%
rename from kabc/scripts/createisomap.pl
rename to tdeabc/scripts/createisomap.pl
diff --git a/kabc/scripts/entrylist b/tdeabc/scripts/entrylist
similarity index 100%
rename from kabc/scripts/entrylist
rename to tdeabc/scripts/entrylist
diff --git a/kabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp
similarity index 99%
rename from kabc/scripts/field.src.cpp
rename to tdeabc/scripts/field.src.cpp
index 2c80810b7..bec318880 100644
--- a/kabc/scripts/field.src.cpp
+++ b/tdeabc/scripts/field.src.cpp
@@ -18,9 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "field.h"
 #include "address.h"
diff --git a/kabc/scripts/makeaddressee b/tdeabc/scripts/makeaddressee
similarity index 100%
rename from kabc/scripts/makeaddressee
rename to tdeabc/scripts/makeaddressee
diff --git a/kabc/secrecy.cpp b/tdeabc/secrecy.cpp
similarity index 98%
rename from kabc/secrecy.cpp
rename to tdeabc/secrecy.cpp
index 7ec439b0c..2725612bc 100644
--- a/kabc/secrecy.cpp
+++ b/tdeabc/secrecy.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "secrecy.h"
 
diff --git a/kabc/secrecy.h b/tdeabc/secrecy.h
similarity index 100%
rename from kabc/secrecy.h
rename to tdeabc/secrecy.h
diff --git a/kabc/sortmode.cpp b/tdeabc/sortmode.cpp
similarity index 98%
rename from kabc/sortmode.cpp
rename to tdeabc/sortmode.cpp
index ee9a6f82d..efb4a3919 100644
--- a/kabc/sortmode.cpp
+++ b/tdeabc/sortmode.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/field.h>
+#include <tdeabc/field.h>
 
 #include "sortmode.h"
 
diff --git a/kabc/sortmode.h b/tdeabc/sortmode.h
similarity index 98%
rename from kabc/sortmode.h
rename to tdeabc/sortmode.h
index 9768fc8c5..f02662b7d 100644
--- a/kabc/sortmode.h
+++ b/tdeabc/sortmode.h
@@ -23,7 +23,7 @@
 
 #include <tdelibs_export.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 namespace KABC {
 
diff --git a/kabc/sound.cpp b/tdeabc/sound.cpp
similarity index 100%
rename from kabc/sound.cpp
rename to tdeabc/sound.cpp
diff --git a/kabc/sound.h b/tdeabc/sound.h
similarity index 100%
rename from kabc/sound.h
rename to tdeabc/sound.h
diff --git a/kabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp
similarity index 97%
rename from kabc/stdaddressbook.cpp
rename to tdeabc/stdaddressbook.cpp
index c887fcb83..3e64645ea 100644
--- a/kabc/stdaddressbook.cpp
+++ b/tdeabc/stdaddressbook.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kcrash.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tderesources/manager.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
@@ -42,12 +42,12 @@ static KStaticDeleter<StdAddressBook> addressBookDeleter;
 
 TQString StdAddressBook::fileName()
 {
-  return locateLocal( "data", "kabc/std.vcf" );
+  return locateLocal( "data", "tdeabc/std.vcf" );
 }
 
 TQString StdAddressBook::directoryName()
 {
-  return locateLocal( "data", "kabc/stdvcf" );
+  return locateLocal( "data", "tdeabc/stdvcf" );
 }
 
 void StdAddressBook::handleCrash()
diff --git a/kabc/stdaddressbook.h b/tdeabc/stdaddressbook.h
similarity index 100%
rename from kabc/stdaddressbook.h
rename to tdeabc/stdaddressbook.h
diff --git a/kabc/tdeab2tdeabc.cpp b/tdeabc/tdeab2tdeabc.cpp
similarity index 99%
rename from kabc/tdeab2tdeabc.cpp
rename to tdeabc/tdeab2tdeabc.cpp
index f03a80f45..13b433abc 100644
--- a/kabc/tdeab2tdeabc.cpp
+++ b/tdeabc/tdeab2tdeabc.cpp
@@ -27,9 +27,9 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"
diff --git a/kabc/tdeab2tdeabc.desktop b/tdeabc/tdeab2tdeabc.desktop
similarity index 94%
rename from kabc/tdeab2tdeabc.desktop
rename to tdeabc/tdeab2tdeabc.desktop
index 945f044d4..ef7641b23 100644
--- a/kabc/tdeab2tdeabc.desktop
+++ b/tdeabc/tdeab2tdeabc.desktop
@@ -23,19 +23,19 @@ Comment[ar]=أداة تحويل libkab إلى libkabc.
 Comment[az]=libkab - libkabc dönüşdürmə vasitəsi.
 Comment[be]=Інструмент пераўтварэння libkab у libkabc.
 Comment[bg]=Програма за конвертиране на libkab до libkabc.
-Comment[bn]=libkab থেকে libkabc-তে পরিবর্তন করার প্রোগ্রাম।
+Comment[bn]=libkab থেকে libtdeabc-তে পরিবর্তন করার প্রোগ্রাম।
 Comment[bs]=alat za pretvaranje libkab u libkabc.
 Comment[ca]=Eina de conversió de libkab a libkabc.
 Comment[cs]=Převod dat z libkab do libkabc.
 Comment[csb]=Nôrzãdze do kònwersëji z libkab do libkabc.
 Comment[cy]=erfyn trosi libkab i libkabc
-Comment[da]=libkab-til-libkabc-konverteringsværktøj.
+Comment[da]=libkab-til-libtdeabc-konverteringsværktøj.
 Comment[de]=Konvertierung von libkab in libkabc
 Comment[el]=Εργαλείο μετατροπής από το libkab στο libkabc.
 Comment[eo]=Konvertilo de "libkab" al "libkabc"
 Comment[es]=Conversor libkab a libkabc.
 Comment[et]=libkab -> libkabc teisendamine
-Comment[eu]=libkab-etik libkabc-era bihurtzeko tresna.
+Comment[eu]=libkab-etik libtdeabc-era bihurtzeko tresna.
 Comment[fa]=ابزار تبدیل libkab به libcabc.
 Comment[fi]=libkab-libkabc -muunnin
 Comment[fr]=Outil de conversion de libkab vers libkabc.
@@ -59,7 +59,7 @@ Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel.
 Comment[lt]=libkab į libkabc konvertavimo įrankis.
 Comment[lv]=libkab uz libkabc kovertēšanas rīks.
 Comment[mk]=алатка за претворање од libkab во libkabc.
-Comment[mn]=libkab-аас libkabc-руу хөрвүүлэгч
+Comment[mn]=libkab-аас libtdeabc-руу хөрвүүлэгч
 Comment[ms]=perkakasan penukaran libkab to libkabc.
 Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc
 Comment[nb]=libkab til libkabc konverteringsverktøy.
diff --git a/kabc/tests/Makefile.am b/tdeabc/tests/Makefile.am
similarity index 94%
rename from kabc/tests/Makefile.am
rename to tdeabc/tests/Makefile.am
index 961d12bd4..201cf746a 100644
--- a/kabc/tests/Makefile.am
+++ b/tdeabc/tests/Makefile.am
@@ -40,11 +40,11 @@ testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(L
 testaddresslineedit_SOURCES = testaddresslineedit.cpp
 
 bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
+bigread_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libkabc_file.la
 bigread_SOURCES = bigread.cpp
 
 bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
+bigwrite_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libkabc_file.la
 bigwrite_SOURCES = bigwrite.cpp
 
 testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/kabc/tests/bigread.cpp b/tdeabc/tests/bigread.cpp
similarity index 98%
rename from kabc/tests/bigread.cpp
rename to tdeabc/tests/bigread.cpp
index 5ea2393dc..a5022367c 100644
--- a/kabc/tests/bigread.cpp
+++ b/tdeabc/tests/bigread.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "addressbook.h"
diff --git a/kabc/tests/bigwrite.cpp b/tdeabc/tests/bigwrite.cpp
similarity index 98%
rename from kabc/tests/bigwrite.cpp
rename to tdeabc/tests/bigwrite.cpp
index 167f5d44d..4b9fa7bc3 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/tdeabc/tests/bigwrite.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "addressbook.h"
diff --git a/kabc/tests/kabcargl.cpp b/tdeabc/tests/kabcargl.cpp
similarity index 98%
rename from kabc/tests/kabcargl.cpp
rename to tdeabc/tests/kabcargl.cpp
index 589c973f2..e38a8a22e 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/tdeabc/tests/kabcargl.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "stdaddressbook.h"
diff --git a/kabc/tests/testaddressee.cpp b/tdeabc/tests/testaddressee.cpp
similarity index 98%
rename from kabc/tests/testaddressee.cpp
rename to tdeabc/tests/testaddressee.cpp
index 09f95d29b..ef55ae403 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/tdeabc/tests/testaddressee.cpp
@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
diff --git a/kabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp
similarity index 99%
rename from kabc/tests/testaddresseelist.cpp
rename to tdeabc/tests/testaddresseelist.cpp
index 10fa4aaef..f247f1744 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/tdeabc/tests/testaddresseelist.cpp
@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
diff --git a/kabc/tests/testaddressfmt.cpp b/tdeabc/tests/testaddressfmt.cpp
similarity index 98%
rename from kabc/tests/testaddressfmt.cpp
rename to tdeabc/tests/testaddressfmt.cpp
index ca13a116c..2eb438335 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/tdeabc/tests/testaddressfmt.cpp
@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
diff --git a/kabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp
similarity index 96%
rename from kabc/tests/testaddresslineedit.cpp
rename to tdeabc/tests/testaddresslineedit.cpp
index 7315aef7e..74446f482 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/tdeabc/tests/testaddresslineedit.cpp
@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "addresslineedit.h"
diff --git a/kabc/tests/testdb.cpp b/tdeabc/tests/testdb.cpp
similarity index 96%
rename from kabc/tests/testdb.cpp
rename to tdeabc/tests/testdb.cpp
index fd4e4f6c1..f7ec1d17c 100644
--- a/kabc/tests/testdb.cpp
+++ b/tdeabc/tests/testdb.cpp
@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "addressbook.h"
diff --git a/kabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp
similarity index 98%
rename from kabc/tests/testdistlist.cpp
rename to tdeabc/tests/testdistlist.cpp
index 0f0e90f90..69a309ff9 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/tdeabc/tests/testdistlist.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "stdaddressbook.h"
diff --git a/kabc/tests/testkabc.cpp b/tdeabc/tests/testkabc.cpp
similarity index 98%
rename from kabc/tests/testkabc.cpp
rename to tdeabc/tests/testkabc.cpp
index 3caea88f1..427262cab 100644
--- a/kabc/tests/testkabc.cpp
+++ b/tdeabc/tests/testkabc.cpp
@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
diff --git a/kabc/tests/testkabcdlg.cpp b/tdeabc/tests/testkabcdlg.cpp
similarity index 98%
rename from kabc/tests/testkabcdlg.cpp
rename to tdeabc/tests/testkabcdlg.cpp
index 24225cc1b..aef203d28 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/tdeabc/tests/testkabcdlg.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "addresseedialog.h"
diff --git a/kabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp
similarity index 100%
rename from kabc/tests/testldapclient.cpp
rename to tdeabc/tests/testldapclient.cpp
diff --git a/kabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h
similarity index 100%
rename from kabc/tests/testldapclient.h
rename to tdeabc/tests/testldapclient.h
diff --git a/kabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
similarity index 99%
rename from kabc/tests/testlock.cpp
rename to tdeabc/tests/testlock.cpp
index 632c690a6..3ebd724bb 100644
--- a/kabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -26,11 +26,11 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kdirwatch.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 
 #include <tqwidget.h>
diff --git a/kabc/tests/testlock.h b/tdeabc/tests/testlock.h
similarity index 100%
rename from kabc/tests/testlock.h
rename to tdeabc/tests/testlock.h
diff --git a/kabc/timezone.cpp b/tdeabc/timezone.cpp
similarity index 100%
rename from kabc/timezone.cpp
rename to tdeabc/timezone.cpp
diff --git a/kabc/timezone.h b/tdeabc/timezone.h
similarity index 100%
rename from kabc/timezone.h
rename to tdeabc/timezone.h
diff --git a/kabc/vcard/AdrParam.cpp b/tdeabc/vcard/AdrParam.cpp
similarity index 100%
rename from kabc/vcard/AdrParam.cpp
rename to tdeabc/vcard/AdrParam.cpp
diff --git a/kabc/vcard/AdrValue.cpp b/tdeabc/vcard/AdrValue.cpp
similarity index 100%
rename from kabc/vcard/AdrValue.cpp
rename to tdeabc/vcard/AdrValue.cpp
diff --git a/kabc/vcard/AgentParam.cpp b/tdeabc/vcard/AgentParam.cpp
similarity index 100%
rename from kabc/vcard/AgentParam.cpp
rename to tdeabc/vcard/AgentParam.cpp
diff --git a/kabc/vcard/AgentValue.cpp b/tdeabc/vcard/AgentValue.cpp
similarity index 100%
rename from kabc/vcard/AgentValue.cpp
rename to tdeabc/vcard/AgentValue.cpp
diff --git a/kabc/vcard/CMakeLists.txt b/tdeabc/vcard/CMakeLists.txt
similarity index 100%
rename from kabc/vcard/CMakeLists.txt
rename to tdeabc/vcard/CMakeLists.txt
diff --git a/kabc/vcard/ClassValue.cpp b/tdeabc/vcard/ClassValue.cpp
similarity index 100%
rename from kabc/vcard/ClassValue.cpp
rename to tdeabc/vcard/ClassValue.cpp
diff --git a/kabc/vcard/ContentLine.cpp b/tdeabc/vcard/ContentLine.cpp
similarity index 100%
rename from kabc/vcard/ContentLine.cpp
rename to tdeabc/vcard/ContentLine.cpp
diff --git a/kabc/vcard/DateParam.cpp b/tdeabc/vcard/DateParam.cpp
similarity index 100%
rename from kabc/vcard/DateParam.cpp
rename to tdeabc/vcard/DateParam.cpp
diff --git a/kabc/vcard/DateValue.cpp b/tdeabc/vcard/DateValue.cpp
similarity index 100%
rename from kabc/vcard/DateValue.cpp
rename to tdeabc/vcard/DateValue.cpp
diff --git a/kabc/vcard/EmailParam.cpp b/tdeabc/vcard/EmailParam.cpp
similarity index 100%
rename from kabc/vcard/EmailParam.cpp
rename to tdeabc/vcard/EmailParam.cpp
diff --git a/kabc/vcard/Entity.cpp b/tdeabc/vcard/Entity.cpp
similarity index 100%
rename from kabc/vcard/Entity.cpp
rename to tdeabc/vcard/Entity.cpp
diff --git a/kabc/vcard/Enum.cpp b/tdeabc/vcard/Enum.cpp
similarity index 100%
rename from kabc/vcard/Enum.cpp
rename to tdeabc/vcard/Enum.cpp
diff --git a/kabc/vcard/FloatValue.cpp b/tdeabc/vcard/FloatValue.cpp
similarity index 100%
rename from kabc/vcard/FloatValue.cpp
rename to tdeabc/vcard/FloatValue.cpp
diff --git a/kabc/vcard/GeoValue.cpp b/tdeabc/vcard/GeoValue.cpp
similarity index 100%
rename from kabc/vcard/GeoValue.cpp
rename to tdeabc/vcard/GeoValue.cpp
diff --git a/kabc/vcard/ImageParam.cpp b/tdeabc/vcard/ImageParam.cpp
similarity index 100%
rename from kabc/vcard/ImageParam.cpp
rename to tdeabc/vcard/ImageParam.cpp
diff --git a/kabc/vcard/ImageValue.cpp b/tdeabc/vcard/ImageValue.cpp
similarity index 100%
rename from kabc/vcard/ImageValue.cpp
rename to tdeabc/vcard/ImageValue.cpp
diff --git a/kabc/vcard/ImgValue.cpp b/tdeabc/vcard/ImgValue.cpp
similarity index 100%
rename from kabc/vcard/ImgValue.cpp
rename to tdeabc/vcard/ImgValue.cpp
diff --git a/kabc/vcard/LangValue.cpp b/tdeabc/vcard/LangValue.cpp
similarity index 100%
rename from kabc/vcard/LangValue.cpp
rename to tdeabc/vcard/LangValue.cpp
diff --git a/kabc/vcard/Makefile.am b/tdeabc/vcard/Makefile.am
similarity index 100%
rename from kabc/vcard/Makefile.am
rename to tdeabc/vcard/Makefile.am
diff --git a/kabc/vcard/NValue.cpp b/tdeabc/vcard/NValue.cpp
similarity index 100%
rename from kabc/vcard/NValue.cpp
rename to tdeabc/vcard/NValue.cpp
diff --git a/kabc/vcard/OrgValue.cpp b/tdeabc/vcard/OrgValue.cpp
similarity index 100%
rename from kabc/vcard/OrgValue.cpp
rename to tdeabc/vcard/OrgValue.cpp
diff --git a/kabc/vcard/Param.cpp b/tdeabc/vcard/Param.cpp
similarity index 100%
rename from kabc/vcard/Param.cpp
rename to tdeabc/vcard/Param.cpp
diff --git a/kabc/vcard/PhoneNumberValue.cpp b/tdeabc/vcard/PhoneNumberValue.cpp
similarity index 100%
rename from kabc/vcard/PhoneNumberValue.cpp
rename to tdeabc/vcard/PhoneNumberValue.cpp
diff --git a/kabc/vcard/README b/tdeabc/vcard/README
similarity index 100%
rename from kabc/vcard/README
rename to tdeabc/vcard/README
diff --git a/kabc/vcard/RToken.cpp b/tdeabc/vcard/RToken.cpp
similarity index 100%
rename from kabc/vcard/RToken.cpp
rename to tdeabc/vcard/RToken.cpp
diff --git a/kabc/vcard/SoundValue.cpp b/tdeabc/vcard/SoundValue.cpp
similarity index 100%
rename from kabc/vcard/SoundValue.cpp
rename to tdeabc/vcard/SoundValue.cpp
diff --git a/kabc/vcard/SourceParam.cpp b/tdeabc/vcard/SourceParam.cpp
similarity index 100%
rename from kabc/vcard/SourceParam.cpp
rename to tdeabc/vcard/SourceParam.cpp
diff --git a/kabc/vcard/TelParam.cpp b/tdeabc/vcard/TelParam.cpp
similarity index 100%
rename from kabc/vcard/TelParam.cpp
rename to tdeabc/vcard/TelParam.cpp
diff --git a/kabc/vcard/TelValue.cpp b/tdeabc/vcard/TelValue.cpp
similarity index 100%
rename from kabc/vcard/TelValue.cpp
rename to tdeabc/vcard/TelValue.cpp
diff --git a/kabc/vcard/TextBinParam.cpp b/tdeabc/vcard/TextBinParam.cpp
similarity index 100%
rename from kabc/vcard/TextBinParam.cpp
rename to tdeabc/vcard/TextBinParam.cpp
diff --git a/kabc/vcard/TextBinValue.cpp b/tdeabc/vcard/TextBinValue.cpp
similarity index 100%
rename from kabc/vcard/TextBinValue.cpp
rename to tdeabc/vcard/TextBinValue.cpp
diff --git a/kabc/vcard/TextListValue.cpp b/tdeabc/vcard/TextListValue.cpp
similarity index 100%
rename from kabc/vcard/TextListValue.cpp
rename to tdeabc/vcard/TextListValue.cpp
diff --git a/kabc/vcard/TextParam.cpp b/tdeabc/vcard/TextParam.cpp
similarity index 100%
rename from kabc/vcard/TextParam.cpp
rename to tdeabc/vcard/TextParam.cpp
diff --git a/kabc/vcard/TextValue.cpp b/tdeabc/vcard/TextValue.cpp
similarity index 100%
rename from kabc/vcard/TextValue.cpp
rename to tdeabc/vcard/TextValue.cpp
diff --git a/kabc/vcard/URIValue.cpp b/tdeabc/vcard/URIValue.cpp
similarity index 100%
rename from kabc/vcard/URIValue.cpp
rename to tdeabc/vcard/URIValue.cpp
diff --git a/kabc/vcard/UTCValue.cpp b/tdeabc/vcard/UTCValue.cpp
similarity index 100%
rename from kabc/vcard/UTCValue.cpp
rename to tdeabc/vcard/UTCValue.cpp
diff --git a/kabc/vcard/VCard.cpp b/tdeabc/vcard/VCard.cpp
similarity index 100%
rename from kabc/vcard/VCard.cpp
rename to tdeabc/vcard/VCard.cpp
diff --git a/kabc/vcard/VCardEntity.cpp b/tdeabc/vcard/VCardEntity.cpp
similarity index 100%
rename from kabc/vcard/VCardEntity.cpp
rename to tdeabc/vcard/VCardEntity.cpp
diff --git a/kabc/vcard/Value.cpp b/tdeabc/vcard/Value.cpp
similarity index 100%
rename from kabc/vcard/Value.cpp
rename to tdeabc/vcard/Value.cpp
diff --git a/kabc/vcard/include/VCard.h b/tdeabc/vcard/include/VCard.h
similarity index 100%
rename from kabc/vcard/include/VCard.h
rename to tdeabc/vcard/include/VCard.h
diff --git a/kabc/vcard/include/VCardAdrParam.h b/tdeabc/vcard/include/VCardAdrParam.h
similarity index 100%
rename from kabc/vcard/include/VCardAdrParam.h
rename to tdeabc/vcard/include/VCardAdrParam.h
diff --git a/kabc/vcard/include/VCardAdrValue.h b/tdeabc/vcard/include/VCardAdrValue.h
similarity index 100%
rename from kabc/vcard/include/VCardAdrValue.h
rename to tdeabc/vcard/include/VCardAdrValue.h
diff --git a/kabc/vcard/include/VCardAgentParam.h b/tdeabc/vcard/include/VCardAgentParam.h
similarity index 100%
rename from kabc/vcard/include/VCardAgentParam.h
rename to tdeabc/vcard/include/VCardAgentParam.h
diff --git a/kabc/vcard/include/VCardAgentValue.h b/tdeabc/vcard/include/VCardAgentValue.h
similarity index 100%
rename from kabc/vcard/include/VCardAgentValue.h
rename to tdeabc/vcard/include/VCardAgentValue.h
diff --git a/kabc/vcard/include/VCardClassValue.h b/tdeabc/vcard/include/VCardClassValue.h
similarity index 100%
rename from kabc/vcard/include/VCardClassValue.h
rename to tdeabc/vcard/include/VCardClassValue.h
diff --git a/kabc/vcard/include/VCardContentLine.h b/tdeabc/vcard/include/VCardContentLine.h
similarity index 100%
rename from kabc/vcard/include/VCardContentLine.h
rename to tdeabc/vcard/include/VCardContentLine.h
diff --git a/kabc/vcard/include/VCardDateParam.h b/tdeabc/vcard/include/VCardDateParam.h
similarity index 100%
rename from kabc/vcard/include/VCardDateParam.h
rename to tdeabc/vcard/include/VCardDateParam.h
diff --git a/kabc/vcard/include/VCardDateValue.h b/tdeabc/vcard/include/VCardDateValue.h
similarity index 100%
rename from kabc/vcard/include/VCardDateValue.h
rename to tdeabc/vcard/include/VCardDateValue.h
diff --git a/kabc/vcard/include/VCardDefines.h b/tdeabc/vcard/include/VCardDefines.h
similarity index 100%
rename from kabc/vcard/include/VCardDefines.h
rename to tdeabc/vcard/include/VCardDefines.h
diff --git a/kabc/vcard/include/VCardEmailParam.h b/tdeabc/vcard/include/VCardEmailParam.h
similarity index 100%
rename from kabc/vcard/include/VCardEmailParam.h
rename to tdeabc/vcard/include/VCardEmailParam.h
diff --git a/kabc/vcard/include/VCardEntity.h b/tdeabc/vcard/include/VCardEntity.h
similarity index 100%
rename from kabc/vcard/include/VCardEntity.h
rename to tdeabc/vcard/include/VCardEntity.h
diff --git a/kabc/vcard/include/VCardEnum.h b/tdeabc/vcard/include/VCardEnum.h
similarity index 100%
rename from kabc/vcard/include/VCardEnum.h
rename to tdeabc/vcard/include/VCardEnum.h
diff --git a/kabc/vcard/include/VCardFloatValue.h b/tdeabc/vcard/include/VCardFloatValue.h
similarity index 100%
rename from kabc/vcard/include/VCardFloatValue.h
rename to tdeabc/vcard/include/VCardFloatValue.h
diff --git a/kabc/vcard/include/VCardGeoValue.h b/tdeabc/vcard/include/VCardGeoValue.h
similarity index 100%
rename from kabc/vcard/include/VCardGeoValue.h
rename to tdeabc/vcard/include/VCardGeoValue.h
diff --git a/kabc/vcard/include/VCardGroup.h b/tdeabc/vcard/include/VCardGroup.h
similarity index 100%
rename from kabc/vcard/include/VCardGroup.h
rename to tdeabc/vcard/include/VCardGroup.h
diff --git a/kabc/vcard/include/VCardImageParam.h b/tdeabc/vcard/include/VCardImageParam.h
similarity index 100%
rename from kabc/vcard/include/VCardImageParam.h
rename to tdeabc/vcard/include/VCardImageParam.h
diff --git a/kabc/vcard/include/VCardImageValue.h b/tdeabc/vcard/include/VCardImageValue.h
similarity index 100%
rename from kabc/vcard/include/VCardImageValue.h
rename to tdeabc/vcard/include/VCardImageValue.h
diff --git a/kabc/vcard/include/VCardImgValue.h b/tdeabc/vcard/include/VCardImgValue.h
similarity index 100%
rename from kabc/vcard/include/VCardImgValue.h
rename to tdeabc/vcard/include/VCardImgValue.h
diff --git a/kabc/vcard/include/VCardLangValue.h b/tdeabc/vcard/include/VCardLangValue.h
similarity index 100%
rename from kabc/vcard/include/VCardLangValue.h
rename to tdeabc/vcard/include/VCardLangValue.h
diff --git a/kabc/vcard/include/VCardNValue.h b/tdeabc/vcard/include/VCardNValue.h
similarity index 100%
rename from kabc/vcard/include/VCardNValue.h
rename to tdeabc/vcard/include/VCardNValue.h
diff --git a/kabc/vcard/include/VCardOrgValue.h b/tdeabc/vcard/include/VCardOrgValue.h
similarity index 100%
rename from kabc/vcard/include/VCardOrgValue.h
rename to tdeabc/vcard/include/VCardOrgValue.h
diff --git a/kabc/vcard/include/VCardParam.h b/tdeabc/vcard/include/VCardParam.h
similarity index 100%
rename from kabc/vcard/include/VCardParam.h
rename to tdeabc/vcard/include/VCardParam.h
diff --git a/kabc/vcard/include/VCardPhoneNumberValue.h b/tdeabc/vcard/include/VCardPhoneNumberValue.h
similarity index 100%
rename from kabc/vcard/include/VCardPhoneNumberValue.h
rename to tdeabc/vcard/include/VCardPhoneNumberValue.h
diff --git a/kabc/vcard/include/VCardRToken.h b/tdeabc/vcard/include/VCardRToken.h
similarity index 100%
rename from kabc/vcard/include/VCardRToken.h
rename to tdeabc/vcard/include/VCardRToken.h
diff --git a/kabc/vcard/include/VCardSndValue.h b/tdeabc/vcard/include/VCardSndValue.h
similarity index 100%
rename from kabc/vcard/include/VCardSndValue.h
rename to tdeabc/vcard/include/VCardSndValue.h
diff --git a/kabc/vcard/include/VCardSoundValue.h b/tdeabc/vcard/include/VCardSoundValue.h
similarity index 100%
rename from kabc/vcard/include/VCardSoundValue.h
rename to tdeabc/vcard/include/VCardSoundValue.h
diff --git a/kabc/vcard/include/VCardSourceParam.h b/tdeabc/vcard/include/VCardSourceParam.h
similarity index 100%
rename from kabc/vcard/include/VCardSourceParam.h
rename to tdeabc/vcard/include/VCardSourceParam.h
diff --git a/kabc/vcard/include/VCardTelParam.h b/tdeabc/vcard/include/VCardTelParam.h
similarity index 100%
rename from kabc/vcard/include/VCardTelParam.h
rename to tdeabc/vcard/include/VCardTelParam.h
diff --git a/kabc/vcard/include/VCardTelValue.h b/tdeabc/vcard/include/VCardTelValue.h
similarity index 100%
rename from kabc/vcard/include/VCardTelValue.h
rename to tdeabc/vcard/include/VCardTelValue.h
diff --git a/kabc/vcard/include/VCardTextBinParam.h b/tdeabc/vcard/include/VCardTextBinParam.h
similarity index 100%
rename from kabc/vcard/include/VCardTextBinParam.h
rename to tdeabc/vcard/include/VCardTextBinParam.h
diff --git a/kabc/vcard/include/VCardTextBinValue.h b/tdeabc/vcard/include/VCardTextBinValue.h
similarity index 100%
rename from kabc/vcard/include/VCardTextBinValue.h
rename to tdeabc/vcard/include/VCardTextBinValue.h
diff --git a/kabc/vcard/include/VCardTextListValue.h b/tdeabc/vcard/include/VCardTextListValue.h
similarity index 100%
rename from kabc/vcard/include/VCardTextListValue.h
rename to tdeabc/vcard/include/VCardTextListValue.h
diff --git a/kabc/vcard/include/VCardTextParam.h b/tdeabc/vcard/include/VCardTextParam.h
similarity index 100%
rename from kabc/vcard/include/VCardTextParam.h
rename to tdeabc/vcard/include/VCardTextParam.h
diff --git a/kabc/vcard/include/VCardTextValue.h b/tdeabc/vcard/include/VCardTextValue.h
similarity index 100%
rename from kabc/vcard/include/VCardTextValue.h
rename to tdeabc/vcard/include/VCardTextValue.h
diff --git a/kabc/vcard/include/VCardURIValue.h b/tdeabc/vcard/include/VCardURIValue.h
similarity index 100%
rename from kabc/vcard/include/VCardURIValue.h
rename to tdeabc/vcard/include/VCardURIValue.h
diff --git a/kabc/vcard/include/VCardUTCValue.h b/tdeabc/vcard/include/VCardUTCValue.h
similarity index 100%
rename from kabc/vcard/include/VCardUTCValue.h
rename to tdeabc/vcard/include/VCardUTCValue.h
diff --git a/kabc/vcard/include/VCardVCard.h b/tdeabc/vcard/include/VCardVCard.h
similarity index 100%
rename from kabc/vcard/include/VCardVCard.h
rename to tdeabc/vcard/include/VCardVCard.h
diff --git a/kabc/vcard/include/VCardVCardEntity.h b/tdeabc/vcard/include/VCardVCardEntity.h
similarity index 100%
rename from kabc/vcard/include/VCardVCardEntity.h
rename to tdeabc/vcard/include/VCardVCardEntity.h
diff --git a/kabc/vcard/include/VCardValue.h b/tdeabc/vcard/include/VCardValue.h
similarity index 100%
rename from kabc/vcard/include/VCardValue.h
rename to tdeabc/vcard/include/VCardValue.h
diff --git a/kabc/vcard/include/generated/AdrParam-generated.h b/tdeabc/vcard/include/generated/AdrParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/AdrParam-generated.h
rename to tdeabc/vcard/include/generated/AdrParam-generated.h
diff --git a/kabc/vcard/include/generated/AdrValue-generated.h b/tdeabc/vcard/include/generated/AdrValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/AdrValue-generated.h
rename to tdeabc/vcard/include/generated/AdrValue-generated.h
diff --git a/kabc/vcard/include/generated/AgentParam-generated.h b/tdeabc/vcard/include/generated/AgentParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/AgentParam-generated.h
rename to tdeabc/vcard/include/generated/AgentParam-generated.h
diff --git a/kabc/vcard/include/generated/AgentValue-generated.h b/tdeabc/vcard/include/generated/AgentValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/AgentValue-generated.h
rename to tdeabc/vcard/include/generated/AgentValue-generated.h
diff --git a/kabc/vcard/include/generated/ClassValue-generated.h b/tdeabc/vcard/include/generated/ClassValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/ClassValue-generated.h
rename to tdeabc/vcard/include/generated/ClassValue-generated.h
diff --git a/kabc/vcard/include/generated/ContentLine-generated.h b/tdeabc/vcard/include/generated/ContentLine-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/ContentLine-generated.h
rename to tdeabc/vcard/include/generated/ContentLine-generated.h
diff --git a/kabc/vcard/include/generated/DateParam-generated.h b/tdeabc/vcard/include/generated/DateParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/DateParam-generated.h
rename to tdeabc/vcard/include/generated/DateParam-generated.h
diff --git a/kabc/vcard/include/generated/DateValue-generated.h b/tdeabc/vcard/include/generated/DateValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/DateValue-generated.h
rename to tdeabc/vcard/include/generated/DateValue-generated.h
diff --git a/kabc/vcard/include/generated/EmailParam-generated.h b/tdeabc/vcard/include/generated/EmailParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/EmailParam-generated.h
rename to tdeabc/vcard/include/generated/EmailParam-generated.h
diff --git a/kabc/vcard/include/generated/FloatValue-generated.h b/tdeabc/vcard/include/generated/FloatValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/FloatValue-generated.h
rename to tdeabc/vcard/include/generated/FloatValue-generated.h
diff --git a/kabc/vcard/include/generated/GeoValue-generated.h b/tdeabc/vcard/include/generated/GeoValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/GeoValue-generated.h
rename to tdeabc/vcard/include/generated/GeoValue-generated.h
diff --git a/kabc/vcard/include/generated/Group-generated.h b/tdeabc/vcard/include/generated/Group-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/Group-generated.h
rename to tdeabc/vcard/include/generated/Group-generated.h
diff --git a/kabc/vcard/include/generated/ImageParam-generated.h b/tdeabc/vcard/include/generated/ImageParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/ImageParam-generated.h
rename to tdeabc/vcard/include/generated/ImageParam-generated.h
diff --git a/kabc/vcard/include/generated/ImageValue-generated.h b/tdeabc/vcard/include/generated/ImageValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/ImageValue-generated.h
rename to tdeabc/vcard/include/generated/ImageValue-generated.h
diff --git a/kabc/vcard/include/generated/ImgParam-generated.h b/tdeabc/vcard/include/generated/ImgParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/ImgParam-generated.h
rename to tdeabc/vcard/include/generated/ImgParam-generated.h
diff --git a/kabc/vcard/include/generated/ImgValue-generated.h b/tdeabc/vcard/include/generated/ImgValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/ImgValue-generated.h
rename to tdeabc/vcard/include/generated/ImgValue-generated.h
diff --git a/kabc/vcard/include/generated/LangValue-generated.h b/tdeabc/vcard/include/generated/LangValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/LangValue-generated.h
rename to tdeabc/vcard/include/generated/LangValue-generated.h
diff --git a/kabc/vcard/include/generated/NValue-generated.h b/tdeabc/vcard/include/generated/NValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/NValue-generated.h
rename to tdeabc/vcard/include/generated/NValue-generated.h
diff --git a/kabc/vcard/include/generated/Name-generated.h b/tdeabc/vcard/include/generated/Name-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/Name-generated.h
rename to tdeabc/vcard/include/generated/Name-generated.h
diff --git a/kabc/vcard/include/generated/OrgValue-generated.h b/tdeabc/vcard/include/generated/OrgValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/OrgValue-generated.h
rename to tdeabc/vcard/include/generated/OrgValue-generated.h
diff --git a/kabc/vcard/include/generated/Param-generated.h b/tdeabc/vcard/include/generated/Param-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/Param-generated.h
rename to tdeabc/vcard/include/generated/Param-generated.h
diff --git a/kabc/vcard/include/generated/ParamName-generated.h b/tdeabc/vcard/include/generated/ParamName-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/ParamName-generated.h
rename to tdeabc/vcard/include/generated/ParamName-generated.h
diff --git a/kabc/vcard/include/generated/ParamValue-generated.h b/tdeabc/vcard/include/generated/ParamValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/ParamValue-generated.h
rename to tdeabc/vcard/include/generated/ParamValue-generated.h
diff --git a/kabc/vcard/include/generated/PhoneNumberValue-generated.h b/tdeabc/vcard/include/generated/PhoneNumberValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/PhoneNumberValue-generated.h
rename to tdeabc/vcard/include/generated/PhoneNumberValue-generated.h
diff --git a/kabc/vcard/include/generated/SoundValue-generated.h b/tdeabc/vcard/include/generated/SoundValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/SoundValue-generated.h
rename to tdeabc/vcard/include/generated/SoundValue-generated.h
diff --git a/kabc/vcard/include/generated/SourceParam-generated.h b/tdeabc/vcard/include/generated/SourceParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/SourceParam-generated.h
rename to tdeabc/vcard/include/generated/SourceParam-generated.h
diff --git a/kabc/vcard/include/generated/TelParam-generated.h b/tdeabc/vcard/include/generated/TelParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/TelParam-generated.h
rename to tdeabc/vcard/include/generated/TelParam-generated.h
diff --git a/kabc/vcard/include/generated/TelValue-generated.h b/tdeabc/vcard/include/generated/TelValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/TelValue-generated.h
rename to tdeabc/vcard/include/generated/TelValue-generated.h
diff --git a/kabc/vcard/include/generated/TextBinParam-generated.h b/tdeabc/vcard/include/generated/TextBinParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/TextBinParam-generated.h
rename to tdeabc/vcard/include/generated/TextBinParam-generated.h
diff --git a/kabc/vcard/include/generated/TextBinValue-generated.h b/tdeabc/vcard/include/generated/TextBinValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/TextBinValue-generated.h
rename to tdeabc/vcard/include/generated/TextBinValue-generated.h
diff --git a/kabc/vcard/include/generated/TextListValue-generated.h b/tdeabc/vcard/include/generated/TextListValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/TextListValue-generated.h
rename to tdeabc/vcard/include/generated/TextListValue-generated.h
diff --git a/kabc/vcard/include/generated/TextNSParam-generated.h b/tdeabc/vcard/include/generated/TextNSParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/TextNSParam-generated.h
rename to tdeabc/vcard/include/generated/TextNSParam-generated.h
diff --git a/kabc/vcard/include/generated/TextParam-generated.h b/tdeabc/vcard/include/generated/TextParam-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/TextParam-generated.h
rename to tdeabc/vcard/include/generated/TextParam-generated.h
diff --git a/kabc/vcard/include/generated/TextValue-generated.h b/tdeabc/vcard/include/generated/TextValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/TextValue-generated.h
rename to tdeabc/vcard/include/generated/TextValue-generated.h
diff --git a/kabc/vcard/include/generated/URIValue-generated.h b/tdeabc/vcard/include/generated/URIValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/URIValue-generated.h
rename to tdeabc/vcard/include/generated/URIValue-generated.h
diff --git a/kabc/vcard/include/generated/UTCValue-generated.h b/tdeabc/vcard/include/generated/UTCValue-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/UTCValue-generated.h
rename to tdeabc/vcard/include/generated/UTCValue-generated.h
diff --git a/kabc/vcard/include/generated/VCard-generated.h b/tdeabc/vcard/include/generated/VCard-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/VCard-generated.h
rename to tdeabc/vcard/include/generated/VCard-generated.h
diff --git a/kabc/vcard/include/generated/VCardEntity-generated.h b/tdeabc/vcard/include/generated/VCardEntity-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/VCardEntity-generated.h
rename to tdeabc/vcard/include/generated/VCardEntity-generated.h
diff --git a/kabc/vcard/include/generated/Value-generated.h b/tdeabc/vcard/include/generated/Value-generated.h
similarity index 100%
rename from kabc/vcard/include/generated/Value-generated.h
rename to tdeabc/vcard/include/generated/Value-generated.h
diff --git a/kabc/vcard/include/generated/generate b/tdeabc/vcard/include/generated/generate
similarity index 100%
rename from kabc/vcard/include/generated/generate
rename to tdeabc/vcard/include/generated/generate
diff --git a/kabc/vcard/include/generated/generateHeaders.awk b/tdeabc/vcard/include/generated/generateHeaders.awk
similarity index 100%
rename from kabc/vcard/include/generated/generateHeaders.awk
rename to tdeabc/vcard/include/generated/generateHeaders.awk
diff --git a/kabc/vcard/include/generated/headerBodies b/tdeabc/vcard/include/generated/headerBodies
similarity index 100%
rename from kabc/vcard/include/generated/headerBodies
rename to tdeabc/vcard/include/generated/headerBodies
diff --git a/kabc/vcard/testread.cpp b/tdeabc/vcard/testread.cpp
similarity index 100%
rename from kabc/vcard/testread.cpp
rename to tdeabc/vcard/testread.cpp
diff --git a/kabc/vcard/testwrite.cpp b/tdeabc/vcard/testwrite.cpp
similarity index 97%
rename from kabc/vcard/testwrite.cpp
rename to tdeabc/vcard/testwrite.cpp
index 67f8eb20a..42b76c80f 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/tdeabc/vcard/testwrite.cpp
@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <VCard.h>
diff --git a/kabc/vcard/vCard-all.cpp b/tdeabc/vcard/vCard-all.cpp
similarity index 100%
rename from kabc/vcard/vCard-all.cpp
rename to tdeabc/vcard/vCard-all.cpp
diff --git a/kabc/vcard21parser.cpp b/tdeabc/vcard21parser.cpp
similarity index 100%
rename from kabc/vcard21parser.cpp
rename to tdeabc/vcard21parser.cpp
diff --git a/kabc/vcard21parser.h b/tdeabc/vcard21parser.h
similarity index 100%
rename from kabc/vcard21parser.h
rename to tdeabc/vcard21parser.h
diff --git a/kabc/vcardconverter.cpp b/tdeabc/vcardconverter.cpp
similarity index 100%
rename from kabc/vcardconverter.cpp
rename to tdeabc/vcardconverter.cpp
diff --git a/kabc/vcardconverter.h b/tdeabc/vcardconverter.h
similarity index 100%
rename from kabc/vcardconverter.h
rename to tdeabc/vcardconverter.h
diff --git a/kabc/vcardformat.cpp b/tdeabc/vcardformat.cpp
similarity index 100%
rename from kabc/vcardformat.cpp
rename to tdeabc/vcardformat.cpp
diff --git a/kabc/vcardformat.h b/tdeabc/vcardformat.h
similarity index 100%
rename from kabc/vcardformat.h
rename to tdeabc/vcardformat.h
diff --git a/kabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp
similarity index 98%
rename from kabc/vcardformatimpl.cpp
rename to tdeabc/vcardformatimpl.cpp
index ebaf337b0..c0d39bb95 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/tdeabc/vcardformatimpl.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <VCard.h>
 
@@ -849,7 +849,7 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty
       if ( type == EntityLogo )
         dir = "logos";
 
-      img.save( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ), pic.type().utf8() );
+      img.save( locateLocal( "data", "tdeabc/" + dir + "/" + addr.uid() ), pic.type().utf8() );
       cl.setValue( new TextValue( "<dummy>" ) );
     }
     params.append( new Param( "ENCODING", "b" ) );
@@ -889,7 +889,7 @@ Picture VCardFormatImpl::readPictureValue( VCARD::ContentLine *cl, VCARD::Entity
       if ( type == EntityLogo )
         dir = "logos";
 
-      img.load( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ) );
+      img.load( locateLocal( "data", "tdeabc/" + dir + "/" + addr.uid() ) );
     } else {
       TQByteArray data;
       KCodecs::base64Decode( v->asString(), data );
@@ -921,7 +921,7 @@ void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, co
     if ( intern ) { // only for vCard export we really write the data inline
         cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
     } else { // save sound in cache
-      TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+      TQFile file( locateLocal( "data", "tdeabc/sounds/" + addr.uid() ) );
       if ( file.open( IO_WriteOnly ) ) {
         file.writeBlock( data );
       }
@@ -953,7 +953,7 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
   if ( isInline ) {
     TQByteArray data;
     if ( v->asString() == "<dummy>" ) { // no sound inline stored => sound is in cache
-      TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+      TQFile file( locateLocal( "data", "tdeabc/sounds/" + addr.uid() ) );
       if ( file.open( IO_ReadOnly ) ) {
         data = file.readAll();
         file.close();
diff --git a/kabc/vcardformatimpl.h b/tdeabc/vcardformatimpl.h
similarity index 100%
rename from kabc/vcardformatimpl.h
rename to tdeabc/vcardformatimpl.h
diff --git a/kabc/vcardformatplugin.cpp b/tdeabc/vcardformatplugin.cpp
similarity index 100%
rename from kabc/vcardformatplugin.cpp
rename to tdeabc/vcardformatplugin.cpp
diff --git a/kabc/vcardformatplugin.h b/tdeabc/vcardformatplugin.h
similarity index 100%
rename from kabc/vcardformatplugin.h
rename to tdeabc/vcardformatplugin.h
diff --git a/kabc/vcardparser/CMakeLists.txt b/tdeabc/vcardparser/CMakeLists.txt
similarity index 100%
rename from kabc/vcardparser/CMakeLists.txt
rename to tdeabc/vcardparser/CMakeLists.txt
diff --git a/kabc/vcardparser/Makefile.am b/tdeabc/vcardparser/Makefile.am
similarity index 76%
rename from kabc/vcardparser/Makefile.am
rename to tdeabc/vcardparser/Makefile.am
index 53e4e42ab..a855c9756 100644
--- a/kabc/vcardparser/Makefile.am
+++ b/tdeabc/vcardparser/Makefile.am
@@ -9,15 +9,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
 check_PROGRAMS = testread testwrite testread2
 
 testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testread_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testread_SOURCES = testread.cpp
 
 testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testread2_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testread2_SOURCES = testread2.cpp testutils.cpp
 
 testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testwrite_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testwrite_SOURCES = testwrite.cpp
 
 TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
@@ -25,7 +25,7 @@ TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
 check-local: testread
 	rm -f FAILED; \
 	for i in $(TESTFILES); \
-	  do perl $(top_srcdir)/kabc/vcardparser/checkvcard.pl \
-	    $(top_srcdir)/kabc/vcardparser/tests/$$i; \
+	  do perl $(top_srcdir)/tdeabc/vcardparser/checkvcard.pl \
+	    $(top_srcdir)/tdeabc/vcardparser/tests/$$i; \
 	done; \
 	[ ! -e FAILED ]
diff --git a/kabc/vcardparser/README.testing b/tdeabc/vcardparser/README.testing
similarity index 100%
rename from kabc/vcardparser/README.testing
rename to tdeabc/vcardparser/README.testing
diff --git a/kabc/vcardparser/checkvcard.pl b/tdeabc/vcardparser/checkvcard.pl
similarity index 100%
rename from kabc/vcardparser/checkvcard.pl
rename to tdeabc/vcardparser/checkvcard.pl
diff --git a/kabc/vcardparser/testread.cpp b/tdeabc/vcardparser/testread.cpp
similarity index 99%
rename from kabc/vcardparser/testread.cpp
rename to tdeabc/vcardparser/testread.cpp
index 6c3405ef9..fd3524b56 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/tdeabc/vcardparser/testread.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 
 #include "vcardconverter.h"
diff --git a/kabc/vcardparser/testread2.cpp b/tdeabc/vcardparser/testread2.cpp
similarity index 97%
rename from kabc/vcardparser/testread2.cpp
rename to tdeabc/vcardparser/testread2.cpp
index ba73081e7..ea278602c 100644
--- a/kabc/vcardparser/testread2.cpp
+++ b/tdeabc/vcardparser/testread2.cpp
@@ -1,5 +1,5 @@
 #include "testutils.h"
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <vcardconverter.h>
 #include <kdebug.h>
 
diff --git a/kabc/vcardparser/tests/vcard1.vcf b/tdeabc/vcardparser/tests/vcard1.vcf
similarity index 100%
rename from kabc/vcardparser/tests/vcard1.vcf
rename to tdeabc/vcardparser/tests/vcard1.vcf
diff --git a/kabc/vcardparser/tests/vcard1.vcf.ref b/tdeabc/vcardparser/tests/vcard1.vcf.ref
similarity index 100%
rename from kabc/vcardparser/tests/vcard1.vcf.ref
rename to tdeabc/vcardparser/tests/vcard1.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard2.vcf b/tdeabc/vcardparser/tests/vcard2.vcf
similarity index 100%
rename from kabc/vcardparser/tests/vcard2.vcf
rename to tdeabc/vcardparser/tests/vcard2.vcf
diff --git a/kabc/vcardparser/tests/vcard2.vcf.ref b/tdeabc/vcardparser/tests/vcard2.vcf.ref
similarity index 100%
rename from kabc/vcardparser/tests/vcard2.vcf.ref
rename to tdeabc/vcardparser/tests/vcard2.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard3.vcf b/tdeabc/vcardparser/tests/vcard3.vcf
similarity index 100%
rename from kabc/vcardparser/tests/vcard3.vcf
rename to tdeabc/vcardparser/tests/vcard3.vcf
diff --git a/kabc/vcardparser/tests/vcard3.vcf.ref b/tdeabc/vcardparser/tests/vcard3.vcf.ref
similarity index 100%
rename from kabc/vcardparser/tests/vcard3.vcf.ref
rename to tdeabc/vcardparser/tests/vcard3.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard4.vcf b/tdeabc/vcardparser/tests/vcard4.vcf
similarity index 100%
rename from kabc/vcardparser/tests/vcard4.vcf
rename to tdeabc/vcardparser/tests/vcard4.vcf
diff --git a/kabc/vcardparser/tests/vcard4.vcf.ref b/tdeabc/vcardparser/tests/vcard4.vcf.ref
similarity index 100%
rename from kabc/vcardparser/tests/vcard4.vcf.ref
rename to tdeabc/vcardparser/tests/vcard4.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard5.vcf b/tdeabc/vcardparser/tests/vcard5.vcf
similarity index 100%
rename from kabc/vcardparser/tests/vcard5.vcf
rename to tdeabc/vcardparser/tests/vcard5.vcf
diff --git a/kabc/vcardparser/tests/vcard5.vcf.ref b/tdeabc/vcardparser/tests/vcard5.vcf.ref
similarity index 100%
rename from kabc/vcardparser/tests/vcard5.vcf.ref
rename to tdeabc/vcardparser/tests/vcard5.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard6.vcf b/tdeabc/vcardparser/tests/vcard6.vcf
similarity index 100%
rename from kabc/vcardparser/tests/vcard6.vcf
rename to tdeabc/vcardparser/tests/vcard6.vcf
diff --git a/kabc/vcardparser/tests/vcard6.vcf.ref b/tdeabc/vcardparser/tests/vcard6.vcf.ref
similarity index 100%
rename from kabc/vcardparser/tests/vcard6.vcf.ref
rename to tdeabc/vcardparser/tests/vcard6.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard7.vcf b/tdeabc/vcardparser/tests/vcard7.vcf
similarity index 100%
rename from kabc/vcardparser/tests/vcard7.vcf
rename to tdeabc/vcardparser/tests/vcard7.vcf
diff --git a/kabc/vcardparser/tests/vcard7.vcf.ref b/tdeabc/vcardparser/tests/vcard7.vcf.ref
similarity index 100%
rename from kabc/vcardparser/tests/vcard7.vcf.ref
rename to tdeabc/vcardparser/tests/vcard7.vcf.ref
diff --git a/kabc/vcardparser/testutils.cpp b/tdeabc/vcardparser/testutils.cpp
similarity index 98%
rename from kabc/vcardparser/testutils.cpp
rename to tdeabc/vcardparser/testutils.cpp
index df4b60c9c..62d1b4121 100644
--- a/kabc/vcardparser/testutils.cpp
+++ b/tdeabc/vcardparser/testutils.cpp
@@ -1,5 +1,5 @@
 #include <vcardparser.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tqfile.h>
 
 using namespace KABC;
diff --git a/kabc/vcardparser/testutils.h b/tdeabc/vcardparser/testutils.h
similarity index 90%
rename from kabc/vcardparser/testutils.h
rename to tdeabc/vcardparser/testutils.h
index 4f2024177..c8218b7ba 100644
--- a/kabc/vcardparser/testutils.h
+++ b/tdeabc/vcardparser/testutils.h
@@ -1,7 +1,7 @@
 #ifndef TESTUTILS_H
 #define TESTUTILS_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tqstring.h>
 
 KABC::Addressee vcard1();
diff --git a/kabc/vcardparser/testwrite.cpp b/tdeabc/vcardparser/testwrite.cpp
similarity index 95%
rename from kabc/vcardparser/testwrite.cpp
rename to tdeabc/vcardparser/testwrite.cpp
index 5a58bd8a8..e40ffe4d0 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/tdeabc/vcardparser/testwrite.cpp
@@ -17,13 +17,13 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/addressee.h>
-#include <kabc/phonenumber.h>
-#include <kabc/address.h>
-#include <kabc/key.h>
-#include <kabc/picture.h>
-#include <kabc/sound.h>
-#include <kabc/secrecy.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/phonenumber.h>
+#include <tdeabc/address.h>
+#include <tdeabc/key.h>
+#include <tdeabc/picture.h>
+#include <tdeabc/sound.h>
+#include <tdeabc/secrecy.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
diff --git a/kabc/vcardparser/vcard.cpp b/tdeabc/vcardparser/vcard.cpp
similarity index 100%
rename from kabc/vcardparser/vcard.cpp
rename to tdeabc/vcardparser/vcard.cpp
diff --git a/kabc/vcardparser/vcard.h b/tdeabc/vcardparser/vcard.h
similarity index 100%
rename from kabc/vcardparser/vcard.h
rename to tdeabc/vcardparser/vcard.h
diff --git a/kabc/vcardparser/vcardline.cpp b/tdeabc/vcardparser/vcardline.cpp
similarity index 100%
rename from kabc/vcardparser/vcardline.cpp
rename to tdeabc/vcardparser/vcardline.cpp
diff --git a/kabc/vcardparser/vcardline.h b/tdeabc/vcardparser/vcardline.h
similarity index 100%
rename from kabc/vcardparser/vcardline.h
rename to tdeabc/vcardparser/vcardline.h
diff --git a/kabc/vcardparser/vcardparser.cpp b/tdeabc/vcardparser/vcardparser.cpp
similarity index 100%
rename from kabc/vcardparser/vcardparser.cpp
rename to tdeabc/vcardparser/vcardparser.cpp
diff --git a/kabc/vcardparser/vcardparser.h b/tdeabc/vcardparser/vcardparser.h
similarity index 100%
rename from kabc/vcardparser/vcardparser.h
rename to tdeabc/vcardparser/vcardparser.h
diff --git a/kabc/vcardtool.cpp b/tdeabc/vcardtool.cpp
similarity index 100%
rename from kabc/vcardtool.cpp
rename to tdeabc/vcardtool.cpp
diff --git a/kabc/vcardtool.h b/tdeabc/vcardtool.h
similarity index 100%
rename from kabc/vcardtool.h
rename to tdeabc/vcardtool.h
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc
index 7c84f31d1..9a50e6e29 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -24,14 +24,14 @@
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqbutton.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <ksslall.h>
 #include <kopenssl.h>
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index 3d54abc45..72f3c66f2 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -37,12 +37,12 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <twin.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "main.h"
 #include "main.moc"
diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp
index 458b3b523..814e68a16 100644
--- a/tdeconf_update/tdeconf_update.cpp
+++ b/tdeconf_update/tdeconf_update.cpp
@@ -30,13 +30,13 @@
 
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 #include <kinstance.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 static TDECmdLineOptions options[] =
 {
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 850bb10f2..b8f512873 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -74,19 +74,19 @@ install( FILES
     kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h
     kapp.h tdeapplication.h kuniqueapp.h kuniqueapplication.h
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
-    klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
+    tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
     twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
     kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
     kregexp.h kcompletion.h kstringhandler.h kstddirs.h
-    kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h
+    kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
     kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
-    kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h
+    kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
     kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
     kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
     kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
     kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
-    tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h
+    tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h
     klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc
     ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h
     kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h
@@ -123,15 +123,15 @@ set( ${target}_SRCS
   libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp
   tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
   kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
-  ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
+  ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp tdelocale.cpp
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
   kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
   tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp
   kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
-  kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp
+  kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp
   kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
-  kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
+  kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp
   kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
   tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
@@ -139,7 +139,7 @@ set( ${target}_SRCS
   kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
   kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp
   fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel
-  tdesycocafactory.cpp kxmessages.cpp kstartupinfo.cpp
+  tdesycocafactory.cpp kxmessages.cpp tdestartupinfo.cpp
   kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp
   kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp
   kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index e4a9ad80d..ae94ecd7c 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -27,10 +27,10 @@ kcrash.cpp		Waldo Bastian <bastian@kde.org>
 kdcoppropertyproxy.cpp
 kdebug.cpp		Stephan Kulow <coolo@kde.org>
 kdesktopfile.cpp
-kglobal.cpp		Stephan Kulow <coolo@kde.org>
+tdeglobal.cpp		Stephan Kulow <coolo@kde.org>
 kglobalaccel.cpp	Ellis Whitehead <ellis@kde.org>
 kglobalaccel_x11.cpp	Ellis Whitehead <ellis@kde.org>
-kglobalsettings.cpp	David Faure <faure@kde.org>
+tdeglobalsettings.cpp	David Faure <faure@kde.org>
 kiconeffect.cpp
 kiconloader.cpp
 kicontheme.cpp
@@ -41,7 +41,7 @@ kkeynative_x11.cpp	Ellis Whitehead <ellis@kde.org>
 kkeysequence.cpp	Ellis Whitehead <ellis@kde.org>
 kkeysequence_emb.cpp	Ellis Whitehead <ellis@kde.org>
 klibloader.cpp
-klocale.cpp		Hans Petter Bieker <bieker@kde.org>
+tdelocale.cpp		Hans Petter Bieker <bieker@kde.org>
 kmdcodec.cpp
 kmimesourcefactory.cpp
 tdemultipledrag.cpp	David Faure <faure@kde.org>
@@ -60,14 +60,14 @@ tdeshortcut.cpp		Ellis Whitehead <ellis@kde.org>
 ksimpleconfig.cpp	Waldo Bastian <bastian@kde.org>
 ksocks.cpp
 kstandarddirs.cpp	Waldo Bastian <bastian@kde.org>
-kstartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
+tdestartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
 kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
 tdestdaccel.cpp		Ellis Whitehead <ellis@kde.org>
 kstringhandler.cpp
 tdesycoca.cpp		Waldo Bastian <bastian@kde.org>
 tdesycocadict.cpp		Waldo Bastian <bastian@kde.org>
 tdesycocafactory.cpp	Waldo Bastian <bastian@kde.org>
-ktempfile.cpp		Waldo Bastian <bastian@kde.org>
+tdetempfile.cpp		Waldo Bastian <bastian@kde.org>
 kuniqueapplication.cpp	Waldo Bastian <bastian@kde.org>
 kurl.cpp		Waldo Bastian <bastian@kde.org>
 kurldrag.cpp		David Faure <faure@kde.org>
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index ae5048ed9..c04ee4c6d 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -41,19 +41,19 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \
 	tdecmdlineargs.h tdeconfigbackend.h kapp.h tdeapplication.h kuniqueapp.h \
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
-	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
+	kprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \
 	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
 	kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
 	kregexp.h kcompletion.h kstringhandler.h \
-	kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \
+	kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
 	kallocator.h kvmallocator.h kcrash.h krfcdate.h \
-	kinstance.h kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h \
+	kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \
 	krandomsequence.h knotifyclient.h kiconeffect.h \
 	kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
 	kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
 	kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
-	tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h \
+	tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h \
 	klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \
 	ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \
 	kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
@@ -93,14 +93,14 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
 	tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
-	klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
+	tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
 	kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
 	tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
 	kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
-	kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp \
+	kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \
 	kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
-	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
+	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \
 	kuniqueapplication.cpp tdeaccelmanager.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
 	tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
@@ -109,7 +109,7 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kpixmapprovider.cpp kurldrag.cpp \
 	kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \
 	tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \
-	kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
+	kxmessages.cpp tdestartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
 	tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
 	kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \
 	tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \
diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp
index 31bc8dd5b..ed6e26163 100644
--- a/tdecore/kappdcopiface.cpp
+++ b/tdecore/kappdcopiface.cpp
@@ -20,7 +20,7 @@
 #include "kappdcopiface.h"
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp
index 940bc379e..38bafaef8 100644
--- a/tdecore/kapplication_win.cpp
+++ b/tdecore/kapplication_win.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include "kcheckaccelerators.h"
diff --git a/tdecore/kcalendarsystem.cpp b/tdecore/kcalendarsystem.cpp
index 39331e170..20d00d181 100644
--- a/tdecore/kcalendarsystem.cpp
+++ b/tdecore/kcalendarsystem.cpp
@@ -22,10 +22,10 @@
 // systems.
 // Also default gregorian and factory classes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kcalendarsystem.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 class KCalendarSystemPrivate
 {
diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp
index ead1aca66..9d4d14661 100644
--- a/tdecore/kcalendarsystemgregorian.cpp
+++ b/tdecore/kcalendarsystemgregorian.cpp
@@ -24,7 +24,7 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemgregorian.h"
diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp
index a0db927f4..2f0aa111a 100644
--- a/tdecore/kcalendarsystemhebrew.cpp
+++ b/tdecore/kcalendarsystemhebrew.cpp
@@ -21,7 +21,7 @@
 
 // Derived hebrew kde calendar class
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemhebrew.h"
diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp
index 8c9fac471..cc66805e0 100644
--- a/tdecore/kcalendarsystemhijri.cpp
+++ b/tdecore/kcalendarsystemhijri.cpp
@@ -23,7 +23,7 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemhijri.h"
diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp
index 559ebb39c..631693e45 100644
--- a/tdecore/kcalendarsystemjalali.cpp
+++ b/tdecore/kcalendarsystemjalali.cpp
@@ -26,8 +26,8 @@
 #include <tqstringlist.h>
 #include <math.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <stdio.h>
 
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index fa623b693..23786c53e 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -22,8 +22,8 @@
 #include "kentities.c"
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqfontinfo.h>
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index b7e113f4b..306591e67 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -41,9 +41,9 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*
 
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 54d051486..8ab23cccc 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kclipboard.h"
 
diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp
index a5349b3ee..4a80d85df 100644
--- a/tdecore/kcompletion.cpp
+++ b/tdecore/kcompletion.cpp
@@ -20,9 +20,9 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqptrvector.h>
 
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index e6d7f5314..2bce648fb 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -28,7 +28,7 @@
 #include <tqguardedptr.h>
 
 #include "tdelibs_export.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksortablevaluelist.h>
 #include <tdeshortcut.h>
 
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 2eed7c282..08abe75c7 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <tqwindowdefs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index b6e742489..5653a9a03 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -184,7 +184,7 @@
 5602        kontact (plugins)
 5650        tderesources
 5700        kabc
-5710        kabc/vcard
+5710        tdeabc/vcard
 5720        kaddressbook
 5800        libkcal
 5850        korganizer
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 062864fca..656edf6f9 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -28,12 +28,12 @@
 #include "kdebugdcopiface.h"
 
 #include "tdeapplication.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kinstance.h"
 #include "kstandarddirs.h"
 
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqintdict.h>
 #include <tqstring.h>
diff --git a/tdecore/kdebugrc b/tdecore/kdebugrc
index e1317ddfb..dbf3ed53f 100644
--- a/tdecore/kdebugrc
+++ b/tdecore/kdebugrc
@@ -96,7 +96,7 @@ InfoOutput=4
 [5400]
 InfoOutput=4
 
-# kabc/vcard
+# tdeabc/vcard
 [5710]
 InfoOutput=4
 
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index a5a57cdd8..b385eeb18 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -35,7 +35,7 @@
 #include "kstandarddirs.h"
 #include "kmountpoint.h"
 #include "kcatalogue.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "kdesktopfile.h"
 #include "kdesktopfile.moc"
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index d78d76b34..964cd49be 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index 426b29ef1..7f2b7b453 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -23,8 +23,8 @@
 #include <ktypelist.h>
 #include <kinstance.h>
 #include <kgenericfactory.tcc>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 /* @internal */
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index 965a537a3..f8639d526 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 /*
-* kglobal.cpp -- Implementation of class TDEGlobal.
+* tdeglobal.cpp -- Implementation of class TDEGlobal.
 * Author:	Sirtaj Singh Kang
 * Version:	$Id$
 * Generated:	Sat May  1 02:08:43 EST 1999
@@ -25,13 +25,13 @@
 #include <tqglobal.h>
 #include <tqdict.h>
 #include <tqptrlist.h>
-#include "kglobal.h"
+#include "tdeglobal.h"
 
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <kiconloader.h>
 #include <tdehardwaredevices.h>
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index 6af97065d..746721e40 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -32,7 +32,7 @@
 #include "tdeaccelbase.h"
 #include <kdebug.h>
 #include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //----------------------------------------------------
 
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index a103c4652..c0c6329c7 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 #include "config.h"
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
 
 #include <tqdir.h>
 #include <tqpixmap.h>
@@ -40,12 +40,12 @@ static QRgb qt_colorref2qrgb(COLORREF col)
 #endif
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kcharsets.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfontinfo.h>
 #include <stdlib.h>
 #include <kprotocolinfo.h>
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index e865a1317..c1a4a8ca5 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -29,9 +29,9 @@
 #include <tqrect.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kicontheme.h>
 #include "kiconeffect.h"
 
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index be44a921f..e81293986 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -30,7 +30,7 @@
 #include <kipc.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index 0c7e67a26..434a3d976 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -27,7 +27,7 @@
 #undef TDEIconLoaderXStatus
 #endif
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kicontheme.h>
 
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index 9d5d2b7d0..544eefe01 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index cf0b35791..6760c95a0 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include "tdeconfig.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include "kcharsets.h"
 #include "kiconloader.h"
 #include "tdehardwaredevices.h"
@@ -29,7 +29,7 @@
 #include "tdeaboutdata.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kmimesourcefactory.h"
 
 #include <tqfont.h>
diff --git a/tdecore/kkeynative_x11.cpp b/tdecore/kkeynative_x11.cpp
index 64635acc3..a44305dad 100644
--- a/tdecore/kkeynative_x11.cpp
+++ b/tdecore/kkeynative_x11.cpp
@@ -32,7 +32,7 @@
 #include <tqstringlist.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef Q_WS_X11
 #define XK_MISCELLANY
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index cd4abb6fb..64bfe383d 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -33,8 +33,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #ifdef Q_WS_X11
 # define XK_MISCELLANY
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index f7e63c215..aed2c06af 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -29,7 +29,7 @@
 #include "klibloader.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "ltdl.h"
 
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index 3e8f9ff45..d9e632184 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <tqasciidict.h>
 #include <tqptrlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <stdlib.h> // For backwards compatibility
 
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index 3e169ba03..4402dd183 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -33,7 +33,7 @@
 #include <tqregexp.h>
 
 #include "kcatalogue.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "ksimpleconfig.h"
 #include "kinstance.h"
@@ -41,7 +41,7 @@
 #include "kdebug.h"
 #include "kcalendarsystem.h"
 #include "kcalendarsystemfactory.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #ifdef Q_WS_WIN
 #include <windows.h>
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index 65a21d13d..94cf704f1 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -39,7 +39,7 @@ class KCatalogue;
 class KCalendarSystem;
 
 /**
- * \file klocale.h
+ * \file tdelocale.h
  */
 
 #ifndef I18N_NOOP
diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp
index ee09a06c8..1f4f8337e 100644
--- a/tdecore/klockfile.cpp
+++ b/tdecore/klockfile.cpp
@@ -39,8 +39,8 @@
 #include <kde_file.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdetempfile.h>
 
 // TODO: http://www.spinnaker.de/linux/nfs-locking.html
 // TODO: Make regression test
diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp
index f08cb249a..8ed02941e 100644
--- a/tdecore/kmimesourcefactory.cpp
+++ b/tdecore/kmimesourcefactory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kiconloader.h>
 
diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h
index 16302dfe4..8292cda42 100644
--- a/tdecore/kmimesourcefactory.h
+++ b/tdecore/kmimesourcefactory.h
@@ -23,7 +23,7 @@
 #define KMIMESOURCEFACTORY_H
 
 #include <tqmime.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class KMimeSourceFactoryPrivate;
 class TDEInstance;
diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp
index c06184221..7335e8e14 100644
--- a/tdecore/kpalette.cpp
+++ b/tdecore/kpalette.cpp
@@ -24,7 +24,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ksavefile.h>
 #include <kstringhandler.h>
 
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 8cc5091c5..86a9a6fcc 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -26,7 +26,7 @@
 #include "kprotocolinfofactory.h"
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksimpleconfig.h>
diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp
index 4daab08dd..115a44f25 100644
--- a/tdecore/kprotocolinfofactory.cpp
+++ b/tdecore/kprotocolinfofactory.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdesycoca.h>
diff --git a/tdecore/krootprop.cpp b/tdecore/krootprop.cpp
index bb15462dd..c717a1823 100644
--- a/tdecore/krootprop.cpp
+++ b/tdecore/krootprop.cpp
@@ -23,8 +23,8 @@
 #ifdef Q_WS_X11 // not needed anyway :-)
 
 #include "krootprop.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 #include "kcharsets.h"
 #include "tdeapplication.h"
 #include <tqtextstream.h>
diff --git a/tdecore/ksavefile.h b/tdecore/ksavefile.h
index e035115a9..282652dea 100644
--- a/tdecore/ksavefile.h
+++ b/tdecore/ksavefile.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <stdio.h>
 #include <errno.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 class KSaveFilePrivate;
 
diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp
index 55cf7485b..dc359f17e 100644
--- a/tdecore/ksimpleconfig.cpp
+++ b/tdecore/ksimpleconfig.cpp
@@ -31,7 +31,7 @@
 #include <tqfileinfo.h>
 #include <tqdir.h>
 
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "tdeconfigbackend.h"
 
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index f39a94221..835566268 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -46,7 +46,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
 
diff --git a/tdecore/ksockaddr.cpp b/tdecore/ksockaddr.cpp
index cd2f9c93c..a645b3aa9 100644
--- a/tdecore/ksockaddr.cpp
+++ b/tdecore/ksockaddr.cpp
@@ -38,7 +38,7 @@
 #include <tqfile.h>
 
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 //#include "kextsock.h"
 
 #ifndef HAVE_STRUCT_SOCKADDR_IN6
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp
index 95e36dc15..a6ecc37d2 100644
--- a/tdecore/ksocks.cpp
+++ b/tdecore/ksocks.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "klibloader.h"
 #include <tdeconfig.h>
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 7eb654f42..7cdf44e37 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqdict.h>
 #include <tqstringlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEConfig;
 class TDEStandardDirsPrivate;
diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp
index a472de5fd..3d798cdc1 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/kstartupinfo.cpp
@@ -45,7 +45,7 @@ DEALINGS IN THE SOFTWARE.
 #define QT_CLEAN_NAMESPACE
 #endif
 
-#include "kstartupinfo.h"
+#include "tdestartupinfo.h"
 
 #include <unistd.h>
 #include <sys/time.h>
@@ -1525,5 +1525,5 @@ static TQString escape_str( const TQString& str_P )
     return ret;
     }
 
-#include "kstartupinfo.moc"
+#include "tdestartupinfo.moc"
 #endif
diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h
index dcc80f978..3f8310f6b 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/kstartupinfo.h
@@ -49,7 +49,7 @@ class TDEStartupInfoPrivate;
  *
  * This class can be used to send information about started application,
  * change the information and receive this information. For detailed
- * description, see tdelibs/tdecore/README.kstartupinfo.
+ * description, see tdelibs/tdecore/README.tdestartupinfo.
  *
  * You usually don't need to use this class for sending the notification
  * information, as KDE libraries should do this when an application is
diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h
index dd759adf7..b6967268c 100644
--- a/tdecore/kstaticdeleter.h
+++ b/tdecore/kstaticdeleter.h
@@ -23,7 +23,7 @@
 #ifndef _KSTATIC_DELETER_H_
 #define _KSTATIC_DELETER_H_
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 /**
  * Static deleters are used to manage static resources. They can register
diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp
index c562c539f..b19c5b875 100644
--- a/tdecore/kstringhandler.cpp
+++ b/tdecore/kstringhandler.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "kstringhandler.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 
 static void parsePythonRange( const TQCString &range, uint &start, uint &end )
 {
diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp
index 53cc83f99..d16d2e185 100644
--- a/tdecore/ktempdir.cpp
+++ b/tdecore/ktempdir.cpp
@@ -47,7 +47,7 @@
 #include <tqdatetime.h>
 #include <tqdir.h>
 
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "tdeapplication.h"
 #include "kinstance.h"
 #include "ktempdir.h"
diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp
index 973e14070..805d315a1 100644
--- a/tdecore/ktempfile.cpp
+++ b/tdecore/ktempfile.cpp
@@ -48,10 +48,10 @@
 #include <tqdatastream.h>
 #include <tqtextstream.h>
 
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "tdeapplication.h"
 #include "kinstance.h"
-#include "ktempfile.h"
+#include "tdetempfile.h"
 #include "kstandarddirs.h"
 #include "kde_file.h"
 #include "kdebug.h"
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp
index 6b21e0392..3436cdabb 100644
--- a/tdecore/ktimezones.cpp
+++ b/tdecore/ktimezones.cpp
@@ -24,7 +24,7 @@
 #include <kmdcodec.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqdatetime.h>
 #include <tqfile.h>
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 964c7c8c7..0a3a0962a 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -40,7 +40,7 @@
 
 #if defined Q_WS_X11
 #include <twin.h> 
-#include <kstartupinfo.h> 
+#include <tdestartupinfo.h> 
 #endif
 
 #include <tdeconfig.h>
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index 9479029a9..2079c050b 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -27,7 +27,7 @@
 // KDE_QT_ONLY is first used for dcop/client (e.g. marshalling)
 #ifndef KDE_QT_ONLY
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kidna.h>
 #include <kprotocolinfo.h>
 #endif
diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp
index 20aa6388e..5e64d09b2 100644
--- a/tdecore/kurldrag.cpp
+++ b/tdecore/kurldrag.cpp
@@ -24,8 +24,8 @@
 #include <unistd.h>
 
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 class KURLDragPrivate
diff --git a/tdecore/kvmallocator.cpp b/tdecore/kvmallocator.cpp
index 996d55791..3b887eeee 100644
--- a/tdecore/kvmallocator.cpp
+++ b/tdecore/kvmallocator.cpp
@@ -31,7 +31,7 @@
 #include <tqintdict.h>
 #include <tqmap.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "kvmallocator.h"
diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp
index c7e968c16..0c072752c 100644
--- a/tdecore/netsupp.cpp
+++ b/tdecore/netsupp.cpp
@@ -37,7 +37,7 @@
 
 #include "config.h"
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #ifndef IN6_IS_ADDR_V4MAPPED
 #define NEED_IN6_TESTS
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index 1c32e80ec..b9ac605c0 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -54,7 +54,7 @@
 #endif
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Us
 #include "kresolver.h"
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index cde24f752..96519d1aa 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -44,7 +44,7 @@
 #include <tqfile.h>
 
 #include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "tdeapplication.h"
 
diff --git a/tdecore/network/tdesocketaddress.cpp b/tdecore/network/tdesocketaddress.cpp
index ff97699c8..a6da5f7c0 100644
--- a/tdecore/network/tdesocketaddress.cpp
+++ b/tdecore/network/tdesocketaddress.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tdesocketaddress.h"
 
 #include "netsupp.h"
diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp
index 0eb31bbc1..66decb15d 100644
--- a/tdecore/network/tdesocketbase.cpp
+++ b/tdecore/network/tdesocketbase.cpp
@@ -24,7 +24,7 @@
 
 #include <config.h>
 #include <tqmutex.h>
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "tdesocketbase.h"
 #include "tdesocketdevice.h"
diff --git a/tdecore/networkbackends/network-manager/network-manager_p.h b/tdecore/networkbackends/network-manager/network-manager_p.h
index 474f628bb..0e1fe4de8 100644
--- a/tdecore/networkbackends/network-manager/network-manager_p.h
+++ b/tdecore/networkbackends/network-manager/network-manager_p.h
@@ -27,7 +27,7 @@
 
 /* TDE headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 98481cefe..36e752f33 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -1,11 +1,11 @@
 // -*- c++ -*-
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <stdio.h>
 #include <tdeaboutdata.h>
 #include <config.h>
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index ac49e5c41..f86e5f5db 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -1,11 +1,11 @@
 // -*- c++ -*-
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <stdio.h>
 #include <tdeaboutdata.h>
 #include <config.h>
diff --git a/tdecore/tdeaboutdata.h b/tdecore/tdeaboutdata.h
index d5addac0a..db76287f2 100644
--- a/tdecore/tdeaboutdata.h
+++ b/tdecore/tdeaboutdata.h
@@ -22,7 +22,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifndef _KABOUTDATA_H_
 #define _KABOUTDATA_H_
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index e019baafc..5430c2529 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -29,7 +29,7 @@
 #include "tdeaccelbase.h"
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeshortcut.h>
 
 #include "tdeaccelprivate.h"
diff --git a/tdecore/tdeaccelaction.cpp b/tdecore/tdeaccelaction.cpp
index 93f17ae25..89d8efaa2 100644
--- a/tdecore/tdeaccelaction.cpp
+++ b/tdecore/tdeaccelaction.cpp
@@ -28,9 +28,9 @@
 #include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeynative.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeshortcutlist.h>
 
 //---------------------------------------------------------------------
diff --git a/tdecore/tdeaccelbase.cpp b/tdecore/tdeaccelbase.cpp
index 434801f61..6673cabb4 100644
--- a/tdecore/tdeaccelbase.cpp
+++ b/tdecore/tdeaccelbase.cpp
@@ -29,10 +29,10 @@
 #include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeynative.h>
 #include "kkeyserver.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "tdeshortcutmenu.h"
 
 //---------------------------------------------------------------------
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 24c77826b..58b010e4e 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -61,10 +61,10 @@
 #include <tqsqlpropertymap.h>
 #endif
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestyle.h>
 #include <kiconloader.h>
 #include <kclipboard.h>
@@ -72,7 +72,7 @@
 #include <ksimpleconfig.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcrash.h>
 #include <kdatastream.h>
 #include <klibloader.h>
@@ -89,7 +89,7 @@
 #include <kglobalaccel.h>
 
 #if defined Q_WS_X11
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #endif
 
 #include <dcopclient.h>
diff --git a/tdecore/tdecmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp
index ad24467e2..46d1b9f4a 100644
--- a/tdecore/tdecmdlineargs.cpp
+++ b/tdecore/tdecmdlineargs.cpp
@@ -37,9 +37,9 @@
 
 #include "tdecmdlineargs.h"
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>
 
diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp
index 35c5b73bc..68307dc85 100644
--- a/tdecore/tdeconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -36,7 +36,7 @@
 #include "tdeconfigbackend.h"
 
 #include "tdeconfig.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "kstaticdeleter.h"
 #include <tqtimer.h>
diff --git a/tdecore/tdeconfig_compiler/example/autoexample.cpp b/tdecore/tdeconfig_compiler/example/autoexample.cpp
index e25219787..6085fa6eb 100644
--- a/tdecore/tdeconfig_compiler/example/autoexample.cpp
+++ b/tdecore/tdeconfig_compiler/example/autoexample.cpp
@@ -27,9 +27,9 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdeconfigdialog.h>
diff --git a/tdecore/tdeconfig_compiler/example/example.cpp b/tdecore/tdeconfig_compiler/example/example.cpp
index c08339d4a..157570d98 100644
--- a/tdecore/tdeconfig_compiler/example/example.cpp
+++ b/tdecore/tdeconfig_compiler/example/example.cpp
@@ -24,9 +24,9 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
index 753bae532..207a78402 100644
--- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
+++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
@@ -30,9 +30,9 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
@@ -1151,7 +1151,7 @@ int main( int argc, char **argv )
   if ( headerIncludes.count() > 0 ) h << endl;
 
   if ( !singleton && cfgFileNameArg && parameters.isEmpty() )
-    h << "#include <kglobal.h>" << endl;
+    h << "#include <tdeglobal.h>" << endl;
 
   h << "#include <tdeconfigskeleton.h>" << endl;
   h << "#include <kdebug.h>" << endl << endl;
@@ -1421,7 +1421,7 @@ int main( int argc, char **argv )
 
   cpp << "#include \"" << headerFileName << "\"" << endl << endl;
 
-  if ( setUserTexts ) cpp << "#include <klocale.h>" << endl << endl;
+  if ( setUserTexts ) cpp << "#include <tdelocale.h>" << endl << endl;
 
   // Header required by singleton implementation
   if ( singleton )
diff --git a/tdecore/tdeconfig_compiler/tests/test2.cpp.ref b/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
index cc3f67b5e..e66c5b9da 100644
--- a/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
@@ -3,7 +3,7 @@
 
 #include "test2.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Test2::Test2(  )
   : MyPrefs( TQString::fromLatin1( "korganizerrc" ) )
diff --git a/tdecore/tdeconfig_compiler/tests/test8a.h.ref b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
index 88686ca1b..a1e5b7e37 100644
--- a/tdecore/tdeconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
@@ -3,7 +3,7 @@
 #ifndef TEST8A_H
 #define TEST8A_H
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
diff --git a/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
index 5aad12fe8..b3fde4334 100644
--- a/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
@@ -3,7 +3,7 @@
 
 #include "test_dpointer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kstaticdeleter.h>
 
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index d050a2efe..6d5197ff7 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -42,9 +42,9 @@
 #include "tdeconfigbackend.h"
 #include "tdeconfigbase.h"
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
 #include <kurl.h>
diff --git a/tdecore/tdeconfigbackend.h b/tdecore/tdeconfigbackend.h
index 71ba15288..83c8047bc 100644
--- a/tdecore/tdeconfigbackend.h
+++ b/tdecore/tdeconfigbackend.h
@@ -25,7 +25,7 @@
 #include "tdeconfigdata.h"
 #include <tdeconfigbase.h>
 #include <klockfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "tdelibs_export.h"
 
 class TQFile;
diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index 668a688d8..a3b15185b 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -28,8 +28,8 @@
 #include <tqtextstream.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 
 #include "tdeconfigbase.h"
diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index dfabefb59..9578c05c1 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -33,7 +33,7 @@
 #include <tdeapplication.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <assert.h>
 
diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp
index 1abaf388b..45a4b4112 100644
--- a/tdecore/tdeconfigskeleton.cpp
+++ b/tdecore/tdeconfigskeleton.cpp
@@ -24,8 +24,8 @@
 
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 
 #include "kstringhandler.h"
diff --git a/tdecore/tdeconfigskeleton.h b/tdecore/tdeconfigskeleton.h
index ccbf4529b..b260db1e8 100644
--- a/tdecore/tdeconfigskeleton.h
+++ b/tdecore/tdeconfigskeleton.h
@@ -34,7 +34,7 @@
 #include <tqstringlist.h>
 #include <tqvariant.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
   /**
    * @short Class for storing a preferences setting
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index 263bc5507..60f3efde9 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -23,10 +23,10 @@
 #include <tqstringlist.h>
 #include <tqsocketnotifier.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksimpledirwatch.h>
 #include <kstandarddirs.h>
 
diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdenetworkconnections.cpp
index 2705343f7..2682aa991 100644
--- a/tdecore/tdenetworkconnections.cpp
+++ b/tdecore/tdenetworkconnections.cpp
@@ -23,7 +23,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // #define DEBUG_SIGNAL_QUEUE 1
 
diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp
index 33797b0bc..bae897e98 100644
--- a/tdecore/tdeshortcut.cpp
+++ b/tdecore/tdeshortcut.cpp
@@ -25,8 +25,8 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 
 //----------------------------------------------------
diff --git a/tdecore/tdeshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp
index 645e69565..ffacd001c 100644
--- a/tdecore/tdeshortcutlist.cpp
+++ b/tdecore/tdeshortcutlist.cpp
@@ -5,7 +5,7 @@
 #include "tdeaccelaction.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kglobalaccel.h>
 #include <kinstance.h>
 #include <tdeshortcut.h>
diff --git a/tdecore/tdeshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp
index 91061a734..c035c0df9 100644
--- a/tdecore/tdeshortcutmenu.cpp
+++ b/tdecore/tdeshortcutmenu.cpp
@@ -23,7 +23,7 @@
 
 #include "tdeaccelaction.h"
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include "tdeshortcutmenu.h"
 //#include <kkeynative.h>
 
diff --git a/tdecore/tdestdaccel.cpp b/tdecore/tdestdaccel.cpp
index f91d2ee66..ba3e64ca5 100644
--- a/tdecore/tdestdaccel.cpp
+++ b/tdecore/tdestdaccel.cpp
@@ -25,8 +25,8 @@
 #include "tdeaccelbase.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeshortcut.h>
 #include <tdeshortcutlist.h>
 
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index 16914c0bc..8f5ede967 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index 2911d3ab8..a831eb65c 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -41,7 +41,7 @@ LDADD = ../libtdecore.la
 tdeconfigtestgui_SOURCES = tdeconfigtestgui.cpp
 kdebugtest_SOURCES = kdebugtest.cpp
 klocaletest_SOURCES = klocaletest.cpp
-#klocaletest2_SOURCES = klocaletest2.cpp klocale.cpp libintl.cpp kcatalogue.cpp
+#klocaletest2_SOURCES = klocaletest2.cpp tdelocale.cpp libintl.cpp kcatalogue.cpp
 #kcatalogue_SOURCES = kcatalogue.cpp libintl.cpp
 ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp
 kurltest_SOURCES = kurltest.cpp
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 0952f292c..6a3abace9 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -22,7 +22,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdesycoca.h>
 
 int
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 12c9010e2..7dc2cc6d7 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -10,8 +10,8 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 class TDELocale;
diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp
index 8148e4208..5213e443f 100644
--- a/tdecore/tests/kcmdlineargstest.cpp
+++ b/tdecore/tests/kcmdlineargstest.cpp
@@ -1,5 +1,5 @@
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <stdio.h>
diff --git a/tdecore/tests/kglobaltest.cpp b/tdecore/tests/kglobaltest.cpp
index eaab091f9..852e2ba34 100644
--- a/tdecore/tests/kglobaltest.cpp
+++ b/tdecore/tests/kglobaltest.cpp
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <stdio.h>
 #include <tdeapplication.h>
 #include <stdlib.h>
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index 0647a10d3..36f301d6c 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -11,9 +11,9 @@
 #include <tqdatetime.h>
 #include <tqlabel.h>
 
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include "klocale.h"
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include "tdelocale.h"
 #include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kdebug.h>
diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp
index bd3162f52..571d3f10b 100644
--- a/tdecore/tests/kmdcodectest.cpp
+++ b/tdecore/tests/kmdcodectest.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 
diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp
index 6ef0fe5e5..94358a8f1 100644
--- a/tdecore/tests/krfcdatetest.cpp
+++ b/tdecore/tests/krfcdatetest.cpp
@@ -2,7 +2,7 @@
 #include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
 #include <krfcdate.h>
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index 01a9c4c3a..a1ce8f86b 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "kuniqueapplication.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kdebug.h"
 #include "ksock.h"
 #include "ksockaddr.h"
diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp
index 20cd6b36d..5c2354fff 100644
--- a/tdecore/tests/ktempfiletest.cpp
+++ b/tdecore/tests/ktempfiletest.cpp
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "ktempfile.h"
+#include "tdetempfile.h"
 #include "tdeapplication.h"
 #include "kstandarddirs.h"
 #include <tqstring.h>
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index 60ac98b5a..13b8ca534 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "kuniqueapplication.h"
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index 6694d0d80..0f57dd97c 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -5,7 +5,7 @@
 #include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
 #include <tqdatastream.h>
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index 20fc95f34..67c535cec 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -21,7 +21,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 
 int
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index 8383f930e..d69b3f6f4 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -46,7 +46,7 @@ application palette (light and dark shades are\ncalculated)."), 0},
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const TDECmdLineOptions options[] =
 {
diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp
index 93352dacc..e96c25011 100644
--- a/tdecore/twin.cpp
+++ b/tdecore/twin.cpp
@@ -37,16 +37,16 @@
 #include "twin.h"
 #include "tdeapplication.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
 #include <kdatastream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #ifdef Q_WS_X11
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <kxerrorhandler.h>
 
 #include <X11/Xlib.h>
diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp
index 27b8b0cdd..a37370e58 100644
--- a/tdecore/twinmodule.cpp
+++ b/tdecore/twinmodule.cpp
@@ -30,7 +30,7 @@
 #include "kdebug.h"
 #include <tqtl.h>
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "netwm.h"
 
diff --git a/tdefile-plugins/elf/tdefile_elf.cpp b/tdefile-plugins/elf/tdefile_elf.cpp
index cad269713..7308a40d1 100644
--- a/tdefile-plugins/elf/tdefile_elf.cpp
+++ b/tdefile-plugins/elf/tdefile_elf.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_elf.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdehtml/css/csshelper.cpp b/tdehtml/css/csshelper.cpp
index 02b5b3d39..a6ea9c38b 100644
--- a/tdehtml/css/csshelper.cpp
+++ b/tdehtml/css/csshelper.cpp
@@ -28,7 +28,7 @@
 #include <tqfontdatabase.h>
 
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_style.h"
diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index b33151b59..8b11c78d2 100644
--- a/tdehtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -26,7 +26,7 @@
 #define YYDEBUG 0
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 
 #include "cssparser.h"
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 2a1fb5477..79f8ba251 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -57,7 +57,7 @@ using namespace DOM;
 
 #include <kstandarddirs.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tqfile.h>
 #include <tqvaluelist.h>
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index f1b2b430d..b7bd23de3 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -41,17 +41,17 @@
 #include <tqpainter.h>
 #include <tqscrollbar.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
 #include <tdepopupmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeshortcut.h>
 #include <tdeconfig.h>
 #include <tdeconfigbase.h>
diff --git a/tdehtml/ecma/kjs_html.cpp b/tdehtml/ecma/kjs_html.cpp
index 8a63ba943..abd059e75 100644
--- a/tdehtml/ecma/kjs_html.cpp
+++ b/tdehtml/ecma/kjs_html.cpp
@@ -56,9 +56,9 @@
 #include "rendering/render_frames.h"
 #include "rendering/render_layer.h"
 
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdebug.h>
 
diff --git a/tdehtml/ecma/kjs_mozilla.cpp b/tdehtml/ecma/kjs_mozilla.cpp
index 6fc7688dd..d26aabb5e 100644
--- a/tdehtml/ecma/kjs_mozilla.cpp
+++ b/tdehtml/ecma/kjs_mozilla.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kjs_mozilla.h"
diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 03bc22987..296290744 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -21,13 +21,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
 #include <tdeio/kmimetype.h>
 #include <tdeio/kservice.h>
 #include <tdeio/ktrader.h>
diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp
index 578cd30f0..bdd7183fe 100644
--- a/tdehtml/ecma/kjs_proxy.cpp
+++ b/tdehtml/ecma/kjs_proxy.cpp
@@ -38,10 +38,10 @@
 #include "xml/dom_nodeimpl.h"
 #include "tdehtmlpart_p.h"
 #include <tdehtml_part.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/time.h>
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 1d38de27e..554781cb9 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -36,9 +36,9 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <tdeparts/browserinterface.h>
 #include <twin.h>
@@ -50,7 +50,7 @@
 #ifndef KONQ_EMBEDDED
 #include <kbookmarkmanager.h>
 #endif
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <assert.h>
 #include <tqstyle.h>
 #include <tqobjectlist.h>
diff --git a/tdehtml/html/dtd.cpp b/tdehtml/html/dtd.cpp
index accc8b855..d3ea86d51 100644
--- a/tdehtml/html/dtd.cpp
+++ b/tdehtml/html/dtd.cpp
@@ -26,7 +26,7 @@
 using namespace DOM;
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // priority of tags. Closing tags of higher priority close tags of lower
 // priority.
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index e4f090973..52ada7a7b 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -47,9 +47,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "css/cssproperties.h"
 #include "css/cssstyleselector.h"
diff --git a/tdehtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp
index 1153e8b7f..fc116caf3 100644
--- a/tdehtml/html/html_elementimpl.cpp
+++ b/tdehtml/html/html_elementimpl.cpp
@@ -50,7 +50,7 @@
 #include "xml/dom2_eventsimpl.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "html_elementimpl.h"
 
 using namespace DOM;
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 372904e0e..6fae233dd 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -47,12 +47,12 @@
 #include "rendering/render_form.h"
 
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #ifndef TDEHTML_NO_WALLET
 #include <tdewallet.h>
 #endif
diff --git a/tdehtml/html/html_imageimpl.cpp b/tdehtml/html/html_imageimpl.cpp
index b1972aad4..a006b3bd0 100644
--- a/tdehtml/html/html_imageimpl.cpp
+++ b/tdehtml/html/html_imageimpl.cpp
@@ -29,7 +29,7 @@
 #include "tdehtml_part.h"
 
 #include <kstringhandler.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_image.h"
diff --git a/tdehtml/html/html_tableimpl.cpp b/tdehtml/html/html_tableimpl.cpp
index 71fe14773..f14ad8583 100644
--- a/tdehtml/html/html_tableimpl.cpp
+++ b/tdehtml/html/html_tableimpl.cpp
@@ -43,7 +43,7 @@
 #include "rendering/render_table.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace tdehtml;
 using namespace DOM;
diff --git a/tdehtml/html/htmlparser.cpp b/tdehtml/html/htmlparser.cpp
index f7cc1daaf..31d3d4c17 100644
--- a/tdehtml/html/htmlparser.cpp
+++ b/tdehtml/html/htmlparser.cpp
@@ -56,7 +56,7 @@
 
 #include "html/htmlparser.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace DOM;
 using namespace tdehtml;
diff --git a/tdehtml/html/htmltokenizer.cpp b/tdehtml/html/htmltokenizer.cpp
index 62d3ffab6..292d1773d 100644
--- a/tdehtml/html/htmltokenizer.cpp
+++ b/tdehtml/html/htmltokenizer.cpp
@@ -50,7 +50,7 @@
 #include "css/csshelper.h"
 #include "ecma/kjs_proxy.h"
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ctype.h>
 #include <assert.h>
 #include <tqvariant.h>
diff --git a/tdehtml/java/kjavaapplet.cpp b/tdehtml/java/kjavaapplet.cpp
index 70a39afbc..a28e541e2 100644
--- a/tdehtml/java/kjavaapplet.cpp
+++ b/tdehtml/java/kjavaapplet.cpp
@@ -22,7 +22,7 @@
 #include "kjavaappletwidget.h"
 #include "kjavaappletcontext.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeparts/browserextension.h>
 
diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp
index 76914a5dc..b644b67ca 100644
--- a/tdehtml/java/kjavaappletcontext.cpp
+++ b/tdehtml/java/kjavaappletcontext.cpp
@@ -23,8 +23,8 @@
 #include "kjavaappletserver.h"
 #include "kjavaprocess.h"
 #include "kjavaapplet.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 5d108ffcf..952fe143b 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -27,13 +27,13 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/browserextension.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 #include <tdeio/job.h>
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
 #include <ksslcertificate.h>
 #include <ksslcertchain.h>
 #include <kssl.h>
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 5d5b47fbf..f80690aa9 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -32,7 +32,7 @@
 #include <klibloader.h>
 #include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index c096261cd..a1f5b8f11 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <twin.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 
diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index 1ff68dd74..6b505c343 100644
--- a/tdehtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -22,7 +22,7 @@
 #include "kjavaprocess.h"
 
 #include <kdebug.h>
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
 
 #include <tqtextstream.h>
 #include <tqmap.h>
diff --git a/tdehtml/misc/arena.cpp b/tdehtml/misc/arena.cpp
index cfbce24ab..e2513ba36 100644
--- a/tdehtml/misc/arena.cpp
+++ b/tdehtml/misc/arena.cpp
@@ -45,7 +45,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "arena.h"
 
 #ifdef HAVE_GETPAGESIZE
diff --git a/tdehtml/misc/decoder.cpp b/tdehtml/misc/decoder.cpp
index 6000aa9cf..28c8a5e9d 100644
--- a/tdehtml/misc/decoder.cpp
+++ b/tdehtml/misc/decoder.cpp
@@ -39,12 +39,12 @@ using namespace tdehtml;
 #include <tqregexp.h>
 #include <tqtextcodec.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <ctype.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/tdehtml/misc/htmlhashes.cpp b/tdehtml/misc/htmlhashes.cpp
index e073f0964..376007819 100644
--- a/tdehtml/misc/htmlhashes.cpp
+++ b/tdehtml/misc/htmlhashes.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "htmlhashes.h"
 #include "htmltags.c"
diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index d8fbb3236..bf9a8ded8 100644
--- a/tdehtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
@@ -5,7 +5,7 @@
 #define TDEHTML_TAGS_H
 
 #include "dom/dom_string.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 KDE_NO_EXPORT const char* getTagName(unsigned short id);
 
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index 0edcc34ea..b8b94cd6b 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -24,11 +24,11 @@
 #include "knsplugininstaller.moc"
 
 #include <kdebug.h>
-#include <kdiroperator.h> 
+#include <tdediroperator.h> 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
-#include <ktempfile.h> 
+#include <tdetempfile.h> 
 #include <netaccess.h>
 
 #include <tqbuttongroup.h>
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index b7f42aa29..7621b5e4f 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -59,7 +59,7 @@
 #include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kimageio.h>
 #include <kcharsets.h>
 #include <kiconloader.h>
@@ -71,7 +71,7 @@
 #ifdef IMAGE_TITLES
 #include <tqfile.h>
 #include <tdefilemetainfo.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #endif
 
 #include "html/html_documentimpl.h"
diff --git a/tdehtml/misc/loader_jpeg.cpp b/tdehtml/misc/loader_jpeg.cpp
index 72816817f..9ee5378f9 100644
--- a/tdehtml/misc/loader_jpeg.cpp
+++ b/tdehtml/misc/loader_jpeg.cpp
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <setjmp.h>
 #include <tqdatetime.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 extern "C" {
 #define XMD_H
diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags
index b2b472892..8a6abf0ed 100644
--- a/tdehtml/misc/maketags
+++ b/tdehtml/misc/maketags
@@ -41,7 +41,7 @@ print header <<EOF;
 #define TDEHTML_TAGS_H
 
 #include "dom/dom_string.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 KDE_NO_EXPORT const char* getTagName(unsigned short id);
 
diff --git a/tdehtml/rendering/font.cpp b/tdehtml/rendering/font.cpp
index b7632fc8d..c70073940 100644
--- a/tdehtml/rendering/font.cpp
+++ b/tdehtml/rendering/font.cpp
@@ -33,7 +33,7 @@
 #include "tdehtml_settings.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqpainter.h>
 #include <tqfontdatabase.h>
diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index d14a93553..eb9762897 100644
--- a/tdehtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -20,7 +20,7 @@
  *
  */
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdebug.h>
 
diff --git a/tdehtml/rendering/render_body.cpp b/tdehtml/rendering/render_body.cpp
index 80a613000..820b1b872 100644
--- a/tdehtml/rendering/render_body.cpp
+++ b/tdehtml/rendering/render_body.cpp
@@ -25,7 +25,7 @@
 #include "xml/dom_docimpl.h"
 #include "tdehtmlview.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 using namespace tdehtml;
diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp
index d138d3ee2..85e1f6665 100644
--- a/tdehtml/rendering/render_box.cpp
+++ b/tdehtml/rendering/render_box.cpp
@@ -45,7 +45,7 @@
 
 #include <tdehtmlview.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <assert.h>
 
 
diff --git a/tdehtml/rendering/render_canvas.cpp b/tdehtml/rendering/render_canvas.cpp
index a3dc548b2..862f374b2 100644
--- a/tdehtml/rendering/render_canvas.cpp
+++ b/tdehtml/rendering/render_canvas.cpp
@@ -29,7 +29,7 @@
 #include "tdehtmlview.h"
 #include "tdehtml_part.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace tdehtml;
 
diff --git a/tdehtml/rendering/render_flow.cpp b/tdehtml/rendering/render_flow.cpp
index 272ceb2db..a535b218e 100644
--- a/tdehtml/rendering/render_flow.cpp
+++ b/tdehtml/rendering/render_flow.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <assert.h>
 #include <tqpainter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_flow.h"
 #include "rendering/render_text.h"
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 89f38a7b2..9d302bfc8 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -30,8 +30,8 @@
 #include <kfind.h>
 #include <kfinddialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kreplace.h>
 #include <kreplacedialog.h>
 #include <tdespell.h>
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 12d0d75ec..68c66495a 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -39,9 +39,9 @@
 #include "misc/knsplugininstaller.h"
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index b41911e3a..ad8f18bb3 100644
--- a/tdehtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -32,7 +32,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "css/csshelper.h"
 #include "misc/helper.h"
diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp
index aee43a817..15bc1b0df 100644
--- a/tdehtml/rendering/render_inline.cpp
+++ b/tdehtml/rendering/render_inline.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_arena.h"
 #include "rendering/render_inline.h"
diff --git a/tdehtml/rendering/render_line.cpp b/tdehtml/rendering/render_line.cpp
index b518d3a43..d8bc8d0e2 100644
--- a/tdehtml/rendering/render_line.cpp
+++ b/tdehtml/rendering/render_line.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <assert.h>
 #include <tqpainter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_flow.h"
 #include "rendering/render_text.h"
diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp
index 5af983a72..cc9ba4e5b 100644
--- a/tdehtml/rendering/render_list.cpp
+++ b/tdehtml/rendering/render_list.cpp
@@ -35,7 +35,7 @@
 #include "xml/dom_docimpl.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqvaluelist.h>
 
 //#define BOX_DEBUG
diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index 1d16057a2..a979e1dc1 100644
--- a/tdehtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -45,7 +45,7 @@
 #include "misc/loader.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqpainter.h>
 #include "tdehtmlview.h"
 #include <tdehtml_part.h>
diff --git a/tdehtml/rendering/render_object.h b/tdehtml/rendering/render_object.h
index 8d066201c..bf120ff84 100644
--- a/tdehtml/rendering/render_object.h
+++ b/tdehtml/rendering/render_object.h
@@ -32,7 +32,7 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "xml/dom_docimpl.h"
 #include "misc/tdehtmllayout.h"
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 5a96d06f0..2d991c3a2 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -35,7 +35,7 @@
 #include <tqevent.h>
 #include <tqapplication.h>
 #include <tqlineedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqobjectlist.h>
 #include <tqvaluevector.h>
 
diff --git a/tdehtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp
index 8a75c73f2..9f2cc3366 100644
--- a/tdehtml/rendering/render_table.cpp
+++ b/tdehtml/rendering/render_table.cpp
@@ -40,7 +40,7 @@
 #include "rendering/render_line.h"
 #include "xml/dom_docimpl.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqapplication.h>
 #include <tqstyle.h>
diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp
index d125b04c6..411f3f221 100644
--- a/tdehtml/rendering/render_text.cpp
+++ b/tdehtml/rendering/render_text.cpp
@@ -43,7 +43,7 @@
 #include <tqimage.h>
 #include <tqpainter.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
diff --git a/tdehtml/rendering/table_layout.cpp b/tdehtml/rendering/table_layout.cpp
index eb8153331..97a6a4c91 100644
--- a/tdehtml/rendering/table_layout.cpp
+++ b/tdehtml/rendering/table_layout.cpp
@@ -23,7 +23,7 @@
 #include "table_layout.h"
 #include "render_table.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace tdehtml;
 
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 3cc65676d..b7dfb8a42 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -44,7 +44,7 @@
 #include <tqdragobject.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
@@ -54,7 +54,7 @@
 #include <kurldrag.h>
 #include <kstringhandler.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <krun.h>
 #include <kurifilter.h>
diff --git a/tdehtml/tdehtml_factory.cpp b/tdehtml/tdehtml_factory.cpp
index b52476ea1..4094030c6 100644
--- a/tdehtml/tdehtml_factory.cpp
+++ b/tdehtml/tdehtml_factory.cpp
@@ -31,7 +31,7 @@
 
 #include <kinstance.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp
index c2e0a89e1..319dd8162 100644
--- a/tdehtml/tdehtml_pagecache.cpp
+++ b/tdehtml/tdehtml_pagecache.cpp
@@ -21,7 +21,7 @@
 #include "tdehtml_pagecache.h"
 
 #include <kstaticdeleter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 #include <tqintdict.h>
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index c4bba759c..28b15c7d1 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -78,18 +78,18 @@ using namespace DOM;
 #include <tdeio/job.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <ktrader.h>
 #include <kdatastream.h>
-#include <ktempfile.h>
-#include <kglobalsettings.h>
+#include <tdetempfile.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 #include <tdeapplication.h>
 #include <tdeparts/browserinterface.h>
diff --git a/tdehtml/tdehtml_printsettings.cpp b/tdehtml/tdehtml_printsettings.cpp
index 251c3403f..19fe7bdbf 100644
--- a/tdehtml/tdehtml_printsettings.cpp
+++ b/tdehtml/tdehtml_printsettings.cpp
@@ -19,7 +19,7 @@
 
 #include "tdehtml_printsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp
index 2a5fd1861..499616cce 100644
--- a/tdehtml/tdehtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -24,7 +24,7 @@
 #include "tdehtml_run.h"
 #include <tdeio/job.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "tdehtml_ext.h"
 #include <tqwidget.h>
 
diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cc
index 8e36f5891..7f799e311 100644
--- a/tdehtml/tdehtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cc
@@ -21,14 +21,14 @@
 
 #include "tdehtml_settings.h"
 #include "tdehtmldefaults.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <tqvaluevector.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 /**
  * @internal
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index bf05d8495..31311cb3d 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -32,7 +32,7 @@
 #include <tdeio/job.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 K_EXPORT_COMPONENT_FACTORY( tdehtmlimagefactory /*NOT the part name, see Makefile.am*/, TDEHTMLImageFactory )
 
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 010075f2a..16b274cbd 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -67,7 +67,7 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kprinter.h>
 #include <ksimpleconfig.h>
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index dd864d65b..201f1ef60 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -22,11 +22,11 @@
 #include <tqvbox.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <tqfile.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/genericfactory.h>
 #include <tdehtml_part.h>
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 028fadc36..62842e086 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -65,7 +65,7 @@
 #include <tdeio/job.h>
 #include <tdemainwindow.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqcolor.h>
 #include <tqcursor.h>
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 47836b41e..423a2a51e 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -46,7 +46,7 @@
 #include <tqptrstack.h>
 #include <tqpaintdevicemetrics.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 #include "rendering/counter_tree.h"
@@ -60,7 +60,7 @@
 #include "tdehtmlview.h"
 #include "tdehtml_part.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstringhandler.h>
 #include <krfcdate.h>
 #include "tdehtml_settings.h"
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index ac8ca630e..7e2e1bc5f 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -33,7 +33,7 @@
 #include "xml/dom_nodeimpl.h"
 #include "xml/dom_restyler.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_text.h"
diff --git a/tdehtml/xml/xml_tokenizer.cpp b/tdehtml/xml/xml_tokenizer.cpp
index 44f90673f..2ee90097b 100644
--- a/tdehtml/xml/xml_tokenizer.cpp
+++ b/tdehtml/xml/xml_tokenizer.cpp
@@ -36,7 +36,7 @@
 #include "tdehtml_part.h"
 #include <tqvariant.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace DOM;
 using namespace tdehtml;
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index e6bef2e02..8bbaa5e43 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -25,8 +25,8 @@
 #include <kmimetype.h>
 #include <kstringhandler.h>
 #include <kinputdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
diff --git a/tdeio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cc
index 30c52bdb8..ee33612a2 100644
--- a/tdeio/bookmarks/kbookmarkexporter.cc
+++ b/tdeio/bookmarks/kbookmarkexporter.cc
@@ -24,7 +24,7 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kbookmarkmanager.h"
 #include "kbookmarkexporter.h"
diff --git a/tdeio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cc
index 366802905..513f89b40 100644
--- a/tdeio/bookmarks/kbookmarkimporter.cc
+++ b/tdeio/bookmarks/kbookmarkimporter.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cc
index 0443b3b1c..9b0cacf25 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cc
@@ -22,7 +22,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cc
index 092ebe596..d588517a3 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
index 6aca22b84..95937f890 100644
--- a/tdeio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
@@ -21,7 +21,7 @@
 #include "kbookmarkimporter_kde1.h"
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cc
index 8ce06a79b..29960ce51 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.cc
@@ -25,7 +25,7 @@
 #include "kbookmarkmanager.h"
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cc
index 57b5d6208..0609c7a3b 100644
--- a/tdeio/bookmarks/kbookmarkimporter_opera.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index 205d879ab..60d4f2932 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -29,9 +29,9 @@
 #include <ksavefile.h>
 #include <dcopref.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqfile.h>
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index 0468bcd5a..e1b00bc40 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -32,8 +32,8 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klineedit.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/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 0c1ebb27c..aeed441b0 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -30,7 +30,7 @@
 #include <tqlistview.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 #include "kbookmark.h"
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index fc34e9029..b47af8ebf 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -30,7 +30,7 @@
 #include <tqlistview.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 #include "kbookmark.h"
diff --git a/tdeio/httpfilter/httpfilter.cc b/tdeio/httpfilter/httpfilter.cc
index 21086d613..0f6a45790 100644
--- a/tdeio/httpfilter/httpfilter.cc
+++ b/tdeio/httpfilter/httpfilter.cc
@@ -19,7 +19,7 @@
 
 #include <tdeio/global.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "httpfilter.h"
 
diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index 4986eb45a..cf4e0530c 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -30,8 +30,8 @@
 #include <tqtimer.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeio/passdlg.h>
 #include <tdewallet.h>
diff --git a/tdeio/kssl/kssl.cc b/tdeio/kssl/kssl.cc
index 66cc503d5..874da6aa6 100644
--- a/tdeio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cc
@@ -48,7 +48,7 @@
 #include <ksslx509v3.h>
 #include <ksslpkcs12.h>
 #include <ksslsession.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksocks.h>
 
 #define sk_dup d->kossl->sk_dup
diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc
index ea3c29556..26550e715 100644
--- a/tdeio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cc
@@ -30,9 +30,9 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <kseparator.h>
diff --git a/tdeio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cc
index e7310ccdc..1f95c3912 100644
--- a/tdeio/kssl/ksslcertificate.cc
+++ b/tdeio/kssl/ksslcertificate.cc
@@ -37,9 +37,9 @@
 
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <sys/types.h>
 
diff --git a/tdeio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cc
index 03a1300e8..7567b8595 100644
--- a/tdeio/kssl/ksslinfodlg.cc
+++ b/tdeio/kssl/ksslinfodlg.cc
@@ -31,11 +31,11 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksqueezedtextlabel.h>
 #include <kurllabel.h>
 #include <kstdguiitem.h>
diff --git a/tdeio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cc
index 93d6d2da4..654444994 100644
--- a/tdeio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cc
@@ -25,12 +25,12 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kopenssl.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdewallet.h>
 
 #include <tqlineedit.h>
diff --git a/tdeio/kssl/ksslpemcallback.cc b/tdeio/kssl/ksslpemcallback.cc
index 2dfbb9146..207949a0c 100644
--- a/tdeio/kssl/ksslpemcallback.cc
+++ b/tdeio/kssl/ksslpemcallback.cc
@@ -23,7 +23,7 @@
 #endif
 
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ksslpemcallback.h"
 
 int KSSLPemCallback(char *buf, int size, int rwflag, void *userdata) {
diff --git a/tdeio/kssl/ksslpkcs12.cc b/tdeio/kssl/ksslpkcs12.cc
index b8b23cf1c..9521e907b 100644
--- a/tdeio/kssl/ksslpkcs12.cc
+++ b/tdeio/kssl/ksslpkcs12.cc
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <ksslall.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 
 #include <assert.h>
diff --git a/tdeio/kssl/ksslpkcs7.cc b/tdeio/kssl/ksslpkcs7.cc
index 8db0000f0..cb66eb468 100644
--- a/tdeio/kssl/ksslpkcs7.cc
+++ b/tdeio/kssl/ksslpkcs7.cc
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <ksslall.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 
 #include <assert.h>
diff --git a/tdeio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cc
index 9895a702b..fbf10b476 100644
--- a/tdeio/kssl/ksslsettings.cc
+++ b/tdeio/kssl/ksslsettings.cc
@@ -33,7 +33,7 @@
 #include <tqsortedlist.h>
 
 #include "ksslsettings.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/tdeio/kssl/ksslutils.cc b/tdeio/kssl/ksslutils.cc
index 80651757f..444e5dd4a 100644
--- a/tdeio/kssl/ksslutils.cc
+++ b/tdeio/kssl/ksslutils.cc
@@ -22,8 +22,8 @@
 #include "ksslutils.h"
 
 #include <tqstring.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
 
 #include "kopenssl.h"
diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index 4f33d1389..533c4fcca 100644
--- a/tdeio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
@@ -41,7 +41,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <kurl.h>
 
diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index c94cc9b72..483e836cb 100644
--- a/tdeio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -24,8 +24,8 @@
 #include <tqtextcodec.h>
 
 #include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 
 #include "downloader.moc"
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index a010d328e..dfb682005 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -23,9 +23,9 @@
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include "proxyscout.moc"
 #include "discovery.h"
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index d41041636..d47845bbb 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <tqfile.h>
 #include <tqsortedlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tqdatetime.h>
diff --git a/tdeio/misc/tdefile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index df210fa4d..aa6590ef5 100644
--- a/tdeio/misc/tdefile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdefilemetainfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpropertiesdialog.h>
 
 #include "fileprops.h"
diff --git a/tdeio/misc/tdemailservice.cpp b/tdeio/misc/tdemailservice.cpp
index 2d256c5c9..23066d633 100644
--- a/tdeio/misc/tdemailservice.cpp
+++ b/tdeio/misc/tdemailservice.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 static const TDECmdLineOptions options[] =
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index aaffd3b65..32465039d 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -9,8 +9,8 @@
 #include <tqtextstream.h>
 
 #include <tdeapplication.h>
-#include <kemailsettings.h>
-#include <klocale.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp
index 99260d8d0..bf175bdc9 100644
--- a/tdeio/misc/tdetelnetservice.cpp
+++ b/tdeio/misc/tdetelnetservice.cpp
@@ -22,10 +22,10 @@
 // $Id$
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <ksimpleconfig.h>
 
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 364197b72..126f0ce2b 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -32,9 +32,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kstandarddirs.h>
 #include <tdewalletentry.h>
diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index aa3a1c09d..c31062c2a 100644
--- a/tdeio/misc/tdewalletd/tdewalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
@@ -531,7 +531,7 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">tqcheckbox.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 107b57c64..c23628eae 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -31,12 +31,12 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdesu/client.h>
 #include <twin.h>
 #include <kdialog.h>
diff --git a/tdeio/tdefile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt
index a69cad536..ed0350999 100644
--- a/tdeio/tdefile/CMakeLists.txt
+++ b/tdeio/tdefile/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(
 
 install( FILES
     tdefiledialog.h kencodingfiledialog.h
-    kdiroperator.h tdefileview.h tdefilefiltercombo.h
+    tdediroperator.h tdefileview.h tdefilefiltercombo.h
     tdefiledetailview.h kcombiview.h kdiskfreesp.h
     tdefileiconview.h tderecentdocument.h
     kurlrequester.h tdefilepreview.h tdefile.h
@@ -56,7 +56,7 @@ set( target tdefile )
 
 set( ${target}_SRCS
   tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp
-  tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
+  tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp
   tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp
   tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
   kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp
diff --git a/tdeio/tdefile/ChangeLog b/tdeio/tdefile/ChangeLog
index ccfb45ab5..229f9f2f8 100644
--- a/tdeio/tdefile/ChangeLog
+++ b/tdeio/tdefile/ChangeLog
@@ -1,6 +1,6 @@
 Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp:
+	* tdediroperator.cpp:
 	lottsa changes, e.g. action handling more clear now.
 	fixed completed item not clearning the previous selection
 
@@ -17,7 +17,7 @@ Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Feb 20 01:50:44 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.*, tdefiledialog.* (saveConfig): 
+	* tdediroperator.*, tdefiledialog.* (saveConfig): 
 	implemented loading, saving and applying configuration
 
 	* tdefiledialog.cpp (setURL): 
@@ -37,7 +37,7 @@ Thu Feb 17 19:09:54 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	Added KDirComboBox and replaced the directory combobox with it. It
 	even does something now :) Items need to be indented tho.
 
-	* tdefilereader.cpp, kdiroperator.{cpp,h}: 
+	* tdefilereader.cpp, tdediroperator.{cpp,h}: 
 	fixed showHidden default
 
 Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -60,7 +60,7 @@ Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	added static methods for multiselection
 	added getOpenURL(), getOpenURLs and getSaveURL()
 	
-	* kdiroperator.cpp (setSorting): 
+	* tdediroperator.cpp (setSorting): 
 	added setSorting() and sorting() to keep sorting when switching views
 	a few cosmetic and TDEAction changes
 
@@ -86,7 +86,7 @@ Fri Feb 11 12:17:59 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp (connectView): 
+	* tdediroperator.cpp (connectView): 
 	- Now that TDEToggleAction is fixed, I can commit the new stuff:
 	  Offer Actions for all the common functionality, i.e. sorting, setting
 	  the view, home(), cdUp(), back, forward, etc.
@@ -107,7 +107,7 @@ Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Thu Feb 10 12:59:29 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp (insertNewFiles): 
+	* tdediroperator.cpp (insertNewFiles): 
 	aahhh, finally fixed that infinite loop in KFileView::mergeLists
 	clear the view before calling view->addItemList( currentContents );
 
@@ -173,7 +173,7 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* tdefileviewitem.cpp:
 	- added time_t mTime() to enable sorting by modification time
 	
-	* kdiroperator.cpp:
+	* tdediroperator.cpp:
 	- offer sorting options in popupmenu
 	- use checkAccess before creating directories. I guess this will again
 	  change when the new kio will be used, tho. 
diff --git a/tdeio/tdefile/Makefile.am b/tdeio/tdefile/Makefile.am
index 4e6b76ce1..857e843c5 100644
--- a/tdeio/tdefile/Makefile.am
+++ b/tdeio/tdefile/Makefile.am
@@ -27,7 +27,7 @@ METASOURCES = AUTO
 #SUBDIRS = . acl_prop_page
 
 include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
-	kdiroperator.h tdefileview.h tdefilefiltercombo.h \
+	tdediroperator.h tdefileview.h tdefilefiltercombo.h \
 	tdefiledetailview.h kcombiview.h kdiskfreesp.h \
 	tdefileiconview.h tderecentdocument.h \
 	kurlrequester.h tdefilepreview.h tdefile.h \
@@ -44,7 +44,7 @@ noinst_HEADERS = config-tdefile.h tderecentdirs.h kmetaprops.h \
 libtdefile_la_SOURCES = \
 	tdefilefiltercombo.cpp \
 	tdefileview.cpp tdefileiconview.cpp \
-	tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
+	tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp \
 	tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
 	tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
 	kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \
diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 01eb8bcb8..7e8e3dae2 100644
--- a/tdeio/tdefile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -38,7 +38,7 @@
 #include <tqwidgetstack.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index 13830ab01..4c4f0cb06 100644
--- a/tdeio/tdefile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -35,7 +35,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqvaluelist.h>
 
diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index 995b80ffc..af3680571 100644
--- a/tdeio/tdefile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -23,7 +23,7 @@
 #define _KCOMBIVIEW_H
 
 #include <tqsplitter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdefile.h>
 #include <tdefileview.h>
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 65455aef0..b59108071 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -24,8 +24,8 @@
 #include <tqdir.h>
 
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <kservice.h>
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index 1ae03daec..dc44aa8ba 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -38,8 +38,8 @@
 #include <kdialogbase.h>
 #include <kdirlister.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kstdaction.h>
@@ -55,7 +55,7 @@
 
 #include "config-tdefile.h"
 #include "kcombiview.h"
-#include "kdiroperator.h"
+#include "tdediroperator.h"
 #include "tdefiledetailview.h"
 #include "tdefileiconview.h"
 #include "tdefilepreview.h"
@@ -1737,4 +1737,4 @@ TQString KDirOperator::viewConfigGroup() const
 void KDirOperator::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kdiroperator.moc"
+#include "tdediroperator.moc"
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 39959229d..5027f631c 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -29,9 +29,9 @@
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <tdefilespeedbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <tderecentdirs.h>
 #include <kshell.h>
@@ -41,7 +41,7 @@
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/renamedlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "tdefiletreeview.h"
 #include "kdirselectdialog.h"
diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp
index c2ea4079a..b2d48b4bf 100644
--- a/tdeio/tdefile/kdirsize.cpp
+++ b/tdeio/tdefile/kdirsize.cpp
@@ -19,7 +19,7 @@
 
 #include "kdirsize.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqapplication.h>
 #include <tqtimer.h>
 #include <config-tdefile.h>
diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index a49210642..d2d588a4e 100644
--- a/tdeio/tdefile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -24,11 +24,11 @@
 #include "kencodingfiledialog.h"
 #include <kcombobox.h>
 #include <tdetoolbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tderecentdocument.h>
 
 struct KEncodingFileDialogPrivate
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index 9d7975e2b..154f9e89d 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -20,8 +20,8 @@
 #include <kiconviewsearchline.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kprogress.h>
diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index a1ce7d6b3..f96be72fc 100644
--- a/tdeio/tdefile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -16,12 +16,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdefileitem.h>
 #include <tdeio/previewjob.h>
diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp
index ce6201177..21c75e0ce 100644
--- a/tdeio/tdefile/kmetaprops.cpp
+++ b/tdeio/tdefile/kmetaprops.cpp
@@ -23,9 +23,9 @@
 #include <kdebug.h>
 #include <tdefilemetainfowidget.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 
 #include <tqvalidator.h>
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index f23ac78e4..8397a5e74 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kstandarddirs.h>
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index f31815e34..c8b5b21ac 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -22,7 +22,7 @@
 #include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "knotifywidgetbase.h"
 
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 5a855de21..5db8b79d9 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -39,9 +39,9 @@
 #include <kcombobox.h>
 #include <kdesktopfile.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimemagic.h>
 #include <krun.h>
diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp
index a053d5627..c45330893 100644
--- a/tdeio/tdefile/kpreviewprops.cpp
+++ b/tdeio/tdefile/kpreviewprops.cpp
@@ -22,8 +22,8 @@
 #include <tqlayout.h>
 
 #include <tdefilemetapreview.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 class KPreviewPropsPlugin::KPreviewPropsPluginPrivate
 {
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 389115a3c..87d3926b3 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -96,9 +96,9 @@ extern "C" {
 #include <kicondialog.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>
 #include <tdeio/chmodjob.h>
@@ -109,7 +109,7 @@ extern "C" {
 #include <kmimetype.h>
 #include <kmountpoint.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index 46b096c2b..2aa79353f 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -33,12 +33,12 @@
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprotocolinfo.h>
 #include <kstringhandler.h>
diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp
index 150e64b34..66fe8efb8 100644
--- a/tdeio/tdefile/kurlcombobox.cpp
+++ b/tdeio/tdefile/kurlcombobox.cpp
@@ -20,9 +20,9 @@
 #include <tqlistbox.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 
 #include <kurlcombobox.h>
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 9a76a69a6..7ecfd543d 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -30,10 +30,10 @@
 #include <kdialog.h>
 #include <kdirselectdialog.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcompletion.h>
 #include <kurldrag.h>
 #include <kprotocolinfo.h>
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index d1e9ec109..1a040a656 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -28,10 +28,10 @@
 
 #include <tdeaccel.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tderecentdocument.h>
 #include <kurl.h>
 #include <kurlrequester.h>
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index b3c44250e..e267bdb60 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -27,11 +27,11 @@
 
 #include <tdeapplication.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 8db764724..03bc17757 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -50,16 +50,16 @@
 #include <tdecompletionbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
 #include <tdeio/kservicetypefactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
@@ -83,7 +83,7 @@
 #include <tdefileview.h>
 #include <tderecentdocument.h>
 #include <tdefilefiltercombo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kimagefilepreview.h>
 
 #include <tdefilespeedbar.h>
diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp
index cd7bd54d3..ed41f8f82 100644
--- a/tdeio/tdefile/tdefilefiltercombo.cpp
+++ b/tdeio/tdefile/tdefilefiltercombo.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <config-tdefile.h>
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 131485273..92bbeba41 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -31,10 +31,10 @@
 
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 #include <tdeio/previewjob.h>
 
diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index dea9ea353..50fef856b 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -21,7 +21,7 @@
 #include "tdefilemetainfowidget.h"
 
 #include <keditcl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <klineedit.h>
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 57543ea8c..acec61475 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -22,7 +22,7 @@
 #include <tdeaction.h>
 #include <tdefilepreview.h>
 #include <tdefilepreview.moc>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 
diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index 6204fa6bb..a2fb01c2c 100644
--- a/tdeio/tdefile/tdefilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -27,8 +27,8 @@
 #include <tqlineedit.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <stdio.h>
@@ -39,7 +39,7 @@
 #include <tqpushbutton.h>
 #include <tdeapplication.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 class KFileSharePropsPlugin::Private
 {
diff --git a/tdeio/tdefile/tdefilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp
index defcb2157..6f3365a5f 100644
--- a/tdeio/tdefile/tdefilespeedbar.cpp
+++ b/tdeio/tdefile/tdefilespeedbar.cpp
@@ -25,9 +25,9 @@
 #include <tqtextstream.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index 6138b3863..cb7432423 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 #include <kdebug.h>
 #include <kdirnotify_stub.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefileitem.h>
 #include <tdefileview.h>
 #include <kmimetype.h>
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 63c973723..f171975d8 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -25,8 +25,8 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "config-tdefile.h"
diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
index 12c2b6477..0548261dd 100644
--- a/tdeio/tdefile/tderecentdirs.cpp
+++ b/tdeio/tdefile/tderecentdirs.cpp
@@ -28,7 +28,7 @@
 #include <tderecentdirs.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #define MAX_DIR_HISTORY 3
 
diff --git a/tdeio/tdefile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp
index 3d95b6c9f..9e2189406 100644
--- a/tdeio/tdefile/tests/kcustommenueditortest.cpp
+++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp
@@ -1,6 +1,6 @@
 #include "kcustommenueditor.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 int main(int argc, char** argv)
diff --git a/tdeio/tdefile/tests/kdirselectdialogtest.cpp b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
index 0c2209d31..c1178c3bc 100644
--- a/tdeio/tdefile/tests/kdirselectdialogtest.cpp
+++ b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
@@ -1,6 +1,6 @@
 #include <tdeapplication.h>
 #include <kdirselectdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 int main( int argc, char **argv )
diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index baf82725f..ce7127d9e 100644
--- a/tdeio/tdefile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -3,7 +3,7 @@
 #include <tqstringlist.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 
 KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name )
diff --git a/tdeio/tdefile/tests/kfstest.cpp b/tdeio/tdefile/tests/kfstest.cpp
index c57e3678e..ada8d825e 100644
--- a/tdeio/tdefile/tests/kfstest.cpp
+++ b/tdeio/tdefile/tests/kfstest.cpp
@@ -30,12 +30,12 @@
 
 #include <tdefiledialog.h>
 #include <tdefileiconview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <kurlbar.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdefile.h>
 #include <kdebug.h>
 #include <kicondialog.h>
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 529d12dda..9ff0199dc 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -19,7 +19,7 @@
 
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
diff --git a/tdeio/tdeio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt
index 8aaf395b6..e2b96ebb1 100644
--- a/tdeio/tdeio/CMakeLists.txt
+++ b/tdeio/tdeio/CMakeLists.txt
@@ -41,8 +41,8 @@ install( FILES
     kurlcompletion.h kshellcompletion.h tdefileitem.h
     tdefileshare.h ksambashare.h knfsshare.h kdirlister.h
     kservicegroup.h kimageio.h kdirnotify.h kdirnotify_stub.h
-    kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h
-    kfilterbase.h kfilterdev.h kemailsettings.h kscan.h
+    kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h
+    kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h
     kdatatool.h karchive.h tdefilefilter.h tdefilemetainfo.h
     renamedlgplugin.h kmimetyperesolver.h kdcopservicestarter.h
     kremoteencoding.h kmimetypechooser.h
@@ -71,7 +71,7 @@ install( FILES
 set( target tdeiocore )
 
 set( ${target}_SRCS
-  authinfo.cpp kshred.cpp kprotocolmanager.cpp slave.cpp
+  authinfo.cpp kshred.cpp tdeprotocolmanager.cpp slave.cpp
   slaveinterface.cpp observer.stub sessiondata.cpp
   scheduler.cpp connection.cpp job.cpp global.cpp
   slaveconfig.cpp kurlpixmapprovider.cpp netaccess.cpp
@@ -79,7 +79,7 @@ set( ${target}_SRCS
   slavebase.cpp passdlg.cpp forwardingslavebase.cpp
   progressbase.cpp defaultprogress.cpp statusbarprogress.cpp
   kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp
-  observer.cpp ../misc/uiserver.stub observer.skel kemailsettings.cpp
+  observer.cpp ../misc/uiserver.stub observer.skel tdeemailsettings.cpp
   kprotocolinfo.cpp renamedlg.cpp skipdlg.cpp kremoteencoding.cpp
   kmimetypechooser.cpp
 )
diff --git a/tdeio/tdeio/Makefile.am b/tdeio/tdeio/Makefile.am
index f0766f5c8..587cfe511 100644
--- a/tdeio/tdeio/Makefile.am
+++ b/tdeio/tdeio/Makefile.am
@@ -53,8 +53,8 @@ include_HEADERS = \
 	kshellcompletion.h tdefileitem.h tdefileshare.h ksambashare.h knfsshare.h \
     kdirlister.h kservicegroup.h \
 	kimageio.h kdirnotify.h kdirnotify_stub.h \
-	kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h \
-	kfilterbase.h kfilterdev.h kemailsettings.h kscan.h kdatatool.h \
+	kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h \
+	kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h kdatatool.h \
 	karchive.h tdefilefilter.h tdefilemetainfo.h renamedlgplugin.h \
 	kmimetyperesolver.h kdcopservicestarter.h kremoteencoding.h \
 	kmimetypechooser.h 
@@ -67,7 +67,7 @@ include_HEADERS += kacl.h
 
 libtdeiocore_la_SOURCES = authinfo.cpp \
 	kshred.cpp \
-	kprotocolmanager.cpp \
+	tdeprotocolmanager.cpp \
 	slave.cpp slaveinterface.cpp observer.stub \
 	sessiondata.cpp	scheduler.cpp \
 	connection.cpp \
@@ -81,7 +81,7 @@ libtdeiocore_la_SOURCES = authinfo.cpp \
 	statusbarprogress.cpp \
 	kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp \
 	observer.cpp uiserver.stub observer.skel \
-	kemailsettings.cpp  \
+	tdeemailsettings.cpp  \
 	kprotocolinfo.cpp \
 	renamedlg.cpp skipdlg.cpp kremoteencoding.cpp \
 	kmimetypechooser.cpp
diff --git a/tdeio/tdeio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp
index 434466d77..24a5c247d 100644
--- a/tdeio/tdeio/chmodjob.cpp
+++ b/tdeio/tdeio/chmodjob.cpp
@@ -29,9 +29,9 @@
 
 #include <tqtimer.h>
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "tdeio/job.h"
 #include "tdeio/chmodjob.h"
diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp
index 528368ba5..a5b6bdf69 100644
--- a/tdeio/tdeio/dataslave.cpp
+++ b/tdeio/tdeio/dataslave.cpp
@@ -23,7 +23,7 @@
 #include "dataslave.h"
 #include "dataprotocol.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 4293e752e..5db9c5a0c 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -26,8 +26,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kstringhandler.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kprocess.h>
 #include <kpushbutton.h>
diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp
index e4bfec5f6..8dce8a5f4 100644
--- a/tdeio/tdeio/global.cpp
+++ b/tdeio/tdeio/global.cpp
@@ -33,9 +33,9 @@
 #include "tdeio/job.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeprotocolmanager.h>
 #include <kde_file.h>
 
 #ifdef HAVE_VOLMGT
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index a4e731451..7f8b9bda3 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -42,12 +42,12 @@ extern "C" {
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdatastream.h>
 #include <tdemainwindow.h>
 #include <kde_file.h>
@@ -60,14 +60,14 @@ extern "C" {
 #include "kdirwatch.h"
 #include "kmimemagic.h"
 #include "kprotocolinfo.h"
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
 #include "tdeio/observer.h"
 
 #include "kssl/ksslcsessioncache.h"
 
 #include <kdirnotify_stub.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <dcopclient.h>
 
 #ifdef Q_OS_UNIX
diff --git a/tdeio/tdeio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp
index c859cce2b..8a7a67632 100644
--- a/tdeio/tdeio/kdcopservicestarter.cpp
+++ b/tdeio/tdeio/kdcopservicestarter.cpp
@@ -22,7 +22,7 @@
 #include "kservice.h"
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 static KStaticDeleter<KDCOPServiceStarter> dss_sd;
diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp
index 669766ab5..b0027588d 100644
--- a/tdeio/tdeio/kdirlister.cpp
+++ b/tdeio/tdeio/kdirlister.cpp
@@ -28,11 +28,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstaticdeleter.h>
 #include <kprotocolinfo.h>
 
diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp
index 63c89b9d7..01b4e0876 100644
--- a/tdeio/tdeio/kdirwatch.cpp
+++ b/tdeio/tdeio/kdirwatch.cpp
@@ -57,7 +57,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
 
diff --git a/tdeio/tdeio/kemailsettings.cpp b/tdeio/tdeio/kemailsettings.cpp
index 296455253..bd46d8708 100644
--- a/tdeio/tdeio/kemailsettings.cpp
+++ b/tdeio/tdeio/kemailsettings.cpp
@@ -26,10 +26,10 @@
  *	$Id$
  */
 
-#include "kemailsettings.h"
+#include "tdeemailsettings.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 class KEMailSettingsPrivate {
diff --git a/tdeio/tdeio/kimageio.cpp b/tdeio/tdeio/kimageio.cpp
index f9de08376..d3768d297 100644
--- a/tdeio/tdeio/kimageio.cpp
+++ b/tdeio/tdeio/kimageio.cpp
@@ -20,9 +20,9 @@
 #include <ltdl.h>
 #include "kimageio.h"
 #include "kimageiofactory.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmimetype.h>
 #include <tdesycocaentry.h>
 #include <tdesycoca.h>
diff --git a/tdeio/tdeio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h
index c55060549..524eafa74 100644
--- a/tdeio/tdeio/kmessageboxwrapper.h
+++ b/tdeio/tdeio/kmessageboxwrapper.h
@@ -18,7 +18,7 @@
 
 #ifndef KMESSAGEBOXWRAPPER_H
 #define KMESSAGEBOXWRAPPER_H
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 8129b31f9..636c04eea 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -52,7 +52,7 @@
 #include <kdesktopfile.h>
 #include <kdirwatch.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 95dfada9c..ffc9a4c78 100644
--- a/tdeio/tdeio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -21,7 +21,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <krun.h>
diff --git a/tdeio/tdeio/kprotocolinfo.cpp b/tdeio/tdeio/kprotocolinfo.cpp
index 9523b70cb..bf11060e4 100644
--- a/tdeio/tdeio/kprotocolinfo.cpp
+++ b/tdeio/tdeio/kprotocolinfo.cpp
@@ -24,7 +24,7 @@
 
 #include "kprotocolinfo.h"
 #include "kprotocolinfofactory.h"
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
 // Most of this class is implemented in tdecore/kprotocolinfo_tdecore.cpp
 // This file only contains a few static class-functions that depend on
diff --git a/tdeio/tdeio/kprotocolmanager.cpp b/tdeio/tdeio/kprotocolmanager.cpp
index 7ed06376b..65ad393a3 100644
--- a/tdeio/tdeio/kprotocolmanager.cpp
+++ b/tdeio/tdeio/kprotocolmanager.cpp
@@ -23,8 +23,8 @@
 
 #include <dcopref.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
@@ -34,7 +34,7 @@
 #include <tdeio/ioslave_defaults.h>
 #include <tdeio/http_slave_defaults.h>
 
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
 class
 KProtocolManagerPrivate
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 8547802d6..d92e3ca11 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -44,7 +44,7 @@
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
@@ -55,7 +55,7 @@
 #include <tqdatetime.h>
 #include <tqregexp.h>
 #include <kdesktopfile.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <kmacroexpander.h>
 #include <kshell.h>
 #include <kde_file.h>
diff --git a/tdeio/tdeio/krun.h b/tdeio/tdeio/krun.h
index 40fd36416..6e5604f7a 100644
--- a/tdeio/tdeio/krun.h
+++ b/tdeio/tdeio/krun.h
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tqstring.h>
 #include <kurl.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 class TDEProcess;
 class KService;
diff --git a/tdeio/tdeio/kscan.cpp b/tdeio/tdeio/kscan.cpp
index 7b00f08a9..b49459771 100644
--- a/tdeio/tdeio/kscan.cpp
+++ b/tdeio/tdeio/kscan.cpp
@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 
 #include "kscan.h"
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 13be78bea..c9a6fdae2 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -40,9 +40,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfigbase.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
diff --git a/tdeio/tdeio/kservicefactory.cpp b/tdeio/tdeio/kservicefactory.cpp
index f4646fa75..abd6ec61e 100644
--- a/tdeio/tdeio/kservicefactory.cpp
+++ b/tdeio/tdeio/kservicefactory.cpp
@@ -24,9 +24,9 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 
diff --git a/tdeio/tdeio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp
index 2e27c99b0..4cb3b8dac 100644
--- a/tdeio/tdeio/kservicegroup.cpp
+++ b/tdeio/tdeio/kservicegroup.cpp
@@ -19,9 +19,9 @@
 #include <tqdir.h>
 
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ksortablevaluelist.h>
 
diff --git a/tdeio/tdeio/kservicegroupfactory.cpp b/tdeio/tdeio/kservicegroupfactory.cpp
index 56ec0c07f..3caf9c027 100644
--- a/tdeio/tdeio/kservicegroupfactory.cpp
+++ b/tdeio/tdeio/kservicegroupfactory.cpp
@@ -24,9 +24,9 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 KServiceGroupFactory::KServiceGroupFactory()
diff --git a/tdeio/tdeio/kshred.cpp b/tdeio/tdeio/kshred.cpp
index 470f9a03e..0bc01c20a 100644
--- a/tdeio/tdeio/kshred.cpp
+++ b/tdeio/tdeio/kshred.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "kshred.h"
 #include <time.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <stdlib.h>
 #include <tdeapplication.h>
diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp
index 9bde2873a..cb5bba1fa 100644
--- a/tdeio/tdeio/ktar.cpp
+++ b/tdeio/tdeio/ktar.cpp
@@ -30,7 +30,7 @@
 #include <tqfile.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <kfilterdev.h>
 #include <kfilterbase.h>
diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index e9ce26908..441d453ac 100644
--- a/tdeio/tdeio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -47,8 +47,8 @@
 #include <tdeio/job.h>
 #include <kprotocolinfo.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kde_file.h>
 
 #include <sys/types.h>
diff --git a/tdeio/tdeio/kuserprofile.cpp b/tdeio/tdeio/kuserprofile.cpp
index 124f7f8f8..a9bdc40c1 100644
--- a/tdeio/tdeio/kuserprofile.cpp
+++ b/tdeio/tdeio/kuserprofile.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp
index dd3a1bdc8..cbab6684e 100644
--- a/tdeio/tdeio/netaccess.cpp
+++ b/tdeio/tdeio/netaccess.cpp
@@ -34,8 +34,8 @@
 #include <tqmetaobject.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/job.h>
diff --git a/tdeio/tdeio/observer.cpp b/tdeio/tdeio/observer.cpp
index dfd847b04..2309c2142 100644
--- a/tdeio/tdeio/observer.cpp
+++ b/tdeio/tdeio/observer.cpp
@@ -34,12 +34,12 @@
 #include "passdlg.h"
 #include "slavebase.h"
 #include "observer_stub.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksslinfodlg.h>
 #include <ksslcertdlg.h>
 #include <ksslcertificate.h>
 #include <ksslcertchain.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace TDEIO;
 
diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp
index 942d16c64..91fba050d 100644
--- a/tdeio/tdeio/passdlg.cpp
+++ b/tdeio/tdeio/passdlg.cpp
@@ -30,7 +30,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 using namespace TDEIO;
diff --git a/tdeio/tdeio/paste.cpp b/tdeio/tdeio/paste.cpp
index fd24f9a0d..42fff5ba2 100644
--- a/tdeio/tdeio/paste.cpp
+++ b/tdeio/tdeio/paste.cpp
@@ -24,16 +24,16 @@
 #include "tdeio/netaccess.h"
 #include "tdeio/observer.h"
 #include "tdeio/renamedlg.h"
-#include "tdeio/kprotocolmanager.h"
+#include "tdeio/tdeprotocolmanager.h"
 
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqapplication.h>
 #include <tqclipboard.h>
diff --git a/tdeio/tdeio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp
index 0252baff1..d95cc7e88 100644
--- a/tdeio/tdeio/pastedialog.cpp
+++ b/tdeio/tdeio/pastedialog.cpp
@@ -20,7 +20,7 @@
 
 #include <klineedit.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp
index c51ba154d..5e3148619 100644
--- a/tdeio/tdeio/previewjob.cpp
+++ b/tdeio/tdeio/previewjob.cpp
@@ -43,10 +43,10 @@
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
 #include <tdefileitem.h>
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <kmdcodec.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <tdeio/kservice.h>
diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index 06b12d129..715f73c42 100644
--- a/tdeio/tdeio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -30,15 +30,15 @@
 #include <tqlineedit.h>
 #include <tqdir.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tdeapplication.h>
 #include <tdeio/global.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>
diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp
index 01bcde298..3935a91cf 100644
--- a/tdeio/tdeio/scheduler.cpp
+++ b/tdeio/tdeio/scheduler.cpp
@@ -28,8 +28,8 @@
 #include <dcopclient.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kprotocolmanager.h>
+#include <tdeglobal.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <assert.h>
 #include <kstaticdeleter.h>
diff --git a/tdeio/tdeio/sessiondata.cpp b/tdeio/tdeio/sessiondata.cpp
index 99c6a26f3..4e4dd14ac 100644
--- a/tdeio/tdeio/sessiondata.cpp
+++ b/tdeio/tdeio/sessiondata.cpp
@@ -23,11 +23,11 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <dcopclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kstandarddirs.h>
 
 #include <tdesu/client.h>
diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp
index 6cd924136..5871bbd09 100644
--- a/tdeio/tdeio/skipdlg.cpp
+++ b/tdeio/tdeio/skipdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp
index e66a719df..b4a7c8f2a 100644
--- a/tdeio/tdeio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -35,11 +35,11 @@
 
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksock.h>
 #include <kprocess.h>
 #include <klibloader.h>
@@ -48,7 +48,7 @@
 #include "tdeio/slave.h"
 #include "tdeio/kservice.h"
 #include <tdeio/global.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 
 #ifdef HAVE_PATHS_H
diff --git a/tdeio/tdeio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp
index 29a8e0c48..76bbc232d 100644
--- a/tdeio/tdeio/slavebase.cpp
+++ b/tdeio/tdeio/slavebase.cpp
@@ -48,7 +48,7 @@
 #include <ksock.h>
 #include <kcrash.h>
 #include <tdesu/client.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksocks.h>
 
 #include "kremoteencoding.h"
diff --git a/tdeio/tdeio/slaveconfig.cpp b/tdeio/tdeio/slaveconfig.cpp
index e81146e76..af1b7b793 100644
--- a/tdeio/tdeio/slaveconfig.cpp
+++ b/tdeio/tdeio/slaveconfig.cpp
@@ -27,7 +27,7 @@
 #include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include "slaveconfig.h"
 
diff --git a/tdeio/tdeio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp
index e0497e391..d7ef698c4 100644
--- a/tdeio/tdeio/statusbarprogress.cpp
+++ b/tdeio/tdeio/statusbarprogress.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kprogress.h>
 
diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index 2a4aff68e..a0d9c86cb 100644
--- a/tdeio/tdeio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -43,19 +43,19 @@
 #include <kdebug.h>
 #include <ksslall.h>
 #include <ksslcertdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #ifndef Q_WS_WIN //temporary
 #include <kresolver.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 
 #include <tdeapplication.h>
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kde_file.h>
 
 #include "tdeio/tcpslavebase.h"
diff --git a/tdeio/tdeio/tdefilefilter.cpp b/tdeio/tdeio/tdefilefilter.cpp
index 310b86221..c1663c2e8 100644
--- a/tdeio/tdeio/tdefilefilter.cpp
+++ b/tdeio/tdeio/tdefilefilter.cpp
@@ -21,7 +21,7 @@
 #include <tqregexp.h>
 
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "tdefilefilter.h"
 
diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index 3d09e6877..378cd5f0a 100644
--- a/tdeio/tdeio/tdefileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -41,11 +41,11 @@
 #include <tdefilemetainfo.h>
 #include <ksambashare.h>
 #include <knfsshare.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <klargefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <krun.h>
 
diff --git a/tdeio/tdeio/tdefilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp
index 796a48305..c1389695d 100644
--- a/tdeio/tdeio/tdefilemetainfo.cpp
+++ b/tdeio/tdeio/tdefilemetainfo.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kdatastream.h> // needed for serialization of bool
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 
 #include "tdefilemetainfo.h"
diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp
index 16e281c16..dc3f8c05a 100644
--- a/tdeio/tdeio/tdefileshare.cpp
+++ b/tdeio/tdeio/tdefileshare.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index eb615344b..f6324afa5 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -29,16 +29,16 @@
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <krun.h>
 #include <tdeio/netaccess.h>
 #include <kprocess.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <kshell.h>
 #include <kde_file.h>
 
diff --git a/tdeio/tests/kiopassdlgtest.cpp b/tdeio/tests/kiopassdlgtest.cpp
index 3dd4d7294..ba429e67a 100644
--- a/tdeio/tests/kiopassdlgtest.cpp
+++ b/tdeio/tests/kiopassdlgtest.cpp
@@ -1,7 +1,7 @@
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 
 #include "passdlg.h"
diff --git a/tdeio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp
index 638a60ec2..527077eb0 100644
--- a/tdeio/tests/kpropsdlgtest.cpp
+++ b/tdeio/tests/kpropsdlgtest.cpp
@@ -1,5 +1,5 @@
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kpropertiesdialog.h>
 #include <tdecmdlineargs.h>
diff --git a/tdeio/tests/kprotocolinfotest.cpp b/tdeio/tests/kprotocolinfotest.cpp
index 646249678..9b5242d65 100644
--- a/tdeio/tests/kprotocolinfotest.cpp
+++ b/tdeio/tests/kprotocolinfotest.cpp
@@ -17,9 +17,9 @@
  */
 
 #include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index ecc5e4af5..3cc22d8e2 100644
--- a/tdeio/tests/tdeioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -17,7 +17,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstatusbar.h>
 #include <tdeio/job.h>
diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cc
index 477db8754..1caeaef3e 100644
--- a/tdeioslave/file/file.cc
+++ b/tdeioslave/file/file.cc
@@ -75,8 +75,8 @@
 #include <kurl.h>
 #include <kinstance.h>
 #include <ksimpleconfig.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqstrlist.h>
 #include "file.h"
@@ -93,7 +93,7 @@
 #include <kstandarddirs.h>
 #include <tdeio/ioslave_defaults.h>
 #include <klargefile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmimetype.h>
 
 using namespace TDEIO;
diff --git a/tdeioslave/ftp/ftp.cc b/tdeioslave/ftp/ftp.cc
index 5b582d376..cf358ce39 100644
--- a/tdeioslave/ftp/ftp.cc
+++ b/tdeioslave/ftp/ftp.cc
@@ -53,7 +53,7 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kmimemagic.h>
 #include <kmimetype.h>
diff --git a/tdeioslave/http/http.cc b/tdeioslave/http/http.cc
index 539cc4dc5..a492221d5 100644
--- a/tdeioslave/http/http.cc
+++ b/tdeioslave/http/http.cc
@@ -51,7 +51,7 @@
 #include <kidna.h>
 #include <ksocks.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kextsock.h>
 #include <kservice.h>
diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index af9ede123..aaf94d25a 100644
--- a/tdeioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -33,12 +33,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqptrlist.h>
 
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include <unistd.h>
 
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index 3b845a104..faa9cdc65 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
@@ -58,8 +58,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kidna.h>
 #include <twin.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kurllabel.h>
 #include <klineedit.h>
 #include <kiconloader.h>
diff --git a/tdeioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp
index 59d912524..414afb41f 100644
--- a/tdeioslave/http/kcookiejar/main.cpp
+++ b/tdeioslave/http/kcookiejar/main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <dcopclient.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 static const char description[] =
diff --git a/tdeioslave/metainfo/metainfo.cpp b/tdeioslave/metainfo/metainfo.cpp
index 54f7acc3a..389a9182e 100644
--- a/tdeioslave/metainfo/metainfo.cpp
+++ b/tdeioslave/metainfo/metainfo.cpp
@@ -24,7 +24,7 @@
 #include <kmimetype.h>
 #include <kdebug.h>
 #include <tdefilemetainfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 #include "metainfo.h"
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp
index 99af949ed..1db2a3d8b 100644
--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@@ -42,7 +42,7 @@ extern "C" {
 #include <tqstringlist.h>
 #include <tqfileinfo.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kiconloader.h>
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index 88bfa020d..be7c00929 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -29,13 +29,13 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tdemultitabbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
 static const char* const tdemdi_not_close_xpm[]={
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 255150289..9201df7b3 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tqstring.h>
 #include <kdebug.h>
diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 4d477fc9c..411d11771 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -51,12 +51,12 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kiconloader.h>
 #include "dockcontainer.h"
diff --git a/tdemdi/tdemdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index e8ae6e9fc..0c333a151 100644
--- a/tdemdi/tdemdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -43,7 +43,7 @@
 #define _KMDI_MAINWINDOW_H_
 
 #include <tdeparts/dockmainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
diff --git a/tdemdi/tdemdichildarea.cpp b/tdemdi/tdemdichildarea.cpp
index 9370bbbe7..29b0b3d2d 100644
--- a/tdemdi/tdemdichildarea.cpp
+++ b/tdemdi/tdemdichildarea.cpp
@@ -32,8 +32,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include <math.h>
 #include <tqpopupmenu.h>
diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp
index cbc4f4b29..40ced6ffb 100644
--- a/tdemdi/tdemdichildfrm.cpp
+++ b/tdemdi/tdemdichildfrm.cpp
@@ -45,7 +45,7 @@
 #include <tqnamespace.h>
 #include <tqimage.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/tdemdi/tdemdichildfrmcaption.cpp b/tdemdi/tdemdichildfrmcaption.cpp
index cc1a4a187..e8e91ea94 100644
--- a/tdemdi/tdemdichildfrmcaption.cpp
+++ b/tdemdi/tdemdichildfrmcaption.cpp
@@ -38,7 +38,7 @@
 #include "tdemdichildfrm.h"
 #include "tdemdichildarea.h"
 #include "tdemdimainfrm.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 
 #ifdef Q_WS_WIN 
diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp
index 1c3f521f7..4d0aa4166 100644
--- a/tdemdi/tdemdichildview.cpp
+++ b/tdemdi/tdemdichildview.cpp
@@ -39,7 +39,7 @@
 #include "tdemdichildfrm.h"
 #include "tdemdidefines.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqiconset.h>
 
 //============ KMdiChildView ============//
diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index ba0ba0de0..d6771b597 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -28,13 +28,13 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tdemultitabbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
 static const char* const tdemdi_not_close_xpm[] =
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 1c43b8039..0a66ea6ff 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tqstring.h>
 #include <assert.h>
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 3c9f7c442..f21cc384b 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -43,12 +43,12 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 
 #include <kiconloader.h>
diff --git a/tdemdi/tdemdimainfrm.h b/tdemdi/tdemdimainfrm.h
index 720324ad5..c73fa5af1 100644
--- a/tdemdi/tdemdimainfrm.h
+++ b/tdemdi/tdemdimainfrm.h
@@ -32,7 +32,7 @@
 #define _KMDIMAINFRM_H_
 
 #include <tdeparts/dockmainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
diff --git a/tdeparts/browserextension.cpp b/tdeparts/browserextension.cpp
index 630e4cb5a..85bfa4a94 100644
--- a/tdeparts/browserextension.cpp
+++ b/tdeparts/browserextension.cpp
@@ -29,8 +29,8 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <kurifilter.h>
 #include <assert.h>
diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp
index 34f4c21c9..3abd01524 100644
--- a/tdeparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -17,15 +17,15 @@
  */
 
 #include "browserrun.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
 #include <kuserprofile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <assert.h>
diff --git a/tdeparts/factory.cpp b/tdeparts/factory.cpp
index a3985fd05..485bd9a36 100644
--- a/tdeparts/factory.cpp
+++ b/tdeparts/factory.cpp
@@ -23,8 +23,8 @@
 
 #include <tqwidget.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <assert.h>
 
diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp
index 9372adc08..954fc83d5 100644
--- a/tdeparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -33,9 +33,9 @@
 #include <tqfileinfo.h>
 
 #include <kinstance.h>
-#include <klocale.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp
index 1af0f1ee3..0f6f59561 100644
--- a/tdeparts/partmanager.cpp
+++ b/tdeparts/partmanager.cpp
@@ -22,7 +22,7 @@
 #include "partmanager.h"
 #include <tdeparts/event.h>
 #include <tdeparts/part.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqapplication.h>
diff --git a/tdeparts/plugin.cpp b/tdeparts/plugin.cpp
index e1469ad1c..378db4a27 100644
--- a/tdeparts/plugin.cpp
+++ b/tdeparts/plugin.cpp
@@ -34,7 +34,7 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kxmlguifactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 
diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp
index 403fda062..c8fb77b29 100644
--- a/tdeparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -10,9 +10,9 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Shell::Shell()
 {
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index 72b165e65..d83ec8f41 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -2,9 +2,9 @@
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <klibloader.h>
 
diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index 664d6c7ec..92e46254e 100644
--- a/tdeparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -10,11 +10,11 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 Shell::Shell()
 {
diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp
index 81ff2c1f2..ad81b91b3 100644
--- a/tdeparts/tests/notepad.cpp
+++ b/tdeparts/tests/notepad.cpp
@@ -12,7 +12,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 
diff --git a/tdeparts/tests/parts.cpp b/tdeparts/tests/parts.cpp
index 408e73280..ebfd9c9f1 100644
--- a/tdeparts/tests/parts.cpp
+++ b/tdeparts/tests/parts.cpp
@@ -14,9 +14,9 @@
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Part1::Part1( TQObject *parent, TQWidget * parentWidget )
  : KParts::ReadOnlyPart( parent, "Part1" )
diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp
index 73d5b7986..d7cf06eac 100644
--- a/tdeparts/tests/plugin_spellcheck.cpp
+++ b/tdeparts/tests/plugin_spellcheck.cpp
@@ -3,8 +3,8 @@
 #include "plugin_spellcheck.h"
 #include <tdeaction.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name, 
diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp
index 685ce6e7e..256f5ee23 100644
--- a/tdeprint/cups/cupsaddsmb2.cpp
+++ b/tdeprint/cups/cupsaddsmb2.cpp
@@ -26,8 +26,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqmessagebox.h>
 #include <tqfile.h>
 #include <tdeio/passdlg.h>
diff --git a/tdeprint/cups/cupsdconf2/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp
index fab6a6fba..83b4d0813 100644
--- a/tdeprint/cups/cupsdconf2/addressdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 AddressDialog::AddressDialog(TQWidget *parent, const char *name)
 	: KDialogBase(Swallow, i18n("ACL Address"), Ok|Cancel, Ok, parent, name, true, true)
diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp
index b337eb883..3268c72bc 100644
--- a/tdeprint/cups/cupsdconf2/browsedialog.cpp
+++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp
@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 BrowseDialog::BrowseDialog(TQWidget *parent, const char *name)
 	: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
index 4b056cdb0..e66048b73 100644
--- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
@@ -28,7 +28,7 @@
 #include <tqcombobox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
index d17c8bd0c..8a788cad3 100644
--- a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
@@ -21,7 +21,7 @@
 
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 TQString Comment::comment()
diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
index 102ead1c8..2c5610411 100644
--- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index c9b219112..22a3b2d54 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -33,11 +33,11 @@
 
 #include <tqdir.h>
 #include <tqvbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tqstringlist.h>
 #include <tqwhatsthis.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
index 268465a76..282657255 100644
--- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
index 79c8a9401..e9cb1a0ad 100644
--- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
@@ -27,7 +27,7 @@
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
index f12f82f1e..49fdecc7c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
index 00972e368..22128b39c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
index 9edca5868..e939c151f 100644
--- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
index d11851c60..6d6061264 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
@@ -28,9 +28,9 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index cfd731430..e89356af9 100644
--- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 int findComboItem(TQComboBox *cb, const TQString& str)
 {
diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
index a058299f0..c28329e67 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index 3e3fa80e2..936dee212 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -22,7 +22,7 @@
 #include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 
diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp
index 3896f7845..0754ae573 100644
--- a/tdeprint/cups/cupsdconf2/locationdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 LocationDialog::LocationDialog(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp
index abc81477c..78b0e1edf 100644
--- a/tdeprint/cups/cupsdconf2/main.cpp
+++ b/tdeprint/cups/cupsdconf2/main.cpp
@@ -20,7 +20,7 @@
 #include "cupsddialog.h"
 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 
diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp
index 18cade9fc..f758d5d1e 100644
--- a/tdeprint/cups/cupsdconf2/portdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/portdialog.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 PortDialog::PortDialog(TQWidget *parent, const char *name)
 	: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index 628e8d40c..0992e2935 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -23,7 +23,7 @@
 #include <tqheader.h>
 #include <tqpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 
diff --git a/tdeprint/cups/cupsdconf2/sizewidget.cpp b/tdeprint/cups/cupsdconf2/sizewidget.cpp
index 742702e48..eaa39152f 100644
--- a/tdeprint/cups/cupsdconf2/sizewidget.cpp
+++ b/tdeprint/cups/cupsdconf2/sizewidget.cpp
@@ -23,7 +23,7 @@
 #include <tqspinbox.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SizeWidget::SizeWidget( TQWidget *parent, const char *name )
 	: TQWidget( parent, name )
diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp
index 330429583..f6d392bd9 100644
--- a/tdeprint/cups/cupsinfos.cpp
+++ b/tdeprint/cups/cupsinfos.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeio/passdlg.h>
 #include <tdeio/authinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp
index 1e07789ac..ed56804bc 100644
--- a/tdeprint/cups/ippreportdlg.cpp
+++ b/tdeprint/cups/ippreportdlg.cpp
@@ -21,9 +21,9 @@
 #include "ipprequest.h"
 #include "kprinter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <ktextedit.h>
 #include <tqsimplerichtext.h>
diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp
index 4edaefb58..ebbefefe9 100644
--- a/tdeprint/cups/ipprequest.cpp
+++ b/tdeprint/cups/ipprequest.cpp
@@ -24,8 +24,8 @@
 #include <string>
 #include <cups/language.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
 #include <cups/cups.h>
diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp
index 1b0ccdaea..6bc9ec155 100644
--- a/tdeprint/cups/kmconfigcups.cpp
+++ b/tdeprint/cups/kmconfigcups.cpp
@@ -20,7 +20,7 @@
 #include "kmconfigcups.h"
 #include "kmcupsconfigwidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index 6f16f5dfa..10a455226 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcheckbox.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
 #include <tqgroupbox.h>
diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp
index a62583b1b..f93c1a4b3 100644
--- a/tdeprint/cups/kmcupsconfigwidget.cpp
+++ b/tdeprint/cups/kmcupsconfigwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqpushbutton.h>
 #include <tqvalidator.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <tdeconfig.h>
 #include <kstringhandler.h>
diff --git a/tdeprint/cups/kmcupsfactory.cpp b/tdeprint/cups/kmcupsfactory.cpp
index 47384eab6..f42bc449e 100644
--- a/tdeprint/cups/kmcupsfactory.cpp
+++ b/tdeprint/cups/kmcupsfactory.cpp
@@ -22,7 +22,7 @@
 #include "kmcupsuimanager.h"
 #include "kcupsprinterimpl.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
 
 typedef K_TYPELIST_4( KMCupsManager, KMCupsJobManager, KMCupsUiManager, KCupsPrinterImpl ) Products;
diff --git a/tdeprint/cups/kmcupsjobmanager.cpp b/tdeprint/cups/kmcupsjobmanager.cpp
index b7284d1ad..fa208e551 100644
--- a/tdeprint/cups/kmcupsjobmanager.cpp
+++ b/tdeprint/cups/kmcupsjobmanager.cpp
@@ -32,7 +32,7 @@
 #include "kpcopiespage.h"
 #include "kptagspage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index cd472eefa..eaf5070b8 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -42,12 +42,12 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdesocketbase.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kextendedsocket.h>
diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp
index 60e683b84..03b85bb0a 100644
--- a/tdeprint/cups/kmcupsuimanager.cpp
+++ b/tdeprint/cups/kmcupsuimanager.cpp
@@ -55,10 +55,10 @@
 
 #include <tqlistview.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "config.h"
 
diff --git a/tdeprint/cups/kmpropbanners.cpp b/tdeprint/cups/kmpropbanners.cpp
index 22098cdff..602af7f6d 100644
--- a/tdeprint/cups/kmpropbanners.cpp
+++ b/tdeprint/cups/kmpropbanners.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropBanners::KMPropBanners(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/cups/kmpropquota.cpp b/tdeprint/cups/kmpropquota.cpp
index 9df6cbcb2..773e667e9 100644
--- a/tdeprint/cups/kmpropquota.cpp
+++ b/tdeprint/cups/kmpropquota.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // some forward declarations (see kmwquota.cpp)
 const char* unitKeyword(int);
diff --git a/tdeprint/cups/kmpropusers.cpp b/tdeprint/cups/kmpropusers.cpp
index 0f67205b0..2a2147aed 100644
--- a/tdeprint/cups/kmpropusers.cpp
+++ b/tdeprint/cups/kmpropusers.cpp
@@ -23,7 +23,7 @@
 
 #include <tqtextview.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropUsers::KMPropUsers(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/cups/kmwbanners.cpp b/tdeprint/cups/kmwbanners.cpp
index c221f69d7..86f1347fb 100644
--- a/tdeprint/cups/kmwbanners.cpp
+++ b/tdeprint/cups/kmwbanners.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQStringList defaultBanners()
 {
diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp
index 05b1b2cfa..15d4f8180 100644
--- a/tdeprint/cups/kmwfax.cpp
+++ b/tdeprint/cups/kmwfax.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurl.h>
 
diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp
index cb9dedd6c..a8ec8d425 100644
--- a/tdeprint/cups/kmwipp.cpp
+++ b/tdeprint/cups/kmwipp.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqvalidator.h>
 
 #include <cups/http.h>
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index e80478f61..f7a4f0593 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -29,12 +29,12 @@
 #include <kpushbutton.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtextview.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kurl.h>
diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp
index c3f48ad27..237d74fd1 100644
--- a/tdeprint/cups/kmwippselect.cpp
+++ b/tdeprint/cups/kmwippselect.cpp
@@ -25,7 +25,7 @@
 
 #include <tdelistbox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp
index 4e640d536..497fa03c3 100644
--- a/tdeprint/cups/kmwother.cpp
+++ b/tdeprint/cups/kmwother.cpp
@@ -29,7 +29,7 @@
 #include <tqheader.h>
 #include <tqdict.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/tdeprint/cups/kmwquota.cpp b/tdeprint/cups/kmwquota.cpp
index 67245fb20..5085913d0 100644
--- a/tdeprint/cups/kmwquota.cpp
+++ b/tdeprint/cups/kmwquota.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
diff --git a/tdeprint/cups/kmwusers.cpp b/tdeprint/cups/kmwusers.cpp
index 714f6f4d4..eed7c08af 100644
--- a/tdeprint/cups/kmwusers.cpp
+++ b/tdeprint/cups/kmwusers.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <keditlistbox.h>
 
 KMWUsers::KMWUsers(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp
index 67ad61aec..f804b249d 100644
--- a/tdeprint/cups/kphpgl2page.cpp
+++ b/tdeprint/cups/kphpgl2page.cpp
@@ -23,7 +23,7 @@
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp
index 669bab190..8d23fe3e0 100644
--- a/tdeprint/cups/kpimagepage.cpp
+++ b/tdeprint/cups/kpimagepage.cpp
@@ -32,7 +32,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp
index f778139dc..d7f13c8a4 100644
--- a/tdeprint/cups/kpschedulepage.cpp
+++ b/tdeprint/cups/kpschedulepage.cpp
@@ -27,7 +27,7 @@
 #include <tqdatetime.h>
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <knuminput.h>
 
diff --git a/tdeprint/cups/kptagspage.cpp b/tdeprint/cups/kptagspage.cpp
index a5d465683..db134d9ba 100644
--- a/tdeprint/cups/kptagspage.cpp
+++ b/tdeprint/cups/kptagspage.cpp
@@ -26,7 +26,7 @@
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name)
 : KPrintDialogPage(parent, name)
diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp
index eb8bc3553..955434da4 100644
--- a/tdeprint/cups/kptextpage.cpp
+++ b/tdeprint/cups/kptextpage.cpp
@@ -29,7 +29,7 @@
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 #include <kdebug.h>
diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp
index abc468f7a..6afc75d0f 100644
--- a/tdeprint/driver.cpp
+++ b/tdeprint/driver.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tqstringlist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <math.h>
 
diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp
index 02c7be610..fece6c40c 100644
--- a/tdeprint/driverview.cpp
+++ b/tdeprint/driverview.cpp
@@ -27,7 +27,7 @@
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DrListView::DrListView(TQWidget *parent, const char *name)
 : TDEListView(parent,name)
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index 1ec954251..77a910b0c 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -34,7 +34,7 @@
 
 #include <kcursor.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 OptionBaseView::OptionBaseView(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp
index 8959aa3e8..7923ea729 100644
--- a/tdeprint/ext/kextprinterimpl.cpp
+++ b/tdeprint/ext/kextprinterimpl.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KExtPrinterImpl::KExtPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KPrinterImpl(parent,name)
diff --git a/tdeprint/ext/kmextmanager.cpp b/tdeprint/ext/kmextmanager.cpp
index 598dd6648..abc832d6f 100644
--- a/tdeprint/ext/kmextmanager.cpp
+++ b/tdeprint/ext/kmextmanager.cpp
@@ -20,7 +20,7 @@
 #include "kmextmanager.h"
 #include "kmprinter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMExtManager::KMExtManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMManager(parent,name)
diff --git a/tdeprint/ext/kmextuimanager.cpp b/tdeprint/ext/kmextuimanager.cpp
index 2fa200848..ee1c4e186 100644
--- a/tdeprint/ext/kmextuimanager.cpp
+++ b/tdeprint/ext/kmextuimanager.cpp
@@ -21,7 +21,7 @@
 #include "kpqtpage.h"
 #include "kprinterpropertydialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMExtUiManager::KMExtUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
index aacf6be8d..dd694b31b 100644
--- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -21,7 +21,7 @@
 #include "kprinter.h"
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KFoomaticPrinterImpl::KFoomaticPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KPrinterImpl(parent,name)
diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp
index 19e8401d8..e1e741003 100644
--- a/tdeprint/foomatic/kmfoomaticmanager.cpp
+++ b/tdeprint/foomatic/kmfoomaticmanager.cpp
@@ -22,7 +22,7 @@
 #include "driver.h"
 
 #include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kprocess.h>
 
diff --git a/tdeprint/foomatic2loader.cpp b/tdeprint/foomatic2loader.cpp
index 6add13378..0d0637c90 100644
--- a/tdeprint/foomatic2loader.cpp
+++ b/tdeprint/foomatic2loader.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <tqbuffer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 void tdeprint_foomatic2scanner_init( TQIODevice* );
 void tdeprint_foomatic2scanner_terminate();
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index 09a2cf45a..16ec56c32 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -36,8 +36,8 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstaticdeleter.h>
 #include <tdeapplication.h>
diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp
index 7ff1efb95..2b42506f5 100644
--- a/tdeprint/kmjob.cpp
+++ b/tdeprint/kmjob.cpp
@@ -19,7 +19,7 @@
 
 #include "kmjob.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMJob::KMJob()
 : KMObject()
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index ca9b1036f..d43239fd7 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -30,7 +30,7 @@
 #include <tqfile.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <klibloader.h>
diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp
index 22fc9d970..c7676e382 100644
--- a/tdeprint/kmprinter.cpp
+++ b/tdeprint/kmprinter.cpp
@@ -21,7 +21,7 @@
 #include "kprinter.h"
 #include "driver.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 KMPrinter::KMPrinter()
diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp
index 84e120e77..910de4931 100644
--- a/tdeprint/kmspecialmanager.cpp
+++ b/tdeprint/kmspecialmanager.cpp
@@ -26,9 +26,9 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <unistd.h>
diff --git a/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp
index 962653dd2..4dd6966d3 100644
--- a/tdeprint/kmuimanager.cpp
+++ b/tdeprint/kmuimanager.cpp
@@ -36,7 +36,7 @@
 #include "kxmlcommand.h"
 #include "kpposterpage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 KMUiManager::KMUiManager(TQObject *parent, const char *name)
diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp
index b13637904..dabad3093 100644
--- a/tdeprint/kmvirtualmanager.cpp
+++ b/tdeprint/kmvirtualmanager.cpp
@@ -28,11 +28,11 @@
 #include <tqtextstream.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <unistd.h>
 
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index d804cc9f2..10eb6e204 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -35,7 +35,7 @@
 #include <tqlayout.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/kpdriverpage.cpp b/tdeprint/kpdriverpage.cpp
index 18cfeb207..2bea47bc8 100644
--- a/tdeprint/kpdriverpage.cpp
+++ b/tdeprint/kpdriverpage.cpp
@@ -22,7 +22,7 @@
 #include "driver.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KPDriverPage::KPDriverPage(KMPrinter *p, DrMain *d, TQWidget *parent, const char *name)
 : KPrintDialogPage(p,d,parent,name)
diff --git a/tdeprint/kpfileselectpage.cpp b/tdeprint/kpfileselectpage.cpp
index 6847ade2b..8b20386bd 100644
--- a/tdeprint/kpfileselectpage.cpp
+++ b/tdeprint/kpfileselectpage.cpp
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqregexp.h>
 #include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 KPFileSelectPage::KPFileSelectPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp
index 4704abb15..6f46085ee 100644
--- a/tdeprint/kpfilterpage.cpp
+++ b/tdeprint/kpfilterpage.cpp
@@ -27,9 +27,9 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kactivelabel.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp
index ea1ec61e3..821290704 100644
--- a/tdeprint/kpgeneralpage.cpp
+++ b/tdeprint/kpgeneralpage.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Some ID's
 #define ORIENT_PORTRAIT_ID	0
diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp
index ab70211c8..78b9ca6ef 100644
--- a/tdeprint/kpmarginpage.cpp
+++ b/tdeprint/kpmarginpage.cpp
@@ -31,9 +31,9 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, const char *name)
 : KPrintDialogPage(0, driver, parent, name)
diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp
index f719e251b..9c0a42501 100644
--- a/tdeprint/kpposterpage.cpp
+++ b/tdeprint/kpposterpage.cpp
@@ -31,7 +31,7 @@
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 
diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp
index 11b5a6574..c0ca5656e 100644
--- a/tdeprint/kpqtpage.cpp
+++ b/tdeprint/kpqtpage.cpp
@@ -32,7 +32,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #define ORIENT_PORTRAIT_ID	0
diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp
index cc94fe3c8..4a4aac597 100644
--- a/tdeprint/kprintaction.cpp
+++ b/tdeprint/kprintaction.cpp
@@ -23,7 +23,7 @@
 #include <tdeprint/kmmanager.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KPrintAction::KPrintActionPrivate
 {
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 312146855..d881971ff 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -46,18 +46,18 @@
 #include <tqvbox.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqdir.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 95cfc1733..4b9a1c98f 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -35,15 +35,15 @@
 #include <tqguardedptr.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <krun.h>
 #include <knotifyclient.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 static void dumpOptions(const TQMap<TQString,TQString>& opts);
 static void reportError(KPrinter*);
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index ac79220f5..edd380009 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -32,14 +32,14 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdatastream.h>
 #include <kdebug.h>
 #include <kmimemagic.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 
diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp
index 1128a7d3a..c120ba843 100644
--- a/tdeprint/kprinterpropertydialog.cpp
+++ b/tdeprint/kprinterpropertydialog.cpp
@@ -25,9 +25,9 @@
 #include "kmprinter.h"
 #include "driver.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
 
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index 0311f543d..623a7f934 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -34,8 +34,8 @@
 #include <krun.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp
index ec93fcce6..89ef5e2ca 100644
--- a/tdeprint/kprintprocess.cpp
+++ b/tdeprint/kprintprocess.cpp
@@ -19,7 +19,7 @@
 
 #include "kprintprocess.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 KPrintProcess::KPrintProcess()
diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp
index f2dcb99ce..2d5712674 100644
--- a/tdeprint/kxmlcommand.cpp
+++ b/tdeprint/kxmlcommand.cpp
@@ -30,13 +30,13 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 static void setOptionText(DrBase *opt, const TQString& s)
 {
diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp
index e81b3a8cd..3647f0b38 100644
--- a/tdeprint/lpd/klpdprinterimpl.cpp
+++ b/tdeprint/lpd/klpdprinterimpl.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KLpdPrinterImpl::KLpdPrinterImpl(TQObject *parent, const char *name)
 : KPrinterImpl(parent,name)
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index 23c0422d0..e72733f89 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -32,7 +32,7 @@
 #include <tqmap.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kprocess.h>
diff --git a/tdeprint/lpd/kmlpduimanager.cpp b/tdeprint/lpd/kmlpduimanager.cpp
index fad3fcd58..173c03b2b 100644
--- a/tdeprint/lpd/kmlpduimanager.cpp
+++ b/tdeprint/lpd/kmlpduimanager.cpp
@@ -27,7 +27,7 @@
 #include "kmpropdriver.h"
 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLpdUiManager::KMLpdUiManager(TQObject *parent, const char *name)
 : KMUiManager(parent,name)
diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp
index 5131b33f3..54f19c405 100644
--- a/tdeprint/lpd/lpdtools.cpp
+++ b/tdeprint/lpd/lpdtools.cpp
@@ -22,7 +22,7 @@
 #include "kmprinter.h"
 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char *pt_pagesize[] = {
 	"ledger", I18N_NOOP("Ledger"),
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index 4237bda59..e628a1c41 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmacroexpander.h>
 
 KLpdUnixPrinterImpl::KLpdUnixPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index 232a49eb0..7a291f6df 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -26,7 +26,7 @@
 #include <tqfileinfo.h>
 #include <tqtextstream.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/tdeprint/lpdunix/kmlpdunixuimanager.cpp b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
index 686dfecbb..b7f059f1a 100644
--- a/tdeprint/lpdunix/kmlpdunixuimanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
@@ -21,7 +21,7 @@
 #include "kpqtpage.h"
 #include "kprinterpropertydialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLpdUnixUiManager::KMLpdUnixUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp
index 3d144644a..acb0e0c2d 100644
--- a/tdeprint/lpr/apshandler.cpp
+++ b/tdeprint/lpr/apshandler.cpp
@@ -31,7 +31,7 @@
 #include <tqtextstream.h>
 #include <tqvaluestack.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <sys/types.h>
diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp
index 3977f12f8..9a8f9caa2 100644
--- a/tdeprint/lpr/editentrydialog.cpp
+++ b/tdeprint/lpr/editentrydialog.cpp
@@ -28,7 +28,7 @@
 #include <tdelistview.h>
 #include <tqlayout.h>
 #include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const char *name)
diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp
index 8a6988188..fed1dd17d 100644
--- a/tdeprint/lpr/kmconfiglpr.cpp
+++ b/tdeprint/lpr/kmconfiglpr.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
diff --git a/tdeprint/lpr/kmlprjobmanager.cpp b/tdeprint/lpr/kmlprjobmanager.cpp
index 851663664..0738d17c1 100644
--- a/tdeprint/lpr/kmlprjobmanager.cpp
+++ b/tdeprint/lpr/kmlprjobmanager.cpp
@@ -25,7 +25,7 @@
 #include "lprsettings.h"
 
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLprJobManager::KMLprJobManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMJobManager(parent, name)
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 157105e60..046f082f7 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -30,13 +30,13 @@
 
 #include <tqfileinfo.h>
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kprinter.h>
 #include <kprocess.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/lpr/kmlpruimanager.cpp b/tdeprint/lpr/kmlpruimanager.cpp
index 655309e0c..b7d23bb42 100644
--- a/tdeprint/lpr/kmlpruimanager.cpp
+++ b/tdeprint/lpr/kmlpruimanager.cpp
@@ -29,7 +29,7 @@
 #include "kmwbackend.h"
 #include "kmconfiglpr.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLprUiManager::KMLprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp
index f72901865..b366537e5 100644
--- a/tdeprint/lpr/lpchelper.cpp
+++ b/tdeprint/lpr/lpchelper.cpp
@@ -26,7 +26,7 @@
 #include <tqtextstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <stdlib.h>
 
diff --git a/tdeprint/lpr/lprhandler.cpp b/tdeprint/lpr/lprhandler.cpp
index fcb838bb9..767b55382 100644
--- a/tdeprint/lpr/lprhandler.cpp
+++ b/tdeprint/lpr/lprhandler.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqvaluestack.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <unistd.h>
 
diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp
index d3e283123..960f5adb8 100644
--- a/tdeprint/lpr/lprngtoolhandler.cpp
+++ b/tdeprint/lpr/lprngtoolhandler.cpp
@@ -28,7 +28,7 @@
 
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index e1242c5fc..826867cd2 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -29,7 +29,7 @@
 #include "util.h"
 #include "foomatic2loader.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp
index 256b85011..466c75853 100644
--- a/tdeprint/management/kaddprinterwizard.cpp
+++ b/tdeprint/management/kaddprinterwizard.cpp
@@ -1,9 +1,9 @@
 #include "kmmanager.h"
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 static TDECmdLineOptions options[] =
 {
diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp
index 32fb7db11..4cf33998f 100644
--- a/tdeprint/management/kmconfigcommand.cpp
+++ b/tdeprint/management/kmconfigcommand.cpp
@@ -24,7 +24,7 @@
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index 6f0e76e19..50eabe9b1 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -30,7 +30,7 @@
 #include "kmconfigjobs.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 21cbc418e..b7be0a1e6 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -28,7 +28,7 @@
 #include <tqlabel.h>
 #include <tqapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 54ebdb87c..890a42045 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -28,7 +28,7 @@
 #include <tqsettings.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index b7c0a1522..635667cec 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -26,13 +26,13 @@
 #include <tqwhatsthis.h>
 
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <krun.h>
 #include <kmimemagic.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
 #include <klineedit.h>
 #include <kguiitem.h>
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 667b40381..c31e525be 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index 3d084f735..2fdcbcb4b 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -24,7 +24,7 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 2297d4034..6154ebea2 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -24,7 +24,7 @@
 #include <tqprogressdialog.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 9eb28cf87..5a172281b 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -29,7 +29,7 @@
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KMDriverDB* KMDriverDB::m_self = 0;
 
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 42d573e71..50297bdca 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -28,12 +28,12 @@
 #include <tqcheckbox.h>
 #include <kcursor.h>
 #include <tqapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqstrlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
 #include <kguiitem.h>
diff --git a/tdeprint/management/kmdriverdialog.cpp b/tdeprint/management/kmdriverdialog.cpp
index ef37e333c..c43017cc7 100644
--- a/tdeprint/management/kmdriverdialog.cpp
+++ b/tdeprint/management/kmdriverdialog.cpp
@@ -20,8 +20,8 @@
 #include "kmdriverdialog.h"
 #include "driverview.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KMDriverDialog::KMDriverDialog(TQWidget *parent, const char *name)
 : KDialogBase(KDialogBase::Swallow,i18n("Configure"),KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok,parent,name,true,false)
diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp
index 9987ccb4c..bae2b6ad6 100644
--- a/tdeprint/management/kminfopage.cpp
+++ b/tdeprint/management/kminfopage.cpp
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 8c263bb48..0cadf3dba 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -30,10 +30,10 @@
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <tqpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 741e69378..98e9595f9 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -33,15 +33,15 @@
 #include <tdelistview.h>
 #include <kstatusbar.h>
 #include <tqpopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <tdeio/netaccess.h>
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 10741d7fe..806cc0d9f 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -23,7 +23,7 @@
 
 #include <tqheader.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcursor.h>
 
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 5e68f3726..4aba92dad 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -36,15 +36,15 @@
 #include "messagewindow.h"
 
 #include <tqdockarea.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tqtimer.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/tdeprint/management/kmpages.cpp b/tdeprint/management/kmpages.cpp
index 4f0f1f4f7..d0c413966 100644
--- a/tdeprint/management/kmpages.cpp
+++ b/tdeprint/management/kmpages.cpp
@@ -23,7 +23,7 @@
 #include "kmpropertypage.h"
 #include "kminstancepage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 
diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp
index 6d7edb707..d311f75c3 100644
--- a/tdeprint/management/kmprinterview.cpp
+++ b/tdeprint/management/kmprinterview.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
 : TQWidgetStack(parent,name), m_type(KMPrinterView::Icons)
diff --git a/tdeprint/management/kmpropbackend.cpp b/tdeprint/management/kmpropbackend.cpp
index 98004d2ed..00aac2b40 100644
--- a/tdeprint/management/kmpropbackend.cpp
+++ b/tdeprint/management/kmpropbackend.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropBackend::KMPropBackend(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp
index 9c7808199..c94838098 100644
--- a/tdeprint/management/kmpropcontainer.cpp
+++ b/tdeprint/management/kmpropcontainer.cpp
@@ -22,7 +22,7 @@
 
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kguiitem.h>
 
diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp
index 55daf0ed5..6f20494fc 100644
--- a/tdeprint/management/kmpropdriver.cpp
+++ b/tdeprint/management/kmpropdriver.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropgeneral.cpp b/tdeprint/management/kmpropgeneral.cpp
index c55603da9..6b24b0466 100644
--- a/tdeprint/management/kmpropgeneral.cpp
+++ b/tdeprint/management/kmpropgeneral.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropmembers.cpp b/tdeprint/management/kmpropmembers.cpp
index 26671eed8..7fc4155a0 100644
--- a/tdeprint/management/kmpropmembers.cpp
+++ b/tdeprint/management/kmpropmembers.cpp
@@ -23,7 +23,7 @@
 
 #include <tqtextview.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp
index ae8b03cbf..50c1a75e8 100644
--- a/tdeprint/management/kmpropwidget.cpp
+++ b/tdeprint/management/kmpropwidget.cpp
@@ -23,8 +23,8 @@
 #include "kmmanager.h"
 #include "kmtimer.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 KMPropWidget::KMPropWidget(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index 2d2a245c7..7c4c0173d 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -34,8 +34,8 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kicondialog.h>
 #include <tdefiledialog.h>
 #include <kseparator.h>
diff --git a/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp
index 6fd8cf2dc..b2e8fdcd4 100644
--- a/tdeprint/management/kmwbackend.cpp
+++ b/tdeprint/management/kmwbackend.cpp
@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kdialog.h>
 #include <kdebug.h>
diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp
index aee060e5f..e04467632 100644
--- a/tdeprint/management/kmwclass.cpp
+++ b/tdeprint/management/kmwclass.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 KMWClass::KMWClass(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwdriver.cpp b/tdeprint/management/kmwdriver.cpp
index 58793c192..9876c0420 100644
--- a/tdeprint/management/kmwdriver.cpp
+++ b/tdeprint/management/kmwdriver.cpp
@@ -24,7 +24,7 @@
 #include "kmdriverdb.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMWDriver::KMWDriver(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp
index f60dcface..cc52f1015 100644
--- a/tdeprint/management/kmwdriverselect.cpp
+++ b/tdeprint/management/kmwdriverselect.cpp
@@ -27,8 +27,8 @@
 #include <tqlayout.h>
 #include <kpushbutton.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index cb46a45a0..73871988a 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -28,9 +28,9 @@
 #include <tqlabel.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
 #include <tdeio/netaccess.h>
 
diff --git a/tdeprint/management/kmwend.cpp b/tdeprint/management/kmwend.cpp
index 2881b4ea0..4ad564cf6 100644
--- a/tdeprint/management/kmwend.cpp
+++ b/tdeprint/management/kmwend.cpp
@@ -23,7 +23,7 @@
 #include "util.h"
 
 #include <tqtextview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 
 KMWEnd::KMWEnd(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp
index f3b54dcdc..58a61e8e4 100644
--- a/tdeprint/management/kmwfile.cpp
+++ b/tdeprint/management/kmwfile.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 KMWFile::KMWFile(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwinfopage.cpp b/tdeprint/management/kmwinfopage.cpp
index fd9e92697..175ff7e74 100644
--- a/tdeprint/management/kmwinfopage.cpp
+++ b/tdeprint/management/kmwinfopage.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kactivelabel.h>
 
 KMWInfoPage::KMWInfoPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index 5bb86967a..bc894c478 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -26,9 +26,9 @@
 #include <kpushbutton.h>
 #include <tqlabel.h>
 #include <tqwidgetstack.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kseparator.h>
 #include <tdeapplication.h>
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index ea79563ec..424e40100 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -23,13 +23,13 @@
 #include "kmfactory.h"
 #include "kmmanager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 KMWLocal::KMWLocal(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp
index 352a075c5..3c4794ad1 100644
--- a/tdeprint/management/kmwlpd.cpp
+++ b/tdeprint/management/kmwlpd.cpp
@@ -23,11 +23,11 @@
 #include "kmprinter.h"
 
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <kdebug.h>
 #include <tqlineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kextsock.h>
 
 static bool checkLpdQueue(const char *host, const char *queue);
diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp
index fe567f7bb..e8378371a 100644
--- a/tdeprint/management/kmwname.cpp
+++ b/tdeprint/management/kmwname.cpp
@@ -23,8 +23,8 @@
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqregexp.h>
 
 KMWName::KMWName(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp
index 8490a179c..3cd71aadd 100644
--- a/tdeprint/management/kmwpassword.cpp
+++ b/tdeprint/management/kmwpassword.cpp
@@ -26,7 +26,7 @@
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp
index e76240cf8..836a7fb15 100644
--- a/tdeprint/management/kmwsmb.cpp
+++ b/tdeprint/management/kmwsmb.cpp
@@ -23,7 +23,7 @@
 #include "kmprinter.h"
 #include "util.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index 6b8f4aae9..a3fb71b3d 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -26,9 +26,9 @@
 #include <tqheader.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index a4f23959a..02b0a6b69 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -27,13 +27,13 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <knumvalidator.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kextsock.h>
 #include <kdebug.h>
 
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 2080149d9..9b165e432 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -38,13 +38,13 @@
 #include <tqapplication.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <kseparator.h>
 #include <tdelistbox.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index 67627fb53..08722cf6e 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -30,9 +30,9 @@
 #include <tqtooltip.h>
 #include <tqlineedit.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kseparator.h>
 #include <kguiitem.h>
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index 1943f9354..ee4e7dbc7 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -30,9 +30,9 @@
 #include <tqlineedit.h>
 #include <tqregexp.h>
 #include <tqsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kextendedsocket.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knumvalidator.h>
 #include <kdebug.h>
 #include <unistd.h>
diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp
index 10ac359f9..f5977bfb0 100644
--- a/tdeprint/management/smbview.cpp
+++ b/tdeprint/management/smbview.cpp
@@ -20,14 +20,14 @@
 #include "smbview.h"
 
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqheader.h>
 #include <tqapplication.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
 
 #include <tqfile.h>
diff --git a/tdeprint/management/tdeprint_management_module.cpp b/tdeprint/management/tdeprint_management_module.cpp
index d15ef791f..89d315c0f 100644
--- a/tdeprint/management/tdeprint_management_module.cpp
+++ b/tdeprint/management/tdeprint_management_module.cpp
@@ -26,9 +26,9 @@
 #include "kmprinter.h"
 #include "kmmainview.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/tdeprint/marginpreview.cpp b/tdeprint/marginpreview.cpp
index 2a5e21e59..45f70b7f1 100644
--- a/tdeprint/marginpreview.cpp
+++ b/tdeprint/marginpreview.cpp
@@ -19,7 +19,7 @@
 
 #include "marginpreview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqpainter.h>
 #include <kcursor.h>
diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp
index 3ec1872f2..c483be123 100644
--- a/tdeprint/marginwidget.cpp
+++ b/tdeprint/marginwidget.cpp
@@ -27,8 +27,8 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricUnit)
 : TQWidget(parent, name), m_default(4, 0), m_pagesize( 2 )
diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp
index 9ccfc8074..b2a686f6e 100644
--- a/tdeprint/plugincombobox.cpp
+++ b/tdeprint/plugincombobox.cpp
@@ -24,7 +24,7 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqwhatsthis.h>
 
 PluginComboBox::PluginComboBox(TQWidget *parent, const char *name)
diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp
index b76c0181a..0839af3d7 100644
--- a/tdeprint/posterpreview.cpp
+++ b/tdeprint/posterpreview.cpp
@@ -25,9 +25,9 @@
 #include <tqtimer.h>
 #include <tqpixmap.h>
 #include <kprinter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 PosterPreview::PosterPreview( TQWidget *parent, const char *name )
 	: TQFrame( parent, name )
diff --git a/tdeprint/ppdloader.cpp b/tdeprint/ppdloader.cpp
index dcf272b0a..b829e2e17 100644
--- a/tdeprint/ppdloader.cpp
+++ b/tdeprint/ppdloader.cpp
@@ -23,7 +23,7 @@
 
 #include <kfilterdev.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <math.h>
 
diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp
index d1889dd1c..4fc362350 100644
--- a/tdeprint/printerfilter.cpp
+++ b/tdeprint/printerfilter.cpp
@@ -22,7 +22,7 @@
 #include "kmfactory.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 PrinterFilter::PrinterFilter(TQObject *parent, const char *name)
diff --git a/tdeprint/rlpr/kmconfigproxy.cpp b/tdeprint/rlpr/kmconfigproxy.cpp
index 78513dad3..d41adcdee 100644
--- a/tdeprint/rlpr/kmconfigproxy.cpp
+++ b/tdeprint/rlpr/kmconfigproxy.cpp
@@ -21,7 +21,7 @@
 #include "kmproxywidget.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMConfigProxy::KMConfigProxy(TQWidget *parent)
 : KMConfigPage(parent,"Proxy")
diff --git a/tdeprint/rlpr/kmproprlpr.cpp b/tdeprint/rlpr/kmproprlpr.cpp
index 62fe97827..08713a784 100644
--- a/tdeprint/rlpr/kmproprlpr.cpp
+++ b/tdeprint/rlpr/kmproprlpr.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index a2a3e6a85..870da43c4 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 
diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp
index c6704ed09..7b8ceac2d 100644
--- a/tdeprint/rlpr/kmrlprmanager.cpp
+++ b/tdeprint/rlpr/kmrlprmanager.cpp
@@ -26,7 +26,7 @@
 #include <tqmap.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMRlprManager::KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMManager(parent,name)
diff --git a/tdeprint/rlpr/kmrlpruimanager.cpp b/tdeprint/rlpr/kmrlpruimanager.cpp
index 9bae2cdc4..fa6383962 100644
--- a/tdeprint/rlpr/kmrlpruimanager.cpp
+++ b/tdeprint/rlpr/kmrlpruimanager.cpp
@@ -26,7 +26,7 @@
 #include "kmproprlpr.h"
 #include "kmconfigproxy.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMRlprUiManager::KMRlprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp
index 79682b91a..056cba1f0 100644
--- a/tdeprint/rlpr/kmwrlpr.cpp
+++ b/tdeprint/rlpr/kmwrlpr.cpp
@@ -29,7 +29,7 @@
 #include <tqlineedit.h>
 #include <tqheader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 static TQListViewItem* rlpr_findChild(TQListViewItem *c, const TQString& txt)
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 8ca1c6569..4ef5ebe1e 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KRlprPrinterImpl::KRlprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KPrinterImpl(parent,name)
diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp
index 19ffb481b..bf2fb3d12 100644
--- a/tdeprint/tdefilelist.cpp
+++ b/tdeprint/tdefilelist.cpp
@@ -29,7 +29,7 @@
 #include <tdeio/netaccess.h>
 #include <kurldrag.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <krun.h>
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 5080cc40c..9b7b6c955 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -21,9 +21,9 @@
 #include "kprintprocess.h"
 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <tdeio/passdlg.h>
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index 11cf22fd2..54d160c73 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -13,7 +13,7 @@
 #include <tqstatusbar.h>
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <tqtoolbutton.h>
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index de54f2de1..9afff64ac 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -25,8 +25,8 @@
 #include <tqcheckbox.h>
 #include <tqaccel.h>
 #include <kdemacros.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
diff --git a/tdeprint/util.h b/tdeprint/util.h
index dafcdaa90..75811aee6 100644
--- a/tdeprint/util.h
+++ b/tdeprint/util.h
@@ -23,7 +23,7 @@
 #include "kprinter.h"
 #include <tqstring.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KURL smbToUrl(const TQString& work, const TQString& server, const TQString& printer);
 void urlToSmb(const KURL& url, TQString& work, TQString& server, TQString& printer);
diff --git a/tderandr/ktimerdialog.cpp b/tderandr/ktimerdialog.cpp
index 0be416be7..eba497372 100644
--- a/tderandr/ktimerdialog.cpp
+++ b/tderandr/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/tderandr/libtderandr.cc b/tderandr/libtderandr.cc
index 976b156ac..fe9461715 100644
--- a/tderandr/libtderandr.cc
+++ b/tderandr/libtderandr.cc
@@ -26,8 +26,8 @@
 #include <tqtimer.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 
 #include <stdlib.h>
diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp
index 68bfc2e68..59fd0e8ae 100644
--- a/tderandr/randr.cpp
+++ b/tderandr/randr.cpp
@@ -22,8 +22,8 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
diff --git a/tderesources/configdialog.cpp b/tderesources/configdialog.cpp
index b6d29dcd3..4eb528835 100644
--- a/tderesources/configdialog.cpp
+++ b/tderesources/configdialog.cpp
@@ -21,9 +21,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp
index e70332c71..8378707e6 100644
--- a/tderesources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -28,8 +28,8 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/tderesources/factory.cpp b/tderesources/factory.cpp
index 09140e7b7..eea2d3673 100644
--- a/tderesources/factory.cpp
+++ b/tderesources/factory.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
diff --git a/tderesources/kcmtderesources.cpp b/tderesources/kcmtderesources.cpp
index 1b779fabd..c3d5ae09e 100644
--- a/tderesources/kcmtderesources.cpp
+++ b/tderesources/kcmtderesources.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeaboutdata.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configpage.h"
 
diff --git a/tderesources/resource.cpp b/tderesources/resource.cpp
index 41c08767e..e6fc4ebbd 100644
--- a/tderesources/resource.cpp
+++ b/tderesources/resource.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "resource.h"
 
 using namespace KRES;
diff --git a/tderesources/selectdialog.cpp b/tderesources/selectdialog.cpp
index c50bd36fd..c8009ae47 100644
--- a/tderesources/selectdialog.cpp
+++ b/tderesources/selectdialog.cpp
@@ -23,8 +23,8 @@
 
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqgroupbox.h>
 #include <tqlayout.h>
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 78df9e335..675044140 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -71,13 +71,13 @@
 #include <tqbuttongroup.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 
 #include <twin.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kprogressbox.h>
 #include <kpassdlg.h>
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index a4908fe63..b57c350a4 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -49,14 +49,14 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 
 #include <twin.h>
 #include <kurl.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kprogressbox.h>
 #include <kpassdlg.h>
diff --git a/tdespell2/settings.cpp b/tdespell2/settings.cpp
index 57535b85c..a23fb062f 100644
--- a/tdespell2/settings.cpp
+++ b/tdespell2/settings.cpp
@@ -23,8 +23,8 @@
 
 #include "broker.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/tdespell2/ui/configdialog.cpp b/tdespell2/ui/configdialog.cpp
index 56e39ca2b..288d62a29 100644
--- a/tdespell2/ui/configdialog.cpp
+++ b/tdespell2/ui/configdialog.cpp
@@ -21,7 +21,7 @@
 #include "configdialog.h"
 #include "configwidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvbox.h>
 
diff --git a/tdespell2/ui/configwidget.cpp b/tdespell2/ui/configwidget.cpp
index 6d98955ae..2317f7307 100644
--- a/tdespell2/ui/configwidget.cpp
+++ b/tdespell2/ui/configwidget.cpp
@@ -26,7 +26,7 @@
 
 #include <keditlistbox.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp
index a0ff36c01..0c45f3cd1 100644
--- a/tdespell2/ui/dialog.cpp
+++ b/tdespell2/ui/dialog.cpp
@@ -28,7 +28,7 @@
 #include "settings.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqlistview.h>
diff --git a/tdesu/ssh.cpp b/tdesu/ssh.cpp
index f45b38e7e..c23ca459b 100644
--- a/tdesu/ssh.cpp
+++ b/tdesu/ssh.cpp
@@ -32,7 +32,7 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "ssh.h"
diff --git a/tdesu/su.cpp b/tdesu/su.cpp
index d75970dd8..e29288ab9 100644
--- a/tdesu/su.cpp
+++ b/tdesu/su.cpp
@@ -35,7 +35,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "su.h"
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> 
diff --git a/tdeunittest/modrunner.cpp b/tdeunittest/modrunner.cpp
index 4caa2d609..350778f6c 100644
--- a/tdeunittest/modrunner.cpp
+++ b/tdeunittest/modrunner.cpp
@@ -24,11 +24,11 @@
  */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "runner.h"
 
diff --git a/tdeunittest/runner.cpp b/tdeunittest/runner.cpp
index 6a961fecd..c63b6ed6c 100644
--- a/tdeunittest/runner.cpp
+++ b/tdeunittest/runner.cpp
@@ -35,7 +35,7 @@ using namespace std;
 
 #include <kdebug.h>
 #include <klibloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "runner.h"
diff --git a/tdeunittest/tester.h b/tdeunittest/tester.h
index 332381ec8..b0ce3e685 100644
--- a/tdeunittest/tester.h
+++ b/tdeunittest/tester.h
@@ -138,7 +138,7 @@ SampleTest - 1 test passed, 1 test failed
  * #include <tdeapplication.h>
  * #include <tdecmdlineargs.h>
  * #include <tdecmdlineargs.h>
- * #include <klocale.h>
+ * #include <tdelocale.h>
  * #include <tdeunittest/runnergui.h>
  *
  * static const char description[] = I18N_NOOP("SampleTests");
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index 9bb067ca0..6a074040b 100644
--- a/tdeutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
@@ -31,8 +31,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstdguiitem.h>
diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h
index 46dde98fb..ca6d2d6c7 100644
--- a/tdeutils/kcmultidialog.h
+++ b/tdeutils/kcmultidialog.h
@@ -26,7 +26,7 @@
 #include <tqptrdict.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 
 class TDECModuleProxy;
diff --git a/tdeutils/kfind.cpp b/tdeutils/kfind.cpp
index 99ef317b6..74fb46e9a 100644
--- a/tdeutils/kfind.cpp
+++ b/tdeutils/kfind.cpp
@@ -22,8 +22,8 @@
 #include "kfind.h"
 #include "kfinddialog.h"
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
 #include <tqstylesheet.h>
diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp
index d9a5284e1..718fdca2f 100644
--- a/tdeutils/kfinddialog.cpp
+++ b/tdeutils/kfinddialog.cpp
@@ -29,8 +29,8 @@
 #include <tqregexp.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <assert.h>
 #include <tqwhatsthis.h>
 
diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp
index cb93b2600..9ea0eb2bc 100644
--- a/tdeutils/kplugininfo.cpp
+++ b/tdeutils/kplugininfo.cpp
@@ -22,7 +22,7 @@
 #include <ktrader.h>
 #include <kdebug.h>
 #include <tdeconfigbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kservice.h>
diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index 5747df7c4..9fe08b027 100644
--- a/tdeutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -35,12 +35,12 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <ksimpleconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <ktabctl.h>
 #include <tdecmoduleinfo.h>
diff --git a/tdeutils/kreplace.cpp b/tdeutils/kreplace.cpp
index 0aad733da..98e3ce93c 100644
--- a/tdeutils/kreplace.cpp
+++ b/tdeutils/kreplace.cpp
@@ -22,8 +22,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include "kreplace.h"
 #include "kreplacedialog.h"
 #include <tqregexp.h>
diff --git a/tdeutils/kreplacedialog.cpp b/tdeutils/kreplacedialog.cpp
index 88c006b4d..d8e74af44 100644
--- a/tdeutils/kreplacedialog.cpp
+++ b/tdeutils/kreplacedialog.cpp
@@ -26,8 +26,8 @@
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 /**
diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp
index 50ad97a03..f60613bce 100644
--- a/tdeutils/ksettings/componentsdialog.cpp
+++ b/tdeutils/ksettings/componentsdialog.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "ksettings/componentsdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tdelistview.h>
 #include <tqlabel.h>
diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp
index 49918b5e7..e74b9ac48 100644
--- a/tdeutils/ksettings/dialog.cpp
+++ b/tdeutils/ksettings/dialog.cpp
@@ -21,7 +21,7 @@
 
 
 #include <kcmultidialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
 #include <ktrader.h>
diff --git a/tdeutils/tdecmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp
index c379a9857..004ceb78a 100644
--- a/tdeutils/tdecmodulecontainer.cpp
+++ b/tdeutils/tdecmodulecontainer.cpp
@@ -30,7 +30,7 @@
 #include <tdecmoduleproxy.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kservice.h>
diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp
index 3a7fdfd63..4869bb1ef 100644
--- a/tdeutils/tdecmoduleinfo.cpp
+++ b/tdeutils/tdecmoduleinfo.cpp
@@ -25,9 +25,9 @@
 
 #include <kdesktopfile.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdecmoduleinfo.h"
 
diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp
index 73f92379f..ced28ae7a 100644
--- a/tdeutils/tdecmoduleloader.cpp
+++ b/tdeutils/tdecmoduleloader.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 
 #include "tdecmoduleloader.h"
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 2d3150935..eeac43b02 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -42,7 +42,7 @@
 #include <tdecmoduleloader.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
diff --git a/tdewallet/backend/tdewalletbackend.cc b/tdewallet/backend/tdewalletbackend.cc
index 9871b9d7b..17fecae0c 100644
--- a/tdewallet/backend/tdewalletbackend.cc
+++ b/tdewallet/backend/tdewalletbackend.cc
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
index 7668b90a7..75d475b97 100644
--- a/tdewallet/tests/tdewalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -5,7 +5,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <tdewallet.h>
diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
index a5ba26711..efeeebc98 100644
--- a/tdewallet/tests/tdewalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -5,7 +5,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <tdewallet.h>
diff --git a/tdewallet/tests/tdewalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp
index 4774e289e..9ee39e4d4 100644
--- a/tdewallet/tests/tdewalletsync.cpp
+++ b/tdewallet/tests/tdewalletsync.cpp
@@ -5,7 +5,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <tdewallet.h>
diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro
index 7e38e3c7d..b3eae05b4 100644
--- a/win/pro_files/kabc/kabc.pro
+++ b/win/pro_files/kabc/kabc.pro
@@ -8,8 +8,8 @@ LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUF
 	$$KDELIBDESTDIR\tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX
 
-INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
-	$(KDELIBS)/kabc/vcardparser
+INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \
+	$(KDELIBS)/tdeabc/vcardparser
 
 system( bash kmoc )
 system( bash kdcopidl )
diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro
index 8dedc015e..e2de8e6d7 100644
--- a/win/pro_files/kabc/vcard/vcard.pro
+++ b/win/pro_files/kabc/vcard/vcard.pro
@@ -7,8 +7,8 @@ DEFINES += MAKE_KVCARD_LIB
 
 LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX 
 
-INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
-	$(KDELIBS)/kabc/vcardparser
+INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \
+	$(KDELIBS)/tdeabc/vcardparser
 
 system( bash kmoc )
 system( bash kdcopidl )
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index da790d7d1..dc16d76b8 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -46,7 +46,7 @@ tdeio/kdcopservicestarter.cpp \
 tdeio/kdirlister.cpp \
 tdeio/kdirnotify.cpp \
 tdeio/kdirwatch.cpp \
-tdeio/kemailsettings.cpp \
+tdeio/tdeemailsettings.cpp \
 tdeio/tdefilefilter.cpp \
 tdeio/tdefileitem.cpp \
 tdeio/tdefilemetainfo.cpp \
@@ -59,7 +59,7 @@ tdeio/kmimetype.cpp \
 tdeio/kmimetypechooser.cpp \
 tdeio/knfsshare.cpp \
 tdeio/kprotocolinfo.cpp \
-tdeio/kprotocolmanager.cpp \
+tdeio/tdeprotocolmanager.cpp \
 tdeio/kremoteencoding.cpp \
 tdeio/krun.cpp \
 tdeio/ksambashare.cpp \
@@ -118,7 +118,7 @@ bookmarks/kbookmarkmenu.cc \
 \
 tdefile/kcombiview.cpp \
 tdefile/kcustommenueditor.cpp \
-tdefile/kdiroperator.cpp \
+tdefile/tdediroperator.cpp \
 tdefile/kdirselectdialog.cpp \
 tdefile/kdirsize.cpp \
 tdefile/kdiskfreesp.cpp \
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 7e564a250..fbc415726 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -49,9 +49,9 @@ kstandarddirs.cpp \
 tdeconfig.cpp \
 tdeconfigdialogmanager.cpp \
 kcharsets.cpp \
-kglobal.cpp \
+tdeglobal.cpp \
 kdebug.cpp \
-ktempfile.cpp \
+tdetempfile.cpp \
 ktempdir.cpp \
 ksavefile.cpp \
 tdeconfigbackend.cpp \
@@ -70,11 +70,11 @@ tdeshortcutmenu.cpp \
 tdeshortcutlist.cpp \
 kinstance.cpp \
 tdeversion.cpp \
-klocale.cpp \
+tdelocale.cpp \
 kicontheme.cpp \
 kiconloader.cpp \
 kiconeffect.cpp \
-kglobalsettings.cpp \
+tdeglobalsettings.cpp \
 kckey.cpp \
 kglobalaccel.cpp \
 kglobalaccel_win.cpp \
@@ -120,7 +120,7 @@ kqiodevicegzip_p.cpp
 #network/tdesocketdevice.cpp \
 #network/ksockssocketdevice.cpp
 
-#kstartupinfo.cpp \
+#tdestartupinfo.cpp \
 #todo: kextsock.cpp \
 #todo: ksock.cpp \
 #todo: ksocks.cpp \
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index b5a506f8b..aa1065c7d 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -71,7 +71,7 @@ tdelistview.cpp \
 tdelistviewsearchline.cpp \
 tdemainwindowiface.cpp \
 tdemainwindow.cpp \
-kmenubar.cpp \
+tdemenubar.cpp \
 knuminput.cpp \
 knumvalidator.cpp \
 kpanelapplet.cpp \
@@ -132,7 +132,7 @@ exists( kmessagebox_win.cpp ) {
  SOURCES += kmessagebox_win.cpp
 }
 !exists( kmessagebox_win.cpp ) {
- SOURCES += kmessagebox.cpp
+ SOURCES += tdemessagebox.cpp
 }
 
 # generated:
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index 3fcfe0c20..79f3b0f32 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -48,7 +48,7 @@ tdecore \
 tdeui \
 kio \
 tderesources \
-kabc/vcard \
+tdeabc/vcard \
 kabc \
 tdeutils \
 tdeparts \
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 399dcadda..2fe77ef36 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -48,7 +48,7 @@ tdeui \
 kstyles/thinkeramik/widget-engine \
 kio \
 tderesources \
-kabc/vcard \
+tdeabc/vcard \
 kabc \
 tdeutils \
 tdeparts \