diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h
index 3ec567ee..50f04c45 100644
--- a/akregator/src/aboutdata.h
+++ b/akregator/src/aboutdata.h
@@ -26,7 +26,7 @@
 #define ABOUTDATA_H
 
 #include <tdeaboutdata.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #define AKREGATOR_VERSION "1.2.9"
 
diff --git a/akregator/src/akregator_export.h b/akregator/src/akregator_export.h
index a5a85b1f..4ee5db1c 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #define AKREGATOR_EXPORT TDE_EXPORT
 
diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h
index 966521cc..16c08178 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 <kdemacros.h>
+#include <tdemacros.h>
 
 template <class>
 class TQValueList;
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 8120628a..af492ebf 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -96,7 +96,7 @@
 // other
 #include <algorithm>
 #include <assert.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kinputdialog.h>
 namespace {
 
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 0d37a423..1b9fe81e 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -36,7 +36,7 @@
 //#include <gpgme.h>
 
 #include <tdemainwindow.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 #include <tqcstring.h>
 #include <tqptrlist.h>
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 3c9e344b..3ec3e1dd 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -36,7 +36,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
     : TDECModule( parent, name )
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 96e30f37..772dfd7d 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -47,7 +47,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <kdemacros.h>
+#include <tdemacros.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 dec0543e..81bf3b8e 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -34,7 +34,7 @@
 
 #include <tdecmodule.h>
 #include <kleo/cryptoconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQCheckBox;
 class TQTimeEdit;
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index e7ac6b69..beaea7fa 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -34,7 +34,7 @@
 #include <ui/dnattributeorderconfigwidget.h>
 #include <kleo/dn.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqlayout.h>
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
index 17521b9d..255e3fdd 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
   class Error;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h
index be12978a..aabfb701 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
   class Data;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
index cf69bdcb..f5f46669 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
   class Error;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
index 6788420e..216faeb5 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
@@ -44,7 +44,7 @@
 
 #include <utility>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 namespace GpgME {
   class Error;
   class Context;
diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h
index 8b99e03a..82cab607 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
   class ImportResult;
diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h
index 05202e3f..a45c82fc 100644
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@@ -35,7 +35,7 @@
 
 #include "kleo/cryptobackendfactory.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #ifndef LIBKLEOPATRA_NO_COMPAT
 namespace Kleo {
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index 12068306..7397e423 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 <kdemacros.h>
+#include <tdemacros.h>
 
 
 class TDEConfigBase;
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index 72292e5b..d8b1dd6c 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -36,7 +36,7 @@
 #include <tqobject.h>
 
 #include "cryptobackend.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <vector>
 #include <map>
diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h
index 4b633378..493a61a0 100644
--- a/certmanager/lib/kleo/dn.h
+++ b/certmanager/lib/kleo/dn.h
@@ -35,7 +35,7 @@
 
 #include <tqstring.h>
 #include <tqvaluevector.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQStringList;
 class TQWidget;
diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h
index 36b735d6..a10bc592 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 class TQStringList;
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index 661c3a4f..6920bec9 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <gpgmepp/keylistresult.h>
 
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index d3d90279..40f3687d 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 <kdemacros.h>
+#include <tdemacros.h>
 namespace GpgME {
   class Key;
 }
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index f6de39ac..0bc8d329 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 <kdemacros.h>
+#include <tdemacros.h>
 #include <tqguardedptr.h>
 
 #include <vector>
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index e96464de..7f965773 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace Kleo {
   class CryptoBackendFactory;
diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h
index 36d8e8c0..f16ff948 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@@ -33,7 +33,7 @@
 #define CRYPTOCONFIGDIALOG_H
 
 #include <kdialogbase.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h
index 4ae64e05..9a97c680 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class CryptPlugWrapper;
 namespace Kleo {
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index ba9fa71e..a8fcf934 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 <kdemacros.h>
+#include <tdemacros.h>
 namespace Kleo {
   class DNAttributeMapper;
 }
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index 29723791..25c82fcf 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 <kdemacros.h>
+#include <tdemacros.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 49fd8b63..0db1b1e3 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class TQPainter;
 class TQColorGroup;
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index bcb466b4..ba383335 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -53,7 +53,7 @@
 #include <kleo/cryptobackend.h>
 
 #include <vector>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace Kleo {
   class KeyListView;
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index a76356f1..60442558 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 <kdemacros.h>
+#include <tdemacros.h>
 #include <vector>
 
 class TQVBoxLayout;
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index 3e07aa00..4119a1d7 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 <kdemacros.h>
+#include <tdemacros.h>
 class TQTimer;
 
 namespace Kleo {
diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h
index 65ac78f9..7414cb08 100644
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@@ -35,7 +35,7 @@
 
 #include <tqprogressdialog.h>
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 namespace Kleo {
 
   class Job;
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index a13847d0..d8b2bddd 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -25,7 +25,7 @@
 #define KABPREFS_H
 
 #include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include "kabprefs_base.h"
 
 class TDEConfig;
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index c636b10b..bd6dc6ba 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 
 #include <tdeconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 class AddressBook;
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index c3282b5c..c9dc07b1 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -28,7 +28,7 @@
 
 #include <tdeabc/addressbook.h>
 #include <klibloader.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #define KAB_CEW_PLUGIN_VERSION 1
 
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index e689ee8f..57a84d70 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 class AddressBook;
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index a7396c2a..43c29898 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -28,7 +28,7 @@
 
 #include <tdeabc/addressbook.h>
 #include <klibloader.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1
 
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index 13321eee..e46d8d5f 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #define KAB_XXPORT_PLUGIN_VERSION 1
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ddac716b..0f818470 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -33,7 +33,7 @@
 #include <tqwidget.h>
 
 #include "core.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 class AddressBook;
diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h
index df04edb7..16033675 100644
--- a/kaddressbook/kaddressbookiface.h
+++ b/kaddressbook/kaddressbookiface.h
@@ -27,7 +27,7 @@
 #include <dcopobject.h>
 #include <kurl.h>
 #include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDE_EXPORT KAddressBookIface : virtual public DCOPObject
 {
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index cf11b13c..3ba9ebdc 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -31,7 +31,7 @@
 
 #include <tdeabc/field.h>
 #include <klibloader.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "filter.h"
 #include "viewconfigurewidget.h"
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index ca6b5da4..733663ab 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -31,7 +31,7 @@
 
 #include "kcmkabconfig.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index c1a6db97..f3c787a9 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -29,7 +29,7 @@
 
 #include <tqregexp.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 60e47b27..a5495127 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -32,7 +32,7 @@
 
 #include "kcmkabldapconfig.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index 7fb8df39..24077e64 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -25,7 +25,7 @@
 #define VIEWCONFIGUREWIDGET_H
 
 #include <kdialogbase.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqpixmap.h>
 
 #include "configurewidget.h"
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index 3c0344d3..58cbcb75 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -29,7 +29,7 @@
 
 #include <kurl.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "xxport.h"
 
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index 4087d3da..e411f09d 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -34,7 +34,7 @@
 #include <calendarresources.h>
 #include <vector>
 #include "resourcecalendar.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQDateTime;
 class Preferences;
diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h
index 79c7f7d3..32c5a66a 100644
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@@ -38,7 +38,7 @@
 #include <tqsplitter.h> 
 
 #include <tdepopupmenu.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "KGanttItem.h"
 #include "xQGanttListView.h"
diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h
index 298efbcc..b4a13c3c 100644
--- a/kgantt/kgantt/KGanttItem.h
+++ b/kgantt/kgantt/KGanttItem.h
@@ -38,7 +38,7 @@
 #include <tqptrlist.h> 
 #include <tqpainter.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "KGanttRelation.h"
 
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 5a65505e..b8a4f404 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -33,7 +33,7 @@
 #define __KMAIL_ABOUTDATA_H__
 
 #include <tdeaboutdata.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KMail {
 
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index f1160149..31519117 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include "kmaccount.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 class TQStringList;
diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp
index 66a4e266..990f1ff3 100644
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@@ -32,7 +32,7 @@
 
 #include "interfaces/bodypartformatter.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace {
 
diff --git a/kmail/callback.h b/kmail/callback.h
index bd2b5659..4fff0f73 100644
--- a/kmail/callback.h
+++ b/kmail/callback.h
@@ -38,7 +38,7 @@
 class KMMessage;
 class KMReaderWin;
 
-#include <kdemacros.h>
+#include <tdemacros.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 e4083b85..7294c96e 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class TQPushButton;
 class TQLabel;
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 7563e34f..daef055d 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -35,7 +35,7 @@
 #include <tdeparts/part.h>
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEInstance;
 class TDEAboutData;
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 08cee0b8..4c873800 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 <kdemacros.h>
+#include <tdemacros.h>
 #include <kservice.h>
 #include <tdetempfile.h>
 
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 3d62d6de..f6e5df11 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -21,7 +21,7 @@
 #include "foldertreebase.h"
 
 #include <tdelocale.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqguardedptr.h>
 #include <tqwidget.h>
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index d1c2ce0f..06c563a5 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -7,11 +7,11 @@
 #include <weaver.h>
 #include <weaverlogger.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tdeimproxy.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #ifdef __TDE_HAVE_TDEHWLIB
 # include <tdenetworkconnections.h>
diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h
index 790e161d..e6208bc7 100644
--- a/kmail/kmstartup.h
+++ b/kmail/kmstartup.h
@@ -18,7 +18,7 @@
 #ifndef KMSTARTUP
 #define KMSTARTUP
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C" {
 
diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h
index a064e15a..c52bf936 100644
--- a/kmobile/kmobileclient.h
+++ b/kmobile/kmobileclient.h
@@ -6,7 +6,7 @@
 #define _KMOBILECLIENT_H_
 
 #include <dcopclient.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDE_EXPORT KMobileClient : public DCOPClient
 {
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 100c668f..14f212a6 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqmutex.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <klibloader.h>
 
 #include <tdeabc/addressee.h>
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index e58b286d..a0cfebff 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -9,7 +9,7 @@
 
 #include "kmobileiface.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 class TDEConfig;
 class KMobileItem;
 
diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp
index 9a00ba38..1a821bb8 100644
--- a/kmobile/tdeioslave/tdeio_mobile.cpp
+++ b/kmobile/tdeioslave/tdeio_mobile.cpp
@@ -33,7 +33,7 @@
 
 #include "tdeio_mobile.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 using namespace TDEIO;
 
diff --git a/knode/aboutdata.h b/knode/aboutdata.h
index 1db0a264..013c23e2 100644
--- a/knode/aboutdata.h
+++ b/knode/aboutdata.h
@@ -15,7 +15,7 @@
 */
 
 #include <tdeaboutdata.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #ifndef KNODE_ABOUTDATA_H
 #define KNODE_ABOUTDATA_H
diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp
index f8b9b70b..2d5d8a58 100644
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@@ -23,7 +23,7 @@
 #include "knconfigpages.h"
 #include "knconfigwidgets.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 //
 // common config page with tabs (code mostly taken from kmail)
diff --git a/knode/knconvert.h b/knode/knconvert.h
index 7cfcf7ab..323a67c8 100644
--- a/knode/knconvert.h
+++ b/knode/knconvert.h
@@ -21,7 +21,7 @@
 
 #include <tqglobal.h>
 #include <tqvaluelist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQListBox;
 class TQLabel;
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 10598419..91dd6838 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include "resource.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEInstance;
 class KNConfigManager;
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index 09469427..5c1e469a 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -21,7 +21,7 @@
 #include "resource.h"
 
 #include <tqglobal.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQListViewItem;
 
diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h
index 948dd452..8ac01f49 100644
--- a/knotes/resourcenotes.h
+++ b/knotes/resourcenotes.h
@@ -34,7 +34,7 @@
 #define RESOURCENOTES_H
 
 #include <tderesources/resource.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <libkcal/alarm.h>
 
 class TDEConfig;
diff --git a/kode/automakefile.h b/kode/automakefile.h
index 25113bd4..d29322a7 100644
--- a/kode/automakefile.h
+++ b/kode/automakefile.h
@@ -26,7 +26,7 @@
 #include <tqmap.h>
 #include <tqstringlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/class.h b/kode/class.h
index 7e8548c7..f63eb362 100644
--- a/kode/class.h
+++ b/kode/class.h
@@ -26,7 +26,7 @@
 #include "membervariable.h"
 #include "typedef.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kode/code.h b/kode/code.h
index d060b2f5..12bf31c4 100644
--- a/kode/code.h
+++ b/kode/code.h
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 namespace KODE {
 
 class TDE_EXPORT Code
diff --git a/kode/enum.h b/kode/enum.h
index f4f90f37..0cae53e4 100644
--- a/kode/enum.h
+++ b/kode/enum.h
@@ -22,7 +22,7 @@
 #define KODE_ENUM_H
 
 #include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/file.h b/kode/file.h
index c0d9d39c..506b5745 100644
--- a/kode/file.h
+++ b/kode/file.h
@@ -28,7 +28,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/function.h b/kode/function.h
index f9cab7e2..94c8b3f1 100644
--- a/kode/function.h
+++ b/kode/function.h
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/license.h b/kode/license.h
index d5aa685d..fca593e2 100644
--- a/kode/license.h
+++ b/kode/license.h
@@ -22,7 +22,7 @@
 #define KODE_LICENSE_H
 
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/membervariable.h b/kode/membervariable.h
index 6adc9ddb..b8995ed7 100644
--- a/kode/membervariable.h
+++ b/kode/membervariable.h
@@ -25,7 +25,7 @@
 
 #include <tqvaluelist.h>
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/printer.h b/kode/printer.h
index 0f92608e..a939c0be 100644
--- a/kode/printer.h
+++ b/kode/printer.h
@@ -26,7 +26,7 @@
 #include "style.h"
 #include "automakefile.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kode/statemachine.h b/kode/statemachine.h
index c4e5f6a5..e1a8fa1f 100644
--- a/kode/statemachine.h
+++ b/kode/statemachine.h
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 #include <tqmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/style.h b/kode/style.h
index 989cf0d1..fe469f33 100644
--- a/kode/style.h
+++ b/kode/style.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/typedef.h b/kode/typedef.h
index 7da8eb46..c922bfdb 100644
--- a/kode/typedef.h
+++ b/kode/typedef.h
@@ -22,7 +22,7 @@
 #define KODE_TYPEDEF_H
 
 #include <tqvaluelist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kode/variable.h b/kode/variable.h
index 87b87eeb..6c52123f 100644
--- a/kode/variable.h
+++ b/kode/variable.h
@@ -24,7 +24,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KODE {
 
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index a075c243..cc71407c 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -24,7 +24,7 @@
 #define KONTACT_CORE_H
 
 #include <tqdatetime.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/part.h>
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index c0895741..f2911ade 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -26,7 +26,7 @@
 
 #include <tqobject.h>
 #include <kxmlguiclient.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqptrlist.h>
 
 class TQStringList;
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 303babb3..cd97525a 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 #include <tqpixmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KStatusBar;
 
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index d6a33963..81e0b72a 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -24,7 +24,7 @@
 
 #include <dcopobject.h>
 #include <plugin.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace Kontact
 {
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 20ba1a72..7b2d92b2 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -37,7 +37,7 @@
 
 #include "kcmkmailsummary.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 7e2dd0a3..41efc83e 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -37,7 +37,7 @@
 
 #include "kcmkorgsummary.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 929be9aa..e186f2a1 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -45,7 +45,7 @@
 
 #include "newsfeeds.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index f0b87414..3a97d2c1 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -39,7 +39,7 @@
 
 #include "kcmsdsummary.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index d400df31..0ceb1ec4 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -39,7 +39,7 @@
 
 #include "kcmkontactsummary.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 7c4b1928..0d2426a0 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h
index 1bbc93ad..a9ba16b3 100644
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@@ -25,7 +25,7 @@
 #define KORG_ABOUTDATA_H
 
 #include <tdeaboutdata.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KOrg {
 
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 8df8ef6f..ff499d49 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -30,7 +30,7 @@
 #include <tqobject.h>
 #include <kurl.h>
 #include <korganizer/part.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "kcalendariface.h"
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index acf786af..d51bb434 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include "koglobals.h"
 #include "interfaces/korganizer/calendarviewbase.h"
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index 06517142..cc00b3b1 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 <kdemacros.h>
+#include <tdemacros.h>
 #include "korganizer/incidencechangerbase.h"
 
 #include "printplugin.h"
diff --git a/korganizer/kocore.h b/korganizer/kocore.h
index f4125c53..e8efe099 100644
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@@ -29,7 +29,7 @@
 #include <korganizer/part.h>
 #include <korganizer/printplugin.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <ktrader.h>
 
 namespace KPIM { class IdentityManager; }
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 739dce7e..0a71274b 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -24,7 +24,7 @@
 #ifndef KOEVENTVIEWER_H
 #define KOEVENTVIEWER_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 #include <tqtextbrowser.h>
 
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 30eef188..a56fc8a1 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -25,7 +25,7 @@
 #define KOEVENTVIEWERDIALOG_H
 
 #include <kdialogbase.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include "koeventviewer.h"
 
 namespace KCal {
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 6ec6cb89..3e96d941 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -23,7 +23,7 @@
 #ifndef KORG_GLOBALS_H
 #define KORG_GLOBALS_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqwidget.h>
 
 class TQDate;
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index 6858b900..587851a1 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">kdemacros.h</include>
+    <include location="global" impldecl="in declaration">tdemacros.h</include>
     <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
 </includes>
 <signals>
diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h
index a1ae0151..cae50fc4 100644
--- a/korganizer/kohelper.h
+++ b/korganizer/kohelper.h
@@ -25,7 +25,7 @@
 #ifndef KOHELPER_H
 #define KOHELPER_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
   class Calendar;
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 6d3395d1..0c57134e 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -26,7 +26,7 @@
 
 #include <tqdict.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "koprefs_base.h"
 
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 137210c8..67cd215d 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -77,7 +77,7 @@
 #include "ktimeedit.h"
 #include "koglobals.h"
 #include "stdcalendar.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 
 KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h
index 508546e8..12409868 100644
--- a/korganizer/korganizerifaceimpl.h
+++ b/korganizer/korganizerifaceimpl.h
@@ -34,7 +34,7 @@
 #include "korganizeriface.h"
 
 #include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class ActionManager;
 
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index c8e462d6..f8d25a4b 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KOrg {
 class CoreHelper;
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index cc42b928..7c265f38 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -30,7 +30,7 @@
 
 #include <tqdatetime.h>
 #include <kprinter.h>
-#include <kdemacros.h>
+#include <tdemacros.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 5b8c977f..6e030365 100644
--- a/korganizer/printing/cellitem.h
+++ b/korganizer/printing/cellitem.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KOrg {
 
diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h
index d3364e41..1284b248 100644
--- a/korganizer/urihandler.h
+++ b/korganizer/urihandler.h
@@ -24,7 +24,7 @@
 #ifndef URIHANDLER_H
 #define URIHANDLER_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 class TQWidget;
diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h
index 71278e62..00d29721 100644
--- a/ktnef/gui/ktnefview.h
+++ b/ktnef/gui/ktnefview.h
@@ -20,7 +20,7 @@
 
 #include <tdelistview.h>
 #include <tqptrlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KTNEFAttach;
 
diff --git a/ktnef/ktnef/ktnefattach.h b/ktnef/ktnef/ktnefattach.h
index 077d7a3c..b2acfe38 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KTNEFProperty;
 
diff --git a/ktnef/ktnef/ktnefmessage.h b/ktnef/ktnef/ktnefmessage.h
index 24723c00..6c0128bf 100644
--- a/ktnef/ktnef/ktnefmessage.h
+++ b/ktnef/ktnef/ktnefmessage.h
@@ -20,7 +20,7 @@
 
 #include <ktnef/ktnefpropertyset.h>
 #include <tqptrlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KTNEFAttach;
 
diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h
index 7d42b9d1..da3c324a 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KTNEFAttach;
 class KTNEFMessage;
diff --git a/ktnef/ktnef/ktnefproperty.h b/ktnef/ktnef/ktnefproperty.h
index 0443e715..ccd04b68 100644
--- a/ktnef/ktnef/ktnefproperty.h
+++ b/ktnef/ktnef/ktnefproperty.h
@@ -20,7 +20,7 @@
 
 #include <tqvariant.h>
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDE_EXPORT KTNEFProperty
 {
diff --git a/ktnef/ktnef/ktnefpropertyset.h b/ktnef/ktnef/ktnefpropertyset.h
index 789bfe89..19cb9067 100644
--- a/ktnef/ktnef/ktnefpropertyset.h
+++ b/ktnef/ktnef/ktnefpropertyset.h
@@ -20,7 +20,7 @@
 
 #include <tqmap.h>
 #include <tqvariant.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KTNEFProperty;
 
diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h
index 30f4e9e5..19d08e7f 100644
--- a/libemailfunctions/email.h
+++ b/libemailfunctions/email.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqcstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /** @file */
 
diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h
index 04d34e4c..557e61ec 100644
--- a/libemailfunctions/idmapper.h
+++ b/libemailfunctions/idmapper.h
@@ -25,7 +25,7 @@
 #include <tqmap.h>
 #include <tqvariant.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libkcal/alarm.h b/libkcal/alarm.h
index 01969cae..ec927005 100644
--- a/libkcal/alarm.h
+++ b/libkcal/alarm.h
@@ -33,7 +33,7 @@
 #include "listbase.h"
 #include "libkcal_export.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 2c76832e..19b87687 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -39,7 +39,7 @@
 #include "kcalversion.h"
 #include "person.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqobject.h>
 #include <tqstring.h>
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index e021a9b6..b14607fc 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -24,7 +24,7 @@
 
 #include "calendar.h"
 #include <tqdict.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h
index 313dd273..401af879 100644
--- a/libkcal/confirmsavedialog.h
+++ b/libkcal/confirmsavedialog.h
@@ -23,7 +23,7 @@
 #include <libkcal/incidence.h>
 
 #include <kdialogbase.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEListView;
 
diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h
index de6b8bd7..60de5c50 100644
--- a/libkcal/customproperties.h
+++ b/libkcal/customproperties.h
@@ -24,7 +24,7 @@
 
 #include <tqstring.h>
 #include <tqmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "libkcal_export.h"
 
diff --git a/libkcal/event.h b/libkcal/event.h
index 707453ae..93b439f8 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -22,7 +22,7 @@
 #define KCAL_EVENT_H
 
 #include "incidence.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index f277b14a..423738df 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -26,7 +26,7 @@
 #include "scheduler.h"
 
 #include "calformat.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index f5fedc34..2f3bb3e8 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -32,7 +32,7 @@
 #include "libkcal_export.h"
 
 #include "incidencebase.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/journal.h b/libkcal/journal.h
index d2ca83c4..3bd10729 100644
--- a/libkcal/journal.h
+++ b/libkcal/journal.h
@@ -23,7 +23,7 @@
 #define KCAL_JOURNAL_H
 
 #include "incidence.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h
index 19502ff1..e6ffe4f9 100644
--- a/libkcal/libkcal_export.h
+++ b/libkcal/libkcal_export.h
@@ -21,7 +21,7 @@
 #ifndef KCAL_KCALEXPORT_H
 #define KCAL_KCALEXPORT_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #define LIBKCAL_EXPORT TDE_EXPORT
 
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index 6465def9..34356377 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -34,7 +34,7 @@
 #include <tqdatetime.h>
 #include <tqtimer.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h
index ff3639c1..f30cc63c 100644
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@@ -22,7 +22,7 @@
 #define KCAL_RESOURCECACHEDCONFIG_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQButtonGroup;
 class TQSpinBox;
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index 84530421..f3713143 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index 1ef4cf01..0c6773f8 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <kdirwatch.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 class TDEConfig;
 
 #include "calendarlocal.h"
diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h
index 2bb732ee..d7747b63 100644
--- a/libkcal/resourcelocalconfig.h
+++ b/libkcal/resourcelocalconfig.h
@@ -28,7 +28,7 @@
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "libkcal_export.h"
 
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index de7d35b2..144397c4 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -23,7 +23,7 @@
 
 #include <kurl.h>
 #include <kdirwatch.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "resourcecached.h"
 
diff --git a/libkholidays/kholidays.h b/libkholidays/kholidays.h
index 9dfc55da..a7501c66 100644
--- a/libkholidays/kholidays.h
+++ b/libkholidays/kholidays.h
@@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqvaluelist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 struct KHoliday {
   TQString text;
diff --git a/libkmime/boolflags.h b/libkmime/boolflags.h
index 821c8188..8fdda365 100644
--- a/libkmime/boolflags.h
+++ b/libkmime/boolflags.h
@@ -17,7 +17,7 @@
 #ifndef __KMIME_BOOLFLAGS_H__
 #define __KMIME_BOOLFLAGS_H__
 
-#include <kdemacros.h>
+#include <tdemacros.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 fcd7aeab..535445f1 100644
--- a/libkmime/kmime_charfreq.h
+++ b/libkmime/kmime_charfreq.h
@@ -16,7 +16,7 @@
 #define __KMIME_CHARFREQ_H__
 
 #include <tqcstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #undef None
 
 namespace KMime {
diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h
index 1bd1bddc..bf4fdecb 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KMime {
 
diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h
index cf398e61..a446c2f5 100644
--- a/libkmime/kmime_header_parsing.h
+++ b/libkmime/kmime_header_parsing.h
@@ -38,7 +38,7 @@
 
 #include <time.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 template <typename K, typename V> class TQMap;
 class TQStringList;
diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h
index 0b17cbb1..d550e507 100644
--- a/libkmime/kmime_headers.h
+++ b/libkmime/kmime_headers.h
@@ -35,7 +35,7 @@
 
 #include <time.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KMime {
 
diff --git a/libkmime/kmime_headers_obs.h b/libkmime/kmime_headers_obs.h
index 2278af90..51e4d5ba 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 <kdemacros.h>
+#include <tdemacros.h>
 
 /** Represents a "Message-Id" header */
 class TDE_EXPORT MessageID : public Base {
diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h
index 53959550..37dbd3e9 100644
--- a/libkmime/kmime_mdn.h
+++ b/libkmime/kmime_mdn.h
@@ -35,7 +35,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQCString;
 
diff --git a/libkmime/kmime_newsarticle.h b/libkmime/kmime_newsarticle.h
index a7b9d35d..b0197f65 100644
--- a/libkmime/kmime_newsarticle.h
+++ b/libkmime/kmime_newsarticle.h
@@ -18,7 +18,7 @@
 
 #include "kmime_message.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KMime {
 
diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h
index ff332c31..23553216 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 <kdemacros.h>
+#include <tdemacros.h>
 
 typedef TQValueList<TQCString> QCStringList;
 
diff --git a/libkmime/kqcstringsplitter.h b/libkmime/kqcstringsplitter.h
index 964fd09d..a5cf97ee 100644
--- a/libkmime/kqcstringsplitter.h
+++ b/libkmime/kqcstringsplitter.h
@@ -19,7 +19,7 @@
 
 #include <tqcstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDE_EXPORT KTQCStringSplitter {
   
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index bd7fda9c..bb4cc6fa 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -36,7 +36,7 @@
 #include <kdialogbase.h>
 
 #include "kpgpkey.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQLineEdit;
 class TQCursor;
diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h
index 736ea20a..422a04e6 100644
--- a/libkpgp/kpgpblock.h
+++ b/libkpgp/kpgpblock.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqstrlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 //#include <tqstringlist.h>
 class TQStringList;
diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h
index dc2e8db6..90888133 100644
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@@ -29,7 +29,7 @@
 
 #include "kpgp.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 class TQRegExp;
diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h
index 4c1a7df8..77d94dea 100644
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@@ -26,7 +26,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 #include <tdeio/job.h>
 
diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h
index 9ad36f5c..6599b5ed 100644
--- a/libkpimexchange/core/exchangeclient.h
+++ b/libkpimexchange/core/exchangeclient.h
@@ -26,7 +26,7 @@
 #include <tqhostaddress.h>
 #include <tqptrlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal { 
   class Event;
diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h
index 32f2c0cc..1ee3b742 100644
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 
 #include <tdeio/job.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h
index 56635a7c..6d570097 100644
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tdeio/job.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 31deaca7..bdc31385 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -9,7 +9,7 @@
 
 #include <kleo/enum.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqstring.h>
 #include <tqcstring.h>
diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h
index f9594422..5b780b9a 100644
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@@ -34,7 +34,7 @@
 
 #include <tqcombobox.h>
 #include <tqvaluelist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 92d59157..69a18f50 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -35,7 +35,7 @@
 
 #include <tqvaluelist.h>
 #include <dcopobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfigBase;
 class TDEConfig;
diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h
index 8b9c3d16..c26fdb58 100644
--- a/libksieve/ksieve/error.h
+++ b/libksieve/ksieve/error.h
@@ -35,7 +35,7 @@
 
 #include <tqstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #ifdef None // X headers
 #  undef None
diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h
index 0a848d0c..1708c10f 100644
--- a/libksieve/ksieve/parser.h
+++ b/libksieve/ksieve/parser.h
@@ -33,7 +33,7 @@
 #ifndef __KSIEVE_PARSING_H__
 #define __KSIEVE_PARSING_H__
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 
diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h
index ec01f20d..03c03829 100644
--- a/libtdenetwork/gpgmepp/context.h
+++ b/libtdenetwork/gpgmepp/context.h
@@ -25,7 +25,7 @@
 #include <utility>
 #include <iosfwd>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/data.h b/libtdenetwork/gpgmepp/data.h
index 4d6dfb1f..b0bb6b02 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/decryptionresult.h b/libtdenetwork/gpgmepp/decryptionresult.h
index 86e6af58..f23d5fc3 100644
--- a/libtdenetwork/gpgmepp/decryptionresult.h
+++ b/libtdenetwork/gpgmepp/decryptionresult.h
@@ -26,7 +26,7 @@
 
 #include <iosfwd>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/encryptionresult.h b/libtdenetwork/gpgmepp/encryptionresult.h
index 745ce09b..62649604 100644
--- a/libtdenetwork/gpgmepp/encryptionresult.h
+++ b/libtdenetwork/gpgmepp/encryptionresult.h
@@ -27,7 +27,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/engineinfo.h b/libtdenetwork/gpgmepp/engineinfo.h
index 6f151185..98164c70 100644
--- a/libtdenetwork/gpgmepp/engineinfo.h
+++ b/libtdenetwork/gpgmepp/engineinfo.h
@@ -24,7 +24,7 @@
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/context.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.h b/libtdenetwork/gpgmepp/eventloopinteractor.h
index e8da527c..6a696a40 100644
--- a/libtdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libtdenetwork/gpgmepp/eventloopinteractor.h
@@ -19,7 +19,7 @@
 #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
 #define __GPGMEPP_EVENTLOOPINTERACTOR_H__
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h
index 110e9834..e85298e6 100644
--- a/libtdenetwork/gpgmepp/importresult.h
+++ b/libtdenetwork/gpgmepp/importresult.h
@@ -25,7 +25,7 @@
 #include <gpgmepp/result.h>
 
 #include <vector>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/interfaces/dataprovider.h b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
index aa21a11f..e9886eac 100644
--- a/libtdenetwork/gpgmepp/interfaces/dataprovider.h
+++ b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h
index c3522360..b64c564e 100644
--- a/libtdenetwork/gpgmepp/key.h
+++ b/libtdenetwork/gpgmepp/key.h
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 
 #include <vector>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/keygenerationresult.h b/libtdenetwork/gpgmepp/keygenerationresult.h
index 7fef89f3..dcfb56f2 100644
--- a/libtdenetwork/gpgmepp/keygenerationresult.h
+++ b/libtdenetwork/gpgmepp/keygenerationresult.h
@@ -23,7 +23,7 @@
 
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/result.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 namespace GpgME {
 
   class Error;
diff --git a/libtdenetwork/gpgmepp/keylistresult.h b/libtdenetwork/gpgmepp/keylistresult.h
index 8a77a0b5..877fd517 100644
--- a/libtdenetwork/gpgmepp/keylistresult.h
+++ b/libtdenetwork/gpgmepp/keylistresult.h
@@ -23,7 +23,7 @@
 
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/result.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/signingresult.h b/libtdenetwork/gpgmepp/signingresult.h
index 3a35c3d5..c43b577e 100644
--- a/libtdenetwork/gpgmepp/signingresult.h
+++ b/libtdenetwork/gpgmepp/signingresult.h
@@ -30,7 +30,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/verificationresult.h b/libtdenetwork/gpgmepp/verificationresult.h
index 1bc61a69..86d54b8d 100644
--- a/libtdenetwork/gpgmepp/verificationresult.h
+++ b/libtdenetwork/gpgmepp/verificationresult.h
@@ -29,7 +29,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h
index 9daf4021..235998f7 100644
--- a/libtdenetwork/qgpgme/dataprovider.h
+++ b/libtdenetwork/qgpgme/dataprovider.h
@@ -22,7 +22,7 @@
 #include <gpgmepp/interfaces/dataprovider.h>
 
 #include <tqcstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace QGpgME {
 
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h
index ea7ccd03..7fca3bc0 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.h
+++ b/libtdenetwork/qgpgme/eventloopinteractor.h
@@ -22,7 +22,7 @@
 #include <gpgmepp/eventloopinteractor.h>
 
 #include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
   class Context;
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 17ad5f05..7bad4c7e 100644
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@@ -37,7 +37,7 @@
 #include "clicklineedit.h"
 #include "kmailcompletion.h"
 #include <dcopobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfig;
 
diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h
index bfe3e4ae..83b8ad51 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqbitarray.h>
 #include <tqpixmap.h>
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 43e442f3..13230c11 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -27,7 +27,7 @@
 #include <tdeabc/addressee.h>
 #include <ktextbrowser.h>
 #include <tdeimproxy.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEIO {
 class Job;
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index dcfee200..152938ab 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqptrdict.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h
index 8cfc2e2e..7c93bc5b 100644
--- a/libtdepim/broadcaststatus.h
+++ b/libtdepim/broadcaststatus.h
@@ -14,7 +14,7 @@
 #include <tqobject.h>
 #include <tqmap.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #undef None
 
diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h
index 3f45ca8f..4b81f552 100644
--- a/libtdepim/categoryeditdialog.h
+++ b/libtdepim/categoryeditdialog.h
@@ -23,7 +23,7 @@
 #define KPIM_CATEGORYEDITDIALOG_H
 
 #include <kdialogbase.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KPimPrefs;
 
diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h
index ec0af3dc..38e05064 100644
--- a/libtdepim/categoryselectdialog.h
+++ b/libtdepim/categoryselectdialog.h
@@ -23,7 +23,7 @@
 #define KPIM_CATEGORYSELECTDIALOG_H
 
 #include <kdialogbase.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KPimPrefs;
 class CategorySelectDialog_base;
diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h
index a570e44e..25ad3e3a 100644
--- a/libtdepim/clicklineedit.h
+++ b/libtdepim/clicklineedit.h
@@ -22,7 +22,7 @@
 #define CLICKLINEEDIT_H
 
 #include <klineedit.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h
index 5de4960c..ef5f34e8 100644
--- a/libtdepim/collectingprocess.h
+++ b/libtdepim/collectingprocess.h
@@ -34,7 +34,7 @@
 #define __KPIM_COLLECTINGPROCESS_H__
 
 #include <kprocess.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h
index c3d93b16..274dc9cf 100644
--- a/libtdepim/configmanager.h
+++ b/libtdepim/configmanager.h
@@ -19,7 +19,7 @@
 
 #include <tqobject.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KMKernel;
 
diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h
index ee50c8db..c4a23b72 100644
--- a/libtdepim/designerfields.h
+++ b/libtdepim/designerfields.h
@@ -28,7 +28,7 @@
 #include <tqpair.h>
 #include <tqstringlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/diffalgo.h b/libtdepim/diffalgo.h
index 2bb6a2b9..424756f8 100644
--- a/libtdepim/diffalgo.h
+++ b/libtdepim/diffalgo.h
@@ -23,7 +23,7 @@
 #define DIFFALGO_H
 
 #include <tqvaluelist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h
index d8e0e003..14a9cffd 100644
--- a/libtdepim/embeddedurlpage.h
+++ b/libtdepim/embeddedurlpage.h
@@ -22,7 +22,7 @@
 #define KPIM_EMBEDDEDURLPAGE_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 namespace KParts { class ReadOnlyPart; }
diff --git a/libtdepim/htmldiffalgodisplay.h b/libtdepim/htmldiffalgodisplay.h
index 5eccc00c..dcce58cb 100644
--- a/libtdepim/htmldiffalgodisplay.h
+++ b/libtdepim/htmldiffalgodisplay.h
@@ -25,7 +25,7 @@
 #include "diffalgo.h"
 
 #include <ktextbrowser.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h
index 16da9143..ea83ae83 100644
--- a/libtdepim/infoextension.h
+++ b/libtdepim/infoextension.h
@@ -23,7 +23,7 @@
 #define  INFOEXTENSION_H
 
 #include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQWidget;
 
diff --git a/libtdepim/interfaces/AddressBookServiceIface.h b/libtdepim/interfaces/AddressBookServiceIface.h
index d14a7e68..2ae23b83 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/interfaces/MailTransportServiceIface.h b/libtdepim/interfaces/MailTransportServiceIface.h
index 3dfbf300..d6a3883d 100644
--- a/libtdepim/interfaces/MailTransportServiceIface.h
+++ b/libtdepim/interfaces/MailTransportServiceIface.h
@@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqcstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPim {
 
diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h
index 8fd64522..aed0a46e 100644
--- a/libtdepim/kaccount.h
+++ b/libtdepim/kaccount.h
@@ -33,7 +33,7 @@
 #define __KACCOUNT
 
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfig;
 
diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h
index c68266b2..4ec2b6fc 100644
--- a/libtdepim/kaddrbook.h
+++ b/libtdepim/kaddrbook.h
@@ -9,7 +9,7 @@
 
 #include <tdeversion.h>
 #include <tdeabc/addressee.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
   class AddressBook;
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index dc1f344e..3d1b8524 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -23,7 +23,7 @@
 #define KPIM_KCMDESIGNERFIELDS_H
 
 #include <tdecmodule.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEListView;
 
diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h
index e031751b..41d955b2 100644
--- a/libtdepim/kdateedit.h
+++ b/libtdepim/kdateedit.h
@@ -28,7 +28,7 @@
 #include <tqdatetime.h>
 #include <tqmap.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "kdatepickerpopup.h"
 
diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h
index 6b3de635..c052c1fc 100644
--- a/libtdepim/kdatepickerpopup.h
+++ b/libtdepim/kdatepickerpopup.h
@@ -24,7 +24,7 @@
 #include <tqdatetime.h>
 #include <tqpopupmenu.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kdatepicker.h>
 
 /**
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index 536118f9..6045e912 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -26,7 +26,7 @@
 #include <tqdragobject.h>
 #include <tqcolor.h>
 #include <tdelistview.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KFolderTree;
 
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index ce21e222..c58f2b49 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -31,7 +31,7 @@
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h
index fad92a08..fcd39254 100644
--- a/libtdepim/kpimprefs.h
+++ b/libtdepim/kpimprefs.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 #include <tdeconfigskeleton.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 
diff --git a/libtdepim/kpimurlrequesterdlg.h b/libtdepim/kpimurlrequesterdlg.h
index a0954ab1..cf504071 100644
--- a/libtdepim/kpimurlrequesterdlg.h
+++ b/libtdepim/kpimurlrequesterdlg.h
@@ -20,7 +20,7 @@
 #ifndef KPIMURLREQUESTDLG_H_INCLUDED
 #define KPIMURLREQUESTDLG_H_INCLUDED
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 #include <tqstring.h>
 
diff --git a/libtdepim/kpixmapregionselectordialog.h b/libtdepim/kpixmapregionselectordialog.h
index c02d6b02..220a00b8 100644
--- a/libtdepim/kpixmapregionselectordialog.h
+++ b/libtdepim/kpixmapregionselectordialog.h
@@ -25,7 +25,7 @@
 #include <kdialogbase.h>
 #include <libtdepim/kpixmapregionselectorwidget.h>
 #include <tqimage.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 85125382..ff85b698 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -32,7 +32,7 @@
 #include <tdecmodule.h>
 #include <tdeconfigskeleton.h>
 #include <tdefile.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 
 class KColorButton;
diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h
index da30ddfa..1bb3ac21 100644
--- a/libtdepim/kregexp3.h
+++ b/libtdepim/kregexp3.h
@@ -34,7 +34,7 @@
 
 #include <tqstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /** @short A TQRegExp (TQt3.x) with a replace() method.
 
diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h
index 102d5c5a..46ac397e 100644
--- a/libtdepim/kresourceprefs.h
+++ b/libtdepim/kresourceprefs.h
@@ -23,7 +23,7 @@
 #define KRESOURCEPREFS_H
 
 #include <tdeconfigskeleton.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 
diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h
index 7262b2cd..35216b85 100644
--- a/libtdepim/krsqueezedtextlabel.h
+++ b/libtdepim/krsqueezedtextlabel.h
@@ -22,7 +22,7 @@
 #define KRSQUEEZEDTEXTLABEL_H
 
 #include <tqlabel.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
  * @short A replacement for TQLabel that squeezes its text
diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h
index 93c76e3c..deb48646 100644
--- a/libtdepim/kscoring.h
+++ b/libtdepim/kscoring.h
@@ -38,7 +38,7 @@
 #include <klineedit.h>
 #include <knuminput.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQDomNode;
 class TQDomDocument;
diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h
index 81e7a21f..41faec00 100644
--- a/libtdepim/kscoringeditor.h
+++ b/libtdepim/kscoringeditor.h
@@ -25,7 +25,7 @@
 
 #include "kwidgetlister.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KComboBox;
 class KLineEdit;
diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h
index 97488fde..e85571a3 100644
--- a/libtdepim/ksubscription.h
+++ b/libtdepim/ksubscription.h
@@ -29,7 +29,7 @@
 #include <tqcheckbox.h>
 
 #include <kdialogbase.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include "kfoldertree.h"
 
 class KSubscription;
diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h
index 7669295b..1cc20084 100644
--- a/libtdepim/ktimeedit.h
+++ b/libtdepim/ktimeedit.h
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 
 #include <tdeapplication.h>
-#include <kdemacros.h>
+#include <tdemacros.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 d6e21cde..1669d795 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KVCardDragPrivate;
 
diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h
index 1af5b010..520e2018 100644
--- a/libtdepim/kwidgetlister.h
+++ b/libtdepim/kwidgetlister.h
@@ -34,7 +34,7 @@
 
 #include <tqwidget.h>
 #include <tqptrlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQPushButton;
 class TQVBoxLayout;
diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h
index f0a036be..275c6661 100644
--- a/libtdepim/kxface.h
+++ b/libtdepim/kxface.h
@@ -30,7 +30,7 @@
 #include <tqobject.h>
 #include <setjmp.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // #define WIDTH 48
 // #define HEIGHT WIDTH
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index 8f1e3c2a..ecfbbd32 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -35,7 +35,7 @@
 #include <tdeabc/ldif.h>
 #include <tdeconfig.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/linklocator.h b/libtdepim/linklocator.h
index ce5bba1c..d1462837 100644
--- a/libtdepim/linklocator.h
+++ b/libtdepim/linklocator.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
  * LinkLocator assists in identifying sections of text that can
diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h
index d83aaebf..1e9e9681 100644
--- a/libtdepim/maillistdrag.h
+++ b/libtdepim/maillistdrag.h
@@ -27,7 +27,7 @@
 #include "tqglobal.h"
 #include "time.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
  * TDEPIM classes for drag and drop of mails
diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h
index d622ea44..f1fe3ca9 100644
--- a/libtdepim/pluginloaderbase.h
+++ b/libtdepim/pluginloaderbase.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLibrary;
 class TQStringList;
diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h
index 090bfde2..ad7dd7e8 100644
--- a/libtdepim/progressdialog.h
+++ b/libtdepim/progressdialog.h
@@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include "overlaywidget.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQProgressBar;
 class TQScrollView;
diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h
index 8610f9c9..17c96c32 100644
--- a/libtdepim/progressmanager.h
+++ b/libtdepim/progressmanager.h
@@ -28,7 +28,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h
index 6fe3a473..1df5e7cc 100644
--- a/libtdepim/qutf7codec.h
+++ b/libtdepim/qutf7codec.h
@@ -27,7 +27,7 @@
 
 #include "tqtextcodec.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #ifndef TQT_NO_TEXTCODEC
 
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index c0d2fc2d..fb26a4a4 100644
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@@ -35,7 +35,7 @@
 
 #include <kdialogbase.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfig;
 class KEditListBox;
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index 9b7c942c..6ea28aef 100644
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@@ -27,7 +27,7 @@
 
 #include <tdeabc/resource.h>
 #include <tqmap.h>
-#include <kdemacros.h>
+#include <tdemacros.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 eead6af6..3a6bb014 100644
--- a/libtdepim/sidebarextension.h
+++ b/libtdepim/sidebarextension.h
@@ -22,7 +22,7 @@
 #define  SIDEBAREXTENSION_H
 
 #include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQWidget;
 
diff --git a/libtdepim/spellingfilter.h b/libtdepim/spellingfilter.h
index 23a43ef1..1046f952 100644
--- a/libtdepim/spellingfilter.h
+++ b/libtdepim/spellingfilter.h
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 #include "linklocator.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDE_EXPORT SpellingFilter
 {
diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h
index caee1172..e75e3c2e 100644
--- a/libtdepim/statusbarprogresswidget.h
+++ b/libtdepim/statusbarprogresswidget.h
@@ -36,7 +36,7 @@
   *  tdeio_littleprogress_dlg (it looks similar)
   */
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KMMainWidget;
 class KProgress;
diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h
index 6960b25b..7c65add1 100644
--- a/libtdepim/tdeabcresourcecached.h
+++ b/libtdepim/tdeabcresourcecached.h
@@ -22,7 +22,7 @@
 #define TDEABC_RESOURCECACHED_H
 
 #include <tdeabc/resource.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqdatetime.h>
 #include <tqtimer.h>
diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h
index 7a24384c..cc9381a5 100644
--- a/libtdepim/tdeconfigpropagator.h
+++ b/libtdepim/tdeconfigpropagator.h
@@ -26,7 +26,7 @@
 #include <tqdom.h>
 #include <tqptrlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfigSkeleton;
 class TDEConfigSkeletonItem;
diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h
index e9922d61..4f4ac8b2 100644
--- a/libtdepim/tdeconfigwizard.h
+++ b/libtdepim/tdeconfigwizard.h
@@ -22,7 +22,7 @@
 #define TDECONFIGWIZARD_H
 
 #include <tdeconfigpropagator.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kdialogbase.h>
 
 class TQListView;
diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp
index 95eb7728..ce2e8068 100644
--- a/libtdepim/tdefileio.cpp
+++ b/libtdepim/tdefileio.cpp
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 
diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h
index 2f2e0453..baadf027 100644
--- a/libtdepim/tdefileio.h
+++ b/libtdepim/tdefileio.h
@@ -11,7 +11,7 @@
 #include <tqcstring.h>
 #include <tqwidget.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 618fccdd..4d37dc95 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 <kdemacros.h>
+#include <tdemacros.h>
 
 KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name )
     : TQWidget( parentWidget, name ), m_part( 0 )
@@ -103,7 +103,7 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const {
     return false;
 }
 
-/// Duplicated from tdelibs/tdecore/kdemacros.h.in for those with tdelibs < 3.4
+/// Duplicated from tdelibs/tdecore/tdemacros.h.in for those with tdelibs < 3.4
 #ifndef TDE_EXPORT_PLUGIN
 #define TDE_EXPORT_PLUGIN(PLUGIN) \
   TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h
index 6f38b870..5cffc86f 100644
--- a/libtdepim/weaver.h
+++ b/libtdepim/weaver.h
@@ -29,7 +29,7 @@ extern "C"
 #include <tqmutex.h>
 #include <tqevent.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KPIM {
 namespace ThreadWeaver {
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index b0c32509..607c30b0 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 4ef5c92c..3856c1e3 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace {
 
diff --git a/tdeioslave/imap4/imap4.cpp b/tdeioslave/imap4/imap4.cpp
index e541e734..7d02a489 100644
--- a/tdeioslave/imap4/imap4.cpp
+++ b/tdeioslave/imap4/imap4.cpp
@@ -92,7 +92,7 @@ extern "C" {
 #include <kmimetype.h>
 #include <kmdcodec.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #define IMAP_PROTOCOL "imap"
 #define IMAP_SSL_PROTOCOL "imaps"
diff --git a/tdeioslave/mbox/mbox.cpp b/tdeioslave/mbox/mbox.cpp
index 62eab9b9..30fd3b0c 100644
--- a/tdeioslave/mbox/mbox.cpp
+++ b/tdeioslave/mbox/mbox.cpp
@@ -34,7 +34,7 @@
 
 #include <stdlib.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "mbox.h"
 
diff --git a/tdeioslave/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp
index 66a0b19a..fcf6d4a7 100644
--- a/tdeioslave/opengroupware/opengroupware.cpp
+++ b/tdeioslave/opengroupware/opengroupware.cpp
@@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tdeioslave/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp
index 8ca806d9..2bbfab80 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 <kdemacros.h>
+#include <tdemacros.h>
 
 static const int debugArea = 7122;
 
diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h
index 7cc2f771..103c404f 100644
--- a/tderesources/birthdays/resourcetdeabc.h
+++ b/tderesources/birthdays/resourcetdeabc.h
@@ -33,7 +33,7 @@
 
 #include "libkcal/resourcecalendar.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEIO {
 class FileCopyJob;
diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h
index 109d9ccf..1cbd01f8 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KBlog {
 class APIBlog;
diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h
index d78042b3..ca387006 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 <kdemacros.h>
+#include <tdemacros.h>
 #include <kcal_resourcegroupwarebaseconfig.h>
 
 namespace KCal {
diff --git a/tderesources/caldav/config.h b/tderesources/caldav/config.h
index ffeaa27f..23ea20fb 100644
--- a/tderesources/caldav/config.h
+++ b/tderesources/caldav/config.h
@@ -19,7 +19,7 @@
 
 #include "resource.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tderesources/configwidget.h>
 
 class TQLineEdit;
diff --git a/tderesources/caldav/configwidgets.h b/tderesources/caldav/configwidgets.h
index 7ad3597e..07362c01 100644
--- a/tderesources/caldav/configwidgets.h
+++ b/tderesources/caldav/configwidgets.h
@@ -36,7 +36,7 @@
 #define KCALDAV_AUTOWIDGETS_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index 95aba7d7..326806b1 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -26,7 +26,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 
 namespace KCal {
diff --git a/tderesources/carddav/config.h b/tderesources/carddav/config.h
index e752aee4..c4c8c659 100644
--- a/tderesources/carddav/config.h
+++ b/tderesources/carddav/config.h
@@ -18,7 +18,7 @@
 
 #include "resource.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tderesources/configwidget.h>
 
 class TQLineEdit;
diff --git a/tderesources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h
index e61b97e0..f723cda6 100644
--- a/tderesources/carddav/configwidgets.h
+++ b/tderesources/carddav/configwidgets.h
@@ -35,7 +35,7 @@
 #define KCARDDAV_AUTOWIDGETS_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h
index 828c6da7..a76754bd 100644
--- a/tderesources/carddav/resource.h
+++ b/tderesources/carddav/resource.h
@@ -25,7 +25,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 
 namespace TDEABC {
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h
index 45cc1344..53005dd5 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.h
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kurl.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "libkcal/calendarlocal.h"
 #include "libkcal/incidence.h"
diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
index 316b5dfd..15aded2e 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KIntSpinBox;
 class KLineEdit;
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h
index 83ee4b27..c52c3925 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.h
@@ -27,7 +27,7 @@
 
 #include <tdeconfig.h>
 #include <kurl.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "libkcal/calendarlocal.h"
 #include "libkcal/journal.h"
diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
index b451fafb..3693e67c 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KIntSpinBox;
 class KLineEdit;
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
index e5996b5e..c9e318f4 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include "libtdepim/tdeabcresourcecached.h"
 
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
index 2b06903a..502f0597 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h
index fa83bef7..f82da2cf 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.h
@@ -29,7 +29,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 
 namespace KCal {
diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
index c811b72b..0bd6d4b9 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h
index 5457e46e..496f8e05 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h
index 64a9c111..ea9c846e 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class ngwt__Settings;
 
diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
index 2c77dab5..a955b0f3 100644
--- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCEGROUPWISECONFIG_H
 
 #include <kurlrequester.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index 17cc9b52..c573eaf9 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
index 7fd2b45a..3ebdb52c 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqmap.h>
 
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index ed054b8e..3f1076c9 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "groupwise.h"
 
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index b8670151..289e894d 100644
--- a/tderesources/kolab/kcal/resourcekolab.h
+++ b/tderesources/kolab/kcal/resourcekolab.h
@@ -37,7 +37,7 @@
 
 #include <tqtimer.h>
 
-#include <kdemacros.h>
+#include <tdemacros.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 c28d6e22..747c2ea4 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 <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace Kolab {
diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index 84bce5e6..dd3dab6b 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h
index 00852d18..ef1beb5d 100644
--- a/tderesources/lib/addressbookadaptor.h
+++ b/tderesources/lib/addressbookadaptor.h
@@ -26,7 +26,7 @@
 #include "groupwaredataadaptor.h"
 
 #include <tdeabc/addressee.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 namespace TDEABC {
diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h
index 4b913d89..aea6a69e 100644
--- a/tderesources/lib/calendaradaptor.h
+++ b/tderesources/lib/calendaradaptor.h
@@ -27,7 +27,7 @@
 
 
 #include <libkcal/incidence.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 namespace KPIM {
diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h
index 6ff319d7..41a39bf4 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h
index 942caf71..069d6245 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h
index 741c12d5..1694613c 100644
--- a/tderesources/lib/folderconfig.h
+++ b/tderesources/lib/folderconfig.h
@@ -24,7 +24,7 @@
 #define KPIM_FOLDERCONFIG_H
 
 #include <kurl.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqwidget.h>
 
 // class TDEListView;
diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h
index 90790af7..4f04bf1c 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqvaluelist.h>
 #include <tqstring.h>
diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h
index ba11cf1b..51def5c7 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 <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace TDEIO {
diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h
index 5fe2c757..13510782 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 <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace KRES {
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index d0f6c48f..fcde85aa 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 <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeabc/locknull.h>
 
 namespace TDEIO {
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
index 22c9f207..23ffef60 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KPushButton;
 class KLineEdit;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index 77358bd6..36307699 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
@@ -24,7 +24,7 @@
 
 #include <kurl.h>
 #include <tdeabcresourcecached.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfig;
 
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index 6b2ad4d3..b7cb3a3e 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h
index 65018c7b..4371ac5b 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class TDE_EXPORT WebdavHandler
 {
diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h
index cdbb6f1a..58ddd831 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h
index 8c4a2b25..6359aa99 100644
--- a/tderesources/remote/resourceremoteconfig.h
+++ b/tderesources/remote/resourceremoteconfig.h
@@ -30,7 +30,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h
index 60dba194..0890eaf0 100644
--- a/tderesources/scalix/kcal/resourcescalix.h
+++ b/tderesources/scalix/kcal/resourcescalix.h
@@ -36,7 +36,7 @@
 
 #include <tqtimer.h>
 
-#include <kdemacros.h>
+#include <tdemacros.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 2266bf1e..592fc0a3 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 <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace Scalix {
diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h
index 99e5f03c..c3e8765c 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index b56f398a..165f4772 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <stdlib.h>
 
diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h
index 59db8a9f..83d78769 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libkcal/incidence.h>
 #include <libkcal/todo.h>
diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h
index 2ebd0108..46da81bd 100644
--- a/tderesources/slox/kcalresourcesloxconfig.h
+++ b/tderesources/slox/kcalresourcesloxconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCESLOXCONFIG_H
 
 #include <kurlrequester.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h
index a9e615da..64c5a273 100644
--- a/tderesources/slox/sloxaccounts.h
+++ b/tderesources/slox/sloxaccounts.h
@@ -21,7 +21,7 @@
 #define SLOXACCOUNTS_H
 
 #include <tdeabc/addressee.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqobject.h>
 
 namespace TDEIO {
diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h
index 577c8387..525f76a3 100644
--- a/tderesources/slox/sloxbase.h
+++ b/tderesources/slox/sloxbase.h
@@ -21,7 +21,7 @@
 #define SLOXUTILS_H
 
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KRES {
 class Resource;
diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h
index bb39ba85..0bad3dae 100644
--- a/tderesources/slox/sloxfolder.h
+++ b/tderesources/slox/sloxfolder.h
@@ -21,7 +21,7 @@
 #define SLOXFOLDER_H
 
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEListViewItem;
 
diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h
index c0be7c1a..d0f466aa 100644
--- a/tderesources/slox/sloxfoldermanager.h
+++ b/tderesources/slox/sloxfoldermanager.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEIO {
 class Job;
diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h
index 126ee75c..c78a2f6d 100644
--- a/tderesources/slox/tdeabcresourceslox.h
+++ b/tderesources/slox/tdeabcresourceslox.h
@@ -24,7 +24,7 @@
 #include "webdavhandler.h"
 
 #include <libtdepim/tdeabcresourcecached.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeabc/addressee.h>
 
 #include <tqmap.h>
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h
index 37b27e1d..76dd7e54 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.h
+++ b/tderesources/slox/tdeabcresourcesloxconfig.h
@@ -21,7 +21,7 @@
 #define RESOURCESLOXCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQCheckBox;
 class KLineEdit;
diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h
index 338fe2c3..d617325f 100644
--- a/tderesources/slox/webdavhandler.h
+++ b/tderesources/slox/webdavhandler.h
@@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqdom.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeabc/addressee.h>
 
 namespace KCal {
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h
index 093a175c..721e0542 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include "service.h"
 
diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
index 3800d324..b4db19cf 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCETVANYTIMECONFIG_H
 
 #include <kurlrequester.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h
index 01fe34b7..c0e12db2 100644
--- a/wizards/egroupwarewizard.h
+++ b/wizards/egroupwarewizard.h
@@ -22,7 +22,7 @@
 #define EGROUPWAREWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;
diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h
index c13cf785..a6b400a1 100644
--- a/wizards/exchangewizard.h
+++ b/wizards/exchangewizard.h
@@ -21,7 +21,7 @@
 #define EXCHANGEWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index 58d9e037..ecfccb4c 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -21,7 +21,7 @@
 #define GROUPWISEWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;
diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h
index 20525dd7..1d8cd120 100644
--- a/wizards/kolabwizard.h
+++ b/wizards/kolabwizard.h
@@ -23,7 +23,7 @@
 #define KOLABWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;
diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h
index 90ca8fa8..379cd51d 100644
--- a/wizards/scalixwizard.h
+++ b/wizards/scalixwizard.h
@@ -23,7 +23,7 @@
 #define SCALIXWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KComboBox;
 class KLineEdit;
diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h
index f2488294..3d543e49 100644
--- a/wizards/sloxwizard.h
+++ b/wizards/sloxwizard.h
@@ -21,7 +21,7 @@
 #define SLOXWIZARD_H
 
 #include <tdeconfigwizard.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class TQCheckBox;