Rename additional header files to avoid conflicts with KDE4

74 files changed, 129 insertions, 129 deletions

diff --git a/libtdepim/addresseediffalgo.h b/libtdepim/addresseediffalgo.h
index f3c6632a7..991d46fbd 100644
--- a/libtdepim/addresseediffalgo.h
+++ b/libtdepim/addresseediffalgo.h
@@ -22,7 +22,7 @@
 #ifndef KPIM_ADDRESSEEDIFFALGO_H
 #define KPIM_ADDRESSEEDIFFALGO_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <libtdepim/diffalgo.h>
 
 namespace KPIM {
diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp
index 9cbbeb027..11e9af2c6 100644
--- a/libtdepim/addresseeemailselection.cpp
+++ b/libtdepim/addresseeemailselection.cpp
@@ -19,9 +19,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "recentaddresses.h"
 
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index bfb736b56..2277182bc 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -34,11 +34,11 @@
 #ifdef TDEPIM_NEW_DISTRLISTS
 #include "distributionlist.h"
 #else
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
 #endif
 
-#include <kabc/stdaddressbook.h>
-#include <kabc/resource.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/resource.h>
 #include <libemailfunctions/email.h>
 
 #include <tdecompletionbox.h>
@@ -48,7 +48,7 @@
 #include <kstaticdeleter.h>
 #include <tdestdaccel.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpopupmenu.h>
 #include <tqapplication.h>
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 035f285da..169d807e0 100644
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@@ -32,7 +32,7 @@
 #include <tqpair.h>
 #include <tqvaluelist.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include "clicklineedit.h"
 #include "kmailcompletion.h"
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index 082b73c54..30288d0aa 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -25,14 +25,14 @@
 #include <tqsignalmapper.h>
 #include <tqtoolbutton.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <kcombobox.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "addresseeselector.h"
 
diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h
index f06c030bc..92c544789 100644
--- a/libtdepim/addresseeselector.h
+++ b/libtdepim/addresseeselector.h
@@ -22,9 +22,9 @@
 #ifndef KPIM_ADDRESSEESELECTOR_H
 #define KPIM_ADDRESSEESELECTOR_H
 
-#include <kabc/addressee.h>
-#include <kabc/distributionlist.h>
-#include <kabc/resource.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/distributionlist.h>
+#include <tdeabc/resource.h>
 #include <kdialogbase.h>
 #include <tdepimmacros.h>
 
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index e4c0a0c48..aebb108cd 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -24,23 +24,23 @@
 #include <tqpopupmenu.h>
 #include <tqurl.h>
 
-#include <kabc/address.h>
-#include <kabc/addressee.h>
-#include <kabc/phonenumber.h>
-#include <kabc/resource.h>
+#include <tdeabc/address.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/phonenumber.h>
+#include <tdeabc/resource.h>
 #include <tdeactionclasses.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <kdebug.h>
 
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 92760529a..af7ee4b19 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -24,7 +24,7 @@
 
 #include <tqcstring.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <ktextbrowser.h>
 #include <tdeimproxy.h>
 #include <tdepimmacros.h>
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index d7c540031..aa52f4625 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -33,20 +33,20 @@
 #ifdef TDEPIM_NEW_DISTRLISTS
 #include "distributionlist.h"
 #include <tderesources/selectdialog.h>
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 #else
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
 #endif
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kpushbutton.h>
 #include <krun.h>
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index ba9eaf1f5..c27ed68bf 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -25,7 +25,7 @@
 #ifndef ADDRESSESDIALOG_H
 #define ADDRESSESDIALOG_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
 #include <tqstringlist.h>
diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp
index d7a26944e..905c46fab 100644
--- a/libtdepim/broadcaststatus.cpp
+++ b/libtdepim/broadcaststatus.cpp
@@ -16,8 +16,8 @@
 
 #include <tqdatetime.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 
 #include "broadcaststatus.h"
diff --git a/libtdepim/calendardiffalgo.cpp b/libtdepim/calendardiffalgo.cpp
index 587d0dc0c..a7d333ae0 100644
--- a/libtdepim/calendardiffalgo.cpp
+++ b/libtdepim/calendardiffalgo.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "calendardiffalgo.h"
 
diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp
index a6ab6e77c..26abbc070 100644
--- a/libtdepim/categoryeditdialog.cpp
+++ b/libtdepim/categoryeditdialog.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kpimprefs.h"
 
diff --git a/libtdepim/categoryselectdialog.cpp b/libtdepim/categoryselectdialog.cpp
index 36996614e..cf1b2ac6d 100644
--- a/libtdepim/categoryselectdialog.cpp
+++ b/libtdepim/categoryselectdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqheader.h>
 
 #include "categoryselectdialog_base.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "categoryselectdialog.h"
 
 #include "kpimprefs.h"
diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp
index ea94e0916..746c07141 100644
--- a/libtdepim/cfgc/autoexample.cpp
+++ b/libtdepim/cfgc/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 <kautoconfigdialog.h>
diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp
index ab58e0d20..8af18fc37 100644
--- a/libtdepim/cfgc/example.cpp
+++ b/libtdepim/cfgc/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/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 1ee6f8a88..a94b62217 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -33,11 +33,11 @@
 #include "ldapclient.h"
 #include "resourceabc.h"
 
-#include <kabc/stdaddressbook.h>
-#include <kabc/resource.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/resource.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
@@ -59,7 +59,7 @@ The default completion weights are as follow:
   LDAP: 50, 49, 48 etc.          (see ldapclient.cpp)
   KABC non-imap resources: 60    (see addresseelineedit.cpp and SimpleCompletionItem here)
   Distribution lists: 60         (see addresseelineedit.cpp and SimpleCompletionItem here)
-  KABC imap resources: 80        (see tderesources/imap/kabc/resourceimap.cpp)
+  KABC imap resources: 80        (see tderesources/imap/tdeabc/resourceimap.cpp)
 
 This dialog allows to change those weights, by showing one item per:
  - LDAP server
diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp
index d3c648096..bb4d8ea99 100644
--- a/libtdepim/csshelper.cpp
+++ b/libtdepim/csshelper.cpp
@@ -32,9 +32,9 @@
 #include "csshelper.h"
 
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqstring.h>
 #include <tqapplication.h>
diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h
index 8e870bd4e..dd05b3369 100644
--- a/libtdepim/designerfields.h
+++ b/libtdepim/designerfields.h
@@ -22,7 +22,7 @@
 #ifndef KPIM_DESIGNERFIELDS_H
 #define KPIM_DESIGNERFIELDS_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqmap.h>
 #include <tqpair.h>
diff --git a/libtdepim/distributionlist.cpp b/libtdepim/distributionlist.cpp
index 4cf079c76..f5742a144 100644
--- a/libtdepim/distributionlist.cpp
+++ b/libtdepim/distributionlist.cpp
@@ -1,5 +1,5 @@
 #include "distributionlist.h"
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 static const char* s_customFieldName = "DistributionList";
 
diff --git a/libtdepim/distributionlist.h b/libtdepim/distributionlist.h
index afc5a5bd2..433e95b5c 100644
--- a/libtdepim/distributionlist.h
+++ b/libtdepim/distributionlist.h
@@ -21,7 +21,7 @@
 #ifndef DISTRIBUTIONLIST_H
 #define DISTRIBUTIONLIST_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 namespace KABC {
 class AddressBook;
diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp
index b8567d774..79bf58637 100644
--- a/libtdepim/embeddedurlpage.cpp
+++ b/libtdepim/embeddedurlpage.cpp
@@ -26,7 +26,7 @@
 #include <tdeparts/browserextension.h>
 #include <tdeparts/part.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 
diff --git a/libtdepim/htmldiffalgodisplay.cpp b/libtdepim/htmldiffalgodisplay.cpp
index 03553c6d8..6b7ac1eff 100644
--- a/libtdepim/htmldiffalgodisplay.cpp
+++ b/libtdepim/htmldiffalgodisplay.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <libtdepim/htmldiffalgodisplay.h>
 
diff --git a/libtdepim/kabcresourcecached.cpp b/libtdepim/kabcresourcecached.cpp
index df8ecbcad..935fc942c 100644
--- a/libtdepim/kabcresourcecached.cpp
+++ b/libtdepim/kabcresourcecached.cpp
@@ -20,9 +20,9 @@
 
 #include <tqfile.h>
 
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "kabcresourcecached.h"
@@ -30,7 +30,7 @@
 using namespace KABC;
 
 ResourceCached::ResourceCached( const TDEConfig *config )
-  : KABC::Resource( config ), mIdMapper( "kabc/uidmaps/" ),
+  : KABC::Resource( config ), mIdMapper( "tdeabc/uidmaps/" ),
     mReloadPolicy( ReloadInterval ),  mReloadInterval( 10 ),
     mKABCReloadTimer( 0, "mKABCReloadTimer" ), mReloaded( false ),
     mSavePolicy( SaveDelayed ), mSaveInterval( 10 ),
@@ -342,12 +342,12 @@ KABC::Addressee::List ResourceCached::deletedAddressees() const
 
 TQString ResourceCached::cacheFile() const
 {
-  return locateLocal( "cache", "kabc/tderesources/" + identifier() );
+  return locateLocal( "cache", "tdeabc/tderesources/" + identifier() );
 }
 
 TQString ResourceCached::changesCacheFile( const TQString &type ) const
 {
-  return locateLocal( "cache", "kabc/changescache/" + identifier() + "_" + type );
+  return locateLocal( "cache", "tdeabc/changescache/" + identifier() + "_" + type );
 }
 
 void ResourceCached::saveChangesCache( const TQMap<TQString, KABC::Addressee> &map, const TQString &type )
diff --git a/libtdepim/kabcresourcecached.h b/libtdepim/kabcresourcecached.h
index db46ee27f..aab4a192a 100644
--- a/libtdepim/kabcresourcecached.h
+++ b/libtdepim/kabcresourcecached.h
@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCECACHED_H
 #define KABC_RESOURCECACHED_H
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 #include <tdepimmacros.h>
 
 #include <tqdatetime.h>
diff --git a/libtdepim/kabcresourcenull.h b/libtdepim/kabcresourcenull.h
index a926e2059..dfc731f79 100644
--- a/libtdepim/kabcresourcenull.h
+++ b/libtdepim/kabcresourcenull.h
@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCENULL_H
 #define KABC_RESOURCENULL_H
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 namespace KABC {
 
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index 9da5eb628..291669216 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -10,18 +10,18 @@
 #ifdef TDEPIM_NEW_DISTRLISTS
 #include "distributionlist.h"
 #else
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
 #endif
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeversion.h>
-#include <kabc/resource.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/vcardconverter.h>
-#include <kabc/errorhandler.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/vcardconverter.h>
+#include <tdeabc/errorhandler.h>
 #include <tderesources/selectdialog.h>
 #include <dcopref.h>
 #include <dcopclient.h>
diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h
index e15d7a9f8..10b896098 100644
--- a/libtdepim/kaddrbook.h
+++ b/libtdepim/kaddrbook.h
@@ -8,7 +8,7 @@
 #include <tqstringlist.h>
 
 #include <tdeversion.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tdepimmacros.h>
 
 namespace KABC {
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index eda7248a9..9156452c1 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -37,15 +37,15 @@
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <kactivelabel.h>
 #include <kdirwatch.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tdeio/netaccess.h>
 
diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp
index 73f0586a6..dd6b4e480 100644
--- a/libtdepim/kdateedit.cpp
+++ b/libtdepim/kdateedit.cpp
@@ -28,9 +28,9 @@
 #include <tqvalidator.h>
 
 #include <kcalendarsystem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include "kdateedit.h"
 
diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp
index f6e7031e0..d9ffe8c3f 100644
--- a/libtdepim/kdatepickerpopup.cpp
+++ b/libtdepim/kdatepickerpopup.cpp
@@ -22,7 +22,7 @@
 #include <tqdatetime.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdatepickerpopup.h"
 
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index abc69fad4..f353c4d39 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 2 -*-
 
 #include "kfoldertree.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index 861cbfb4d..879b61567 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -41,7 +41,7 @@
 #include <kcombobox.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp
index f1c43daa5..8bb72d5ce 100644
--- a/libtdepim/kincidencechooser.cpp
+++ b/libtdepim/kincidencechooser.cpp
@@ -35,8 +35,8 @@
 #include <tqapplication.h>
 
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "kincidencechooser.h"
 #include "libkcal/incidence.h"
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index acd798120..24a3b7d34 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kguiitem.h>
 #include <tdepopupmenu.h>
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 80b9951a2..3070b165d 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -24,7 +24,7 @@
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 
 #include <tqlayout.h>
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index c59080ed4..d5fe826a9 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <unistd.h>
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index a5e2ff696..82c04e3f9 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -31,7 +31,7 @@
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 #include <kprinter.h>
 #include <kfinddialog.h>
diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp
index 40996d1e6..b5dfc63ad 100644
--- a/libtdepim/komposer/test/test.cpp
+++ b/libtdepim/komposer/test/test.cpp
@@ -24,7 +24,7 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kuniqueapplication.h>
 
 #include <tqlabel.h>
diff --git a/libtdepim/kpimprefs.cpp b/libtdepim/kpimprefs.cpp
index 02e397361..d58ca447e 100644
--- a/libtdepim/kpimprefs.cpp
+++ b/libtdepim/kpimprefs.cpp
@@ -28,9 +28,9 @@
 #include <tqstring.h>
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kpimprefs.h"
diff --git a/libtdepim/kpimurlrequesterdlg.cpp b/libtdepim/kpimurlrequesterdlg.cpp
index 311d1d007..6abff8d0e 100644
--- a/libtdepim/kpimurlrequesterdlg.cpp
+++ b/libtdepim/kpimurlrequesterdlg.cpp
@@ -21,7 +21,7 @@
 #include <kpimurlrequesterdlg.h>
 #include <tderecentdocument.h>
 #include <kurlrequesterdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // KDE3.4 or KDE4.0: FIXME: Move to tdelibs!
 KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label,
diff --git a/libtdepim/kpixmapregionselectordialog.cpp b/libtdepim/kpixmapregionselectordialog.cpp
index b715e000b..d77c31355 100644
--- a/libtdepim/kpixmapregionselectordialog.cpp
+++ b/libtdepim/kpixmapregionselectordialog.cpp
@@ -23,7 +23,7 @@
 #include <kdialogbase.h>
 #include <tqdialog.h>
 #include <tqdesktopwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 using namespace KPIM;
diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp
index e82168826..e1c4cce45 100644
--- a/libtdepim/kpixmapregionselectorwidget.cpp
+++ b/libtdepim/kpixmapregionselectorwidget.cpp
@@ -32,7 +32,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/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index b4aea5589..ae24bc221 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -37,9 +37,9 @@
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefontdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfigskeleton.h>
 #include <kurlrequester.h>
 #include "ktimeedit.h"
diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp
index 4fcc9774c..e447ac7ec 100644
--- a/libtdepim/kscoring.cpp
+++ b/libtdepim/kscoring.cpp
@@ -29,7 +29,7 @@
 #include <tqcheckbox.h>
 #include <tqtextview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp
index a0ce66f5a..d793c7a1c 100644
--- a/libtdepim/kscoringeditor.cpp
+++ b/libtdepim/kscoringeditor.cpp
@@ -21,7 +21,7 @@
 #include "kscoringeditor.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kcolorcombo.h>
 #include <kiconloader.h>
diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp
index 94030bcc1..d72776bc0 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -23,7 +23,7 @@
 #include <kseparator.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp
index 2fe849c5f..edb871e86 100644
--- a/libtdepim/ktimeedit.cpp
+++ b/libtdepim/ktimeedit.cpp
@@ -29,10 +29,10 @@
 #include <tqdatetime.h>
 #include <tqlineedit.h>
 
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ktimeedit.h"
 #include <tqvalidator.h>
diff --git a/libtdepim/kvcarddrag.cpp b/libtdepim/kvcarddrag.cpp
index d8e83d898..285224497 100644
--- a/libtdepim/kvcarddrag.cpp
+++ b/libtdepim/kvcarddrag.cpp
@@ -21,7 +21,7 @@
 
 #include "kvcarddrag.h"
 
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 
 static const char vcard_mime_string[] = "text/x-vcard";
 
diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h
index e2d3c1e24..83c7f3e50 100644
--- a/libtdepim/kvcarddrag.h
+++ b/libtdepim/kvcarddrag.h
@@ -25,8 +25,8 @@
 #include <tqdragobject.h>
 #include <tqstring.h>
 
-#include <kabc/addressee.h>
-#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
 #include <tdepimmacros.h>
 
 class KVCardDragPrivate;
diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp
index 546bbb322..dc4e8a620 100644
--- a/libtdepim/kwidgetlister.cpp
+++ b/libtdepim/kwidgetlister.cpp
@@ -31,7 +31,7 @@
 
 #include "kwidgetlister.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqpushbutton.h>
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index 4ea3b4584..290238403 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -29,8 +29,8 @@
 #include <tqtextstream.h>
 #include <tqurl.h>
 
-#include <kabc/ldapurl.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldapurl.h>
+#include <tdeabc/ldif.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index 789b46054..51701272b 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -32,7 +32,7 @@
 #include <tqtimer.h>
 
 #include <tdeio/job.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldif.h>
 #include <tdeconfig.h>
 
 #include <tdepimmacros.h>
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index 7a1319b74..b6e49c8a2 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -31,13 +31,13 @@
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 
-#include <kabc/addresslineedit.h>
+#include <tdeabc/addresslineedit.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 using namespace KPIM;
 
diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp
index d71bc875e..f740c1940 100644
--- a/libtdepim/linklocator.cpp
+++ b/libtdepim/linklocator.cpp
@@ -22,7 +22,7 @@
 
 #include "linklocator.h"
 #include "pimemoticons.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kmdcodec.h>
diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp
index 159ca2f24..b269efe08 100644
--- a/libtdepim/maillistdrag.cpp
+++ b/libtdepim/maillistdrag.cpp
@@ -25,7 +25,7 @@
 #include <tqdatastream.h>
 #include <tqeventloop.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 using namespace KPIM;
diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp
index 5d0a89f67..911fbba6e 100644
--- a/libtdepim/pluginloaderbase.cpp
+++ b/libtdepim/pluginloaderbase.cpp
@@ -22,10 +22,10 @@
 #include <pluginloaderbase.h>
 
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp
index 82a8895d4..101579305 100644
--- a/libtdepim/progressdialog.cpp
+++ b/libtdepim/progressdialog.cpp
@@ -45,7 +45,7 @@
 #include <tqvbox.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kstdguiitem.h>
 #include <kiconloader.h>
diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp
index 0f3e39cae..37216e94c 100644
--- a/libtdepim/progressmanager.cpp
+++ b/libtdepim/progressmanager.cpp
@@ -24,7 +24,7 @@
 #include <tqvaluevector.h>
 #include <kdebug.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 #include "progressmanager.h"
diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp
index 35c52e35d..6698b263d 100644
--- a/libtdepim/recentaddresses.cpp
+++ b/libtdepim/recentaddresses.cpp
@@ -32,10 +32,10 @@
 
 #include <kstaticdeleter.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <keditlistbox.h>
 
 
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index 6adc65986..547986370 100644
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@@ -31,7 +31,7 @@
 #define RECENTADDRESSES_H
 
 #include <tqstringlist.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include <kdialogbase.h>
 
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index fe2e45bf1..0b76b7f36 100644
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@@ -25,7 +25,7 @@
 #ifndef RESOURCEABC_H
 #define RESOURCEABC_H
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 #include <tqmap.h>
 #include <tdepimmacros.h>
 
diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp
index 2fb4efe41..2b658112a 100644
--- a/libtdepim/sendsmsdialog.cpp
+++ b/libtdepim/sendsmsdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqtextedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "sendsmsdialog.h"
 
diff --git a/libtdepim/ssllabel.cpp b/libtdepim/ssllabel.cpp
index 6e4717cd3..fc876fad1 100644
--- a/libtdepim/ssllabel.cpp
+++ b/libtdepim/ssllabel.cpp
@@ -35,7 +35,7 @@
 #include "ssllabel.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtooltip.h>
 
diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp
index 99a035b89..61dd1bf2b 100644
--- a/libtdepim/statusbarprogresswidget.cpp
+++ b/libtdepim/statusbarprogresswidget.cpp
@@ -47,7 +47,7 @@ using KPIM::ProgressManager;
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <tqframe.h>
diff --git a/libtdepim/tdeconfigpropagator.cpp b/libtdepim/tdeconfigpropagator.cpp
index f6f482402..01ed31ab3 100644
--- a/libtdepim/tdeconfigpropagator.cpp
+++ b/libtdepim/tdeconfigpropagator.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfigskeleton.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqstringlist.h>
diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp
index 30e11fbc9..8c2620d1f 100644
--- a/libtdepim/tdeconfigwizard.cpp
+++ b/libtdepim/tdeconfigwizard.cpp
@@ -21,10 +21,10 @@
 
 #include "tdeconfigwizard.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 
 #include <tqlistview.h>
diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp
index ad899351f..14fc458ed 100644
--- a/libtdepim/tdefileio.cpp
+++ b/libtdepim/tdefileio.cpp
@@ -6,13 +6,13 @@
 #include <config.h>
 #endif
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <assert.h>
 #include <tqdir.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 #include <tqwidget.h>
diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp
index 9fb3470d0..64d969fd5 100644
--- a/libtdepim/tests/testaddresseelineedit.cpp
+++ b/libtdepim/tests/testaddresseelineedit.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "../addresseelineedit.h"
diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp
index 438208698..8410188c2 100644
--- a/libtdepim/tests/testaddresseeselector.cpp
+++ b/libtdepim/tests/testaddresseeselector.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "../addresseeselector.h"
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 257624645..a87e950c3 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdateedit.h"
 
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index d57cc5929..0bbb536d7 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -23,7 +23,7 @@ using KPIM::DistributionList;
 
 #include <config.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
diff --git a/libtdepim/tests/testkincidencechooser.cpp b/libtdepim/tests/testkincidencechooser.cpp
index d2f8cadf3..ab113a046 100644
--- a/libtdepim/tests/testkincidencechooser.cpp
+++ b/libtdepim/tests/testkincidencechooser.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <libkcal/event.h>
 using namespace KCal;
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index fd6c70eb8..f2a9a5fd3 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -26,7 +26,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <tqlayout.h>