diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h
index 7b45da8c..0135878f 100644
--- a/kommander/editor/widgetfactory.h
+++ b/kommander/editor/widgetfactory.h
@@ -168,7 +168,7 @@ private:
      bool mousePressed;
 };
 
-class KDE_EXPORT EditorToolBox : public ToolBox
+class TDE_EXPORT EditorToolBox : public ToolBox
 {
     TQ_OBJECT
   
diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp
index 4a1d8903..e8449f1a 100644
--- a/kommander/plugin/specialinformation.cpp
+++ b/kommander/plugin/specialinformation.cpp
@@ -65,7 +65,7 @@ SpecialFunction::SpecialFunction(ParserType p, const TQString& name, const TQStr
 }
 
 
-TQString KDE_EXPORT SpecialFunction::prototype(uint prototypeFlags) const
+TQString TDE_EXPORT SpecialFunction::prototype(uint prototypeFlags) const
 {
   if (!m_types.count())
     return m_function;
@@ -84,21 +84,21 @@ TQString KDE_EXPORT SpecialFunction::prototype(uint prototypeFlags) const
     return TQString("%1(%2)").arg(m_function).arg(params.join(", "));
 }
 
-TQString KDE_EXPORT SpecialFunction::argumentName(uint i) const
+TQString TDE_EXPORT SpecialFunction::argumentName(uint i) const
 {
   if (i < m_args.count())
     return m_args[i];
   return TQString();
 }
 
-TQString KDE_EXPORT SpecialFunction::argumentType(uint i) const
+TQString TDE_EXPORT SpecialFunction::argumentType(uint i) const
 {
   if (i < m_types.count())
     return m_types[i];
   return TQString();
 }
 
-int KDE_EXPORT SpecialFunction::argumentCount() const
+int TDE_EXPORT SpecialFunction::argumentCount() const
 {
   return m_types.count();
 }
@@ -106,7 +106,7 @@ int KDE_EXPORT SpecialFunction::argumentCount() const
 
 
 
-int KDE_EXPORT SpecialInformation::function(int group, const TQString& fname)
+int TDE_EXPORT SpecialInformation::function(int group, const TQString& fname)
 {
   TQString f = fname.lower();
   if (m_functions.contains(group) && m_functions[group].contains(f))
@@ -116,13 +116,13 @@ int KDE_EXPORT SpecialInformation::function(int group, const TQString& fname)
   return -1;
 }
   
-KDE_EXPORT SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname)
+TDE_EXPORT SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname)
 {
   int gid = group(gname);
   return m_specials[gid][function(gid, fname)];
 }
 
-int KDE_EXPORT SpecialInformation::group(const TQString& gname)
+int TDE_EXPORT SpecialInformation::group(const TQString& gname)
 {
  if (m_groups.contains(gname))
     return m_groups[gname];
@@ -139,7 +139,7 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname)
   return function(group(gname), fname) != -1;
 }
 
-bool KDE_EXPORT SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p)
+bool TDE_EXPORT SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p)
 {
   return m_specials.contains(gname) && m_specials[gname].contains(fname)
     && m_specials[gname][fname].isSupported(p);
@@ -153,14 +153,14 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname,
   return f != -1 && m_specials[g][f].isSupported(p);
 }
 
-int KDE_EXPORT SpecialInformation::minArg(int gname, int fname)
+int TDE_EXPORT SpecialInformation::minArg(int gname, int fname)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].minArg();
   return -1;
 }
 
-int KDE_EXPORT SpecialInformation::maxArg(int gname, int fname)
+int TDE_EXPORT SpecialInformation::maxArg(int gname, int fname)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].maxArg();
@@ -188,7 +188,7 @@ TQString SpecialInformation::description(int gname, int fname)
   return TQString();
 }
 
-TQString KDE_EXPORT SpecialInformation::prototype(int gname, int fname, uint flags)
+TQString TDE_EXPORT SpecialInformation::prototype(int gname, int fname, uint flags)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].prototype(flags);
@@ -248,7 +248,7 @@ void SpecialInformation::insertGroup(int id, const TQString& name, const TQStrin
   }
 }
 
-TQString KDE_EXPORT SpecialInformation::parserGroupName(const TQString& name)
+TQString TDE_EXPORT SpecialInformation::parserGroupName(const TQString& name)
 {
   if (m_parserGroups.contains(name))
     return m_parserGroups[name];
@@ -256,12 +256,12 @@ TQString KDE_EXPORT SpecialInformation::parserGroupName(const TQString& name)
     return name;
 }
 
-TQStringList KDE_EXPORT SpecialInformation::groups()
+TQStringList TDE_EXPORT SpecialInformation::groups()
 {
   return m_groups.keys();
 }
 
-TQStringList KDE_EXPORT SpecialInformation::functions(const TQString& g)
+TQStringList TDE_EXPORT SpecialInformation::functions(const TQString& g)
 {
   int gid = group(g);
   if (gid == -1)
@@ -281,7 +281,7 @@ bool SpecialFunction::isSupported(ParserType p) const
   return (m_parserTypes & p);
 }
 
-void KDE_EXPORT SpecialInformation::registerSpecials()
+void TDE_EXPORT SpecialInformation::registerSpecials()
 {
   insertGroup(Group::DCOP, "DCOP", "");
   insert(DCOP::addUniqueItem, "addUniqueItem(TQString widget, TQString item)",
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index 96c4aabd..484969d5 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -17,7 +17,7 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class KDE_EXPORT KmdrMainWindow : public TDEMainWindow
+class TDE_EXPORT KmdrMainWindow : public TDEMainWindow
 {
 TQ_OBJECT
   
diff --git a/kommander/widget/kommander_export.h b/kommander/widget/kommander_export.h
index 3cc7aa73..3fc17b1e 100644
--- a/kommander/widget/kommander_export.h
+++ b/kommander/widget/kommander_export.h
@@ -27,7 +27,7 @@
 
 #include <kdemacros.h>
 
-#define KOMMANDER_EXPORT KDE_EXPORT
+#define KOMMANDER_EXPORT TDE_EXPORT
 
 #else
 #define KOMMANDER_EXPORT
diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h
index e15743c6..fdb1b2aa 100644
--- a/kommander/widgets/aboutdialog.h
+++ b/kommander/widgets/aboutdialog.h
@@ -21,7 +21,7 @@ class TDEAboutData;
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class KDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget
+class TDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget
 {
   TQ_OBJECT
   
diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h
index dc9d7f7d..039bab06 100644
--- a/kommander/widgets/fontdialog.h
+++ b/kommander/widgets/fontdialog.h
@@ -20,7 +20,7 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class KDE_EXPORT FontDialog : public TQLabel, public KommanderWidget
+class TDE_EXPORT FontDialog : public TQLabel, public KommanderWidget
 {
   TQ_OBJECT
   
diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h
index 4f1b08d4..60a095e3 100644
--- a/kommander/widgets/popupmenu.h
+++ b/kommander/widgets/popupmenu.h
@@ -22,7 +22,7 @@ class TDEPopupMenu;
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class KDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget
+class TDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget
 {
   TQ_OBJECT
   
diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h
index a80b8d9f..4d596bb2 100644
--- a/kommander/widgets/toolbox.h
+++ b/kommander/widgets/toolbox.h
@@ -19,7 +19,7 @@
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
 
-class KDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget
+class TDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget
 {
   TQ_OBJECT
   
diff --git a/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in b/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in
index 008bac11..1719e78c 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in
+++ b/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in
@@ -24,7 +24,7 @@
 #undef __KDE_HAVE_GCC_VISIBILITY
 
 /**
- * The KDE_NO_EXPORT macro marks the symbol of the given variable 
+ * The TDE_NO_EXPORT macro marks the symbol of the given variable 
  * to be hidden. A hidden symbol is stripped during the linking step, 
  * so it can't be used from outside the resulting library, which is similar
  * to static. However, static limits the visibility to the current 
@@ -32,20 +32,20 @@
  * units.
  *
  * \code
- * int KDE_NO_EXPORT foo;
- * int KDE_EXPORT bar;
+ * int TDE_NO_EXPORT foo;
+ * int TDE_EXPORT bar;
  * \end
  */
 
 #ifdef __KDE_HAVE_GCC_VISIBILITY
-#define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
-#define KDE_EXPORT __attribute__ ((visibility("default")))
+#define TDE_NO_EXPORT __attribute__ ((visibility("hidden")))
+#define TDE_EXPORT __attribute__ ((visibility("default")))
 #elif defined(TQ_WS_WIN)
-#define KDE_NO_EXPORT
-#define KDE_EXPORT __declspec(dllexport)
+#define TDE_NO_EXPORT
+#define TDE_EXPORT __declspec(dllexport)
 #else
-#define KDE_NO_EXPORT
-#define KDE_EXPORT
+#define TDE_NO_EXPORT
+#define TDE_EXPORT
 #endif
 
 /**
@@ -53,8 +53,8 @@
  * cope with symbol visibility.
  */
 #define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
-  TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
+  TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
+  TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
   TQ_EXPORT_PLUGIN(PLUGIN)
 
 /**
diff --git a/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h b/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h
index 42d3d199..15eb4d5e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h
@@ -20,7 +20,7 @@
 #ifndef _TDELIBS_EXPORT_H
 #define _TDELIBS_EXPORT_H
 
-/* needed for KDE_EXPORT macros */
+/* needed for TDE_EXPORT macros */
 #include <kdemacros.h>
 
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
@@ -31,32 +31,32 @@
 
 #else /* Q_OS_UNIX */
 
-#undef KDE_EXPORT
-#define KDE_EXPORT 
+#undef TDE_EXPORT
+#define TDE_EXPORT 
 
 /* export statements for unix */
-#define TDECORE_EXPORT KDE_EXPORT
-#define TDEUI_EXPORT KDE_EXPORT
-#define TDEFX_EXPORT KDE_EXPORT
-#define TDEPRINT_EXPORT KDE_EXPORT
-#define TDEDNSSD_EXPORT KDE_EXPORT
-#define TDEIO_EXPORT KDE_EXPORT
-#define DCOP_EXPORT KDE_EXPORT
-#define TDEPARTS_EXPORT KDE_EXPORT
-#define KTEXTEDITOR_EXPORT KDE_EXPORT
-#define KABC_EXPORT KDE_EXPORT
-#define TDESU_EXPORT KDE_EXPORT
-#define KVCARD_EXPORT KDE_EXPORT
-#define TDERESOURCES_EXPORT KDE_EXPORT
-#define KSTYLE_EXPORT KDE_EXPORT
-#define TDEHTML_EXPORT KDE_EXPORT
-#define KMDI_EXPORT KDE_EXPORT
-#define TDEUTILS_EXPORT KDE_EXPORT
-#define KATEPARTINTERFACES_EXPORT KDE_EXPORT
-#define KATEPART_EXPORT KDE_EXPORT
-#define KMID_EXPORT KDE_EXPORT
-#define TDEIMPROXY_EXPORT KDE_EXPORT
-#define KDE_ARTS_EXPORT KDE_EXPORT
+#define TDECORE_EXPORT TDE_EXPORT
+#define TDEUI_EXPORT TDE_EXPORT
+#define TDEFX_EXPORT TDE_EXPORT
+#define TDEPRINT_EXPORT TDE_EXPORT
+#define TDEDNSSD_EXPORT TDE_EXPORT
+#define TDEIO_EXPORT TDE_EXPORT
+#define DCOP_EXPORT TDE_EXPORT
+#define TDEPARTS_EXPORT TDE_EXPORT
+#define KTEXTEDITOR_EXPORT TDE_EXPORT
+#define KABC_EXPORT TDE_EXPORT
+#define TDESU_EXPORT TDE_EXPORT
+#define KVCARD_EXPORT TDE_EXPORT
+#define TDERESOURCES_EXPORT TDE_EXPORT
+#define KSTYLE_EXPORT TDE_EXPORT
+#define TDEHTML_EXPORT TDE_EXPORT
+#define KMDI_EXPORT TDE_EXPORT
+#define TDEUTILS_EXPORT TDE_EXPORT
+#define KATEPARTINTERFACES_EXPORT TDE_EXPORT
+#define KATEPART_EXPORT TDE_EXPORT
+#define KMID_EXPORT TDE_EXPORT
+#define TDEIMPROXY_EXPORT TDE_EXPORT
+#define KDE_ARTS_EXPORT TDE_EXPORT
 
 #define KPATH_SEPARATOR ':'