diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 68076fd..47a2db4 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -81,7 +81,7 @@ class PluginView : public KXMLGUIClient
 
 extern "C"
 {
-	KDE_EXPORT void* init_katefiletemplates()
+	TDE_EXPORT void* init_katefiletemplates()
 	{
 		TDEGlobal::locale()->insertCatalogue("katefiletemplates");
 		return new KatePluginFactory;
diff --git a/kate/katesort/plugin_sort.cpp b/kate/katesort/plugin_sort.cpp
index 38dd4b1..848c9ae 100644
--- a/kate/katesort/plugin_sort.cpp
+++ b/kate/katesort/plugin_sort.cpp
@@ -38,7 +38,7 @@ class PluginView : public KXMLGUIClient
 
 extern "C"
 {
-	KDE_EXPORT void* init_katesortplugin()
+	TDE_EXPORT void* init_katesortplugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("katesort");
 		return new KatePluginFactory;
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 2951d1f..c5b9504 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -55,7 +55,7 @@ class PluginView : public KXMLGUIClient
 
 extern "C"
 {
-	KDE_EXPORT void* init_libkatetabbarextensionplugin()
+	TDE_EXPORT void* init_libkatetabbarextensionplugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("katetabbarextension");
 		return new KatePluginFactory;
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 0cfcb5e..5661729 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -41,7 +41,7 @@
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) {
+	TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) {
 		TDEGlobal::locale()->insertCatalogue( "kbinaryclock");
 		return new KBinaryClock( configFile, KPanelApplet::Normal,
 							KPanelApplet::Preferences, parent, "kbinaryclock");
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 4328f8f..3e8924b 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -48,7 +48,7 @@ $Id$
 // Applet initialization function
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+	TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
 	{
 		TDEGlobal::locale()->insertCatalogue("kolourpicker");
 		return new KolourPicker(configFile, KPanelApplet::Normal,
diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h
index 7243d50..5e27981 100644
--- a/kicker-applets/kolourpicker/simplebutton.h
+++ b/kicker-applets/kolourpicker/simplebutton.h
@@ -26,7 +26,7 @@
 
 #include <kdemacros.h>
 
-class KDE_EXPORT SimpleButton : public TQButton
+class TDE_EXPORT SimpleButton : public TQButton
 {
     TQ_OBJECT
   
@@ -61,7 +61,7 @@ class KDE_EXPORT SimpleButton : public TQButton
         SimpleButtonPrivate* d;
 };
 
-class KDE_EXPORT SimpleArrowButton: public SimpleButton
+class TDE_EXPORT SimpleArrowButton: public SimpleButton
 {
     TQ_OBJECT
   
diff --git a/kicker-applets/ktimemon/timemon.cpp b/kicker-applets/ktimemon/timemon.cpp
index 3fe5372..de3d826 100644
--- a/kicker-applets/ktimemon/timemon.cpp
+++ b/kicker-applets/ktimemon/timemon.cpp
@@ -35,7 +35,7 @@
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("ktimemon");
         KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal,
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 08c534f..f38bcb2 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+  TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
   {
     TDEGlobal::locale()->insertCatalogue("kmathapplet");
     return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet");
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index a55ed06..a7ef56c 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -57,7 +57,7 @@ const int NO_BUTTONS = 4;
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile)
+	TDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile)
 	{
 		TDEGlobal::locale()->insertCatalogue("mediacontrol");
 		return new MediaControl(configFile, KPanelApplet::Normal,
diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h
index 7243d50..5e27981 100644
--- a/kicker-applets/mediacontrol/simplebutton.h
+++ b/kicker-applets/mediacontrol/simplebutton.h
@@ -26,7 +26,7 @@
 
 #include <kdemacros.h>
 
-class KDE_EXPORT SimpleButton : public TQButton
+class TDE_EXPORT SimpleButton : public TQButton
 {
     TQ_OBJECT
   
@@ -61,7 +61,7 @@ class KDE_EXPORT SimpleButton : public TQButton
         SimpleButtonPrivate* d;
 };
 
-class KDE_EXPORT SimpleArrowButton: public SimpleButton
+class TDE_EXPORT SimpleArrowButton: public SimpleButton
 {
     TQ_OBJECT
   
diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp
index 5ab5263..38211b2 100644
--- a/konq-plugins/sidebar/delicious/plugin.cpp
+++ b/konq-plugins/sidebar/delicious/plugin.cpp
@@ -68,7 +68,7 @@ bool KonqSidebarDelicious::universalMode()
 
 extern "C"
 {
-    KDE_EXPORT void* create_konqsidebar_delicious( TDEInstance *instance, TQObject *par, TQWidget *widp,
+    TDE_EXPORT void* create_konqsidebar_delicious( TDEInstance *instance, TQObject *par, TQWidget *widp,
                                                    TQString &desktopname, const char *name )
     {
         TDEGlobal::locale()->insertCatalogue( "konqsidebar_delicious" );
@@ -78,7 +78,7 @@ extern "C"
 
 extern "C"
 {
-   KDE_EXPORT bool add_konqsidebar_delicious( TQString* fn, TQString* /*param*/, TQMap<TQString,TQString> *map )
+   TDE_EXPORT bool add_konqsidebar_delicious( TQString* fn, TQString* /*param*/, TQMap<TQString,TQString> *map )
    {
        map->insert("Type", "Link");
        map->insert("Icon", "konqsidebar_delicious");
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index 00e499c..c39b45b 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -51,7 +51,7 @@ void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/)
 
 extern "C"
 {
-    KDE_EXPORT void* create_konqsidebar_mediaplayer(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+    TDE_EXPORT void* create_konqsidebar_mediaplayer(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
     {
 	TDEGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer");
         return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name);
@@ -60,7 +60,7 @@ extern "C"
 
 extern "C"
 {
-   KDE_EXPORT bool add_konqsidebar_mediaplayer(TQString* fn, TQString* /*param*/, TQMap<TQString,TQString> *map)
+   TDE_EXPORT bool add_konqsidebar_mediaplayer(TQString* fn, TQString* /*param*/, TQMap<TQString,TQString> *map)
    {
 		        map->insert("Type","Link");
 			map->insert("Icon","konqsidebar_mediaplayer");
diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp
index b2967a1..bf7b241 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabar.cpp
@@ -38,7 +38,7 @@ void Metabar::handlePreview(const KFileItemList &items)
 
 extern "C"
 {
-	KDE_EXPORT bool add_konqsidebar_metabar(TQString* fn, TQString* param, TQMap<TQString,TQString> *map)
+	TDE_EXPORT bool add_konqsidebar_metabar(TQString* fn, TQString* param, TQMap<TQString,TQString> *map)
 	{
 		Q_UNUSED(param);
 
@@ -54,7 +54,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT void* create_konqsidebar_metabar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+	TDE_EXPORT void* create_konqsidebar_metabar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
 	{
 		return new Metabar(instance,par,widp,desktopname,name);
 	}
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index f2c33fe..00eaada 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -250,7 +250,7 @@ namespace KSB_News {
 
 
   extern "C" {
-    KDE_EXPORT void* create_konq_sidebarnews(TDEInstance *instance, TQObject *par,
+    TDE_EXPORT void* create_konq_sidebarnews(TDEInstance *instance, TQObject *par,
                                              TQWidget *widp,
                                              TQString &desktopname,
                                              const char *name) {
@@ -260,7 +260,7 @@ namespace KSB_News {
   }
 
   extern "C" {
-    KDE_EXPORT bool add_konq_sidebarnews(TQString* fn, TQString*,
+    TDE_EXPORT bool add_konq_sidebarnews(TQString* fn, TQString*,
                                          TQMap<TQString,TQString> *map) {
       map->insert("Type", "Link");
       map->insert("Icon", "konqsidebar_news");
diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp
index 5b47072..6dd562e 100644
--- a/konq-plugins/webarchiver/webarchivecreator.cpp
+++ b/konq-plugins/webarchiver/webarchivecreator.cpp
@@ -32,7 +32,7 @@
 
 extern "C"
 {
-	KDE_EXPORT ThumbCreator* KDE_EXPORT new_creator()
+	TDE_EXPORT ThumbCreator* new_creator()
 	{
 		return new WebArchiveCreator;
 	}
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 504ad77..f433da9 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -41,7 +41,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("wakeup");
 		return new Wakeup();
diff --git a/noatun-plugins/alsaplayer/alsaplayerui.cpp b/noatun-plugins/alsaplayer/alsaplayerui.cpp
index 84c92e0..06e6924 100644
--- a/noatun-plugins/alsaplayer/alsaplayerui.cpp
+++ b/noatun-plugins/alsaplayer/alsaplayerui.cpp
@@ -25,7 +25,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("alsaplayerui");
 		return new AlsaPlayer;
diff --git a/noatun-plugins/blurscope/sdlscope.cpp b/noatun-plugins/blurscope/sdlscope.cpp
index 1d153a3..2a55f99 100644
--- a/noatun-plugins/blurscope/sdlscope.cpp
+++ b/noatun-plugins/blurscope/sdlscope.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		return new SDLScope();
 	}
diff --git a/noatun-plugins/charlatan/charlatanui.cpp b/noatun-plugins/charlatan/charlatanui.cpp
index b1ec9ec..586ddc7 100644
--- a/noatun-plugins/charlatan/charlatanui.cpp
+++ b/noatun-plugins/charlatan/charlatanui.cpp
@@ -25,7 +25,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("charlatanui");
 		return new Charlatan;
diff --git a/noatun-plugins/dub/dub/dubplaylist.cpp b/noatun-plugins/dub/dub/dubplaylist.cpp
index a8e91df..f1fd256 100644
--- a/noatun-plugins/dub/dub/dubplaylist.cpp
+++ b/noatun-plugins/dub/dub/dubplaylist.cpp
@@ -26,7 +26,7 @@
 // plugin interface
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("dub");
 		DubPlaylist* dub = new DubPlaylist;
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 065069a..1d7891d 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -16,7 +16,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("ffrs");
 		return new FFRS();
diff --git a/noatun-plugins/luckytag/luckytag.cpp b/noatun-plugins/luckytag/luckytag.cpp
index e30ab8d..38a920e 100644
--- a/noatun-plugins/luckytag/luckytag.cpp
+++ b/noatun-plugins/luckytag/luckytag.cpp
@@ -25,7 +25,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		return new LuckyTagger;
 	}
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 353bef4..270dde4 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -14,7 +14,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("lyrics");
 		return new Lyrics();
diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp
index fe4d569..5c27cef 100644
--- a/noatun-plugins/nexscope/noatunplugin.cpp
+++ b/noatun-plugins/nexscope/noatunplugin.cpp
@@ -8,7 +8,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("nexscope");
 		return new NexPlugin();
diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp
index 99780bd..893639e 100644
--- a/noatun-plugins/noatunmadness/madness.cpp
+++ b/noatun-plugins/noatunmadness/madness.cpp
@@ -21,7 +21,7 @@ RMS's novel that I'm supposed to put at the top of every story.  He's insane.
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		return new Madness();
 	}
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index 8365468..0942f61 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -19,7 +19,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		return new Oblique();
 	}
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
index 2135d8e..86e542f 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
@@ -25,7 +25,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("pitchablespeed");
 		return new PitchableSpeed();
diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp
index 3d143dd..6985a1f 100644
--- a/noatun-plugins/synaescope/synaescope.cpp
+++ b/noatun-plugins/synaescope/synaescope.cpp
@@ -15,7 +15,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("synaescope");
 		return new SynaeScope();
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index 5e20dd6..dfe6b17 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -21,7 +21,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("tippecanoe");
 		return new SynaeScope();
diff --git a/noatun-plugins/tyler/file.cpp b/noatun-plugins/tyler/file.cpp
index 79fb663..afbf908 100644
--- a/noatun-plugins/tyler/file.cpp
+++ b/noatun-plugins/tyler/file.cpp
@@ -41,7 +41,7 @@ static TQString getSavePath(void)
 
 extern "C"
 {
-	KDE_EXPORT void save_effect(t_effect *effect)
+	TDE_EXPORT void save_effect(t_effect *effect)
 	{
 		TQFile file(getSavePath());
 		if(!file.open(IO_WriteOnly))
@@ -61,7 +61,7 @@ int nb_effects=0;
 
 extern "C"
 {
-	KDE_EXPORT void load_effects()
+	TDE_EXPORT void load_effects()
 	{
 		TQFile file(getDataPath());
 		if(!file.open(IO_ReadOnly))
@@ -84,7 +84,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT void load_random_effect(t_effect *effect)
+	TDE_EXPORT void load_random_effect(t_effect *effect)
 	{
 		if(nb_effects > 0)
 		{
diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp
index 5eb7073..d50bc30 100644
--- a/noatun-plugins/tyler/tyler.cpp
+++ b/noatun-plugins/tyler/tyler.cpp
@@ -14,7 +14,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("tyler");
 		return new Tyler();
diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp
index 41118ec..875ea34 100644
--- a/noatun-plugins/wavecapture/wavecapture.cpp
+++ b/noatun-plugins/wavecapture/wavecapture.cpp
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin* create_plugin()
+	TDE_EXPORT Plugin* create_plugin()
 	{
 		TDEGlobal::locale()->insertCatalogue("wavecapture");
 		return new WaveCapture();