The workaround that tdepimmacros.h do is no longer needed

and kdemacros.h can be used directly.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

298 files changed, 299 insertions, 292 deletions

diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h
index aa4611346..9b57d201e 100644
--- a/akregator/src/aboutdata.h
+++ b/akregator/src/aboutdata.h
@@ -26,7 +26,7 @@
 #define ABOUTDATA_H
 
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #define AKREGATOR_VERSION "1.2.9"
 
diff --git a/akregator/src/akregator_export.h b/akregator/src/akregator_export.h
index 00fead928..d389c0d99 100644
--- a/akregator/src/akregator_export.h
+++ b/akregator/src/akregator_export.h
@@ -21,7 +21,7 @@
 #ifndef AKREGATOR_AKREGATOREXPORT_H
 #define AKREGATOR_AKREGATOREXPORT_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #define AKREGATOR_EXPORT KDE_EXPORT
 
diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h
index 26c5037bf..966521cc8 100644
--- a/akregator/src/librss/global.h
+++ b/akregator/src/librss/global.h
@@ -11,7 +11,7 @@
 #ifndef LIBRSS_GLOBAL_H
 #define LIBRSS_GLOBAL_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 template <class>
 class TQValueList;
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 86ee531a3..a972ce9b1 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -96,7 +96,7 @@
 // other
 #include <algorithm>
 #include <assert.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kinputdialog.h>
 namespace {
 
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 5b6b26455..cf03a7101 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -36,7 +36,7 @@
 //#include <gpgme.h>
 
 #include <tdemainwindow.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 #include <tqcstring.h>
 #include <tqptrlist.h>
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index c31fa9007..087e237e3 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -36,7 +36,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
     : TDECModule( parent, name )
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 7a19d4515..43373e72d 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -47,7 +47,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #if 0 // disabled, since it is apparently confusing
 // For sync'ing kabldaprc
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index f6a32301a..e9bdd51aa 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -34,7 +34,7 @@
 
 #include <tdecmodule.h>
 #include <kleo/cryptoconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQCheckBox;
 class TQTimeEdit;
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index a802a06fe..186686844 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -34,7 +34,7 @@
 #include <ui/dnattributeorderconfigwidget.h>
 #include <kleo/dn.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqlayout.h>
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
index 79ff268be..7e4eda03e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
@@ -38,7 +38,7 @@
 #include "qgpgmejob.h"
 
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class Error;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h
index 844ca974d..64ce36bc5 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h
@@ -43,7 +43,7 @@
 #include <tqstring.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class Data;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
index c9e164746..0b1362c92 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
@@ -36,7 +36,7 @@
 #include <kleo/keygenerationjob.h>
 
 #include "qgpgmejob.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class Error;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
index 24672d834..90079706e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
@@ -44,7 +44,7 @@
 
 #include <utility>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
   class Error;
   class Context;
diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h
index e11d28751..fce71937a 100644
--- a/certmanager/lib/cryptplug.h
+++ b/certmanager/lib/cryptplug.h
@@ -25,7 +25,7 @@
 
 #include <gpgmepp/context.h>
 #include <gpgme.h> // need it for gpgme_protocol_t :(
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class ImportResult;
diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h
index 3eb5f7e6b..6f3f6f3d5 100644
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@@ -35,7 +35,7 @@
 
 #include "kleo/cryptobackendfactory.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #ifndef LIBKLEOPATRA_NO_COMPAT
 namespace Kleo {
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index a8ea1112c..2be5cd567 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -54,7 +54,7 @@
 #include <tqpair.h>
 #include <tqstringlist.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 class TDEConfigBase;
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index 09012da3d..3fa642f35 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -36,7 +36,7 @@
 #include <tqobject.h>
 
 #include "cryptobackend.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <vector>
 #include <map>
diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h
index c9bdbffda..c194d58e8 100644
--- a/certmanager/lib/kleo/dn.h
+++ b/certmanager/lib/kleo/dn.h
@@ -35,7 +35,7 @@
 
 #include <tqstring.h>
 #include <tqvaluevector.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQStringList;
 class TQWidget;
diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h
index 07e93c497..723f65aeb 100644
--- a/certmanager/lib/kleo/enum.h
+++ b/certmanager/lib/kleo/enum.h
@@ -33,7 +33,7 @@
 #ifndef __KLEO_ENUM_H__
 #define __KLEO_ENUM_H__
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 class TQStringList;
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index 0b74d2f9b..ebce19f2e 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@@ -35,7 +35,7 @@
 
 #include <kleo/keylistjob.h>
 #include <kleo/cryptobackend.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <gpgmepp/keylistresult.h>
 
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index a573934d6..e65be1d2f 100644
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@@ -34,7 +34,7 @@
 #define __KLEO_KEYFILTERMANAGER_H__
 
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
   class Key;
 }
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index d927c9274..31d9d9e91 100644
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@@ -36,7 +36,7 @@
 #include <kleo/job.h>
 #include <kleo/cryptobackend.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqguardedptr.h>
 
 #include <vector>
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index bde73c2ed..ad60654b6 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -35,7 +35,7 @@
 #define __KLEO_UI_BACKENDCONFIGWIDGET_H__
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
   class CryptoBackendFactory;
diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h
index 3f6ba328c..0ef8009c6 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@@ -33,7 +33,7 @@
 #define CRYPTOCONFIGDIALOG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h
index a98bc5fe2..950a87e94 100644
--- a/certmanager/lib/ui/directoryserviceswidget.h
+++ b/certmanager/lib/ui/directoryserviceswidget.h
@@ -34,7 +34,7 @@
 #define DIRECTORYSERVICESWIDGET_H
 #include "directoryserviceswidgetbase.h"
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class CryptPlugWrapper;
 namespace Kleo {
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index ea24728da..d39220ac9 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -34,7 +34,7 @@
 #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
   class DNAttributeMapper;
 }
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index 8fa6a7cc6..a83e124b1 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -40,7 +40,7 @@
 #include <kleo/enum.h>
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <kpgpkey.h> // for EncryptPref
 #include <gpgmepp/key.h>
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 4149cb41e..6eeef5d87 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -36,7 +36,7 @@
 #include <tdelistview.h>
 
 #include <gpgmepp/key.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQPainter;
 class TQColorGroup;
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index e73b7988c..30fba80da 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -53,7 +53,7 @@
 #include <kleo/cryptobackend.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
   class KeyListView;
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index 3138d9996..126baa73a 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -41,7 +41,7 @@
 
 #include <kleo/cryptobackend.h>
 #include <gpgmepp/key.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <vector>
 
 class TQVBoxLayout;
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index 51f86dade..c5495d393 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -34,7 +34,7 @@
 #define __KLEO_PROGRESSBAR_H__
 
 #include <tqprogressbar.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQTimer;
 
 namespace Kleo {
diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h
index dadfd7690..eb1b95b76 100644
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@@ -35,7 +35,7 @@
 
 #include <tqprogressdialog.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
 
   class Job;
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index 4ac486f78..49350be4b 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -25,7 +25,7 @@
 #define KABPREFS_H
 
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "kabprefs_base.h"
 
 class TDEConfig;
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index 33bc6f762..5660fed92 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 
 #include <tdeconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 class AddressBook;
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index 85195dd84..6927c7a82 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -28,7 +28,7 @@
 
 #include <tdeabc/addressbook.h>
 #include <klibloader.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #define KAB_CEW_PLUGIN_VERSION 1
 
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 0132399c1..6632984d7 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -35,7 +35,7 @@
 #include <tdeabc/field.h>
 #include <kcommand.h>
 #include <kxmlguiclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 class AddressBook;
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index 3de00edde..bcffc9b8b 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -28,7 +28,7 @@
 
 #include <tdeabc/addressbook.h>
 #include <klibloader.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1
 
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index b0dd43e74..a22205957 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -30,7 +30,7 @@
 #include <tdeabc/addresseelist.h>
 #include <klibloader.h>
 #include <kxmlguiclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #define KAB_XXPORT_PLUGIN_VERSION 1
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 2a4bb2f4a..40ce444e1 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -33,7 +33,7 @@
 #include <tqwidget.h>
 
 #include "core.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 class AddressBook;
diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h
index b7fa5f5c8..c02922d38 100644
--- a/kaddressbook/kaddressbookiface.h
+++ b/kaddressbook/kaddressbookiface.h
@@ -27,7 +27,7 @@
 #include <dcopobject.h>
 #include <kurl.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KDE_EXPORT KAddressBookIface : virtual public DCOPObject
 {
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 8090408dc..8071b8af2 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -31,7 +31,7 @@
 
 #include <tdeabc/field.h>
 #include <klibloader.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "filter.h"
 #include "viewconfigurewidget.h"
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index db05432cf..ce2c99730 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -31,7 +31,7 @@
 
 #include "kcmkabconfig.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index dcbcd2c58..8905b8995 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -29,7 +29,7 @@
 
 #include <tqregexp.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 73e8c5a22..0731ae577 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -32,7 +32,7 @@
 
 #include "kcmkabldapconfig.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index 839078e66..11957a01c 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -25,7 +25,7 @@
 #define VIEWCONFIGUREWIDGET_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqpixmap.h>
 
 #include "configurewidget.h"
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index 3da145d4c..04323636b 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -29,7 +29,7 @@
 
 #include <kurl.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "xxport.h"
 
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index 796c42dbe..4087d3da7 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -34,7 +34,7 @@
 #include <calendarresources.h>
 #include <vector>
 #include "resourcecalendar.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQDateTime;
 class Preferences;
diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h
index 887acfaf8..ea83a2138 100644
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@@ -38,7 +38,7 @@
 #include <tqsplitter.h> 
 
 #include <tdepopupmenu.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "KGanttItem.h"
 #include "xQGanttListView.h"
diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h
index 99a63ee3e..67c1a198d 100644
--- a/kgantt/kgantt/KGanttItem.h
+++ b/kgantt/kgantt/KGanttItem.h
@@ -38,7 +38,7 @@
 #include <tqptrlist.h> 
 #include <tqpainter.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "KGanttRelation.h"
 
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 02c0a7c46..2ae6283a9 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -33,7 +33,7 @@
 #define __KMAIL_ABOUTDATA_H__
 
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KMail {
 
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 9097d3510..b1c1ef7ce 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include "kmaccount.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 class TQStringList;
diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp
index 5fe9348ef..b45140ac5 100644
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@@ -32,7 +32,7 @@
 
 #include "interfaces/bodypartformatter.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace {
 
diff --git a/kmail/callback.h b/kmail/callback.h
index 560d5ddcc..2722d0ffb 100644
--- a/kmail/callback.h
+++ b/kmail/callback.h
@@ -38,7 +38,7 @@
 class KMMessage;
 class KMReaderWin;
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 #include <libkcal/attendee.h> // only for an enum, we are not linking
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 10e9b8df7..3d8447a04 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -17,7 +17,7 @@
 #include <tdelistview.h>
 #include <tdecmodule.h>
 #include <tdelocale.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQPushButton;
 class TQLabel;
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 34a6e8d55..3738aed77 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -35,7 +35,7 @@
 #include <tdeparts/part.h>
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEInstance;
 class TDEAboutData;
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index dcafbf3d1..24e425243 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -11,7 +11,7 @@
 #include <tdeio/job.h>
 #include "kmmsgbase.h" // for KMMsgStatus
 #include <mimelib/string.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kservice.h>
 #include <tdetempfile.h>
 
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index b41c2b556..d5780a895 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -21,7 +21,7 @@
 #include "foldertreebase.h"
 
 #include <tdelocale.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqguardedptr.h>
 #include <tqwidget.h>
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index d92266835..b8055340b 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -11,7 +11,7 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tdeimproxy.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #ifdef __TDE_HAVE_TDEHWLIB
 # include <tdenetworkconnections.h>
diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h
index 456a39a4a..11c840e67 100644
--- a/kmail/kmstartup.h
+++ b/kmail/kmstartup.h
@@ -18,7 +18,7 @@
 #ifndef KMSTARTUP
 #define KMSTARTUP
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C" {
 
diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h
index 72bf66050..df46600a9 100644
--- a/kmobile/kmobileclient.h
+++ b/kmobile/kmobileclient.h
@@ -6,7 +6,7 @@
 #define _KMOBILECLIENT_H_
 
 #include <dcopclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KDE_EXPORT KMobileClient : public DCOPClient
 {
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 78fc50e80..546a6a119 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqmutex.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <klibloader.h>
 
 #include <tdeabc/addressee.h>
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index 166b8eb92..fb50ce5ce 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -9,7 +9,7 @@
 
 #include "kmobileiface.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfig;
 class KMobileItem;
 
diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp
index db5314172..7b2544100 100644
--- a/kmobile/tdeioslave/tdeio_mobile.cpp
+++ b/kmobile/tdeioslave/tdeio_mobile.cpp
@@ -33,7 +33,7 @@
 
 #include "tdeio_mobile.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 using namespace TDEIO;
 
diff --git a/knode/aboutdata.h b/knode/aboutdata.h
index 528e75b02..50faa6dc7 100644
--- a/knode/aboutdata.h
+++ b/knode/aboutdata.h
@@ -15,7 +15,7 @@
 */
 
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #ifndef KNODE_ABOUTDATA_H
 #define KNODE_ABOUTDATA_H
diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp
index 237ff41b7..d9f218781 100644
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@@ -23,7 +23,7 @@
 #include "knconfigpages.h"
 #include "knconfigwidgets.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 //
 // common config page with tabs (code mostly taken from kmail)
diff --git a/knode/knconvert.h b/knode/knconvert.h
index 59b23c9c2..3f87a25e2 100644
--- a/knode/knconvert.h
+++ b/knode/knconvert.h
@@ -21,7 +21,7 @@
 
 #include <tqglobal.h>
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQListBox;
 class TQLabel;
diff --git a/knode/knglobals.h b/knode/knglobals.h
index f361f3bb2..c2eca4b8e 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include "resource.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEInstance;
 class KNConfigManager;
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index c90e697df..418e0d3e6 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -21,7 +21,7 @@
 #include "resource.h"
 
 #include <tqglobal.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQListViewItem;
 
diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h
index d33b34233..9ea668a0d 100644
--- a/knotes/resourcenotes.h
+++ b/knotes/resourcenotes.h
@@ -34,7 +34,7 @@
 #define RESOURCENOTES_H
 
 #include <tderesources/resource.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/alarm.h>
 
 class TDEConfig;
diff --git a/kode/automakefile.h b/kode/automakefile.h
index 418851ade..1a5937324 100644
--- a/kode/automakefile.h
+++ b/kode/automakefile.h
@@ -26,7 +26,7 @@
 #include <tqmap.h>
 #include <tqstringlist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/class.h b/kode/class.h
index f3f44114b..aab15d279 100644
--- a/kode/class.h
+++ b/kode/class.h
@@ -26,7 +26,7 @@
 #include "membervariable.h"
 #include "typedef.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kode/code.h b/kode/code.h
index 97a1b8d34..2b1da6311 100644
--- a/kode/code.h
+++ b/kode/code.h
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
 
 class KDE_EXPORT Code
diff --git a/kode/enum.h b/kode/enum.h
index 56681724f..d4566bba5 100644
--- a/kode/enum.h
+++ b/kode/enum.h
@@ -22,7 +22,7 @@
 #define KODE_ENUM_H
 
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/file.h b/kode/file.h
index f4fe555e8..7a8991542 100644
--- a/kode/file.h
+++ b/kode/file.h
@@ -28,7 +28,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/function.h b/kode/function.h
index 305838eb4..6d928f4fd 100644
--- a/kode/function.h
+++ b/kode/function.h
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/license.h b/kode/license.h
index 6474babc8..e73be1348 100644
--- a/kode/license.h
+++ b/kode/license.h
@@ -22,7 +22,7 @@
 #define KODE_LICENSE_H
 
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/membervariable.h b/kode/membervariable.h
index fe5e889db..f75ab0f12 100644
--- a/kode/membervariable.h
+++ b/kode/membervariable.h
@@ -25,7 +25,7 @@
 
 #include <tqvaluelist.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/printer.h b/kode/printer.h
index 1d3f103ef..ceb0f7a99 100644
--- a/kode/printer.h
+++ b/kode/printer.h
@@ -26,7 +26,7 @@
 #include "style.h"
 #include "automakefile.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kode/statemachine.h b/kode/statemachine.h
index 5c977293f..a34905925 100644
--- a/kode/statemachine.h
+++ b/kode/statemachine.h
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/style.h b/kode/style.h
index 26921f716..42b5fe187 100644
--- a/kode/style.h
+++ b/kode/style.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/typedef.h b/kode/typedef.h
index 9cc696357..a985c5fb3 100644
--- a/kode/typedef.h
+++ b/kode/typedef.h
@@ -22,7 +22,7 @@
 #define KODE_TYPEDEF_H
 
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/variable.h b/kode/variable.h
index 1eda384f1..252d7b405 100644
--- a/kode/variable.h
+++ b/kode/variable.h
@@ -24,7 +24,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KODE {
 
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index 2e96fd0be..c76406d5e 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -24,7 +24,7 @@
 #define KONTACT_CORE_H
 
 #include <tqdatetime.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/part.h>
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 3d8c66cf5..70c8a7e23 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -26,7 +26,7 @@
 
 #include <tqobject.h>
 #include <kxmlguiclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqptrlist.h>
 
 class TQStringList;
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 961c4b07b..dba346e2b 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 #include <tqpixmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KStatusBar;
 
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 6ecc23812..025bb8b83 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -24,7 +24,7 @@
 
 #include <dcopobject.h>
 #include <plugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kontact
 {
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 497e27803..e2f9126f7 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -37,7 +37,7 @@
 
 #include "kcmkmailsummary.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 0f17435cc..b8c7a0cdf 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -37,7 +37,7 @@
 
 #include "kcmkorgsummary.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 577bc992a..179baed3c 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -45,7 +45,7 @@
 
 #include "newsfeeds.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 93c7bd8bc..b2d1a45dc 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -39,7 +39,7 @@
 
 #include "kcmsdsummary.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 3877827d2..65bd13e5b 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -39,7 +39,7 @@
 
 #include "kcmkontactsummary.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 622d597b1..4e6e44077 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h
index 0edf98110..9edf278a1 100644
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@@ -25,7 +25,7 @@
 #define KORG_ABOUTDATA_H
 
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KOrg {
 
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 3494ecffe..ebfed5155 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -30,7 +30,7 @@
 #include <tqobject.h>
 #include <kurl.h>
 #include <korganizer/part.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "kcalendariface.h"
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 469eddaf8..e9b3d6728 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -31,7 +31,7 @@
 #include <tdefile.h>
 #include <korganizer/koeventviewer.h>
 #include <libkcal/scheduler.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "koglobals.h"
 #include "interfaces/korganizer/calendarviewbase.h"
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index a8ca0c582..fa47ab7a5 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -29,7 +29,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "korganizer/incidencechangerbase.h"
 
 #include "printplugin.h"
diff --git a/korganizer/kocore.h b/korganizer/kocore.h
index d160f68d1..f5dd7c97b 100644
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@@ -29,7 +29,7 @@
 #include <korganizer/part.h>
 #include <korganizer/printplugin.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <ktrader.h>
 
 namespace KPIM { class IdentityManager; }
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 91fb0d4db..5aa897ac2 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -24,7 +24,7 @@
 #ifndef KOEVENTVIEWER_H
 #define KOEVENTVIEWER_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeconfig.h>
 #include <tqtextbrowser.h>
 
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index f66ecafd5..4c6a8f37d 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -25,7 +25,7 @@
 #define KOEVENTVIEWERDIALOG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "koeventviewer.h"
 
 namespace KCal {
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 678426fd6..b6f48cf78 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -23,7 +23,7 @@
 #ifndef KORG_GLOBALS_H
 #define KORG_GLOBALS_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqwidget.h>
 
 class TQDate;
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index 6adb3cbc5..83c5799f7 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -617,7 +617,7 @@ For security reasons, it is not recommended to store your password in the config
     <tabstop>retrieveSavePassword</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">tdepimmacros.h</include>
+    <include location="global" impldecl="in declaration">kdemacros.h</include>
     <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
 </includes>
 <Q_SIGNALS>
diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h
index 329de2a60..e73484213 100644
--- a/korganizer/kohelper.h
+++ b/korganizer/kohelper.h
@@ -25,7 +25,7 @@
 #ifndef KOHELPER_H
 #define KOHELPER_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
   class Calendar;
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 0fa1eb21d..3e57a77c3 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -26,7 +26,7 @@
 
 #include <tqdict.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "koprefs_base.h"
 
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 08763b63a..3e4f98bfa 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -77,7 +77,7 @@
 #include "ktimeedit.h"
 #include "koglobals.h"
 #include "stdcalendar.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h
index 4873ef631..c91a715e7 100644
--- a/korganizer/korganizerifaceimpl.h
+++ b/korganizer/korganizerifaceimpl.h
@@ -34,7 +34,7 @@
 #include "korganizeriface.h"
 
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class ActionManager;
 
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index 29b925a67..ae62d75a8 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -31,7 +31,7 @@
 #include <kdialogbase.h>
 #include <korganizer/baseview.h>
 #include <korganizer/printplugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KOrg {
 class CoreHelper;
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index 3684e2f12..7b9e52e00 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -30,7 +30,7 @@
 
 #include <tqdatetime.h>
 #include <kprinter.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h
index e4a37da06..4d8206bc5 100644
--- a/korganizer/printing/cellitem.h
+++ b/korganizer/printing/cellitem.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KOrg {
 
diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h
index 572a67a55..ccf8338f1 100644
--- a/korganizer/urihandler.h
+++ b/korganizer/urihandler.h
@@ -24,7 +24,7 @@
 #ifndef URIHANDLER_H
 #define URIHANDLER_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 class TQWidget;
diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h
index 0ddec104f..34b848674 100644
--- a/ktnef/gui/ktnefview.h
+++ b/ktnef/gui/ktnefview.h
@@ -20,7 +20,7 @@
 
 #include <tdelistview.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KTNEFAttach;
 
diff --git a/ktnef/ktnef/ktnefattach.h b/ktnef/ktnef/ktnefattach.h
index 280c862fe..24a14c2dc 100644
--- a/ktnef/ktnef/ktnefattach.h
+++ b/ktnef/ktnef/ktnefattach.h
@@ -22,7 +22,7 @@
 #include <tqmap.h>
 #include <tqvariant.h>
 #include <ktnef/ktnefpropertyset.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KTNEFProperty;
 
diff --git a/ktnef/ktnef/ktnefmessage.h b/ktnef/ktnef/ktnefmessage.h
index afc372e27..48d397c4b 100644
--- a/ktnef/ktnef/ktnefmessage.h
+++ b/ktnef/ktnef/ktnefmessage.h
@@ -20,7 +20,7 @@
 
 #include <ktnef/ktnefpropertyset.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KTNEFAttach;
 
diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h
index fc93391cf..ea098dd69 100644
--- a/ktnef/ktnef/ktnefparser.h
+++ b/ktnef/ktnef/ktnefparser.h
@@ -21,7 +21,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KTNEFAttach;
 class KTNEFMessage;
diff --git a/ktnef/ktnef/ktnefproperty.h b/ktnef/ktnef/ktnefproperty.h
index 7b9d9d204..c0af8d94f 100644
--- a/ktnef/ktnef/ktnefproperty.h
+++ b/ktnef/ktnef/ktnefproperty.h
@@ -20,7 +20,7 @@
 
 #include <tqvariant.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KDE_EXPORT KTNEFProperty
 {
diff --git a/ktnef/ktnef/ktnefpropertyset.h b/ktnef/ktnef/ktnefpropertyset.h
index 44166e312..c35aa0e32 100644
--- a/ktnef/ktnef/ktnefpropertyset.h
+++ b/ktnef/ktnef/ktnefpropertyset.h
@@ -20,7 +20,7 @@
 
 #include <tqmap.h>
 #include <tqvariant.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KTNEFProperty;
 
diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h
index f8b5b46b7..6f5f44e0c 100644
--- a/libemailfunctions/email.h
+++ b/libemailfunctions/email.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqcstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 /** @file */
 
diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h
index 50075aefb..fcd974514 100644
--- a/libemailfunctions/idmapper.h
+++ b/libemailfunctions/idmapper.h
@@ -25,7 +25,7 @@
 #include <tqmap.h>
 #include <tqvariant.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libkcal/alarm.h b/libkcal/alarm.h
index 09de14f09..01969caed 100644
--- a/libkcal/alarm.h
+++ b/libkcal/alarm.h
@@ -33,7 +33,7 @@
 #include "listbase.h"
 #include "libkcal_export.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 082559383..eeccff929 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -39,7 +39,7 @@
 #include "kcalversion.h"
 #include "person.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqobject.h>
 #include <tqstring.h>
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index a77238e47..e021a9b62 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -24,7 +24,7 @@
 
 #include "calendar.h"
 #include <tqdict.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h
index f92d4ae5a..bc0fcb09d 100644
--- a/libkcal/confirmsavedialog.h
+++ b/libkcal/confirmsavedialog.h
@@ -23,7 +23,7 @@
 #include <libkcal/incidence.h>
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEListView;
 
diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h
index e1b020dc6..de6b8bd77 100644
--- a/libkcal/customproperties.h
+++ b/libkcal/customproperties.h
@@ -24,7 +24,7 @@
 
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "libkcal_export.h"
 
diff --git a/libkcal/event.h b/libkcal/event.h
index 9bd217e1c..ba0780fb3 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -22,7 +22,7 @@
 #define KCAL_EVENT_H
 
 #include "incidence.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index 8da2868ab..f277b14ac 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -26,7 +26,7 @@
 #include "scheduler.h"
 
 #include "calformat.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 20579ce7f..f5fedc34b 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -32,7 +32,7 @@
 #include "libkcal_export.h"
 
 #include "incidencebase.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/journal.h b/libkcal/journal.h
index a3289d57d..d2ca83c45 100644
--- a/libkcal/journal.h
+++ b/libkcal/journal.h
@@ -23,7 +23,7 @@
 #define KCAL_JOURNAL_H
 
 #include "incidence.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/kcalversion.h b/libkcal/kcalversion.h
index 13422197d..8eac5f4c7 100644
--- a/libkcal/kcalversion.h
+++ b/libkcal/kcalversion.h
@@ -21,6 +21,8 @@
 #ifndef KCAL_KCALVERSION_H
 #define KCAL_KCALVERSION_H
 
+#include <tdeversion.h>
+
 #define LIBKCAL_IS_VERSION( a,b,c ) ( LIBKCAL_VERSION >= TDE_MAKE_VERSION(a,b,c) )
 #define LIBKCAL_VERSION TDE_MAKE_VERSION(1,3,0)
 #define LIBKCAL_VERSIONSTR "1.3"
diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h
index 88f270d01..7fca2dbee 100644
--- a/libkcal/libkcal_export.h
+++ b/libkcal/libkcal_export.h
@@ -21,7 +21,7 @@
 #ifndef KCAL_KCALEXPORT_H
 #define KCAL_KCALEXPORT_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #define LIBKCAL_EXPORT KDE_EXPORT
 
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index 94c00ae49..f890d2654 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -34,7 +34,7 @@
 #include <tqdatetime.h>
 #include <tqtimer.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h
index 0ee57793d..de63c2b67 100644
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@@ -22,7 +22,7 @@
 #define KCAL_RESOURCECACHEDCONFIG_H
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQButtonGroup;
 class TQSpinBox;
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index f33b7da44..ebb6a8b9e 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -41,7 +41,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/manager.h>
 #include <tdeabc/lock.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index d13ed2d81..5b47d5ea6 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfig;
 
 #include "calendarlocal.h"
diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h
index 7a1e7f721..d8b0c6c15 100644
--- a/libkcal/resourcelocalconfig.h
+++ b/libkcal/resourcelocalconfig.h
@@ -28,7 +28,7 @@
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "libkcal_export.h"
 
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index 6826da6b4..2f1bbec32 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -23,7 +23,7 @@
 
 #include <kurl.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "resourcecached.h"
 
diff --git a/libkholidays/kholidays.h b/libkholidays/kholidays.h
index b2e31b875..198053778 100644
--- a/libkholidays/kholidays.h
+++ b/libkholidays/kholidays.h
@@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqvaluelist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 struct KHoliday {
   TQString text;
diff --git a/libkmime/boolflags.h b/libkmime/boolflags.h
index ccd4e8529..0964c19a5 100644
--- a/libkmime/boolflags.h
+++ b/libkmime/boolflags.h
@@ -17,7 +17,7 @@
 #ifndef __KMIME_BOOLFLAGS_H__
 #define __KMIME_BOOLFLAGS_H__
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 /** This class stores boolean values in single bytes.
     It provides a similar functionality as TQBitArray
diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h
index 280c48999..64a6e213c 100644
--- a/libkmime/kmime_charfreq.h
+++ b/libkmime/kmime_charfreq.h
@@ -16,7 +16,7 @@
 #define __KMIME_CHARFREQ_H__
 
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #undef None
 
 namespace KMime {
diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h
index cd1e588ad..2a2f4d79e 100644
--- a/libkmime/kmime_codecs.h
+++ b/libkmime/kmime_codecs.h
@@ -40,7 +40,7 @@
 #include <tqcstring.h> // TQByteArray
 
 #include <kdebug.h> // for kdFatal()
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KMime {
 
diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h
index efa2192bc..c4c69945e 100644
--- a/libkmime/kmime_header_parsing.h
+++ b/libkmime/kmime_header_parsing.h
@@ -38,7 +38,7 @@
 
 #include <time.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 template <typename K, typename V> class TQMap;
 class TQStringList;
diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h
index 6978ffed2..02d0ad6a1 100644
--- a/libkmime/kmime_headers.h
+++ b/libkmime/kmime_headers.h
@@ -35,7 +35,7 @@
 
 #include <time.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KMime {
 
diff --git a/libkmime/kmime_headers_obs.h b/libkmime/kmime_headers_obs.h
index a167e1f86..8905d1c59 100644
--- a/libkmime/kmime_headers_obs.h
+++ b/libkmime/kmime_headers_obs.h
@@ -20,7 +20,7 @@
 #error You cannot use this file with the new header classes!
 #endif
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 /** Represents a "Message-Id" header */
 class KDE_EXPORT MessageID : public Base {
diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h
index 57b58a340..c261b5fdc 100644
--- a/libkmime/kmime_mdn.h
+++ b/libkmime/kmime_mdn.h
@@ -35,7 +35,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQCString;
 
diff --git a/libkmime/kmime_newsarticle.h b/libkmime/kmime_newsarticle.h
index bbca34d83..accb8f5c8 100644
--- a/libkmime/kmime_newsarticle.h
+++ b/libkmime/kmime_newsarticle.h
@@ -18,7 +18,7 @@
 
 #include "kmime_message.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KMime {
 
diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h
index 736e15831..7acc861ce 100644
--- a/libkmime/kmime_util.h
+++ b/libkmime/kmime_util.h
@@ -21,7 +21,7 @@
 #include "tqcstring.h"
 #include "tqvaluelist.h"
 #include "time.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 typedef TQValueList<TQCString> QCStringList;
 
diff --git a/libkmime/kqcstringsplitter.h b/libkmime/kqcstringsplitter.h
index 117f05108..cc992a487 100644
--- a/libkmime/kqcstringsplitter.h
+++ b/libkmime/kqcstringsplitter.h
@@ -19,7 +19,7 @@
 
 #include <tqcstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KDE_EXPORT KTQCStringSplitter {
   
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index 4382f1f5f..5ae06b798 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -36,7 +36,7 @@
 #include <kdialogbase.h>
 
 #include "kpgpkey.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQLineEdit;
 class TQCursor;
diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h
index 82001a1de..a1df95bf3 100644
--- a/libkpgp/kpgpblock.h
+++ b/libkpgp/kpgpblock.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqstrlist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 //#include <tqstringlist.h>
 class TQStringList;
diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h
index 5756d9ed0..2b05911e9 100644
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@@ -29,7 +29,7 @@
 
 #include "kpgp.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 class TQRegExp;
diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h
index e55b22434..9cd0f576c 100644
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@@ -26,7 +26,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 #include <tdeio/job.h>
 
diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h
index 6c994c02a..0feab87e3 100644
--- a/libkpimexchange/core/exchangeclient.h
+++ b/libkpimexchange/core/exchangeclient.h
@@ -26,7 +26,7 @@
 #include <tqhostaddress.h>
 #include <tqptrlist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal { 
   class Event;
diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h
index 03b066903..f8d8d1026 100644
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 
 #include <tdeio/job.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h
index 85753b2ce..bbc5b8cf2 100644
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tdeio/job.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 2cc4ec4ec..6a6c972f4 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -9,7 +9,7 @@
 
 #include <kleo/enum.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqstring.h>
 #include <tqcstring.h>
diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h
index 5fcfa7eec..e63046071 100644
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@@ -34,7 +34,7 @@
 
 #include <tqcombobox.h>
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index b341891f0..0162df4c5 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -35,7 +35,7 @@
 
 #include <tqvaluelist.h>
 #include <dcopobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEConfigBase;
 class TDEConfig;
diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h
index def7e0145..762c49e75 100644
--- a/libksieve/ksieve/error.h
+++ b/libksieve/ksieve/error.h
@@ -35,7 +35,7 @@
 
 #include <tqstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #ifdef None // X headers
 #  undef None
diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h
index 72db29353..22e6ebf38 100644
--- a/libksieve/ksieve/parser.h
+++ b/libksieve/ksieve/parser.h
@@ -33,7 +33,7 @@
 #ifndef __KSIEVE_PARSING_H__
 #define __KSIEVE_PARSING_H__
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 
diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h
index e886d8320..2eaee6601 100644
--- a/libtdenetwork/gpgmepp/context.h
+++ b/libtdenetwork/gpgmepp/context.h
@@ -25,7 +25,7 @@
 #include <utility>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/data.h b/libtdenetwork/gpgmepp/data.h
index e12064729..b1c76029e 100644
--- a/libtdenetwork/gpgmepp/data.h
+++ b/libtdenetwork/gpgmepp/data.h
@@ -25,7 +25,7 @@
 
 #include <sys/types.h> // for size_t, off_t
 #include <cstdio> // FILE
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/decryptionresult.h b/libtdenetwork/gpgmepp/decryptionresult.h
index da4833bbd..1721a19e8 100644
--- a/libtdenetwork/gpgmepp/decryptionresult.h
+++ b/libtdenetwork/gpgmepp/decryptionresult.h
@@ -26,7 +26,7 @@
 
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/encryptionresult.h b/libtdenetwork/gpgmepp/encryptionresult.h
index 4339bef56..44ea09a6b 100644
--- a/libtdenetwork/gpgmepp/encryptionresult.h
+++ b/libtdenetwork/gpgmepp/encryptionresult.h
@@ -27,7 +27,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/engineinfo.h b/libtdenetwork/gpgmepp/engineinfo.h
index c07d2817a..5dcd2f83e 100644
--- a/libtdenetwork/gpgmepp/engineinfo.h
+++ b/libtdenetwork/gpgmepp/engineinfo.h
@@ -24,7 +24,7 @@
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/context.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.h b/libtdenetwork/gpgmepp/eventloopinteractor.h
index 0bf3785f8..37acc0f89 100644
--- a/libtdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libtdenetwork/gpgmepp/eventloopinteractor.h
@@ -19,7 +19,7 @@
 #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
 #define __GPGMEPP_EVENTLOOPINTERACTOR_H__
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h
index 020ed0c4d..87f9aaf93 100644
--- a/libtdenetwork/gpgmepp/importresult.h
+++ b/libtdenetwork/gpgmepp/importresult.h
@@ -25,7 +25,7 @@
 #include <gpgmepp/result.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/interfaces/dataprovider.h b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
index 34dd4a7e1..be926446b 100644
--- a/libtdenetwork/gpgmepp/interfaces/dataprovider.h
+++ b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h
index 753ffec06..4bbd24be2 100644
--- a/libtdenetwork/gpgmepp/key.h
+++ b/libtdenetwork/gpgmepp/key.h
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/keygenerationresult.h b/libtdenetwork/gpgmepp/keygenerationresult.h
index 7b2d98e84..2cf8c8a77 100644
--- a/libtdenetwork/gpgmepp/keygenerationresult.h
+++ b/libtdenetwork/gpgmepp/keygenerationresult.h
@@ -23,7 +23,7 @@
 
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/result.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
 
   class Error;
diff --git a/libtdenetwork/gpgmepp/keylistresult.h b/libtdenetwork/gpgmepp/keylistresult.h
index 068210c02..064539cf2 100644
--- a/libtdenetwork/gpgmepp/keylistresult.h
+++ b/libtdenetwork/gpgmepp/keylistresult.h
@@ -23,7 +23,7 @@
 
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/result.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/signingresult.h b/libtdenetwork/gpgmepp/signingresult.h
index 1ee7a8def..a31b29289 100644
--- a/libtdenetwork/gpgmepp/signingresult.h
+++ b/libtdenetwork/gpgmepp/signingresult.h
@@ -30,7 +30,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/verificationresult.h b/libtdenetwork/gpgmepp/verificationresult.h
index e572ecfee..70269df38 100644
--- a/libtdenetwork/gpgmepp/verificationresult.h
+++ b/libtdenetwork/gpgmepp/verificationresult.h
@@ -29,7 +29,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h
index 36e2afc77..e3613a250 100644
--- a/libtdenetwork/qgpgme/dataprovider.h
+++ b/libtdenetwork/qgpgme/dataprovider.h
@@ -22,7 +22,7 @@
 #include <gpgmepp/interfaces/dataprovider.h>
 
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace QGpgME {
 
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h
index 64abc576a..9c75fcb08 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.h
+++ b/libtdenetwork/qgpgme/eventloopinteractor.h
@@ -22,7 +22,7 @@
 #include <gpgmepp/eventloopinteractor.h>
 
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class Context;
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 278c8e087..34439202d 100644
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@@ -37,7 +37,7 @@
 #include "clicklineedit.h"
 #include "kmailcompletion.h"
 #include <dcopobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEConfig;
 
diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h
index 2fa40f4e4..101cc6e60 100644
--- a/libtdepim/addresseeselector.h
+++ b/libtdepim/addresseeselector.h
@@ -26,7 +26,7 @@
 #include <tdeabc/distributionlist.h>
 #include <tdeabc/resource.h>
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqbitarray.h>
 #include <tqpixmap.h>
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 15cc74909..6ee832688 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -27,7 +27,7 @@
 #include <tdeabc/addressee.h>
 #include <ktextbrowser.h>
 #include <tdeimproxy.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEIO {
 class Job;
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index e87866c73..55b29231a 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqptrdict.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h
index fc9eb607a..af8b383c5 100644
--- a/libtdepim/broadcaststatus.h
+++ b/libtdepim/broadcaststatus.h
@@ -14,7 +14,7 @@
 #include <tqobject.h>
 #include <tqmap.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #undef None
 
diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h
index 86cd8e323..67d8aa159 100644
--- a/libtdepim/categoryeditdialog.h
+++ b/libtdepim/categoryeditdialog.h
@@ -23,7 +23,7 @@
 #define KPIM_CATEGORYEDITDIALOG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KPimPrefs;
 
diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h
index ca501ddc3..6a4bfb406 100644
--- a/libtdepim/categoryselectdialog.h
+++ b/libtdepim/categoryselectdialog.h
@@ -23,7 +23,7 @@
 #define KPIM_CATEGORYSELECTDIALOG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KPimPrefs;
 class CategorySelectDialog_base;
diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h
index ca832b5ee..e8c181ce7 100644
--- a/libtdepim/clicklineedit.h
+++ b/libtdepim/clicklineedit.h
@@ -22,7 +22,7 @@
 #define CLICKLINEEDIT_H
 
 #include <klineedit.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h
index 106b59749..5aad3f07b 100644
--- a/libtdepim/collectingprocess.h
+++ b/libtdepim/collectingprocess.h
@@ -34,7 +34,7 @@
 #define __KPIM_COLLECTINGPROCESS_H__
 
 #include <kprocess.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h
index 87d48e4e2..b00fb7e54 100644
--- a/libtdepim/configmanager.h
+++ b/libtdepim/configmanager.h
@@ -19,7 +19,7 @@
 
 #include <tqobject.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KMKernel;
 
diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h
index dd05b3369..ab709621c 100644
--- a/libtdepim/designerfields.h
+++ b/libtdepim/designerfields.h
@@ -28,7 +28,7 @@
 #include <tqpair.h>
 #include <tqstringlist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/diffalgo.h b/libtdepim/diffalgo.h
index 513db7e33..a437d9d5b 100644
--- a/libtdepim/diffalgo.h
+++ b/libtdepim/diffalgo.h
@@ -23,7 +23,7 @@
 #define DIFFALGO_H
 
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h
index 0a24b2063..bb302d9ed 100644
--- a/libtdepim/embeddedurlpage.h
+++ b/libtdepim/embeddedurlpage.h
@@ -22,7 +22,7 @@
 #define KPIM_EMBEDDEDURLPAGE_H
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 
 namespace KParts { class ReadOnlyPart; }
diff --git a/libtdepim/htmldiffalgodisplay.h b/libtdepim/htmldiffalgodisplay.h
index 35d95f5c8..e38b7a604 100644
--- a/libtdepim/htmldiffalgodisplay.h
+++ b/libtdepim/htmldiffalgodisplay.h
@@ -25,7 +25,7 @@
 #include "diffalgo.h"
 
 #include <ktextbrowser.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h
index f1d43a520..6ee5efe40 100644
--- a/libtdepim/infoextension.h
+++ b/libtdepim/infoextension.h
@@ -23,7 +23,7 @@
 #define  INFOEXTENSION_H
 
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQWidget;
 
diff --git a/libtdepim/interfaces/AddressBookServiceIface.h b/libtdepim/interfaces/AddressBookServiceIface.h
index e07ac3e76..e39b8fc7c 100644
--- a/libtdepim/interfaces/AddressBookServiceIface.h
+++ b/libtdepim/interfaces/AddressBookServiceIface.h
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tqstring.h>
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/interfaces/MailTransportServiceIface.h b/libtdepim/interfaces/MailTransportServiceIface.h
index d256775a3..3a69f83b6 100644
--- a/libtdepim/interfaces/MailTransportServiceIface.h
+++ b/libtdepim/interfaces/MailTransportServiceIface.h
@@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqcstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPim {
 
diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h
index 06c0a7c1e..e5ec2d79f 100644
--- a/libtdepim/kaccount.h
+++ b/libtdepim/kaccount.h
@@ -33,7 +33,7 @@
 #define __KACCOUNT
 
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEConfig;
 
diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h
index a9e2c8c57..bd44e25ae 100644
--- a/libtdepim/kaddrbook.h
+++ b/libtdepim/kaddrbook.h
@@ -9,7 +9,7 @@
 
 #include <tdeversion.h>
 #include <tdeabc/addressee.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
   class AddressBook;
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index 8ab575416..abf3c183f 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -23,7 +23,7 @@
 #define KPIM_KCMDESIGNERFIELDS_H
 
 #include <tdecmodule.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEListView;
 
diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h
index ee5bf8d6f..3cab1fe49 100644
--- a/libtdepim/kdateedit.h
+++ b/libtdepim/kdateedit.h
@@ -28,7 +28,7 @@
 #include <tqdatetime.h>
 #include <tqmap.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "kdatepickerpopup.h"
 
diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h
index 38b947ada..ba9d551f5 100644
--- a/libtdepim/kdatepickerpopup.h
+++ b/libtdepim/kdatepickerpopup.h
@@ -24,7 +24,7 @@
 #include <tqdatetime.h>
 #include <tqpopupmenu.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kdatepicker.h>
 
 /**
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index a06af1368..58e358585 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -1,4 +1,5 @@
 #include "kfoldertree.h"
+#include <tdeversion.h>
 #include <tdelocale.h>
 #include <tdeio/global.h>
 #include <kiconloader.h>
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index d9f0a1a68..a69e80d53 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -26,7 +26,7 @@
 #include <tqdragobject.h>
 #include <tqcolor.h>
 #include <tdelistview.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KFolderTree;
 
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 3070b165d..abacd0ebb 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -31,7 +31,7 @@
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h
index dd180c970..b67d24916 100644
--- a/libtdepim/kpimprefs.h
+++ b/libtdepim/kpimprefs.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 #include <tdeconfigskeleton.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 
diff --git a/libtdepim/kpimurlrequesterdlg.h b/libtdepim/kpimurlrequesterdlg.h
index 6a00cf4ef..8679923d8 100644
--- a/libtdepim/kpimurlrequesterdlg.h
+++ b/libtdepim/kpimurlrequesterdlg.h
@@ -20,7 +20,7 @@
 #ifndef KPIMURLREQUESTDLG_H_INCLUDED
 #define KPIMURLREQUESTDLG_H_INCLUDED
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 #include <tqstring.h>
 
diff --git a/libtdepim/kpixmapregionselectordialog.h b/libtdepim/kpixmapregionselectordialog.h
index ee864391a..2f77ab890 100644
--- a/libtdepim/kpixmapregionselectordialog.h
+++ b/libtdepim/kpixmapregionselectordialog.h
@@ -25,7 +25,7 @@
 #include <kdialogbase.h>
 #include <libtdepim/kpixmapregionselectorwidget.h>
 #include <tqimage.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 3e331b180..86c7b81f4 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -32,7 +32,7 @@
 #include <tdecmodule.h>
 #include <tdeconfigskeleton.h>
 #include <tdefile.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 class KColorButton;
diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h
index ab27c4ea3..909e6bfa9 100644
--- a/libtdepim/kregexp3.h
+++ b/libtdepim/kregexp3.h
@@ -34,7 +34,7 @@
 
 #include <tqstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 /** @short A TQRegExp (TQt3.x) with a replace() method.
 
diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h
index 1954f19c1..398490a13 100644
--- a/libtdepim/kresourceprefs.h
+++ b/libtdepim/kresourceprefs.h
@@ -23,7 +23,7 @@
 #define KRESOURCEPREFS_H
 
 #include <tdeconfigskeleton.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 
diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h
index cfa924f33..877c2c8fa 100644
--- a/libtdepim/krsqueezedtextlabel.h
+++ b/libtdepim/krsqueezedtextlabel.h
@@ -22,7 +22,7 @@
 #define KRSQUEEZEDTEXTLABEL_H
 
 #include <tqlabel.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 /**
  * @short A replacement for TQLabel that squeezes its text
diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h
index a345ba14d..d901d0bfd 100644
--- a/libtdepim/kscoring.h
+++ b/libtdepim/kscoring.h
@@ -38,7 +38,7 @@
 #include <klineedit.h>
 #include <knuminput.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQDomNode;
 class TQDomDocument;
diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h
index 0160a9e47..33677662a 100644
--- a/libtdepim/kscoringeditor.h
+++ b/libtdepim/kscoringeditor.h
@@ -25,7 +25,7 @@
 
 #include "kwidgetlister.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KComboBox;
 class KLineEdit;
diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h
index 0fb5209c0..27b5695cf 100644
--- a/libtdepim/ksubscription.h
+++ b/libtdepim/ksubscription.h
@@ -29,7 +29,7 @@
 #include <tqcheckbox.h>
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "kfoldertree.h"
 
 class KSubscription;
diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h
index 1bb307f85..554128b68 100644
--- a/libtdepim/ktimeedit.h
+++ b/libtdepim/ktimeedit.h
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 
 #include <tdeapplication.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 /**
   This is a class that provides an easy, user friendly way to edit times.
diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h
index 40263ac55..8ac98042d 100644
--- a/libtdepim/kvcarddrag.h
+++ b/libtdepim/kvcarddrag.h
@@ -27,7 +27,7 @@
 
 #include <tdeabc/addressee.h>
 #include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KVCardDragPrivate;
 
diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h
index 449172c31..957164302 100644
--- a/libtdepim/kwidgetlister.h
+++ b/libtdepim/kwidgetlister.h
@@ -34,7 +34,7 @@
 
 #include <tqwidget.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQPushButton;
 class TQVBoxLayout;
diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h
index 7d472560c..a78f411df 100644
--- a/libtdepim/kxface.h
+++ b/libtdepim/kxface.h
@@ -30,7 +30,7 @@
 #include <tqobject.h>
 #include <setjmp.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 // #define WIDTH 48
 // #define HEIGHT WIDTH
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index 41c44e110..b1d8814c8 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -35,7 +35,7 @@
 #include <tdeabc/ldif.h>
 #include <tdeconfig.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp
index f740c1940..1de43268f 100644
--- a/libtdepim/linklocator.cpp
+++ b/libtdepim/linklocator.cpp
@@ -22,6 +22,7 @@
 
 #include "linklocator.h"
 #include "pimemoticons.h"
+#include <tdeversion.h>
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
diff --git a/libtdepim/linklocator.h b/libtdepim/linklocator.h
index 4597d836b..3fb3330b5 100644
--- a/libtdepim/linklocator.h
+++ b/libtdepim/linklocator.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 /**
  * LinkLocator assists in identifying sections of text that can
diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h
index 130ec29fb..c0a95c8a5 100644
--- a/libtdepim/maillistdrag.h
+++ b/libtdepim/maillistdrag.h
@@ -27,7 +27,7 @@
 #include "tqglobal.h"
 #include "time.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 /**
  * TDEPIM classes for drag and drop of mails
diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h
index 384ccf014..6edc61bee 100644
--- a/libtdepim/pluginloaderbase.h
+++ b/libtdepim/pluginloaderbase.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLibrary;
 class TQStringList;
diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h
index b650d0ec6..051d12b3b 100644
--- a/libtdepim/progressdialog.h
+++ b/libtdepim/progressdialog.h
@@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include "overlaywidget.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQProgressBar;
 class TQScrollView;
diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h
index 044919657..4ec175679 100644
--- a/libtdepim/progressmanager.h
+++ b/libtdepim/progressmanager.h
@@ -28,7 +28,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h
index ef7000ff4..01e97494a 100644
--- a/libtdepim/qutf7codec.h
+++ b/libtdepim/qutf7codec.h
@@ -27,7 +27,7 @@
 
 #include "tqtextcodec.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #ifndef TQT_NO_TEXTCODEC
 
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index 774f1e061..f9f6a6ceb 100644
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@@ -35,7 +35,7 @@
 
 #include <kdialogbase.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEConfig;
 class KEditListBox;
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index 54a2843cb..e1213e3e1 100644
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@@ -27,7 +27,7 @@
 
 #include <tdeabc/resource.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 // This is here because it can't go to tdelibs/tdeabc yet, but ultimately
 // it should probably go there (maybe redesigned to have a real object
diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h
index e084ce081..672114992 100644
--- a/libtdepim/sidebarextension.h
+++ b/libtdepim/sidebarextension.h
@@ -22,7 +22,7 @@
 #define  SIDEBAREXTENSION_H
 
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQWidget;
 
diff --git a/libtdepim/spellingfilter.h b/libtdepim/spellingfilter.h
index 4178a888e..d0a8d8845 100644
--- a/libtdepim/spellingfilter.h
+++ b/libtdepim/spellingfilter.h
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 #include "linklocator.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KDE_EXPORT SpellingFilter
 {
diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h
index 87271d69d..f09c14b58 100644
--- a/libtdepim/statusbarprogresswidget.h
+++ b/libtdepim/statusbarprogresswidget.h
@@ -36,7 +36,7 @@
   *  tdeio_littleprogress_dlg (it looks similar)
   */
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KMMainWidget;
 class KProgress;
diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h
index b86108b40..f67abc614 100644
--- a/libtdepim/tdeabcresourcecached.h
+++ b/libtdepim/tdeabcresourcecached.h
@@ -22,7 +22,7 @@
 #define TDEABC_RESOURCECACHED_H
 
 #include <tdeabc/resource.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqdatetime.h>
 #include <tqtimer.h>
diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h
index 32d50e9d1..94a0bff8f 100644
--- a/libtdepim/tdeconfigpropagator.h
+++ b/libtdepim/tdeconfigpropagator.h
@@ -26,7 +26,7 @@
 #include <tqdom.h>
 #include <tqptrlist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEConfigSkeleton;
 class TDEConfigSkeletonItem;
diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h
index 67b76d9c6..93221a854 100644
--- a/libtdepim/tdeconfigwizard.h
+++ b/libtdepim/tdeconfigwizard.h
@@ -22,7 +22,7 @@
 #define TDECONFIGWIZARD_H
 
 #include <tdeconfigpropagator.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kdialogbase.h>
 
 class TQListView;
diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp
index 14fc458ed..ec798a722 100644
--- a/libtdepim/tdefileio.cpp
+++ b/libtdepim/tdefileio.cpp
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h
index e90451315..f0cd8d8d4 100644
--- a/libtdepim/tdefileio.h
+++ b/libtdepim/tdefileio.h
@@ -11,7 +11,7 @@
 #include <tqcstring.h>
 #include <tqwidget.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 2801a9d3a..74d7329b1 100644
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@@ -24,7 +24,7 @@
 #include <kmimetype.h>
 #include <tqlayout.h>
 #include <tdeapplication.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name )
     : TQWidget( parentWidget, name ), m_part( 0 )
diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h
index 3f0d1e734..20e076f4f 100644
--- a/libtdepim/weaver.h
+++ b/libtdepim/weaver.h
@@ -29,7 +29,7 @@ extern "C"
 #include <tqmutex.h>
 #include <tqevent.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 namespace ThreadWeaver {
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index bfe78c615..da28a1f0c 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -80,7 +80,7 @@
 #include <tqdir.h>
 #include <tqtextstream.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 178cd4780..c5e1297a8 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -63,7 +63,7 @@ using TDEABC::Addressee;
 #include "addresseeview.h"
 using KPIM::AddresseeView;
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace {
 
diff --git a/tdeioslave/imap4/imap4.cpp b/tdeioslave/imap4/imap4.cpp
index 280cbde70..449711dec 100644
--- a/tdeioslave/imap4/imap4.cpp
+++ b/tdeioslave/imap4/imap4.cpp
@@ -92,7 +92,7 @@ extern "C" {
 #include <kmimetype.h>
 #include <kmdcodec.h>
 
-#include "tdepimmacros.h"
+#include <kdemacros.h>
 
 #define IMAP_PROTOCOL "imap"
 #define IMAP_SSL_PROTOCOL "imaps"
diff --git a/tdeioslave/mbox/mbox.cpp b/tdeioslave/mbox/mbox.cpp
index 5742baffd..8f45dcaff 100644
--- a/tdeioslave/mbox/mbox.cpp
+++ b/tdeioslave/mbox/mbox.cpp
@@ -34,7 +34,7 @@
 
 #include <stdlib.h>
 
-#include "tdepimmacros.h"
+#include <kdemacros.h>
 
 #include "mbox.h"
 
diff --git a/tdeioslave/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp
index 304ff225f..882b4c6b1 100644
--- a/tdeioslave/opengroupware/opengroupware.cpp
+++ b/tdeioslave/opengroupware/opengroupware.cpp
@@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tdeioslave/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp
index b36336400..0925b5153 100644
--- a/tdeioslave/sieve/sieve.cpp
+++ b/tdeioslave/sieve/sieve.cpp
@@ -49,7 +49,7 @@ using std::exit;
 #include <sys/stat.h>
 #include <cassert>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 static const int debugArea = 7122;
 
diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h
index 5ba80ca1b..35271c1d5 100644
--- a/tderesources/birthdays/resourcetdeabc.h
+++ b/tderesources/birthdays/resourcetdeabc.h
@@ -33,7 +33,7 @@
 
 #include "libkcal/resourcecalendar.h"
 
-#include "libtdepim/tdepimmacros.h"
+#include <kdemacros.h>
 
 namespace TDEIO {
 class FileCopyJob;
diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h
index 4e850d148..56d3cad27 100644
--- a/tderesources/blogging/kcal_resourceblogging.h
+++ b/tderesources/blogging/kcal_resourceblogging.h
@@ -22,7 +22,7 @@
 #define KCAL_RESOURCEBLOGGING_H
 
 #include <kcal_resourcegroupwarebase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KBlog {
 class APIBlog;
diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h
index b7584167c..d2062d760 100644
--- a/tderesources/blogging/kcal_resourcebloggingconfig.h
+++ b/tderesources/blogging/kcal_resourcebloggingconfig.h
@@ -20,7 +20,7 @@
 #ifndef KCAL_RESOURCEBLOGGINGCONFIG_H
 #define KCAL_RESOURCEBLOGGINGCONFIG_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kcal_resourcegroupwarebaseconfig.h>
 
 namespace KCal {
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index 2d0c3ec0d..96f88a45f 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -26,7 +26,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeconfig.h>
 
 namespace KCal {
diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h
index caec0d074..a24b12a72 100644
--- a/tderesources/carddav/resource.h
+++ b/tderesources/carddav/resource.h
@@ -25,7 +25,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeconfig.h>
 
 namespace TDEABC {
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h
index 776bc68b3..0e46c6d32 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.h
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kurl.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "libkcal/calendarlocal.h"
 #include "libkcal/incidence.h"
diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
index 2790717fb..b99bca734 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -22,7 +22,7 @@
 #define RESOURCEXMLRPCCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KIntSpinBox;
 class KLineEdit;
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h
index 2e91d66fb..336488de5 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.h
@@ -27,7 +27,7 @@
 
 #include <tdeconfig.h>
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "libkcal/calendarlocal.h"
 #include "libkcal/journal.h"
diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
index e087dbe2b..e6b05bee9 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -22,7 +22,7 @@
 #define RESOURCEXMLRPCCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KIntSpinBox;
 class KLineEdit;
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
index 6458b8098..c0ccb9444 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
@@ -22,7 +22,7 @@
 #define TDEABC_RESOURCEXMLRPC_H
 
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "libtdepim/tdeabcresourcecached.h"
 
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
index f4893c846..577734839 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
@@ -22,7 +22,7 @@
 #define RESOURCEXMLRPCCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h
index 2d4928974..c86d18bc9 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.h
@@ -29,7 +29,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeconfig.h>
 
 namespace KCal {
diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
index aa00123f6..917ce52e1 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -23,7 +23,7 @@
 #define RESOURCEFEATUREPLANCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h
index 36b0456c8..7aa82f719 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav.h
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h
@@ -23,7 +23,7 @@
 #define TDEABC_RESOURCEGROUPDAV_H
 
 #include "tdeabc_resourcegroupwarebase.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h
index c4b330df7..5743a282a 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.h
+++ b/tderesources/groupwise/kcal_resourcegroupwise.h
@@ -30,7 +30,7 @@
 #include <tdeabc/locknull.h>
 #include <tdeio/job.h>
 #include <tdeconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class ngwt__Settings;
 
diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
index cea6ad699..87447e0a5 100644
--- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCEGROUPWISECONFIG_H
 
 #include <kurlrequester.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index fb1d075ae..b57c36e8e 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h
@@ -23,7 +23,7 @@
 #include "soap/groupwiseserver.h"
 
 #include <tdeabcresourcecached.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
index df62753a5..233743f8f 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
@@ -23,7 +23,7 @@
 #include "soap/groupwiseserver.h"
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqmap.h>
 
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index 56021e68f..c51fa4e4f 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "groupwise.h"
 
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index 357c98040..8a4da37cf 100644
--- a/tderesources/kolab/kcal/resourcekolab.h
+++ b/tderesources/kolab/kcal/resourcekolab.h
@@ -37,7 +37,7 @@
 
 #include <tqtimer.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcecalendar.h>
diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h
index fb0d191b9..5f205b16d 100644
--- a/tderesources/kolab/knotes/resourcekolab.h
+++ b/tderesources/kolab/knotes/resourcekolab.h
@@ -39,7 +39,7 @@
 #include <libkcal/calendarlocal.h>
 #include "../shared/resourcekolabbase.h"
 #include "../shared/subresource.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 namespace Kolab {
diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp
index 21583eb32..7d594735e 100644
--- a/tderesources/kolab/tdeabc/contact.cpp
+++ b/tderesources/kolab/tdeabc/contact.cpp
@@ -33,6 +33,7 @@
 #include "contact.h"
 #include "resourcekolab.h"
 
+#include <tdeversion.h>
 #include <tdeabc/addressee.h>
 #include <tdeabc/stdaddressbook.h>
 #include <libkcal/freebusyurlstore.h>
diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index a19dfbaa0..9b4b4a172 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
@@ -38,7 +38,7 @@
 #include "../shared/resourcekolabbase.h"
 #include "../shared/subresource.h"
 #include <kmail/kmailicalIface.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h
index a1a43f0e2..5a754bc69 100644
--- a/tderesources/lib/addressbookadaptor.h
+++ b/tderesources/lib/addressbookadaptor.h
@@ -26,7 +26,7 @@
 #include "groupwaredataadaptor.h"
 
 #include <tdeabc/addressee.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 
 namespace TDEABC {
diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h
index 354a2795e..7a2567e35 100644
--- a/tderesources/lib/calendaradaptor.h
+++ b/tderesources/lib/calendaradaptor.h
@@ -27,7 +27,7 @@
 
 
 #include <libkcal/incidence.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 
 namespace KPIM {
diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h
index 883d1510e..fcb16afa1 100644
--- a/tderesources/lib/davaddressbookadaptor.h
+++ b/tderesources/lib/davaddressbookadaptor.h
@@ -24,7 +24,7 @@
 #include "addressbookadaptor.h"
 #include "folderlister.h"
 #include <tqdom.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h
index 998a9cc7d..ab1c9757f 100644
--- a/tderesources/lib/davcalendaradaptor.h
+++ b/tderesources/lib/davcalendaradaptor.h
@@ -24,7 +24,7 @@
 #include "calendaradaptor.h"
 #include "folderlister.h"
 #include <tqdom.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h
index a9b4c714c..e027095d0 100644
--- a/tderesources/lib/folderconfig.h
+++ b/tderesources/lib/folderconfig.h
@@ -24,7 +24,7 @@
 #define KPIM_FOLDERCONFIG_H
 
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqwidget.h>
 
 // class TDEListView;
diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h
index a1d3f2ebf..ac99d5169 100644
--- a/tderesources/lib/folderlister.h
+++ b/tderesources/lib/folderlister.h
@@ -26,7 +26,7 @@
 // #include "tderesources_groupwareprefs.h"
 /*#include "groupwareresourcejob.h"*/
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqvaluelist.h>
 #include <tqstring.h>
diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h
index b7bd6e333..0370aa6f1 100644
--- a/tderesources/lib/groupwaredataadaptor.h
+++ b/tderesources/lib/groupwaredataadaptor.h
@@ -29,7 +29,7 @@
 #include <tqstring.h>
 #include <libkcal/listbase.h>
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 namespace TDEIO {
diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h
index 51263e263..185864550 100644
--- a/tderesources/lib/kcal_cachesettingsdlg.h
+++ b/tderesources/lib/kcal_cachesettingsdlg.h
@@ -23,7 +23,7 @@
 #define KCAL_CACHESETTINGSDLG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 namespace KRES {
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index 80a1d4600..f7f80435c 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.h
+++ b/tderesources/lib/kcal_resourcegroupwarebase.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 #include <libkcal/resourcecached.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeabc/locknull.h>
 
 namespace TDEIO {
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
index 7639b562f..940ba61bd 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -23,7 +23,7 @@
 #define KCAL_RESOURCEGROUPWAREBASECONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KPushButton;
 class KLineEdit;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index 7835d3d23..9d122fe46 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
@@ -24,7 +24,7 @@
 
 #include <kurl.h>
 #include <tdeabcresourcecached.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEConfig;
 
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index 7b8326239..37e98ef48 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
@@ -23,7 +23,7 @@
 #define TDEABC_RESOURCEGROUPWAREBASECONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h
index 0bfb33e90..a2de509d4 100644
--- a/tderesources/lib/webdavhandler.h
+++ b/tderesources/lib/webdavhandler.h
@@ -27,7 +27,7 @@
 #include <tqdom.h>
 #include <tqdatetime.h>
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KDE_EXPORT WebdavHandler
 {
diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp
index 5551516e4..c6f3599f4 100644
--- a/tderesources/newexchange/exchangeconvertercontact.cpp
+++ b/tderesources/newexchange/exchangeconvertercontact.cpp
@@ -21,6 +21,7 @@
 #include "exchangeconvertercontact.h"
 #include <libkcal/freebusyurlstore.h>
 #include <webdavhandler.h>
+#include <tdeversion.h>
 #include <kdebug.h>
 
 
diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h
index 84e213ae3..ec7be9212 100644
--- a/tderesources/remote/resourceremote.h
+++ b/tderesources/remote/resourceremote.h
@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h
index a05171eed..fdf262032 100644
--- a/tderesources/remote/resourceremoteconfig.h
+++ b/tderesources/remote/resourceremoteconfig.h
@@ -30,7 +30,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h
index b58eee859..d4e564c00 100644
--- a/tderesources/scalix/kcal/resourcescalix.h
+++ b/tderesources/scalix/kcal/resourcescalix.h
@@ -36,7 +36,7 @@
 
 #include <tqtimer.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcecalendar.h>
diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h
index 6a3676c1e..ab40b7073 100644
--- a/tderesources/scalix/knotes/resourcescalix.h
+++ b/tderesources/scalix/knotes/resourcescalix.h
@@ -38,7 +38,7 @@
 #include <libkcal/calendarlocal.h>
 #include "../shared/resourcescalixbase.h"
 #include "../shared/subresource.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 namespace Scalix {
diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h
index f9d4c3092..f5c8ffe6d 100644
--- a/tderesources/scalix/tdeabc/resourcescalix.h
+++ b/tderesources/scalix/tdeabc/resourcescalix.h
@@ -39,7 +39,7 @@
 #include "../shared/resourcescalixbase.h"
 #include "../shared/subresource.h"
 #include <kmail/kmailicalIface.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 5ce8dca1d..0af6c4660 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -28,7 +28,7 @@
 #include <tdeio/global.h>
 #include <tdelocale.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <stdlib.h>
 
diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h
index 39a2757e0..cfad65ed7 100644
--- a/tderesources/slox/kcalresourceslox.h
+++ b/tderesources/slox/kcalresourceslox.h
@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <libkcal/incidence.h>
 #include <libkcal/todo.h>
diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h
index e2a666c0b..f5784f845 100644
--- a/tderesources/slox/kcalresourcesloxconfig.h
+++ b/tderesources/slox/kcalresourcesloxconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCESLOXCONFIG_H
 
 #include <kurlrequester.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h
index 2e9d1289f..1af805864 100644
--- a/tderesources/slox/sloxaccounts.h
+++ b/tderesources/slox/sloxaccounts.h
@@ -21,7 +21,7 @@
 #define SLOXACCOUNTS_H
 
 #include <tdeabc/addressee.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqobject.h>
 
 namespace TDEIO {
diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h
index 8e9309c9d..dc3c9c536 100644
--- a/tderesources/slox/sloxbase.h
+++ b/tderesources/slox/sloxbase.h
@@ -21,7 +21,7 @@
 #define SLOXUTILS_H
 
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KRES {
 class Resource;
diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h
index 6f6a6c938..06f080034 100644
--- a/tderesources/slox/sloxfolder.h
+++ b/tderesources/slox/sloxfolder.h
@@ -21,7 +21,7 @@
 #define SLOXFOLDER_H
 
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEListViewItem;
 
diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h
index f31c212c7..3907dab76 100644
--- a/tderesources/slox/sloxfoldermanager.h
+++ b/tderesources/slox/sloxfoldermanager.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEIO {
 class Job;
diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp
index 248e3f395..79036abd1 100644
--- a/tderesources/slox/tdeabcresourceslox.cpp
+++ b/tderesources/slox/tdeabcresourceslox.cpp
@@ -21,6 +21,7 @@
 
 #include <tqapplication.h>
 
+#include <tdeversion.h>
 #include <tdeabc/picture.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h
index 35a71be22..a37f17d6b 100644
--- a/tderesources/slox/tdeabcresourceslox.h
+++ b/tderesources/slox/tdeabcresourceslox.h
@@ -24,7 +24,7 @@
 #include "webdavhandler.h"
 
 #include <libtdepim/tdeabcresourcecached.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeabc/addressee.h>
 
 #include <tqmap.h>
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h
index 6bbaf6ae8..36e021267 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.h
+++ b/tderesources/slox/tdeabcresourcesloxconfig.h
@@ -21,7 +21,7 @@
 #define RESOURCESLOXCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQCheckBox;
 class KLineEdit;
diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h
index c7c93222b..6d98fd522 100644
--- a/tderesources/slox/webdavhandler.h
+++ b/tderesources/slox/webdavhandler.h
@@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqdom.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeabc/addressee.h>
 
 namespace KCal {
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h
index 1be0aa0ef..636389be9 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.h
@@ -30,7 +30,7 @@
 #include <tdeabc/locknull.h>
 #include <tdeio/job.h>
 #include <tdeconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "service.h"
 
diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
index c99e86e09..814cc4921 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCETVANYTIMECONFIG_H
 
 #include <kurlrequester.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h
index 431c61d3c..bd25dea11 100644
--- a/wizards/egroupwarewizard.h
+++ b/wizards/egroupwarewizard.h
@@ -22,7 +22,7 @@
 #define EGROUPWAREWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;
diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h
index ffa35d025..8f4978ed1 100644
--- a/wizards/exchangewizard.h
+++ b/wizards/exchangewizard.h
@@ -21,7 +21,7 @@
 #define EXCHANGEWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index 7960a39be..734e14d71 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -21,7 +21,7 @@
 #define GROUPWISEWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;
diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h
index 99fd0c0d2..a0f898a0b 100644
--- a/wizards/kolabwizard.h
+++ b/wizards/kolabwizard.h
@@ -23,7 +23,7 @@
 #define KOLABWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;
diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h
index 273f6c4a6..3b5b5ec31 100644
--- a/wizards/scalixwizard.h
+++ b/wizards/scalixwizard.h
@@ -23,7 +23,7 @@
 #define SCALIXWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KComboBox;
 class KLineEdit;
diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h
index d9b24c60c..ad6ec0d25 100644
--- a/wizards/sloxwizard.h
+++ b/wizards/sloxwizard.h
@@ -21,7 +21,7 @@
 #define SLOXWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;