Replace kdemacros.h with tdemacros.h

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3353e7fa30be3d2f6c5161a7fd10fd056b5828cd)

57 files changed, 58 insertions, 58 deletions

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 {