diff --git a/CMakeLists.txt b/CMakeLists.txt
index d03faf8aa..d01650535 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1400,7 +1400,7 @@ endif()
 ##### write configure files #####################
 
 configure_file( config.h.cmake config.h )
-configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
+configure_file( tdecore/tdemacros.h.cmake tdecore/tdemacros.h )
 configure_file( kjs/global.h.in kjs/global.h )
 configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )
 configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
diff --git a/interfaces/tdescript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h
index 1d5ce6b97..d52c0f85a 100644
--- a/interfaces/tdescript/scriptinterface.h
+++ b/interfaces/tdescript/scriptinterface.h
@@ -29,7 +29,7 @@
 #define __scriptinterface_h__
 #include <tqvariant.h>
 #include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 //#include <scripclientinterface.h>
 class TQString;
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 6b6c465b1..ff0dcb80c 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -22,7 +22,7 @@
 class TQString;
 class TQStrList;
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
  * TerminalInterface is an interface implemented by KonsolePart to
diff --git a/kimgio/psd.h b/kimgio/psd.h
index 14733ad68..fa21bf081 100644
--- a/kimgio/psd.h
+++ b/kimgio/psd.h
@@ -10,7 +10,7 @@
 #ifndef KIMG_PSD_H
 #define KIMG_PSD_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQImageIO;
 
diff --git a/libtdemid/player.h b/libtdemid/player.h
index 5a6a46a95..c0ada8b1c 100644
--- a/libtdemid/player.h
+++ b/libtdemid/player.h
@@ -29,7 +29,7 @@
 #include <libtdemid/deviceman.h>
 #include <libtdemid/track.h>
 #include <libtdemid/notearray.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
  * This struct stores text, lyrics and change tempo events among others.
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index 98ea086b6..7937a52d6 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -34,7 +34,7 @@
 #include "network.h"
 
 #include <tdeversion.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C" {
 	TDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj )
diff --git a/networkstatus/networkstatusindicator.h b/networkstatus/networkstatusindicator.h
index e88a41f17..e7778027e 100644
--- a/networkstatus/networkstatusindicator.h
+++ b/networkstatus/networkstatusindicator.h
@@ -24,7 +24,7 @@
 #define KDE_NETWORKSTATUS_INDICATOR_H
 
 #include <tqhbox.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <networkstatuscommon.h>
 
 class StatusBarNetworkStatusIndicator : public TQHBox
diff --git a/tdeabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h
index b8df436ac..4536c7ece 100644
--- a/tdeabc/resourceselectdialog.h
+++ b/tdeabc/resourceselectdialog.h
@@ -24,7 +24,7 @@
 #include <tqmap.h>
 
 #include <kdialog.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEListBox;
 
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index c794a8039..7fb7cdccf 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -73,7 +73,7 @@ install( FILES
     kmanagerselection.h kmountpoint.h kuser.h klockfile.h
     kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h
     tdelibs_export.h kde_file.h ktimezones.h
-    ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h
+    ${CMAKE_CURRENT_BINARY_DIR}/tdemacros.h kdemacros.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
diff --git a/tdecore/Mainpage.dox b/tdecore/Mainpage.dox
index c275aa84e..4a74d242a 100644
--- a/tdecore/Mainpage.dox
+++ b/tdecore/Mainpage.dox
@@ -37,5 +37,5 @@ Some helper utilities: @gpl
 */
 
 // DOXYGEN_EXCLUDE = malloc kde_file.h
-// DOXYGEN_SET_INPUT += @topdir@/kdemacros.h.cmake
+// DOXYGEN_SET_INPUT += @topdir@/tdemacros.h.cmake
 // DOXYGEN_SET_PROJECT_NAME = TrinityCore
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 58e74a010..1bc47e379 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -59,7 +59,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
 	kmanagerselection.h kmountpoint.h kuser.h klockfile.h \
 	kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h tdelibs_export.h \
-	kdemacros.h kde_file.h ktimezones.h
+	tdemacros.h kde_file.h ktimezones.h
 
 libtdefakes_la_SOURCES = fakes.c vsnprintf.c
 libtdefakes_la_LDFLAGS = -version-info 6:0:2
diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in
index d7ef1cd08..7ecda35e7 100644
--- a/tdecore/configure.in.in
+++ b/tdecore/configure.in.in
@@ -169,7 +169,7 @@ AC_CHECK_HEADERS(sys/mount.h)
 
 dnl AC_OUTPUT(tdecore/tde-config.cpp)
 
-AM_CONFIG_HEADER(tdecore/kdemacros.h)
+AM_CONFIG_HEADER(tdecore/tdemacros.h)
 
 SVGICONS=
 	
diff --git a/tdecore/kdemacros.h b/tdecore/kdemacros.h
new file mode 100644
index 000000000..73808c60d
--- /dev/null
+++ b/tdecore/kdemacros.h
@@ -0,0 +1 @@
+#include <tdemacros.h>
diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp
index 397005183..0ea43178d 100644
--- a/tdecore/netsupp.cpp
+++ b/tdecore/netsupp.cpp
@@ -49,7 +49,7 @@
 extern int h_errno;
 #endif
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #if !defined(kde_sockaddr_in6)
 /*
diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h
index 0c3aba844..bcbcbacbc 100644
--- a/tdecore/tdehw/tdestoragedevice.h
+++ b/tdecore/tdehw/tdestoragedevice.h
@@ -22,7 +22,7 @@
 
 #include "tdegenericdevice.h"
 #include "tqvariant.h"
-#include "kdemacros.h"
+#include "tdemacros.h"
 
 struct crypt_device;
 
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index bfe07b0e3..78f129f89 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -21,7 +21,7 @@
 #define _TDELIBS_EXPORT_H
 
 /* needed for TDE_EXPORT macros */
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
 #include <tqglobal.h>
diff --git a/tdecore/kdemacros.h.cmake b/tdecore/tdemacros.h.cmake
similarity index 98%
rename from tdecore/kdemacros.h.cmake
rename to tdecore/tdemacros.h.cmake
index 1c652176a..b8d5abd43 100644
--- a/tdecore/kdemacros.h.cmake
+++ b/tdecore/tdemacros.h.cmake
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KDE_MACROS_H_
-#define _KDE_MACROS_H_
+#ifndef _TDE_MACROS_H_
+#define _TDE_MACROS_H_
 
 /* Set by configure */
 #cmakedefine __TDE_HAVE_TDEHWLIB 1
@@ -183,4 +183,4 @@
 #define TDE_WEAK_SYMBOL
 #endif
 
-#endif /* _KDE_MACROS_H_ */
+#endif /* _TDE_MACROS_H_ */
diff --git a/tdecore/kdemacros.h.in b/tdecore/tdemacros.h.in
similarity index 98%
rename from tdecore/kdemacros.h.in
rename to tdecore/tdemacros.h.in
index 571d5fafe..721b6849b 100644
--- a/tdecore/kdemacros.h.in
+++ b/tdecore/tdemacros.h.in
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KDE_MACROS_H_
-#define _KDE_MACROS_H_
+#ifndef _TDE_MACROS_H_
+#define _TDE_MACROS_H_
 
 /* Set by configure */
 #undef __KDE_HAVE_GCC_VISIBILITY
@@ -182,4 +182,4 @@
 #define TDE_WEAK_SYMBOL
 #endif
 
-#endif /* _KDE_MACROS_H_ */
+#endif /* _TDE_MACROS_H_ */
diff --git a/tdehtml/css/css_base.h b/tdehtml/css/css_base.h
index db0700a35..d39d5e94d 100644
--- a/tdehtml/css/css_base.h
+++ b/tdehtml/css/css_base.h
@@ -29,7 +29,7 @@
 #include "dom/dom_misc.h"
 #include "xml/dom_nodeimpl.h"
 #include "misc/shared.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqdatetime.h>
 #include <tqptrlist.h>
 
diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h
index 6e3d89717..563d09cd1 100644
--- a/tdehtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
@@ -31,7 +31,7 @@
 
 #include <tqcolor.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace DOM {
 
diff --git a/tdehtml/dom/html_form.h b/tdehtml/dom/html_form.h
index 63c626356..7533a29de 100644
--- a/tdehtml/dom/html_form.h
+++ b/tdehtml/dom/html_form.h
@@ -33,7 +33,7 @@
 #include <dom/html_element.h>
 #include <dom/html_misc.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace DOM {
 
diff --git a/tdehtml/dom/html_image.h b/tdehtml/dom/html_image.h
index f6f25b0d6..ec2ab819e 100644
--- a/tdehtml/dom/html_image.h
+++ b/tdehtml/dom/html_image.h
@@ -31,7 +31,7 @@
 
 #include <dom/html_element.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace DOM {
 
diff --git a/tdehtml/dom/html_object.h b/tdehtml/dom/html_object.h
index 6161f8ef2..22d5b002b 100644
--- a/tdehtml/dom/html_object.h
+++ b/tdehtml/dom/html_object.h
@@ -34,7 +34,7 @@
 
 #include <dom/html_element.h>
 #include <dom/html_form.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace DOM {
 
diff --git a/tdehtml/misc/htmlattrs.h b/tdehtml/misc/htmlattrs.h
index 7f28a5081..eabe89cd2 100644
--- a/tdehtml/misc/htmlattrs.h
+++ b/tdehtml/misc/htmlattrs.h
@@ -6,7 +6,7 @@ htmlattrs.in by makeattrs, do not edit */
 #define HTML_ATTRS_H
 
 #include "dom/dom_string.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 using namespace DOM;
 
 #define ATTR_ACCEPT_CHARSET 1
diff --git a/tdehtml/misc/makeattrs b/tdehtml/misc/makeattrs
index 1ed890c2c..b981b285f 100644
--- a/tdehtml/misc/makeattrs
+++ b/tdehtml/misc/makeattrs
@@ -36,7 +36,7 @@ print out "%{\n/* This file is automatically generated from
 print out "struct attrs {\n    int name;\n    int id;\n};\n%%\n";
 
 print header "/* This file is automatically generated from
-htmlattrs.in by makeattrs, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef HTML_ATTRS_H\n#define HTML_ATTRS_H\n\n#include \"dom/dom_string.h\"\n#include <kdemacros.h>\nusing namespace DOM;\n\n";
+htmlattrs.in by makeattrs, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef HTML_ATTRS_H\n#define HTML_ATTRS_H\n\n#include \"dom/dom_string.h\"\n#include <tdemacros.h>\nusing namespace DOM;\n\n";
 
 my %amap = ();
 my $last_ci_attr = 0;
diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h
index 7d3f01312..a67cb28ab 100644
--- a/tdehtml/tdehtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -30,7 +30,7 @@
 
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kfinddialog.h>
 
 #include <tqregexp.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h
index 007dcf86a..d6bc81a12 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.h
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqmap.h>
 #include <ksimpleconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "kbookmarkimporter.h"
 
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.h b/tdeio/bookmarks/kbookmarkimporter_ie.h
index d0707cefb..70f4ee0b6 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.h
@@ -23,7 +23,7 @@
 #include <tqcstring.h>
 #include <tqstringlist.h>
 #include <ksimpleconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <kbookmarkimporter.h>
 
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.h b/tdeio/bookmarks/kbookmarkimporter_ns.h
index 4ccee6fa3..d765bd7db 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.h
@@ -23,7 +23,7 @@
 #include <tqcstring.h>
 #include <tqstringlist.h>
 #include <ksimpleconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "kbookmarkimporter.h"
 #include "kbookmarkexporter.h"
diff --git a/tdeio/kssl/ksslcertchain.h b/tdeio/kssl/ksslcertchain.h
index bf9c66cc3..960bcfbb4 100644
--- a/tdeio/kssl/ksslcertchain.h
+++ b/tdeio/kssl/ksslcertchain.h
@@ -23,7 +23,7 @@
 
 #include <tqglobal.h>
 #include <tqptrlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQString;
 class TQCString;
diff --git a/tdeio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h
index eca012b9b..5fa05a023 100644
--- a/tdeio/kssl/ksslutils.h
+++ b/tdeio/kssl/ksslutils.h
@@ -20,7 +20,7 @@
 #ifndef _INCLUDE_KSSLUTILS_H
 #define _INCLUDE_KSSLUTILS_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
diff --git a/tdeio/tdefile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h
index 61fc22a6b..8fa1a5880 100644
--- a/tdeio/tdefile/kpropertiesdialog.h
+++ b/tdeio/tdefile/kpropertiesdialog.h
@@ -31,7 +31,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 #include <tdefileitem.h>
 #include <kdialogbase.h>
diff --git a/tdeio/tdeio/posixacladdons.cpp b/tdeio/tdeio/posixacladdons.cpp
index 1e4d9bec0..c4d4ca555 100644
--- a/tdeio/tdeio/posixacladdons.cpp
+++ b/tdeio/tdeio/posixacladdons.cpp
@@ -21,7 +21,7 @@
 
 #if defined(USE_POSIX_ACL) && !defined(HAVE_NON_POSIX_ACL_EXTENSIONS)
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/tdenewstuff/knewstuff.h b/tdenewstuff/knewstuff.h
index e76b6603b..9477a593d 100644
--- a/tdenewstuff/knewstuff.h
+++ b/tdenewstuff/knewstuff.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQObject;
 class TQWidget;
diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h
index 695025aab..3b31666a5 100644
--- a/tdeprint/kprinter.h
+++ b/tdeprint/kprinter.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdelibs_export.h>
 
 #include <tdeprint/kpreloadobject.h>
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index e2d899e3c..8d51332e4 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqaccel.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
diff --git a/tdestyles/plastik/config/plastikconf.cpp b/tdestyles/plastik/config/plastikconf.cpp
index 5da07beb1..6fbeb74a1 100644
--- a/tdestyles/plastik/config/plastikconf.cpp
+++ b/tdestyles/plastik/config/plastikconf.cpp
@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kcolorbutton.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "plastikconf.h"
 
diff --git a/win/kdemacros.h b/win/kdemacros.h
deleted file mode 100644
index c8c017b02..000000000
--- a/win/kdemacros.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <kdemacros.h.in>
diff --git a/win/tdemacros.h b/win/tdemacros.h
new file mode 100644
index 000000000..da23cd9b4
--- /dev/null
+++ b/win/tdemacros.h
@@ -0,0 +1 @@
+#include <tdemacros.h.in>