diff --git a/kmyfirewall/core/ipaddress.h b/kmyfirewall/core/ipaddress.h
index cfcd23a..3f9d0fc 100644
--- a/kmyfirewall/core/ipaddress.h
+++ b/kmyfirewall/core/ipaddress.h
@@ -31,7 +31,7 @@
 #include <tqvaluelist.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // Project includes
 
diff --git a/kmyfirewall/core/iptchain.h b/kmyfirewall/core/iptchain.h
index f5cbb48..45b8627 100644
--- a/kmyfirewall/core/iptchain.h
+++ b/kmyfirewall/core/iptchain.h
@@ -23,7 +23,7 @@ email                : chubinger@irrsinnig.org
 #include "tqdom.h"
 #include "tquuid.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KMF {
 class KMFError;
diff --git a/kmyfirewall/core/iptrule.h b/kmyfirewall/core/iptrule.h
index c21a3d0..4ff5230 100644
--- a/kmyfirewall/core/iptrule.h
+++ b/kmyfirewall/core/iptrule.h
@@ -21,7 +21,7 @@ email                : chubinger@irrsinnig.org
 #include <tqptrlist.h>
 #include <tqdict.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // Project Includes
 #include "iptruleoption.h" 
diff --git a/kmyfirewall/core/iptruleoption.h b/kmyfirewall/core/iptruleoption.h
index a923ad1..13ce3d4 100644
--- a/kmyfirewall/core/iptruleoption.h
+++ b/kmyfirewall/core/iptruleoption.h
@@ -25,7 +25,7 @@ email                : chubinger@irrsinnig.org
 
 #include <tqdom.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #define MAXOPTNUM 10
 namespace KMF {
diff --git a/kmyfirewall/core/kmfappstate.h b/kmyfirewall/core/kmfappstate.h
index 530e054..17bf564 100644
--- a/kmyfirewall/core/kmfappstate.h
+++ b/kmyfirewall/core/kmfappstate.h
@@ -12,7 +12,7 @@
 #ifndef KMFAPPSTATE_H
 #define KMFAPPSTATE_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace KMF {
diff --git a/kmyfirewall/core/kmfcheckinput.h b/kmyfirewall/core/kmfcheckinput.h
index bb1cc58..08a2e7a 100644
--- a/kmyfirewall/core/kmfcheckinput.h
+++ b/kmyfirewall/core/kmfcheckinput.h
@@ -23,7 +23,7 @@
 
 #include <tqdict.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 class TQString;
 
 namespace KMF {
diff --git a/kmyfirewall/core/kmferror.h b/kmyfirewall/core/kmferror.h
index 34d2a4f..9962b3a 100644
--- a/kmyfirewall/core/kmferror.h
+++ b/kmyfirewall/core/kmferror.h
@@ -17,7 +17,7 @@
 #define KMFERROR_H
 
 #include <tqstring.h> 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqstringlist.h>
 
 /**
diff --git a/kmyfirewall/core/kmferrorhandler.h b/kmyfirewall/core/kmferrorhandler.h
index 5618e6d..b11e99d 100644
--- a/kmyfirewall/core/kmferrorhandler.h
+++ b/kmyfirewall/core/kmferrorhandler.h
@@ -16,7 +16,7 @@
 #ifndef KMFERRORHANDLER_H
 #define KMFERRORHANDLER_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
   *@author Christian Hubinger
diff --git a/kmyfirewall/core/kmfinstallerinterface.h b/kmyfirewall/core/kmfinstallerinterface.h
index a9d519f..dce0ff3 100644
--- a/kmyfirewall/core/kmfinstallerinterface.h
+++ b/kmyfirewall/core/kmfinstallerinterface.h
@@ -13,7 +13,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
 #ifndef __KMFINSTALLER_INTERFACE_H
 #define __KMFINSTALLER_INTERFACE_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqvaluelist.h>
 
diff --git a/kmyfirewall/core/kmfnethost.h b/kmyfirewall/core/kmfnethost.h
index 3bf3c71..4f05e03 100644
--- a/kmyfirewall/core/kmfnethost.h
+++ b/kmyfirewall/core/kmfnethost.h
@@ -34,7 +34,7 @@
 #include <tquuid.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 
 // Project includes
diff --git a/kmyfirewall/core/kmfnetzone.h b/kmyfirewall/core/kmfnetzone.h
index fa8a7be..53714c4 100644
--- a/kmyfirewall/core/kmfnetzone.h
+++ b/kmyfirewall/core/kmfnetzone.h
@@ -32,7 +32,7 @@
 #include <tqobject.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // Project includes
 #include "ipaddress.h"
diff --git a/kmyfirewall/core/kmfprotocol.h b/kmyfirewall/core/kmfprotocol.h
index 3141834..0d45f45 100644
--- a/kmyfirewall/core/kmfprotocol.h
+++ b/kmyfirewall/core/kmfprotocol.h
@@ -33,7 +33,7 @@
 #include <tqmap.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 // Project includes
diff --git a/kmyfirewall/core/kmfprotocolcategory.h b/kmyfirewall/core/kmfprotocolcategory.h
index 036f939..72e607c 100644
--- a/kmyfirewall/core/kmfprotocolcategory.h
+++ b/kmyfirewall/core/kmfprotocolcategory.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 namespace KMF {
diff --git a/kmyfirewall/core/kmfprotocolusage.h b/kmyfirewall/core/kmfprotocolusage.h
index cf00621..25fb143 100644
--- a/kmyfirewall/core/kmfprotocolusage.h
+++ b/kmyfirewall/core/kmfprotocolusage.h
@@ -22,7 +22,7 @@
 #include <tqmap.h>
 #include <tqobject.h>
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 // Project includes
diff --git a/kmyfirewall/core/kmfruleeditinterface.h b/kmyfirewall/core/kmfruleeditinterface.h
index 966297a..cb98eed 100644
--- a/kmyfirewall/core/kmfruleeditinterface.h
+++ b/kmyfirewall/core/kmfruleeditinterface.h
@@ -14,7 +14,7 @@
 
 #include <tqptrlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 /**
 @author Christian Hubinger
 */
diff --git a/kmyfirewall/core/kmfrulesetdoc.h b/kmyfirewall/core/kmfrulesetdoc.h
index e5211dd..a9dc520 100644
--- a/kmyfirewall/core/kmfrulesetdoc.h
+++ b/kmyfirewall/core/kmfrulesetdoc.h
@@ -20,7 +20,7 @@
 #include <tqguardedptr.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KMF {
 class KMFTarget;
diff --git a/kmyfirewall/core/kmfruletargetoptioneditinterface.h b/kmyfirewall/core/kmfruletargetoptioneditinterface.h
index 8cffb8e..61df1c6 100644
--- a/kmyfirewall/core/kmfruletargetoptioneditinterface.h
+++ b/kmyfirewall/core/kmfruletargetoptioneditinterface.h
@@ -17,7 +17,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
 @author Christian Hubinger
diff --git a/kmyfirewall/core/kmftarget.h b/kmyfirewall/core/kmftarget.h
index ad5826e..5aa4079 100644
--- a/kmyfirewall/core/kmftarget.h
+++ b/kmyfirewall/core/kmftarget.h
@@ -21,7 +21,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
 #include <tqdom.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kprocess.h>
 
 // Project includes
diff --git a/kmyfirewall/core/kmftargetconfig.h b/kmyfirewall/core/kmftargetconfig.h
index 25df92e..de6e4a7 100644
--- a/kmyfirewall/core/kmftargetconfig.h
+++ b/kmyfirewall/core/kmftargetconfig.h
@@ -23,7 +23,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
 #include <tqstring.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 // Project includes
diff --git a/kmyfirewall/core/kmyfirewallinterface.h b/kmyfirewall/core/kmyfirewallinterface.h
index 376dfab..f8daa7e 100644
--- a/kmyfirewall/core/kmyfirewallinterface.h
+++ b/kmyfirewall/core/kmyfirewallinterface.h
@@ -27,7 +27,7 @@
 */
 
 #include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQWidget;
 
diff --git a/kmyfirewall/core/netfilterobject.h b/kmyfirewall/core/netfilterobject.h
index 1449b26..c02fbc4 100644
--- a/kmyfirewall/core/netfilterobject.h
+++ b/kmyfirewall/core/netfilterobject.h
@@ -26,7 +26,7 @@
 #include <tquuid.h>
 #include <tqstringlist.h>
 #include <tqguardedptr.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // KDE includes
 
diff --git a/kmyfirewall/kmfwidgets/kmfchecklistitem.h b/kmyfirewall/kmfwidgets/kmfchecklistitem.h
index 68214e1..9927abc 100644
--- a/kmyfirewall/kmfwidgets/kmfchecklistitem.h
+++ b/kmyfirewall/kmfwidgets/kmfchecklistitem.h
@@ -23,7 +23,7 @@
 #define KMFCHECKLISTITEM_H
 
 #include <tqlistview.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KMF {
 class KMFProtocol;
diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.h b/kmyfirewall/kmfwidgets/kmfchecklistoutput.h
index 425cdf0..f00da79 100644
--- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.h
+++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.h
@@ -18,7 +18,7 @@
 
 #include <tqdialog.h>
 #include <tqpixmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 class TQLabel;
 class TQListView;
 class TQListViewItem;
diff --git a/kmyfirewall/kmfwidgets/kmfdocumentinfo.h b/kmyfirewall/kmfwidgets/kmfdocumentinfo.h
index d7d1292..2f1f55a 100644
--- a/kmyfirewall/kmfwidgets/kmfdocumentinfo.h
+++ b/kmyfirewall/kmfwidgets/kmfdocumentinfo.h
@@ -18,7 +18,7 @@
 // TQt includes
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // project includes
 namespace KMF {
diff --git a/kmyfirewall/kmfwidgets/kmfiptdocoptions.h b/kmyfirewall/kmfwidgets/kmfiptdocoptions.h
index 3632a60..0193c0d 100644
--- a/kmyfirewall/kmfwidgets/kmfiptdocoptions.h
+++ b/kmyfirewall/kmfwidgets/kmfiptdocoptions.h
@@ -17,7 +17,7 @@
 #define KMFIPTDOCOPTIONS_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include "kmyfirewalliptdocoptions.h"
 
 /**
diff --git a/kmyfirewall/kmfwidgets/kmfmultiportwidget.h b/kmyfirewall/kmfwidgets/kmfmultiportwidget.h
index 7957c21..b5b8c20 100644
--- a/kmyfirewall/kmfwidgets/kmfmultiportwidget.h
+++ b/kmyfirewall/kmfwidgets/kmfmultiportwidget.h
@@ -17,7 +17,7 @@
 #define KMFMULTIPORTWIDGET_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include "kmyfirewallmultiportwidget.h"
 
 
diff --git a/kmyfirewall/kmfwidgets/kmfnetworkwidget.h b/kmyfirewall/kmfwidgets/kmfnetworkwidget.h
index e66efc5..5f21f44 100644
--- a/kmyfirewall/kmfwidgets/kmfnetworkwidget.h
+++ b/kmyfirewall/kmfwidgets/kmfnetworkwidget.h
@@ -19,7 +19,7 @@
 #include <tqguardedptr.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // project includes
 #include "../core/kmfnetzone.h"
diff --git a/kmyfirewall/kmfwidgets/kmfnewdocdlg.h b/kmyfirewall/kmfwidgets/kmfnewdocdlg.h
index 5d67b8b..9a064d1 100644
--- a/kmyfirewall/kmfwidgets/kmfnewdocdlg.h
+++ b/kmyfirewall/kmfwidgets/kmfnewdocdlg.h
@@ -17,7 +17,7 @@
 #define KMFNEWDOCDLG_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include "kmyfirewallnewdocument.h"
 
 
diff --git a/kmyfirewall/kmfwidgets/kmfobjectinfo.h b/kmyfirewall/kmfwidgets/kmfobjectinfo.h
index 4fe123e..e1c1b6c 100644
--- a/kmyfirewall/kmfwidgets/kmfobjectinfo.h
+++ b/kmyfirewall/kmfwidgets/kmfobjectinfo.h
@@ -19,7 +19,7 @@
 #include <tqwidget.h>
 #include "kmyfirewallobjectinfo.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
   *@author Christian Hubinger
diff --git a/kmyfirewall/kmfwidgets/kmfportwidget.h b/kmyfirewall/kmfwidgets/kmfportwidget.h
index 35a7cc3..9a8b851 100644
--- a/kmyfirewall/kmfwidgets/kmfportwidget.h
+++ b/kmyfirewall/kmfwidgets/kmfportwidget.h
@@ -17,7 +17,7 @@
 #define KMFPORTWIDGET_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include "kmyfirewallportwidget.h"
 
 /**Widget for input of portnumbers, portranges or names
diff --git a/kmyfirewall/kmfwidgets/kmfselectinterface.h b/kmyfirewall/kmfwidgets/kmfselectinterface.h
index 59c445a..cf48a90 100644
--- a/kmyfirewall/kmfwidgets/kmfselectinterface.h
+++ b/kmyfirewall/kmfwidgets/kmfselectinterface.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 
 // KDE Includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // Project Includes
 
diff --git a/kmyfirewall/kmfwidgets/kmftemplatechooser.h b/kmyfirewall/kmfwidgets/kmftemplatechooser.h
index c30a480..0db3592 100644
--- a/kmyfirewall/kmfwidgets/kmftemplatechooser.h
+++ b/kmyfirewall/kmfwidgets/kmftemplatechooser.h
@@ -21,7 +21,7 @@
 #include <tqptrlist.h>
 
 // KDE includes
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 // project includes