diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index c4e41d14..fac5f73c 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -1446,7 +1446,7 @@ TQString KcmSambaConf::handbookSection() const
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name)
   {
     TDEGlobal::locale()->insertCatalogue("tdefileshare");
     return new KcmSambaConf(parent, name);
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 1fa07914..c22ffce6 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -74,7 +74,7 @@ void PopupBox::enablePopup()
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+  TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
   {
     TDEGlobal::locale()->insertCatalogue("kdictapplet");
     return new DictApplet(configFile, KPanelApplet::Stretch, 0, parent, "kdictapplet");
diff --git a/kdict/main.cpp b/kdict/main.cpp
index ce51a24d..db7a6a18 100644
--- a/kdict/main.cpp
+++ b/kdict/main.cpp
@@ -29,7 +29,7 @@ static TDECmdLineOptions knoptions[] =
 };
 
 
-extern "C" KDE_EXPORT int kdemain(int argc, char* argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char* argv[])
 {
   TDEAboutData aboutData("kdict",
                         I18N_NOOP("Dictionary"),
diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp
index c4d52fac..b02bbaa4 100644
--- a/kget/kget_plug_in/kget_plug_in.cpp
+++ b/kget/kget_plug_in/kget_plug_in.cpp
@@ -176,7 +176,7 @@ KPluginFactory::~KPluginFactory()
 
 extern "C"
 {
-    KDE_EXPORT void* init_tdehtml_kget()
+    TDE_EXPORT void* init_tdehtml_kget()
     {
         TDEGlobal::locale()->insertCatalogue("kget");
         return new KPluginFactory;
diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h
index 38b72ff4..db6c9827 100644
--- a/knewsticker/common/newsengine.h
+++ b/knewsticker/common/newsengine.h
@@ -36,7 +36,7 @@ class TQDomDocument;
 class TDEProcess;
 class KURL;
 
-class KDE_EXPORT Article : public XMLNewsArticle, public TDEShared
+class TDE_EXPORT Article : public XMLNewsArticle, public TDEShared
 {
 	public:
 		typedef TDESharedPtr<Article> Ptr;
@@ -58,7 +58,7 @@ class KDE_EXPORT Article : public XMLNewsArticle, public TDEShared
 		bool m_read;
 };
 
-class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public TDEShared
+class TDE_EXPORT NewsSourceBase : public XMLNewsSource, public TDEShared
 {
 	TQ_OBJECT
   
@@ -133,7 +133,7 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public TDEShared
 		Article::List m_articles;
 };
 
-class KDE_EXPORT SourceFileNewsSource : public NewsSourceBase
+class TDE_EXPORT SourceFileNewsSource : public NewsSourceBase
 {
 	TQ_OBJECT
   
@@ -172,7 +172,7 @@ class KDE_EXPORT SourceFileNewsSource : public NewsSourceBase
 #undef EHOSTDOWN
 #undef EHOSTUNREACH
 
-class KDE_EXPORT ProgramNewsSource : public NewsSourceBase
+class TDE_EXPORT ProgramNewsSource : public NewsSourceBase
 {
 	TQ_OBJECT
   
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index dc71105f..e33d8295 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -533,7 +533,7 @@ void KNewsTickerMenu::slotOpenArticle(int idx)
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString &configFile)
+	TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString &configFile)
 	{
 		TDEGlobal::locale()->insertCatalogue(TQString::fromLatin1("knewsticker"));
 		return new KNewsTicker(configFile, KPanelApplet::Stretch,
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index f63a283f..4db586e3 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -120,7 +120,7 @@ TQObject *KntSrcFilePropsFactory::createObject(TQObject *parent, const char *,
 
 extern "C"
 {
-	KDE_EXPORT void *init_libkntsrcfilepropsdlg()
+	TDE_EXPORT void *init_libkntsrcfilepropsdlg()
 	{
         TDEGlobal::locale()->insertCatalogue( "knewsticker" );
 		return new KntSrcFilePropsFactory();
diff --git a/kopete/libkopete/kopete_export.h b/kopete/libkopete/kopete_export.h
index 2c1e35cf..43d76676 100644
--- a/kopete/libkopete/kopete_export.h
+++ b/kopete/libkopete/kopete_export.h
@@ -22,7 +22,7 @@
 #include <tdeversion.h>
 
 #if KDE_IS_VERSION(3,3,2)
-#define KOPETE_EXPORT KDE_EXPORT
+#define KOPETE_EXPORT TDE_EXPORT
 #else
 #define KOPETE_EXPORT
 #endif
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
index 709255a7..9dd0d30b 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
@@ -378,7 +378,7 @@ void JabberDiscoProtocol::dispatchLoop ()
 
 extern "C"
 {
-	KDE_EXPORT int kdemain(int argc, char **argv);
+	TDE_EXPORT int kdemain(int argc, char **argv);
 }
 
 
diff --git a/kopete/protocols/msn/Makefile.am b/kopete/protocols/msn/Makefile.am
index 5248d295..10d05490 100644
--- a/kopete/protocols/msn/Makefile.am
+++ b/kopete/protocols/msn/Makefile.am
@@ -35,8 +35,8 @@ kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(L
 
 dummy.cpp: $(srcdir)/Makefile.am
 	echo '#include "kdemacros.h"' > $@
-	echo 'extern "C" KDE_EXPORT void *init_libkopete_msn_shared();' >> $@
-	echo 'extern "C" KDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }' >> $@
+	echo 'extern "C" TDE_EXPORT void *init_libkopete_msn_shared();' >> $@
+	echo 'extern "C" TDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }' >> $@
 
 service_DATA = kopete_msn.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/protocols/msn/dummy.cpp b/kopete/protocols/msn/dummy.cpp
index 6edd39fa..c1273f3a 100644
--- a/kopete/protocols/msn/dummy.cpp
+++ b/kopete/protocols/msn/dummy.cpp
@@ -1,3 +1,3 @@
 #include "kdemacros.h"
-extern "C" KDE_EXPORT void *init_libkopete_msn_shared();
-extern "C" KDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }
+extern "C" TDE_EXPORT void *init_libkopete_msn_shared();
+extern "C" TDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }
diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h
index 62603c07..ccffb037 100644
--- a/kopete/protocols/oscar/oscaraccount.h
+++ b/kopete/protocols/oscar/oscaraccount.h
@@ -39,7 +39,7 @@ class OscarContact;
 class OscarAccountPrivate;
 class TQTextCodec;
 
-class KDE_EXPORT OscarAccount : public Kopete::PasswordedAccount
+class TDE_EXPORT OscarAccount : public Kopete::PasswordedAccount
 {
 	TQ_OBJECT
   
diff --git a/kopete/protocols/oscar/oscarcontact.h b/kopete/protocols/oscar/oscarcontact.h
index a1286c6d..456a7aa9 100644
--- a/kopete/protocols/oscar/oscarcontact.h
+++ b/kopete/protocols/oscar/oscarcontact.h
@@ -57,7 +57,7 @@ class TDEToggleAction;
  * \li get/set the ignore setting for the contact
  * \li get/set the visibility setting for the contact ( i.e. are we visible to the contact )
  */
-class KDE_EXPORT OscarContact : public Kopete::Contact
+class TDE_EXPORT OscarContact : public Kopete::Contact
 {
 TQ_OBJECT
   
diff --git a/kopete/protocols/oscar/oscarmyselfcontact.h b/kopete/protocols/oscar/oscarmyselfcontact.h
index 0de022d0..15c90fe0 100644
--- a/kopete/protocols/oscar/oscarmyselfcontact.h
+++ b/kopete/protocols/oscar/oscarmyselfcontact.h
@@ -34,7 +34,7 @@ class TDEToggleAction;
  * myself() contact for oscar protocol
  * @author Richard Smith
  */
-class KDE_EXPORT OscarMyselfContact : public Kopete::Contact
+class TDE_EXPORT OscarMyselfContact : public Kopete::Contact
 {
 TQ_OBJECT
   
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index da45c5f4..ec52f682 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -53,7 +53,7 @@ static const char kpfVersion[] = "1.0.1";
 
 extern "C"
 {
-  KDE_EXPORT  KPanelApplet *
+  TDE_EXPORT  KPanelApplet *
   init(TQWidget * parent, const TQString & configFile)
   {
     if (0 == kpf::userId() || 0 == kpf::effectiveUserId())
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 56c69852..806b18df 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -47,7 +47,7 @@ typedef KGenericFactory<KcmKRfb, TQWidget> KcmKRfbFactory;
 
 // Can't use K_EXPORT_COMPONENT_FACTORY, since insertCatalogue necessary
 extern "C" {
-  KDE_EXPORT void *init_kcm_krfb() {
+  TDE_EXPORT void *init_kcm_krfb() {
     TDEGlobal::locale()->insertCatalogue("krfb"); // For invitation translations
     return new KcmKRfbFactory("kcm_krfb"); 
   }
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index 692e6ea7..939bb382 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -650,7 +650,7 @@ KInetD::~KInetD() {
 }
 
 extern "C" {
-	KDE_EXPORT KDEDModule *create_kinetd(TQCString &name)
+	TDE_EXPORT KDEDModule *create_kinetd(TQCString &name)
 	{
         TDEGlobal::locale()->insertCatalogue("kinetd");
 		return new KInetD(name);
diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp
index 1c63c050..fb82e61a 100644
--- a/ksirc/ksirc.cpp
+++ b/ksirc/ksirc.cpp
@@ -66,7 +66,7 @@ public:
     }
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
 {
     TDEAboutData aboutData( "ksirc", I18N_NOOP("KSirc"),
         KSIRC_VERSION, description, TDEAboutData::License_Artistic,
diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp
index 6ebe0aac..d6987c7d 100644
--- a/ktalkd/kcmktalkd/main.cpp
+++ b/ktalkd/kcmktalkd/main.cpp
@@ -102,22 +102,22 @@ TQString KTalkdConfigModule::handbookSection() const
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_ktalkd(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_ktalkd(TQWidget *parent, const char *)
 	{
 		return new KTalkdConfigModule(parent, "kcmktalkd");
 }
 
-	KDE_EXPORT TDECModule *create_ktalkd_answmach(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_ktalkd_answmach(TQWidget *parent, const char *)
 {
 		return new KAnswmachPageConfig(parent, "kcmktalkd");
 	}
 
-	KDE_EXPORT TDECModule *create_ktalkd_sound(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_ktalkd_sound(TQWidget *parent, const char *)
 	{
 		return new KSoundPageConfig(parent, "kcmktalkd");
 	}
 
-	KDE_EXPORT TDECModule *create_ktalkd_forwmach(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_ktalkd_forwmach(TQWidget *parent, const char *)
 	{
 		return new KForwmachPageConfig(parent, "kcmktalkd");
 	}
diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp
index 7252785f..69152510 100644
--- a/lanbrowsing/kcmlisa/main.cpp
+++ b/lanbrowsing/kcmlisa/main.cpp
@@ -33,15 +33,15 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_lisa(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_lisa(TQWidget *parent, const char *)
   {
     return new LisaSettings("/etc/lisarc", parent);
   }
-  KDE_EXPORT TDECModule *create_reslisa(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_reslisa(TQWidget *parent, const char *)
   {
     return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", parent);
   }
-  KDE_EXPORT TDECModule *create_tdeiolan(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_tdeiolan(TQWidget *parent, const char *)
   {
     return new IOSlaveSettings("tdeio_lanrc", parent);
   }
diff --git a/lanbrowsing/tdeio_lan/tdeio_lan.cpp b/lanbrowsing/tdeio_lan/tdeio_lan.cpp
index 4c24261d..e197fb0d 100644
--- a/lanbrowsing/tdeio_lan/tdeio_lan.cpp
+++ b/lanbrowsing/tdeio_lan/tdeio_lan.cpp
@@ -62,7 +62,7 @@ using namespace TDEIO;
 #define SHUT_RDWR 2
 #endif
 
-extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
+extern "C" { TDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
diff --git a/librss/global.h b/librss/global.h
index 2afe3dd2..7d249f3f 100644
--- a/librss/global.h
+++ b/librss/global.h
@@ -13,7 +13,7 @@
 
 #include <kdemacros.h>
 
-#define LIBRSS_EXPORT KDE_EXPORT
+#define LIBRSS_EXPORT TDE_EXPORT
 
 template <class>
 class TQValueList;
diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp
index 13b62520..9b0ad947 100644
--- a/tdednssd/ioslave/dnssd.cpp
+++ b/tdednssd/ioslave/dnssd.cpp
@@ -349,7 +349,7 @@ void ZeroConfProtocol::newService(DNSSD::RemoteService::Ptr srv)
 
 extern "C"
 {
-	int KDE_EXPORT kdemain( int argc, char **argv )
+	int TDE_EXPORT kdemain( int argc, char **argv )
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
diff --git a/tdednssd/kdedmodule/dnssdwatcher.cpp b/tdednssd/kdedmodule/dnssdwatcher.cpp
index 8fd571e2..87a0341d 100644
--- a/tdednssd/kdedmodule/dnssdwatcher.cpp
+++ b/tdednssd/kdedmodule/dnssdwatcher.cpp
@@ -84,7 +84,7 @@ void DNSSDWatcher::createNotifier(const KURL& url)
 }
 
 extern "C" {
-	KDE_EXPORT KDEDModule *create_dnssdwatcher(const TQCString &obj)
+	TDE_EXPORT KDEDModule *create_dnssdwatcher(const TQCString &obj)
 	{
 		TDEGlobal::locale()->insertCatalogue("dnssdwatcher");
 		return new DNSSDWatcher(obj);
diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp
index 7f226199..bad2bb13 100644
--- a/wifi/kwireless/kwireless.cpp
+++ b/wifi/kwireless/kwireless.cpp
@@ -76,7 +76,7 @@ void KWireLess::resizeEvent(TQResizeEvent *)
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
+    TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
     {
         TDEGlobal::locale()->insertCatalogue("kwireless");
         return new KWireLess(configFile, KPanelApplet::Normal,