Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT

Signed-off-by: Michele Calgaro <[email protected]>

135 files changed, 364 insertions, 371 deletions

diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h
index ea2e1e66a..ad1afbed7 100644
--- a/arts/kde/kartsdispatcher.h
+++ b/arts/kde/kartsdispatcher.h
@@ -61,7 +61,7 @@ namespace Arts
  * }
  * \endcode
  */
-class KDE_EXPORT KArtsDispatcher : public TQObject
+class TDE_EXPORT KArtsDispatcher : public TQObject
 {
 TQ_OBJECT
 public:
diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h
index 8626405f0..b53ba0003 100644
--- a/arts/kde/kplayobject.h
+++ b/arts/kde/kplayobject.h
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tqobject.h>
 
-class KDE_EXPORT KPlayObject : public TQObject
+class TDE_EXPORT KPlayObject : public TQObject
 {
 TQ_OBJECT
 public:
@@ -185,7 +185,7 @@ class PlayObjectFactory;
   * internal state until the real Arts::PlayObject got created, afterwards
   * the state of the Arts::PlayObject will be returned.
   */
-class KDE_EXPORT PlayObject : public TQObject
+class TDE_EXPORT PlayObject : public TQObject
 {
 TQ_OBJECT
 public:
diff --git a/arts/kde/kplayobjectfactory.h b/arts/kde/kplayobjectfactory.h
index 9d4e41647..a0bc841c2 100644
--- a/arts/kde/kplayobjectfactory.h
+++ b/arts/kde/kplayobjectfactory.h
@@ -30,7 +30,7 @@
 
 class KArtsServer;
 
-class KDE_EXPORT KPlayObjectFactory
+class TDE_EXPORT KPlayObjectFactory
 {
 public:
 	/**
@@ -76,7 +76,7 @@ class POFHelper;
 	 * use the KDE multimedia framework can be found in the documentation
 	 * for KDE::PlayObject.
 	 */
-class KDE_EXPORT PlayObjectFactory// : public TQObject ### for KDE4 make it a TQObject to be able to receive signals
+class TDE_EXPORT PlayObjectFactory// : public TQObject ### for KDE4 make it a TQObject to be able to receive signals
 {
 public:
 	/**
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 176559bea..14606b007 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -102,7 +102,7 @@ class KNotifyPrivate
 #endif
 
 extern "C"{
-	KDE_EXPORT int kdemain(int argc, char **argv) {
+	TDE_EXPORT int kdemain(int argc, char **argv) {
 		TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
 					"3.0", I18N_NOOP("TDE Notification Server"),
 					TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
diff --git a/interfaces/tdemediaplayer/player.h b/interfaces/tdemediaplayer/player.h
index 5302c721a..927144e5c 100644
--- a/interfaces/tdemediaplayer/player.h
+++ b/interfaces/tdemediaplayer/player.h
@@ -43,7 +43,7 @@ namespace KMediaPlayer
  * the user interface facets, for those who wish to provide their own
  * interface.
  */
-class KDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject
+class TDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject
 {
 TQ_OBJECT
 
diff --git a/interfaces/tdemediaplayer/playerdcopobject.h b/interfaces/tdemediaplayer/playerdcopobject.h
index 73a1cfa1d..4c2511e4a 100644
--- a/interfaces/tdemediaplayer/playerdcopobject.h
+++ b/interfaces/tdemediaplayer/playerdcopobject.h
@@ -30,7 +30,7 @@
 namespace KMediaPlayer
 {
 
-class KDE_EXPORT PlayerDCOPObject : public DCOPObject
+class TDE_EXPORT PlayerDCOPObject : public DCOPObject
 {
 K_DCOP
 
diff --git a/interfaces/tdemediaplayer/view.h b/interfaces/tdemediaplayer/view.h
index 69fce7b5f..fce17f819 100644
--- a/interfaces/tdemediaplayer/view.h
+++ b/interfaces/tdemediaplayer/view.h
@@ -31,7 +31,7 @@ namespace KMediaPlayer
 {
 
 /** View is part of the user interface of a Player. */
-class KDE_EXPORT View : public TQWidget
+class TDE_EXPORT View : public TQWidget
 {
 TQ_OBJECT
 
diff --git a/interfaces/tdescript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h
index 78e6ba960..1d5ce6b97 100644
--- a/interfaces/tdescript/scriptinterface.h
+++ b/interfaces/tdescript/scriptinterface.h
@@ -44,7 +44,7 @@ class KScriptClientInterface;
 	*	@author Ian Reinhart Geiser <[email protected]>
 	*
 	**/
-	class KDE_EXPORT KScriptInterface : public TQObject
+	class TDE_EXPORT KScriptInterface : public TQObject
 	{
 	TQ_OBJECT
 	public:
diff --git a/interfaces/tdescript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h
index ed9db2d95..82ca96dc7 100644
--- a/interfaces/tdescript/scriptmanager.h
+++ b/interfaces/tdescript/scriptmanager.h
@@ -36,7 +36,7 @@ class ScriptInfo;
 	*	@author Ian Reinhart Geiser <[email protected]>
 	*
 	**/
-	class KDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface
+	class TDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface
 	{
 	TQ_OBJECT
 	friend class KScriptInterface;
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index b0f2b9d5f..6b6c465b1 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -88,7 +88,7 @@ class TQStrList;
  *
  * @author Dominique Devriese <[email protected]>
  */
-class KDE_EXPORT TerminalInterface
+class TDE_EXPORT TerminalInterface
 {
 public:
   /**
@@ -125,7 +125,7 @@ public:
    @since 3.5
 */
 
-class KDE_EXPORT ExtTerminalInterface
+class TDE_EXPORT ExtTerminalInterface
 {
 public:
   /**
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 1153bcf25..b401ed1f0 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -876,7 +876,7 @@ public:
   KDEDQtDCOPObject kdedQtDcopObject;
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
      TDEAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
         "$Id$",
diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h
index bdc9cb6d2..0619e7d87 100644
--- a/kded/kdedmodule.h
+++ b/kded/kdedmodule.h
@@ -40,7 +40,7 @@ class Kded;
  *
  * \code
  *   extern "C" {
- *     KDE_EXPORT KDEDModule *create_xyz(TQCString *name)
+ *     TDE_EXPORT KDEDModule *create_xyz(TQCString *name)
  *     {
  *       return new XYZ(name);
  *     }
@@ -52,7 +52,7 @@ class Kded;
  * @author Waldo Bastian <[email protected]>
  */
 
-class KDE_EXPORT KDEDModule : public TQObject, public DCOPObject
+class TDE_EXPORT KDEDModule : public TQObject, public DCOPObject
 {
   TQ_OBJECT
 // For inclusion in KDE4 (since it's BIC) long-needed fix for allowing
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index d3ba42f19..030932cc3 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -715,7 +715,7 @@ public:
    ~WaitForSignal() { kapp->eventLoop()->exitLoop(); }
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 {
    TDELocale::setMainCatalogue("tdelibs");
    TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
diff --git a/kded/test/test.cpp b/kded/test/test.cpp
index 8d2aa91b9..f5f84e52e 100644
--- a/kded/test/test.cpp
+++ b/kded/test/test.cpp
@@ -34,7 +34,7 @@ void TestModule::registerMe(const TQCString &app)
 }
 
 extern "C" { 
-  KDE_EXPORT KDEDModule *create_test(const TQCString &obj)
+  TDE_EXPORT KDEDModule *create_test(const TQCString &obj)
   {
      return new TestModule(obj);
   }
diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp
index 57a44156c..d44b979b5 100644
--- a/kdoctools/main.cpp
+++ b/kdoctools/main.cpp
@@ -23,7 +23,7 @@ extern int xmlLoadExtDtdDefaultValue;
 
 extern "C"
 {
-    KDE_EXPORT int kdemain( int argc, char **argv )
+    TDE_EXPORT int kdemain( int argc, char **argv )
     {
         TDEInstance instance( "tdeio_help" );
         fillInstance(instance);
diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp
index 94bcc60dd..2b2868625 100644
--- a/kdoctools/main_ghelp.cpp
+++ b/kdoctools/main_ghelp.cpp
@@ -23,7 +23,7 @@ extern int xmlLoadExtDtdDefaultValue;
 
 extern "C"
 {
-    KDE_EXPORT int kdemain( int argc, char **argv )
+    TDE_EXPORT int kdemain( int argc, char **argv )
     {
         TDEInstance instance( "tdeio_ghelp" );
         fillInstance(instance);
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index 28e4f9110..b84b41a23 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -953,7 +953,7 @@ namespace {	// Private.
 }
 
 
-KDE_EXPORT void kimgio_dds_read( TQImageIO *io )
+TDE_EXPORT void kimgio_dds_read( TQImageIO *io )
 {
 	TQDataStream s( io->ioDevice() );
 	s.setByteOrder( TQDataStream::LittleEndian );
@@ -1011,7 +1011,7 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io )
 }
 
 
-KDE_EXPORT void kimgio_dds_write( TQImageIO * )
+TDE_EXPORT void kimgio_dds_write( TQImageIO * )
 {
 	// TODO Stub!
 }
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index bcf916836..f7f756c0f 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -121,7 +121,7 @@ static bool bbox ( TQIODevice *io, int *x1, int *y1, int *x2, int *y2)
         return ret;
 }
 
-KDE_EXPORT void kimgio_eps_read (TQImageIO *image)
+TDE_EXPORT void kimgio_eps_read (TQImageIO *image)
 {
         kdDebug(399) << "kimgio EPS: starting..." << endl;
 
@@ -245,7 +245,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image)
 }
 
 // Sven Wiegand <[email protected]> -- eps output filter (from KSnapshot)
-KDE_EXPORT void kimgio_eps_write( TQImageIO *imageio )
+TDE_EXPORT void kimgio_eps_write( TQImageIO *imageio )
 {
   TQPrinter psOut(TQPrinter::PrinterResolution);
   TQPainter p;
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index 862d8237a..d03e41dbe 100644
--- a/kimgio/exr.cpp
+++ b/kimgio/exr.cpp
@@ -114,7 +114,7 @@ TQRgb RgbaToQrgba(struct Rgba imagePixel)
 				  char (Imath::clamp ( a * 84.66f, 0.f, 255.f ) ) );
 }
 
-KDE_EXPORT void kimgio_exr_read( TQImageIO *io )
+TDE_EXPORT void kimgio_exr_read( TQImageIO *io )
 {
     try
     {
@@ -156,7 +156,7 @@ KDE_EXPORT void kimgio_exr_read( TQImageIO *io )
 }
 
 
-KDE_EXPORT void kimgio_exr_write(TQImageIO *)
+TDE_EXPORT void kimgio_exr_write(TQImageIO *)
 {
 	// TODO: stub
 }
diff --git a/kimgio/g3r.cpp b/kimgio/g3r.cpp
index 1efb07434..445c46012 100644
--- a/kimgio/g3r.cpp
+++ b/kimgio/g3r.cpp
@@ -11,7 +11,7 @@
 
 #include "g3r.h"
 
-KDE_EXPORT void kimgio_g3_read( TQImageIO *io )
+TDE_EXPORT void kimgio_g3_read( TQImageIO *io )
 {
     // This won't work if io is not a TQFile !
   TIFF *tiff = TIFFOpen(TQFile::encodeName(io->fileName()), "r");  
@@ -44,7 +44,7 @@ KDE_EXPORT void kimgio_g3_read( TQImageIO *io )
 }
 
 
-KDE_EXPORT void kimgio_g3_write(TQImageIO *)
+TDE_EXPORT void kimgio_g3_write(TQImageIO *)
 {
 	// TODO: stub
 }
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index 0749ce751..88cdfafe7 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -199,7 +199,7 @@ namespace {	// Private.
 } // namespace
 
 
-KDE_EXPORT void kimgio_hdr_read( TQImageIO * io )
+TDE_EXPORT void kimgio_hdr_read( TQImageIO * io )
 {
 	int len;
 	char line[MAXLINE];
@@ -258,7 +258,7 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io )
 }
 
 
-KDE_EXPORT void kimgio_hdr_write( TQImageIO * )
+TDE_EXPORT void kimgio_hdr_write( TQImageIO * )
 {
 	// intentionally not implemented (since writing low dynamic range data to a HDR file is nonsense.)
 }
diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp
index bf53ecc3b..57627cb8b 100644
--- a/kimgio/ico.cpp
+++ b/kimgio/ico.cpp
@@ -241,7 +241,7 @@ namespace
     }
 }
 
-extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io )
+extern "C" TDE_EXPORT void kimgio_ico_read( TQImageIO* io )
 {
     TQIODevice::Offset offset = io->ioDevice()->at();
 
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
index 5b7e4318e..ff64f9263 100644
--- a/kimgio/jp2.cpp
+++ b/kimgio/jp2.cpp
@@ -149,7 +149,7 @@ render_view( gs_t& gs, TQImage& qti )
 } // render_view
 
 
-KDE_EXPORT void
+TDE_EXPORT void
 kimgio_jp2_read( TQImageIO* io )
 {
 	if( jas_init() ) return;
@@ -233,7 +233,7 @@ write_components( jas_image_t* ji, const TQImage& qi )
     return true;
 } // write_components
 
-KDE_EXPORT void
+TDE_EXPORT void
 kimgio_jp2_write( TQImageIO* io )
 {
 	if( jas_init() ) return;
diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp
index ea02b67a9..232f5c3ca 100644
--- a/kimgio/pcx.cpp
+++ b/kimgio/pcx.cpp
@@ -262,7 +262,7 @@ static void readImage24( TQImage &img, TQDataStream &s, const PCXHEADER &header
   }
 }
 
-KDE_EXPORT void kimgio_pcx_read( TQImageIO *io )
+TDE_EXPORT void kimgio_pcx_read( TQImageIO *io )
 {
   TQDataStream s( io->ioDevice() );
   s.setByteOrder( TQDataStream::LittleEndian );
@@ -479,7 +479,7 @@ static void writeImage24( TQImage &img, TQDataStream &s, PCXHEADER &header )
   }
 }
 
-KDE_EXPORT void kimgio_pcx_write( TQImageIO *io )
+TDE_EXPORT void kimgio_pcx_write( TQImageIO *io )
 {
   TQDataStream s( io->ioDevice() );
   s.setByteOrder( TQDataStream::LittleEndian );
diff --git a/kimgio/psd.h b/kimgio/psd.h
index cf2e7dc25..14733ad68 100644
--- a/kimgio/psd.h
+++ b/kimgio/psd.h
@@ -15,8 +15,8 @@
 class TQImageIO;
 
 extern "C" {
-KDE_EXPORT void kimgio_psd_read( TQImageIO * );
-KDE_EXPORT void kimgio_psd_write( TQImageIO * );
+TDE_EXPORT void kimgio_psd_read( TQImageIO * );
+TDE_EXPORT void kimgio_psd_write( TQImageIO * );
 }
 
 #endif
diff --git a/kimgio/rgb.cpp b/kimgio/rgb.cpp
index bdda0959a..26129ca3e 100644
--- a/kimgio/rgb.cpp
+++ b/kimgio/rgb.cpp
@@ -31,7 +31,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KDE_EXPORT void kimgio_rgb_read(TQImageIO *io)
+TDE_EXPORT void kimgio_rgb_read(TQImageIO *io)
 {
 	SGIImage sgi(io);
 	TQImage img;
@@ -47,7 +47,7 @@ KDE_EXPORT void kimgio_rgb_read(TQImageIO *io)
 }
 
 
-KDE_EXPORT void kimgio_rgb_write(TQImageIO *io)
+TDE_EXPORT void kimgio_rgb_write(TQImageIO *io)
 {
 	SGIImage sgi(io);
 	TQImage img = io->image();
diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp
index 65e29a8cf..b0c2e2688 100644
--- a/kimgio/tga.cpp
+++ b/kimgio/tga.cpp
@@ -313,7 +313,7 @@ namespace {	// Private.
 } // namespace
 
 
-KDE_EXPORT void kimgio_tga_read( TQImageIO *io )
+TDE_EXPORT void kimgio_tga_read( TQImageIO *io )
 {
 	//kdDebug(399) << "Loading TGA file!" << endl;
 	
@@ -359,7 +359,7 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io )
 }
 
 
-KDE_EXPORT void kimgio_tga_write( TQImageIO *io )
+TDE_EXPORT void kimgio_tga_write( TQImageIO *io )
 {
     TQDataStream s( io->ioDevice() );
     s.setByteOrder( TQDataStream::LittleEndian );
diff --git a/kimgio/tiffr.cpp b/kimgio/tiffr.cpp
index bbffa82a9..7f7b13ea6 100644
--- a/kimgio/tiffr.cpp
+++ b/kimgio/tiffr.cpp
@@ -60,7 +60,7 @@ static void tiff_unmap( thandle_t, tdata_t, toff_t )
 {
 }
 
-KDE_EXPORT void kimgio_tiff_read( TQImageIO *io )
+TDE_EXPORT void kimgio_tiff_read( TQImageIO *io )
 {
 	TIFF *tiff;
 	uint32 width, height;
@@ -143,7 +143,7 @@ KDE_EXPORT void kimgio_tiff_read( TQImageIO *io )
 	io->setStatus ( 0 );
 }
 
-KDE_EXPORT void kimgio_tiff_write( TQImageIO * )
+TDE_EXPORT void kimgio_tiff_write( TQImageIO * )
 {
 	// TODO: stub
 }
diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp
index 78af2e995..d90b12d85 100644
--- a/kimgio/xcf.cpp
+++ b/kimgio/xcf.cpp
@@ -32,14 +32,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KDE_EXPORT void kimgio_xcf_read(TQImageIO *io)
+TDE_EXPORT void kimgio_xcf_read(TQImageIO *io)
 {
 	XCFImageFormat xcfif;
 	xcfif.readXCF(io);
 }
 
 
-KDE_EXPORT void kimgio_xcf_write(TQImageIO *io)
+TDE_EXPORT void kimgio_xcf_write(TQImageIO *io)
 {
 	kdDebug(399) << "XCF: write support not implemented" << endl;
 	io->setStatus(-1);
diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp
index c2ceae05a..fdc598195 100644
--- a/kimgio/xview.cpp
+++ b/kimgio/xview.cpp
@@ -19,7 +19,7 @@
 static const int b_255_3[]= {0,85,170,255},  // index*255/3
            rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7
 
-KDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio )
+TDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio )
 {      
 	int x=-1;
 	int y=-1;
@@ -100,7 +100,7 @@ KDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio )
 	return;
 }
 
-KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio )
+TDE_EXPORT void kimgio_xv_write( TQImageIO *imageio )
 {
 	TQIODevice& f = *( imageio->ioDevice() );
 
diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp
index a82c0b658..d668598e6 100644
--- a/libtdescreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -93,7 +93,7 @@ protected:
 typedef WId Window;
 #endif
 
-KDE_EXPORT int main(int argc, char *argv[])
+TDE_EXPORT int main(int argc, char *argv[])
 {
     TDELocale::setMainCatalogue("libtdescreensaver");
     TDECmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version);
diff --git a/libtdescreensaver/tdescreensaver.h b/libtdescreensaver/tdescreensaver.h
index bfca411cd..e5e3e39f2 100644
--- a/libtdescreensaver/tdescreensaver.h
+++ b/libtdescreensaver/tdescreensaver.h
@@ -56,7 +56,7 @@ class KBlankEffectPrivate;
 * @short Provides a TQWidget for a screensaver to draw into.
 * @author Martin R. Jones <[email protected]>
 */
-class KDE_EXPORT KScreenSaver : public TQWidget
+class TDE_EXPORT KScreenSaver : public TQWidget
 {
 	TQ_OBJECT
 public:
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index 7060477c1..98ea086b6 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -36,18 +36,8 @@
 #include <tdeversion.h>
 #include <kdemacros.h>
 
-#if KDE_IS_VERSION( 3,3,90 )
-/* life is great */
-#else
-/* workaround typo that breaks compilation with newer gcc */
-#undef KDE_EXPORT
-#define KDE_EXPORT
-#undef KDE_NO_EXPORT
-#define KDE_NO_EXPORT
-#endif
-
 extern "C" {
-	KDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj )
+	TDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj )
 	{
 		return new NetworkStatusModule( obj );
 	}
diff --git a/networkstatus/networkstatuscommon.cpp b/networkstatus/networkstatuscommon.cpp
index b2a8cc8f1..0b7df6151 100644
--- a/networkstatus/networkstatuscommon.cpp
+++ b/networkstatus/networkstatuscommon.cpp
@@ -22,7 +22,7 @@
 #include "networkstatuscommon.h"
 #include <kdebug.h>
 
-KDE_EXPORT TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p )
+TDE_EXPORT TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p )
 {
 	kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl;
 	s << (int)p.status;
@@ -33,7 +33,7 @@ KDE_EXPORT TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Pr
 	return s;
 }
 
-KDE_EXPORT TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p )
+TDE_EXPORT TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p )
 {
 	int status, onDemandPolicy, internet;
 	s >> status;
diff --git a/tdeabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp
index dcb49330e..778a81ef7 100644
--- a/tdeabc/formats/binaryformat.cpp
+++ b/tdeabc/formats/binaryformat.cpp
@@ -38,7 +38,7 @@ using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT FormatPlugin *format()
+  TDE_EXPORT FormatPlugin *format()
   {
     return new BinaryFormat;
   }
diff --git a/tdeabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp
index 028dce31c..b2e749c6a 100644
--- a/tdeabc/plugins/dir/resourcedirplugin.cpp
+++ b/tdeabc/plugins/dir/resourcedirplugin.cpp
@@ -25,7 +25,7 @@ using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_tdeabc_dir()
+  TDE_EXPORT void *init_tdeabc_dir()
   {
     return new KRES::PluginFactory<ResourceDir, ResourceDirConfig>();
   }
diff --git a/tdeabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp
index a5df5fe18..c9b71b818 100644
--- a/tdeabc/plugins/evolution/resourceevo.cpp
+++ b/tdeabc/plugins/evolution/resourceevo.cpp
@@ -30,7 +30,7 @@ class EvolutionFactory : public KRES::PluginFactoryBase
 
 extern "C"
 {
-  KDE_EXPORT void *init_tdeabc_evo()
+  TDE_EXPORT void *init_tdeabc_evo()
   {
     return ( new EvolutionFactory() );
   }
diff --git a/tdeabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp
index 6f7598a40..1838bf6b9 100644
--- a/tdeabc/plugins/file/resourcefileplugin.cpp
+++ b/tdeabc/plugins/file/resourcefileplugin.cpp
@@ -25,7 +25,7 @@ using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_tdeabc_file()
+  TDE_EXPORT void *init_tdeabc_file()
   {
     return new KRES::PluginFactory<ResourceFile, ResourceFileConfig>();
   }
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
index 6046e9ae2..aefd56b02 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
@@ -28,7 +28,7 @@ using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_tdeabc_ldaptdeio()
+  TDE_EXPORT void *init_tdeabc_ldaptdeio()
   {
     TDEGlobal::locale()->insertCatalogue("tdeabc_ldaptdeio");
     return new KRES::PluginFactory<ResourceLDAPTDEIO, ResourceLDAPTDEIOConfig>();
diff --git a/tdeabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp
index cd87cc000..0e3b1d3c7 100644
--- a/tdeabc/plugins/net/resourcenetplugin.cpp
+++ b/tdeabc/plugins/net/resourcenetplugin.cpp
@@ -25,7 +25,7 @@ using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_tdeabc_net()
+  TDE_EXPORT void *init_tdeabc_net()
   {
     return new KRES::PluginFactory<ResourceNet, ResourceNetConfig>();
   }
diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp
index a820b56df..3741fff3b 100644
--- a/tdeabc/plugins/sql/resourcesql.cpp
+++ b/tdeabc/plugins/sql/resourcesql.cpp
@@ -33,7 +33,7 @@ using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_tdeabc_sql()
+  TDE_EXPORT void *init_tdeabc_sql()
   {
     return new KRES::PluginFactory<ResourceSql,ResourceSqlConfig>();
   }
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index b62c9df23..df39d7810 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -196,7 +196,7 @@ static void setIcon(TQWidget *w, const TQString &iconName)
 #endif
 }
 
-extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
+extern "C" TDE_EXPORT int kdemain(int _argc, char *_argv[])
 {
     TDEAboutData aboutData( "tdecmshell", I18N_NOOP("TDE Control Module"),
                           0,
diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp
index 939a70e80..35dbcfbf4 100644
--- a/tdeconf_update/tdeconf_update.cpp
+++ b/tdeconf_update/tdeconf_update.cpp
@@ -938,7 +938,7 @@ void KonfUpdate::resetOptions()
 }
 
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 {
    TDEAboutData aboutData("tdeconf_update", I18N_NOOP("KConf Update"),
                         "1.0.2",
diff --git a/tdecore/kdemacros.h.cmake b/tdecore/kdemacros.h.cmake
index 683538f9d..f48f518f6 100644
--- a/tdecore/kdemacros.h.cmake
+++ b/tdecore/kdemacros.h.cmake
@@ -25,7 +25,7 @@
 #cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
 
 /**
- * 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 
@@ -33,29 +33,32 @@
  * 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
 
+#define KDE_NO_EXPORT TDE_NO_EXPORT
+#define KDE_EXPORT TDE_EXPORT
+
 /**
  * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to
  * cope with symbol visibility.
  */
 #define KDE_Q_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/tdecore/kdemacros.h.in b/tdecore/kdemacros.h.in
index d72efe36c..aa17c976c 100644
--- a/tdecore/kdemacros.h.in
+++ b/tdecore/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_Q_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/tdecore/klibloader.h b/tdecore/klibloader.h
index 82b268c16..813106164 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -36,7 +36,7 @@ class KLibLoaderPrivate;
 class KLibraryPrivate;
 
 # define K_EXPORT_COMPONENT_FACTORY( libname, factory ) \
-    extern "C" { KDE_EXPORT void *init_##libname() { return new factory; } }
+    extern "C" { TDE_EXPORT void *init_##libname() { return new factory; } }
 
 /**
  * @short Represents a dynamically loaded library.
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 4377ec9ce..af48a5386 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -18,7 +18,7 @@
 
 #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
 #undef TDEIO_EXPORT
-#define TDEIO_EXPORT KDE_EXPORT
+#define TDEIO_EXPORT TDE_EXPORT
 #endif
 
 #define KPROTOCOLINFO_TDECORE
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index e56b0efbb..28d64a9dc 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -340,7 +340,7 @@ protected:
 private:
     // HACK
 #ifdef TDESOCKET_BINARY_COMPAT_HACK
-    KDE_EXPORT bool bindAndListen();
+    TDE_EXPORT bool bindAndListen();
 #endif // TDESOCKET_BINARY_COMPAT_HACK
 
     TDEServerSocket(const TDEServerSocket&);
diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp
index 0c072752c..397005183 100644
--- a/tdecore/netsupp.cpp
+++ b/tdecore/netsupp.cpp
@@ -1233,5 +1233,5 @@ int inet_pton(int af, const char *cp, void *buf)
 namespace KDE
 {
   /** @internal */
-  extern const int KDE_EXPORT resolverFlags = KRF_getaddrinfo | KRF_resolver | KRF_afinet6 | KRF_inet_ntop | KRF_inet_pton;
+  extern const int TDE_EXPORT resolverFlags = KRF_getaddrinfo | KRF_resolver | KRF_afinet6 | KRF_inet_ntop | KRF_inet_pton;
 }
diff --git a/tdecore/network/kresolver_p.h b/tdecore/network/kresolver_p.h
index c9d64e4bc..896fe536f 100644
--- a/tdecore/network/kresolver_p.h
+++ b/tdecore/network/kresolver_p.h
@@ -206,7 +206,7 @@ namespace KNetwork
       KResolverManager();
 
     public:
-      static KResolverManager* manager() KDE_NO_EXPORT;	// creates and returns the global manager
+      static KResolverManager* manager() TDE_NO_EXPORT;	// creates and returns the global manager
 
       // destructor
       ~KResolverManager();
diff --git a/tdecore/network/kresolverstandardworkers_p.h b/tdecore/network/kresolverstandardworkers_p.h
index 05d0d5b26..92d15892a 100644
--- a/tdecore/network/kresolverstandardworkers_p.h
+++ b/tdecore/network/kresolverstandardworkers_p.h
@@ -39,7 +39,7 @@
 
 namespace KNetwork { namespace Internal
 {
-  extern void initStandardWorkers() KDE_NO_EXPORT;
+  extern void initStandardWorkers() TDE_NO_EXPORT;
 
   /**
    * @internal
diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp
index 568e0d22b..732de02a4 100644
--- a/tdecore/network/ksrvresolverworker.cpp
+++ b/tdecore/network/ksrvresolverworker.cpp
@@ -242,7 +242,7 @@ namespace KNetwork
   namespace Internal
   {
 
-    void initSrvWorker() KDE_NO_EXPORT;
+    void initSrvWorker() TDE_NO_EXPORT;
     void initSrvWorker()
     {
       if (getenv("TDE_NO_SRV") != NULL)
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 326388614..d089f24f6 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -188,7 +188,7 @@ extern int getfd(const char *fnam);
 #include "kappdcopiface.h"
 
 // exported for tdm kfrontend
-KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
+TDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
 bool kde_kiosk_exception = false; // flag to disable kiosk restrictions
 bool kde_kiosk_admin = false;
 
diff --git a/tdecore/tdeconfig_compiler/README.dox b/tdecore/tdeconfig_compiler/README.dox
index b79a086cf..ad02f29b3 100644
--- a/tdecore/tdeconfig_compiler/README.dox
+++ b/tdecore/tdeconfig_compiler/README.dox
@@ -104,7 +104,7 @@ The following options are read from the kcfgc file:
   <td><b>Visibility</b></td>
   <td>string</td>
   <td>-</td>
-  <td>Inserts visibility directive (for example KDE_EXPORT) between "class" keyword and class 
+  <td>Inserts visibility directive (for example TDE_EXPORT) between "class" keyword and class 
   name in header file</td>
 </tr>
 <tr>
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index f54b1e138..59db6d0ae 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -124,7 +124,7 @@ TQString readLineFile(TQString fname) {
 TQString decodeHexEncoding(TQString str);
 
 extern "C" {
-	KDE_EXPORT TDEHardwareDevices* create_tdeHardwareDevices()
+	TDE_EXPORT TDEHardwareDevices* create_tdeHardwareDevices()
 	{
 		return new TDEHardwareDevices();
 	}
diff --git a/tdecore/tdehw/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp
index b2ae276a8..9a273cebb 100644
--- a/tdecore/tdehw/tdenetworkconnections.cpp
+++ b/tdecore/tdehw/tdenetworkconnections.cpp
@@ -41,7 +41,7 @@
 /*================================================================================================*/
 
 extern "C" {
-	KDE_EXPORT TDEGlobalNetworkManager* create_tdeGlobalNetworkManager()
+	TDE_EXPORT TDEGlobalNetworkManager* create_tdeGlobalNetworkManager()
 	{
 		return new TDEGlobalNetworkManager();
 	}
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index 9697c6bb4..e1b7e3662 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/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 */
@@ -32,30 +32,30 @@
 #else /* Q_OS_UNIX */
 
 /* 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 TDESTYLE_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 TDERANDR_EXPORT KDE_EXPORT
-#define TDEIMPROXY_EXPORT KDE_EXPORT
-#define KDE_ARTS_EXPORT KDE_EXPORT
-#define TDEUNITTEST_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 TDESTYLE_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 TDERANDR_EXPORT TDE_EXPORT
+#define TDEIMPROXY_EXPORT TDE_EXPORT
+#define KDE_ARTS_EXPORT TDE_EXPORT
+#define TDEUNITTEST_EXPORT TDE_EXPORT
 
 #define KPATH_SEPARATOR ':'
 
diff --git a/tdefx/kcpuinfo.cpp b/tdefx/kcpuinfo.cpp
index 97c99f8d9..ff6d3505c 100644
--- a/tdefx/kcpuinfo.cpp
+++ b/tdefx/kcpuinfo.cpp
@@ -48,10 +48,10 @@ static void sighandler( int )
 #endif
 
 #ifdef __PPC__
-static sigjmp_buf KDE_NO_EXPORT jmpbuf;
-static sig_atomic_t KDE_NO_EXPORT canjump = 0;
+static sigjmp_buf TDE_NO_EXPORT jmpbuf;
+static sig_atomic_t TDE_NO_EXPORT canjump = 0;
 
-static void KDE_NO_EXPORT sigill_handler( int sig )
+static void TDE_NO_EXPORT sigill_handler( int sig )
 {
     if ( !canjump ) {
         signal( sig, SIG_DFL );
diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp
index 2c741fc06..6571c2a48 100644
--- a/tdefx/tdestyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -2383,7 +2383,7 @@ void TDEStyle::virtual_hook( int, void* )
 
 // HACK for gtk-qt-engine
 
-extern "C" KDE_EXPORT
+extern "C" TDE_EXPORT
 void kde_tdestyle_set_scrollbar_type_windows( void* style )
 {
     ((TDEStyle*)style)->setScrollBarType( TDEStyle::WindowsStyleScrollBar );
diff --git a/tdehtml/CMakeLists.txt b/tdehtml/CMakeLists.txt
index 624612d55..70fea75bd 100644
--- a/tdehtml/CMakeLists.txt
+++ b/tdehtml/CMakeLists.txt
@@ -108,8 +108,8 @@ set( ${target}_SRCS
 
 file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
 "#include <tdelibs_export.h>
-extern \"C\" KDE_EXPORT void* init_libtdehtml();
-extern \"C\" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); }
+extern \"C\" TDE_EXPORT void* init_libtdehtml();
+extern \"C\" TDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); }
 " )
 
 tde_add_kpart( ${target}
@@ -130,8 +130,8 @@ set( ${target}_SRCS
 file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/imgdummy.cpp
 "
 #include <tdelibs_export.h>
-extern \"C\"  KDE_EXPORT void* init_tdehtmlimagefactory();
-extern \"C\"  KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); }
+extern \"C\"  TDE_EXPORT void* init_tdehtmlimagefactory();
+extern \"C\"  TDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); }
 " )
 
 tde_add_kpart( ${target}
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 79ecf8a89..307389105 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -62,8 +62,8 @@ libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \
 # init_libtdehtml is in libtdehtml.so; init_libtdehtmlpart needs to be in the part
 dummy.cpp: $(srcdir)/Makefile.am
 	echo '#include <tdelibs_export.h>' > $@
-	echo 'extern "C" KDE_EXPORT void* init_libtdehtml();' >> $@
-	echo 'extern "C" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); } ' >> $@
+	echo 'extern "C" TDE_EXPORT void* init_libtdehtml();' >> $@
+	echo 'extern "C" TDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); } ' >> $@
 
 libtdehtmlpart_la_SOURCES = dummy.cpp
 libtdehtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
@@ -72,8 +72,8 @@ libtdehtmlpart_la_LIBADD = libtdehtml.la $(LIB_TQT)
 # init_tdehtmlimagefactory is in libtdehtml.so; init_tdehtmlimagepart needs to be in the part
 imgdummy.cpp: $(srcdir)/Makefile.am
 	echo '#include <tdelibs_export.h>' > $@
-	echo 'extern "C"  KDE_EXPORT void* init_tdehtmlimagefactory();' >> $@
-	echo 'extern "C"  KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); } ' >> $@
+	echo 'extern "C"  TDE_EXPORT void* init_tdehtmlimagefactory();' >> $@
+	echo 'extern "C"  TDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); } ' >> $@
 
 tdehtmlimagepart_la_SOURCES = imgdummy.cpp
 tdehtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/tdehtml/css/css_base.h b/tdehtml/css/css_base.h
index d2ab4f63f..db0700a35 100644
--- a/tdehtml/css/css_base.h
+++ b/tdehtml/css/css_base.h
@@ -264,7 +264,7 @@ namespace DOM {
 	TQPtrList<StyleBaseImpl> *m_lstChildren;
     };
 
-    KDE_NO_EXPORT int getPropertyID(const char *tagStr, int len);
+    TDE_NO_EXPORT int getPropertyID(const char *tagStr, int len);
 
 }
 
diff --git a/tdehtml/css/cssproperties.h b/tdehtml/css/cssproperties.h
index c06431c62..bcdcee6e3 100644
--- a/tdehtml/css/cssproperties.h
+++ b/tdehtml/css/cssproperties.h
@@ -4,7 +4,7 @@
 #ifndef CSSPROPERTIES_H
 #define CSSPROPERTIES_H
 
-DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
+DOM::DOMString getPropertyName(unsigned short id) TDE_NO_EXPORT;
 
 #define CSS_PROP_INVALID 0
 #define CSS_PROP_MIN 1
diff --git a/tdehtml/css/cssstyleselector.h b/tdehtml/css/cssstyleselector.h
index f826c0323..bc7c5c7ad 100644
--- a/tdehtml/css/cssstyleselector.h
+++ b/tdehtml/css/cssstyleselector.h
@@ -124,7 +124,7 @@ namespace tdehtml
 	~CSSStyleSelector();
 
 	void addSheet( DOM::CSSStyleSheetImpl *sheet );
-        KDE_EXPORT static void clear();
+        TDE_EXPORT static void clear();
         static void reparseConfiguration();
 
 	static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc);
diff --git a/tdehtml/css/cssvalues.h b/tdehtml/css/cssvalues.h
index 12d606acc..0869f392f 100644
--- a/tdehtml/css/cssvalues.h
+++ b/tdehtml/css/cssvalues.h
@@ -5,7 +5,7 @@
 #ifndef CSSVALUES_H
 #define CSSVALUES_H
 
-DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
+DOM::DOMString getValueName(unsigned short id) TDE_NO_EXPORT;
 
 #define CSS_VAL_INVALID 0
 #define CSS_VAL_MIN 1
diff --git a/tdehtml/css/makeprop b/tdehtml/css/makeprop
index b01ed7319..5a806d6f7 100644
--- a/tdehtml/css/makeprop
+++ b/tdehtml/css/makeprop
@@ -26,7 +26,7 @@ grep "^[^\#]" cssproperties.in > cssproperties.strip
 echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n    const char *name;\n    int id;\n};\n\nstatic const struct props * findProp (const char *str, unsigned int len);\n\n%%' > cssproperties.gperf
 cat cssproperties.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_PROP_" toupper($0) } while (getline) }' >> cssproperties.gperf
 echo '%%' >> cssproperties.gperf
-echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;\n' > cssproperties.h
+echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) TDE_NO_EXPORT;\n' > cssproperties.h
 cat cssproperties.strip | awk '{ \
 i=1; \
 print "#define CSS_PROP_INVALID 0"; \
diff --git a/tdehtml/css/makevalues b/tdehtml/css/makevalues
index 3ca0a82ea..957d9b70c 100755
--- a/tdehtml/css/makevalues
+++ b/tdehtml/css/makevalues
@@ -28,7 +28,7 @@ echo -e '%{\n/* This file is automatically generated from cssvalues.in by makeva
 cat cssvalues.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_VAL_" toupper($0) } while (getline) }' >> cssvalues.gperf
 echo '%%' >> cssvalues.gperf
 echo -e '/* This file is automatically generated from cssvalues.in by
-#makevalues, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSVALUES_H\n#define CSSVALUES_H\n\nDOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;\n' > cssvalues.h
+#makevalues, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSVALUES_H\n#define CSSVALUES_H\n\nDOM::DOMString getValueName(unsigned short id) TDE_NO_EXPORT;\n' > cssvalues.h
 cat cssvalues.strip | awk '{ \
 i=1; \
 print "#define CSS_VAL_INVALID 0"; \
diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index 0a0a2da47..c3dd39255 100644
--- a/tdehtml/ecma/kjs_binding.cpp
+++ b/tdehtml/ecma/kjs_binding.cpp
@@ -395,18 +395,18 @@ Value KJS::getLiveConnectValue(KParts::LiveConnectExtension *lc, const TQString
   }
 }
 
-/* only with gcc > 3.4 KDE_NO_EXPORT */
+/* only with gcc > 3.4 TDE_NO_EXPORT */
 EmbedLiveConnect::EmbedLiveConnect(KParts::LiveConnectExtension *lc, UString n, KParts::LiveConnectExtension::Type t, int id)
   : m_liveconnect (lc), name(n), objtype(t), objid(id)
 {}
 
-/* only with gcc > 3.4 KDE_NO_EXPORT */
+/* only with gcc > 3.4 TDE_NO_EXPORT */
 EmbedLiveConnect::~EmbedLiveConnect() {
   if (m_liveconnect)
     m_liveconnect->unregister(objid);
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 Value EmbedLiveConnect::get(ExecState *, const Identifier & prop) const
 {
   if (m_liveconnect) {
@@ -419,19 +419,19 @@ Value EmbedLiveConnect::get(ExecState *, const Identifier & prop) const
   return Undefined();
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 void EmbedLiveConnect::put(ExecState * exec, const Identifier &prop, const Value & value, int)
 {
   if (m_liveconnect)
     m_liveconnect->put(objid, prop.qstring(), value.toString(exec).qstring());
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 bool EmbedLiveConnect::implementsCall() const {
   return objtype == KParts::LiveConnectExtension::TypeFunction;
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 Value EmbedLiveConnect::call(ExecState *exec, Object&, const List &args)
 {
   if (m_liveconnect) {
@@ -447,17 +447,17 @@ Value EmbedLiveConnect::call(ExecState *exec, Object&, const List &args)
   return Undefined();
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 bool EmbedLiveConnect::toBoolean(ExecState *) const {
   return true;
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 Value EmbedLiveConnect::toPrimitive(ExecState *exec, Type) const {
   return String(toString(exec));
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 UString EmbedLiveConnect::toString(ExecState *) const {
   TQString str;
   const char *type = objtype == KParts::LiveConnectExtension::TypeFunction ? "Function" : "Object";
diff --git a/tdehtml/ecma/kjs_binding.h b/tdehtml/ecma/kjs_binding.h
index b6d60348e..f8276bcb8 100644
--- a/tdehtml/ecma/kjs_binding.h
+++ b/tdehtml/ecma/kjs_binding.h
@@ -89,7 +89,7 @@ namespace KJS {
    * that the interpreter runs for.
    * The interpreter also stores the DOM object - >KJS::DOMObject cache.
    */
-  class KDE_EXPORT ScriptInterpreter : public Interpreter
+  class TDE_EXPORT ScriptInterpreter : public Interpreter
   {
   public:
     ScriptInterpreter( const Object &global, tdehtml::ChildFrame* frame );
diff --git a/tdehtml/ecma/kjs_dom.h b/tdehtml/ecma/kjs_dom.h
index e812745ea..57f8678f9 100644
--- a/tdehtml/ecma/kjs_dom.h
+++ b/tdehtml/ecma/kjs_dom.h
@@ -246,7 +246,7 @@ namespace KJS {
   };
 
   bool checkNodeSecurity(ExecState *exec, const DOM::Node& n);
-  KDE_EXPORT Value getDOMNode(ExecState *exec, const DOM::Node& n);
+  TDE_EXPORT Value getDOMNode(ExecState *exec, const DOM::Node& n);
   Value getDOMNamedNodeMap(ExecState *exec, const DOM::NamedNodeMap& m);
   Value getDOMNodeList(ExecState *exec, const DOM::NodeList& l);
   Value getDOMDOMImplementation(ExecState *exec, const DOM::DOMImplementation& i);
diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h
index 539131fd5..7badb3947 100644
--- a/tdehtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -68,7 +68,7 @@ namespace KJS {
     static const ClassInfo info;
   };
 
-  class KDE_EXPORT Window : public ObjectImp {
+  class TDE_EXPORT Window : public ObjectImp {
     friend TQGuardedPtr<TDEHTMLPart> getInstance();
     friend class Location;
     friend class WindowFunc;
@@ -245,7 +245,7 @@ namespace KJS {
     int timerId;
   };
 
-  class KDE_EXPORT WindowQObject : public TQObject {
+  class TDE_EXPORT WindowQObject : public TQObject {
     TQ_OBJECT
   public:
     WindowQObject(Window *w);
diff --git a/tdehtml/html/dtd.cpp b/tdehtml/html/dtd.cpp
index d3ea86d51..c2285e112 100644
--- a/tdehtml/html/dtd.cpp
+++ b/tdehtml/html/dtd.cpp
@@ -45,7 +45,7 @@ using namespace DOM;
 // 9 body frameset
 // 10 html
 
-const unsigned short KDE_NO_EXPORT DOM::tagPriority[] = {
+const unsigned short TDE_NO_EXPORT DOM::tagPriority[] = {
     0, // 0
     1, // ID_A == 1
     1, // ID_ABBR
diff --git a/tdehtml/misc/htmlattrs.c b/tdehtml/misc/htmlattrs.c
index e37f4c5c9..1c11494ec 100644
--- a/tdehtml/misc/htmlattrs.c
+++ b/tdehtml/misc/htmlattrs.c
@@ -1013,7 +1013,7 @@ static const unsigned short attrList[] = {
     65535
 };
 
-const char* KDE_NO_EXPORT getAttrName(unsigned short id)
+const char* TDE_NO_EXPORT getAttrName(unsigned short id)
 {
     if (!id || id > TOTAL_KEYWORDS) return "";
     return spool_attr + wordlist_attr[attrList[id]].name;
diff --git a/tdehtml/misc/htmlattrs.h b/tdehtml/misc/htmlattrs.h
index d9aaff067..7f28a5081 100644
--- a/tdehtml/misc/htmlattrs.h
+++ b/tdehtml/misc/htmlattrs.h
@@ -163,6 +163,6 @@ using namespace DOM;
 #define ATTR_VALUE 152
 #define ATTR_LAST_ATTR 152
 #define ATTR_LAST_CI_ATTR 103
-const char* getAttrName(unsigned short id) KDE_NO_EXPORT;
+const char* getAttrName(unsigned short id) TDE_NO_EXPORT;
 
 #endif
diff --git a/tdehtml/misc/htmltags.c b/tdehtml/misc/htmltags.c
index fa701fe69..0ccdfbb01 100644
--- a/tdehtml/misc/htmltags.c
+++ b/tdehtml/misc/htmltags.c
@@ -680,7 +680,7 @@ static const unsigned short tagSList[] = {
    630, 635, 640, 646,    0
 };
 
-const char* KDE_NO_EXPORT getTagName(unsigned short id)
+const char* TDE_NO_EXPORT getTagName(unsigned short id)
 {
     if(id > ID_CLOSE_TAG*2) id = ID_CLOSE_TAG+1;
     return &tagStable[tagSList[id]];
diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index bf9a8ded8..ae4f7eba9 100644
--- a/tdehtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
@@ -7,7 +7,7 @@
 #include "dom/dom_string.h"
 #include <tdeglobal.h>
 
-KDE_NO_EXPORT const char* getTagName(unsigned short id);
+TDE_NO_EXPORT const char* getTagName(unsigned short id);
 
 #define ID_A 1
 #define ID_ABBR 2
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index e340b3023..826759098 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -457,7 +457,7 @@ namespace tdehtml
 	 * init the cache in case it's not already. This needs to get called once
 	 * before using it.
 	 */
-	KDE_EXPORT static void init();
+	TDE_EXPORT static void init();
 
 	/**
 	 * Ask the cache for some url. Will return a cachedObject, and
@@ -481,14 +481,14 @@ namespace tdehtml
 	static void setSize( int bytes );
 	static int size() { return maxSize; };
 	static void statistics();
-	KDE_EXPORT static void flush(bool force=false);
+	TDE_EXPORT static void flush(bool force=false);
 
 	/**
 	 * clears the cache
 	 * Warning: call this only at the end of your program, to clean
 	 * up memory (useful for finding memory holes)
 	 */
-	KDE_EXPORT static void clear();
+	TDE_EXPORT static void clear();
 
 	static Loader *loader() { return m_loader; }
 
diff --git a/tdehtml/misc/loader_jpeg.cpp b/tdehtml/misc/loader_jpeg.cpp
index 9ee5378f9..61f091105 100644
--- a/tdehtml/misc/loader_jpeg.cpp
+++ b/tdehtml/misc/loader_jpeg.cpp
@@ -90,7 +90,7 @@ struct tdehtml_jpeg_source_mgr : public jpeg_source_mgr {
     bool do_progressive;
 
 public:
-    tdehtml_jpeg_source_mgr() KDE_NO_EXPORT;
+    tdehtml_jpeg_source_mgr() TDE_NO_EXPORT;
 };
 
 
diff --git a/tdehtml/misc/makeattrs b/tdehtml/misc/makeattrs
index 935f350bd..1ed890c2c 100644
--- a/tdehtml/misc/makeattrs
+++ b/tdehtml/misc/makeattrs
@@ -67,7 +67,7 @@ print header "#define ATTR_LAST_CI_ATTR $last_ci_attr\n";
 print out "%%\n";
 close out;
 
-print header "const char* getAttrName(unsigned short id) KDE_NO_EXPORT;\n";
+print header "const char* getAttrName(unsigned short id) TDE_NO_EXPORT;\n";
 
 print header "\n#endif\n";
 close header;
@@ -103,7 +103,7 @@ while(defined ($line = shift @a))
     print OUT "    " .$hmap{$amap{$l}}.",\n";
 }
 print OUT "    65535\n};\n\n";
-print OUT "const char* KDE_NO_EXPORT getAttrName(unsigned short id)\n{\n";
+print OUT "const char* TDE_NO_EXPORT getAttrName(unsigned short id)\n{\n";
 print OUT "    if (!id || id > TOTAL_KEYWORDS) return \"\";\n";
 print OUT "    return spool_attr + wordlist_attr[attrList[id]].name;\n";
 print OUT "}\n";
diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags
index 8a6abf0ed..0b6dabefd 100644
--- a/tdehtml/misc/maketags
+++ b/tdehtml/misc/maketags
@@ -43,7 +43,7 @@ print header <<EOF;
 #include "dom/dom_string.h"
 #include <tdeglobal.h>
 
-KDE_NO_EXPORT const char* getTagName(unsigned short id);
+TDE_NO_EXPORT const char* getTagName(unsigned short id);
 
 EOF
 
@@ -118,7 +118,7 @@ foreach my $line (@tags)
     ++$c;
 }
 print OUT "    0\n};\n\n";
-print OUT "const char* KDE_NO_EXPORT getTagName(unsigned short id)\n{\n";
+print OUT "const char* TDE_NO_EXPORT getTagName(unsigned short id)\n{\n";
 print OUT "    if(id > ID_CLOSE_TAG*2) id = ID_CLOSE_TAG+1;\n";
 print OUT "    return &tagStable[tagSList[id]];\n}\n";
 
diff --git a/tdehtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h
index 9c73eb0bb..2854f2c87 100644
--- a/tdehtml/rendering/render_layer.h
+++ b/tdehtml/rendering/render_layer.h
@@ -241,7 +241,7 @@ public:
     // paints the layers that intersect the damage rect from back to
     // front.  The nodeAtPoint method looks for mouse events by walking
     // layers that intersect the point from front to back.
-    KDE_EXPORT void paint(TQPainter *p, const TQRect& damageRect, bool selectionOnly=false);
+    TDE_EXPORT void paint(TQPainter *p, const TQRect& damageRect, bool selectionOnly=false);
     bool nodeAtPoint(RenderObject::NodeInfo& info, int x, int y);
 
     // This method figures out our layerBounds in coordinates relative to
@@ -260,7 +260,7 @@ public:
     void detach(RenderArena* renderArena);
 
 #ifdef ENABLE_DUMP
-    KDE_EXPORT void dump(TQTextStream &stream, const TQString &ind = TQString::null);
+    TDE_EXPORT void dump(TQTextStream &stream, const TQString &ind = TQString::null);
 #endif
 
      // Overloaded new operator.  Derived classes must override operator new
@@ -283,7 +283,7 @@ private:
 
     void collectLayers(TQPtrVector<RenderLayer>*&, TQPtrVector<RenderLayer>*&);
 
-    KDE_EXPORT void paintLayer(RenderLayer* rootLayer, TQPainter *p, const TQRect& paintDirtyRect, bool selectionOnly=false);
+    TDE_EXPORT void paintLayer(RenderLayer* rootLayer, TQPainter *p, const TQRect& paintDirtyRect, bool selectionOnly=false);
     RenderLayer* nodeAtPointForLayer(RenderLayer* rootLayer, RenderObject::NodeInfo& info,
                                      int x, int y, const TQRect& hitTestRect);
     bool shouldBeOverflowOnly() const;
diff --git a/tdehtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h
index 7a5ec5353..24617e0ca 100644
--- a/tdehtml/rendering/render_replaced.h
+++ b/tdehtml/rendering/render_replaced.h
@@ -115,7 +115,7 @@ public:
 #endif
 
     // for ECMA to flush all pending resizes
-    KDE_EXPORT static void flushWidgetResizes();
+    TDE_EXPORT static void flushWidgetResizes();
 
 public slots:
     void slotWidgetDestructed();
diff --git a/tdehtml/rendering/render_style.h b/tdehtml/rendering/render_style.h
index 90aef33df..fbf62a161 100644
--- a/tdehtml/rendering/render_style.h
+++ b/tdehtml/rendering/render_style.h
@@ -843,7 +843,7 @@ class RenderStyle : public Shared<RenderStyle>
 {
     friend class CSSStyleSelector;
 public:
-    KDE_EXPORT static void cleanup();
+    TDE_EXPORT static void cleanup();
 
     // pseudo elements
     enum PseudoId {
diff --git a/tdehtml/tdehtml_caret.cpp b/tdehtml/tdehtml_caret.cpp
index 71d30629b..8bc787c1f 100644
--- a/tdehtml/tdehtml_caret.cpp
+++ b/tdehtml/tdehtml_caret.cpp
@@ -408,7 +408,7 @@ static NodeImpl *prevLeafNode(NodeImpl *r, NodeImpl *baseElem)
  *	\c r, or false for the inside.
  * @param outsideEnd return true when the caret position is at the outside end.
  */
-void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(NodeImpl *node, long offset,
+void /*TDE_NO_EXPORT*/ mapDOMPosToRenderPos(NodeImpl *node, long offset,
 		RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd)
 {
   if (node->nodeType() == Node::TEXT_NODE) {
@@ -480,7 +480,7 @@ void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(NodeImpl *node, long offset,
  * @param node returns DOM node
  * @param offset returns zero-based offset within node
  */
-void /*KDE_NO_EXPORT*/ mapRenderPosToDOMPos(RenderObject *r, long r_ofs,
+void /*TDE_NO_EXPORT*/ mapRenderPosToDOMPos(RenderObject *r, long r_ofs,
 		bool outside, bool outsideEnd, NodeImpl *&node, long &offset)
 {
   node = r->element();
@@ -661,7 +661,7 @@ void CaretBox::dump(TQTextStream &ts, const TQString &ind) const
 #else
 #  define DEBUG_ACIB DEBUG_CARETMODE
 #endif
-void CaretBoxLine::addConvertedInlineBox(InlineBox *box, SeekBoxParams &sbp) /*KDE_NO_EXPORT*/
+void CaretBoxLine::addConvertedInlineBox(InlineBox *box, SeekBoxParams &sbp) /*TDE_NO_EXPORT*/
 {
   // Generate only one outside caret box between two elements. If
   // coalesceOutsideBoxes is true, generating left outside boxes is inhibited.
@@ -768,7 +768,7 @@ kdDebug(6200) << "some replaced or what " << box << endl;
 }
 #undef DEBUG_ACIB
 
-void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontMetrics &fm) /*KDE_NO_EXPORT*/
+void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontMetrics &fm) /*TDE_NO_EXPORT*/
 {
 
   CaretBox *caretBox = new CaretBox(flowBox, false, false);
@@ -782,7 +782,7 @@ void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontM
   caretBox->_h = fm.height();
 }
 
-void CaretBoxLine::addCreatedFlowBoxEdge(InlineFlowBox *flowBox, const TQFontMetrics &fm, bool left, bool rtl) /*KDE_NO_EXPORT*/
+void CaretBoxLine::addCreatedFlowBoxEdge(InlineFlowBox *flowBox, const TQFontMetrics &fm, bool left, bool rtl) /*TDE_NO_EXPORT*/
 {
   CaretBox *caretBox = new CaretBox(flowBox, true, !left);
   caret_boxes.append(caretBox);
@@ -795,7 +795,7 @@ void CaretBoxLine::addCreatedFlowBoxEdge(InlineFlowBox *flowBox, const TQFontMet
   caretBox->_w = 1;
 }
 
-void CaretBoxLine::addCreatedInlineBoxEdge(InlineBox *box, const TQFontMetrics &fm, bool left, bool rtl) /*KDE_NO_EXPORT*/
+void CaretBoxLine::addCreatedInlineBoxEdge(InlineBox *box, const TQFontMetrics &fm, bool left, bool rtl) /*TDE_NO_EXPORT*/
 {
   CaretBox *caretBox = new CaretBox(box, true, !left);
   caret_boxes.append(caretBox);
@@ -811,7 +811,7 @@ void CaretBoxLine::addCreatedInlineBoxEdge(InlineBox *box, const TQFontMetrics &
 CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
 	InlineFlowBox *basicFlowBox, InlineBox *seekBox, bool seekOutside,
         bool seekOutsideEnd, CaretBoxIterator &iter, RenderObject *seekObject)
-// 	KDE_NO_EXPORT
+// 	TDE_NO_EXPORT
 {
   // Iterate all inline boxes within this inline flow box.
   // Caret boxes will be created for each
@@ -837,7 +837,7 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
 }
 
 CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
-	RenderBox *cb, bool outside, bool outsideEnd, CaretBoxIterator &iter) /*KDE_NO_EXPORT*/
+	RenderBox *cb, bool outside, bool outsideEnd, CaretBoxIterator &iter) /*TDE_NO_EXPORT*/
 {
   int _x = cb->xPos();
   int _y = cb->yPos();
@@ -1314,8 +1314,8 @@ void LinearDocument::initEndIterator()
 
 // == class LineIterator implementation
 
-CaretBoxIterator LineIterator::currentBox /*KDE_NO_EXPORT*/;
-long LineIterator::currentOffset /*KDE_NO_EXPORT*/;
+CaretBoxIterator LineIterator::currentBox /*TDE_NO_EXPORT*/;
+long LineIterator::currentOffset /*TDE_NO_EXPORT*/;
 
 LineIterator::LineIterator(LinearDocument *l, DOM::NodeImpl *node, long offset)
 		: lines(l)
diff --git a/tdehtml/tdehtml_caret_p.h b/tdehtml/tdehtml_caret_p.h
index 6d85a76b2..7a2d5e06b 100644
--- a/tdehtml/tdehtml_caret_p.h
+++ b/tdehtml/tdehtml_caret_p.h
@@ -384,7 +384,7 @@ public:
   static CaretBoxLine *constructCaretBoxLine(MassDeleter<CaretBoxLine> *deleter,
   	InlineFlowBox *baseFlowBox, InlineBox *seekBox, bool seekOutside,
         bool seekOutsideEnd, CaretBoxIterator &iter,
-	RenderObject *seekObject = 0) /*KDE_NO_EXPORT*/;
+	RenderObject *seekObject = 0) /*TDE_NO_EXPORT*/;
 
   /** constructs a new caret box line for the given render block.
    * @param deleter deleter which handles alloc+dealloc of the object
@@ -395,7 +395,7 @@ public:
    *	position for \c cb
    */
   static CaretBoxLine *constructCaretBoxLine(MassDeleter<CaretBoxLine> *deleter,
-  	RenderBox *cb, bool outside, bool outsideEnd, CaretBoxIterator &iter) /*KDE_NO_EXPORT*/;
+  	RenderBox *cb, bool outside, bool outsideEnd, CaretBoxIterator &iter) /*TDE_NO_EXPORT*/;
 
 #if DEBUG_CARETMODE > 0
   void dump(TQTextStream &ts, const TQString &ind) const;
@@ -456,7 +456,7 @@ protected:
    *
    * It will additionally look for the caret box specified in SeekBoxParams.
    */
-  void addConvertedInlineBox(InlineBox *, SeekBoxParams &) /*KDE_NO_EXPORT*/;
+  void addConvertedInlineBox(InlineBox *, SeekBoxParams &) /*TDE_NO_EXPORT*/;
 
   /** creates and adds the edge of a generic inline box
    * @param box inline box
@@ -465,7 +465,7 @@ protected:
    * @param rtl true if direction is rtl
    */
   void addCreatedInlineBoxEdge(InlineBox *box, const TQFontMetrics &fm,
-  	bool left, bool rtl) /*KDE_NO_EXPORT*/;
+  	bool left, bool rtl) /*TDE_NO_EXPORT*/;
   /** creates and adds the edge of an inline flow box
    * @param flowBox inline flow box
    * @param fm font metrics of inline flow box
@@ -473,12 +473,12 @@ protected:
    * @param rtl true if direction is rtl
    */
   void addCreatedFlowBoxEdge(InlineFlowBox *flowBox, const TQFontMetrics &fm,
-  	bool left, bool rtl) /*KDE_NO_EXPORT*/;
+  	bool left, bool rtl) /*TDE_NO_EXPORT*/;
   /** creates and adds the inside of an inline flow box
    * @param flowBox inline flow box
    * @param fm font metrics of inline flow box
    */
-  void addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontMetrics &fm) /*KDE_NO_EXPORT*/;
+  void addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontMetrics &fm) /*TDE_NO_EXPORT*/;
 
   friend class CaretBoxIterator;
 };
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 6e2b6fa17..16f60d277 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -956,8 +956,8 @@ void TDEHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
 
 
 // defined in tdehtml_part.cpp
-extern const int KDE_NO_EXPORT fastZoomSizes[];
-extern const int KDE_NO_EXPORT fastZoomSizeCount;
+extern const int TDE_NO_EXPORT fastZoomSizes[];
+extern const int TDE_NO_EXPORT fastZoomSizeCount;
 
 // BCI: remove in KDE 4
 TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
diff --git a/tdehtml/tdehtml_factory.cpp b/tdehtml/tdehtml_factory.cpp
index 4094030c6..7aaf16b5a 100644
--- a/tdehtml/tdehtml_factory.cpp
+++ b/tdehtml/tdehtml_factory.cpp
@@ -39,7 +39,7 @@
 
 template class TQPtrList<TDEHTMLPart>;
 
-extern "C" KDE_EXPORT void *init_libtdehtml()
+extern "C" TDE_EXPORT void *init_libtdehtml()
 {
     // We can't use a plain self() here, because that would
     // return the global factory, which might already exist
diff --git a/tdehtml/tdehtml_factory.h b/tdehtml/tdehtml_factory.h
index 5d424282c..3fd53b163 100644
--- a/tdehtml/tdehtml_factory.h
+++ b/tdehtml/tdehtml_factory.h
@@ -36,7 +36,7 @@ namespace DOM
   class DocumentImpl;
 }
 
-class KDE_EXPORT TDEHTMLFactory : public KParts::Factory
+class TDE_EXPORT TDEHTMLFactory : public KParts::Factory
 {
   TQ_OBJECT
   friend class DOM::DocumentImpl;
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 81c228e90..712bbe764 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -5673,8 +5673,8 @@ static const int minZoom = 20;
 static const int maxZoom = 300;
 
 // My idea of useful stepping ;-) (LS)
-extern const int KDE_NO_EXPORT fastZoomSizes[] = { 20, 50, 75, 90, 100, 120, 150, 200, 300 };
-extern const int KDE_NO_EXPORT fastZoomSizeCount = sizeof fastZoomSizes / sizeof fastZoomSizes[0];
+extern const int TDE_NO_EXPORT fastZoomSizes[] = { 20, 50, 75, 90, 100, 120, 150, 200, 300 };
+extern const int TDE_NO_EXPORT fastZoomSizeCount = sizeof fastZoomSizes / sizeof fastZoomSizes[0];
 
 void TDEHTMLPart::slotIncZoom()
 {
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index 132624fdd..53d0fd4b6 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -72,7 +72,7 @@ namespace KParts
 
 namespace tdehtml
 {
-  class KDE_EXPORT ChildFrame : public TQObject
+  class TDE_EXPORT ChildFrame : public TQObject
   {
       TQ_OBJECT
   public:
@@ -118,7 +118,7 @@ namespace tdehtml
 
 struct TDEHTMLFrameList : public TQValueList<tdehtml::ChildFrame*>
 {
-    Iterator find( const TQString &name ) KDE_NO_EXPORT;
+    Iterator find( const TQString &name ) TDE_NO_EXPORT;
 };
 
 typedef TDEHTMLFrameList::ConstIterator ConstFrameIt;
diff --git a/tdehtml/test_regression_fontoverload.cpp b/tdehtml/test_regression_fontoverload.cpp
index 0faf49fcc..6cb06f824 100644
--- a/tdehtml/test_regression_fontoverload.cpp
+++ b/tdehtml/test_regression_fontoverload.cpp
@@ -206,7 +206,7 @@ static TQString helv_pickxlfd( int pixelsize, bool italic, bool bold )
 
 }
 
-KDE_EXPORT QFontEngine *
+TDE_EXPORT QFontEngine *
 TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
 			 const QFontDef &request, int )
 {
@@ -253,13 +253,13 @@ TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
     return fe;
 }
 
-KDE_EXPORT bool TQFontDatabase::isBitmapScalable( const TQString &,
+TDE_EXPORT bool TQFontDatabase::isBitmapScalable( const TQString &,
 				      const TQString &) const
 {
     return true;
 }
 
-KDE_EXPORT bool  TQFontDatabase::isSmoothlyScalable( const TQString &,
+TDE_EXPORT bool  TQFontDatabase::isSmoothlyScalable( const TQString &,
                                          const TQString &) const
 {
     return true;
@@ -280,22 +280,22 @@ bool TDEHTMLSettings::unfinishedImageFrame() const
   return false;
 }
 
-KDE_EXPORT int TQPaintDevice::x11AppDpiY( int )
+TDE_EXPORT int TQPaintDevice::x11AppDpiY( int )
 {
     return 100;
 }
 
-KDE_EXPORT int TQPaintDevice::x11AppDpiX( int )
+TDE_EXPORT int TQPaintDevice::x11AppDpiX( int )
 {
     return 100;
 }
 
-KDE_EXPORT void TQFont::insertSubstitution(const TQString &,
+TDE_EXPORT void TQFont::insertSubstitution(const TQString &,
                                const TQString &)
 {
 }
 
-KDE_EXPORT void TQFont::insertSubstitutions(const TQString &,
+TDE_EXPORT void TQFont::insertSubstitutions(const TQString &,
                                 const TQStringList &)
 {
 }
@@ -339,7 +339,7 @@ void DCOPClient::processSocketData( int )
 #include <tqapplication.h>
 #include <tqpalette.h>
 
-KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
+TDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
                                const char*  )
 {
     static bool done = false;
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index 22b71051f..c8525fbcc 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -47,7 +47,7 @@
 
 // from tdehtml_caret_p.h
 namespace tdehtml {
-void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(DOM::NodeImpl *node, long offset,
+void /*TDE_NO_EXPORT*/ mapDOMPosToRenderPos(DOM::NodeImpl *node, long offset,
 		tdehtml::RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd);
 }
 
diff --git a/tdeinit/tdelauncher_main.cpp b/tdeinit/tdelauncher_main.cpp
index 747050668..fc43a903a 100644
--- a/tdeinit/tdelauncher_main.cpp
+++ b/tdeinit/tdelauncher_main.cpp
@@ -50,7 +50,7 @@ static TDECmdLineOptions options[] =
   TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char**argv )
 {
    // Started via tdeinit.
    if (fcntl(LAUNCHER_FD, F_GETFD) == -1)
diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index 8e16290a5..2bee1af83 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -43,7 +43,7 @@
 #endif
 
 extern "C" {
-    KDE_EXPORT KDEDModule *create_kpasswdserver(const TQCString &name)
+    TDE_EXPORT KDEDModule *create_kpasswdserver(const TQCString &name)
     {
        return new KPasswdServer(name);
     }
diff --git a/tdeio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h
index 33cec9503..eca012b9b 100644
--- a/tdeio/kssl/ksslutils.h
+++ b/tdeio/kssl/ksslutils.h
@@ -48,7 +48,7 @@ class TQDateTime;
  *  @return the date formatted in a TQString
  *  @see ASN1_UTCTIME_QDateTime
  */
-KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm);
+TDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm);
 
 /**
  *  Convert an ASN1 UTCTIME value to a TQDateTime.  Uses TDELocale settings.
@@ -58,7 +58,7 @@ KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm);
  *
  *  @return the date formatted in a QDateTime
  */
-KDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt);
+TDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt);
 
 
 /**
@@ -68,7 +68,7 @@ KDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt);
  *
  *  @return the number formatted in a TQString
  */
-KDE_EXPORT TQString ASN1_INTEGER_QString(ASN1_INTEGER *aint);
+TDE_EXPORT TQString ASN1_INTEGER_QString(ASN1_INTEGER *aint);
 #endif
 
 
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index c1140af1b..1d2cf8f87 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -187,7 +187,7 @@ namespace KPAC
         return "DIRECT";
     }
 
-    extern "C" KDE_EXPORT KDEDModule* create_proxyscout( const TQCString& name )
+    extern "C" TDE_EXPORT KDEDModule* create_proxyscout( const TQCString& name )
     {
         return new ProxyScout( name );
     }
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index 33a87c13d..3a04d93f0 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -52,11 +52,11 @@
 // See design notes at end
 
 extern "C" {
-	KDE_EXPORT KDEDModule *create_kssld(const TQCString &name) {
+	TDE_EXPORT KDEDModule *create_kssld(const TQCString &name) {
 		return new KSSLD(name);
 	}
 
-	KDE_EXPORT void *__kde_do_unload;
+	TDE_EXPORT void *__kde_do_unload;
 }
 
 
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 5b7840fd0..009ea348b 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -51,7 +51,7 @@
 #include <assert.h>
 
 extern "C" {
-   KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
+   TDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
 	   return new TDEWalletD(name);
    }
 }
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index b2d02615d..05f11fd06 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -1374,7 +1374,7 @@ UIServer* UIServer::createInstance()
 
 //------------------------------------------------------------
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 {
     TDELocale::setMainCatalogue("tdelibs");
     //  GS 5/2001 - I changed the name to "TDE" to make it look better
diff --git a/tdeio/tdeio/kprotocolinfo.cpp b/tdeio/tdeio/kprotocolinfo.cpp
index bf11060e4..4332fc23b 100644
--- a/tdeio/tdeio/kprotocolinfo.cpp
+++ b/tdeio/tdeio/kprotocolinfo.cpp
@@ -19,7 +19,7 @@
 
 #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
 #undef TDEIO_EXPORT
-#define TDEIO_EXPORT KDE_EXPORT
+#define TDEIO_EXPORT TDE_EXPORT
 #endif
 
 #include "kprotocolinfo.h"
diff --git a/tdeio/tdeio/posixacladdons.cpp b/tdeio/tdeio/posixacladdons.cpp
index 873f1a81e..1e4d9bec0 100644
--- a/tdeio/tdeio/posixacladdons.cpp
+++ b/tdeio/tdeio/posixacladdons.cpp
@@ -63,7 +63,7 @@ protected:
     }
 };
 
-KDE_EXPORT int acl_cmp(acl_t acl1, acl_t acl2)
+TDE_EXPORT int acl_cmp(acl_t acl1, acl_t acl2)
 {
     if ( !acl1 || !acl2 )
         return -1;
@@ -129,7 +129,7 @@ KDE_EXPORT int acl_cmp(acl_t acl1, acl_t acl2)
     return 0;
 }
 
-KDE_EXPORT acl_t acl_from_mode(mode_t mode)
+TDE_EXPORT acl_t acl_from_mode(mode_t mode)
 {
     acl_t newACL = acl_init( 3 );
     acl_entry_t entry;
@@ -180,7 +180,7 @@ KDE_EXPORT acl_t acl_from_mode(mode_t mode)
     return newACL;
 }
 
-KDE_EXPORT int acl_equiv_mode(acl_t acl, mode_t *mode_p)
+TDE_EXPORT int acl_equiv_mode(acl_t acl, mode_t *mode_p)
 {
     acl_entry_t entry;
     acl_tag_t tag;
diff --git a/tdeioslave/file/file.cpp b/tdeioslave/file/file.cpp
index a069cc5a8..59c0e6a05 100644
--- a/tdeioslave/file/file.cpp
+++ b/tdeioslave/file/file.cpp
@@ -108,7 +108,7 @@ static void appendACLAtoms( const TQCString & path, UDSEntry& entry,
                             mode_t type, bool withACL );
 #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/tdeioslave/ftp/ftp.cpp b/tdeioslave/ftp/ftp.cpp
index 8e0f96b5d..db7de572c 100644
--- a/tdeioslave/ftp/ftp.cpp
+++ b/tdeioslave/ftp/ftp.cpp
@@ -134,7 +134,7 @@ TDEIO::filesize_t Ftp::UnknownSize = (TDEIO::filesize_t)-1;
 
 using namespace TDEIO;
 
-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/tdeioslave/http/http.cpp b/tdeioslave/http/http.cpp
index cd5d51a63..7d9fd72dc 100644
--- a/tdeioslave/http/http.cpp
+++ b/tdeioslave/http/http.cpp
@@ -93,7 +93,7 @@
 using namespace TDEIO;
 
 extern "C" {
-  KDE_EXPORT int kdemain(int argc, char **argv);
+  TDE_EXPORT int kdemain(int argc, char **argv);
 }
 
 int kdemain( int argc, char **argv )
diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index 1f2be7abf..3ea4b6fe2 100644
--- a/tdeioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -187,7 +187,7 @@ void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQStri
    }
 }
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 {
    TDELocale::setMainCatalogue("tdelibs");
    TDECmdLineArgs::init( argc, argv, appName,
diff --git a/tdeioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp
index 52a2b7967..738b64eba 100644
--- a/tdeioslave/http/kcookiejar/kcookieserver.cpp
+++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp
@@ -46,7 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kcookieserver.h"
 
 extern "C" {
-    KDE_EXPORT KDEDModule *create_kcookiejar(const TQCString &name)
+    TDE_EXPORT KDEDModule *create_kcookiejar(const TQCString &name)
     {
        return new KCookieServer(name);
     }
diff --git a/tdeioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp
index 414afb41f..eb4cca5e5 100644
--- a/tdeioslave/http/kcookiejar/main.cpp
+++ b/tdeioslave/http/kcookiejar/main.cpp
@@ -40,7 +40,7 @@ static const TDECmdLineOptions options[] =
  TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
    TDELocale::setMainCatalogue("tdelibs");
    TDECmdLineArgs::init(argc, argv, "kcookiejar", I18N_NOOP("HTTP cookie daemon"),
diff --git a/tdeioslave/iso/iso.cpp b/tdeioslave/iso/iso.cpp
index 80e32b415..4688a3e7a 100644
--- a/tdeioslave/iso/iso.cpp
+++ b/tdeioslave/iso/iso.cpp
@@ -56,7 +56,7 @@ static const unsigned char zisofs_magic[8] = {
 
 using namespace TDEIO;
 
-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/tdeioslave/metainfo/metainfo.cpp b/tdeioslave/metainfo/metainfo.cpp
index 37f50a132..458b5679f 100644
--- a/tdeioslave/metainfo/metainfo.cpp
+++ b/tdeioslave/metainfo/metainfo.cpp
@@ -37,7 +37,7 @@ using namespace TDEIO;
 
 extern "C"
 {
-    KDE_EXPORT int kdemain(int argc, char **argv);
+    TDE_EXPORT int kdemain(int argc, char **argv);
 }
 
 int kdemain(int argc, char **argv)
diff --git a/tdenewstuff/downloaddialog.h b/tdenewstuff/downloaddialog.h
index 207d24fb4..99016c0ab 100644
--- a/tdenewstuff/downloaddialog.h
+++ b/tdenewstuff/downloaddialog.h
@@ -54,7 +54,7 @@ class Engine;
  * \par Maintainer:
  * Josef Spillner ([email protected])
  */
-class KDE_EXPORT DownloadDialog : public KDialogBase
+class TDE_EXPORT DownloadDialog : public KDialogBase
 {
     TQ_OBJECT
     struct Private;
diff --git a/tdenewstuff/engine.h b/tdenewstuff/engine.h
index 0cac342ab..51da4eef6 100644
--- a/tdenewstuff/engine.h
+++ b/tdenewstuff/engine.h
@@ -49,7 +49,7 @@ class ProviderDialog;
  * \par Maintainer:
  * Josef Spillner ([email protected])
  */
-class KDE_EXPORT Engine : public TQObject
+class TDE_EXPORT Engine : public TQObject
 {
     TQ_OBJECT
     struct Private;
diff --git a/tdenewstuff/entry.h b/tdenewstuff/entry.h
index e04822e39..033f54113 100644
--- a/tdenewstuff/entry.h
+++ b/tdenewstuff/entry.h
@@ -42,7 +42,7 @@ namespace KNS {
  * \par Maintainer:
  * Josef Spillner ([email protected])
  */
-class KDE_EXPORT Entry
+class TDE_EXPORT Entry
 {
   public:
     Entry();
diff --git a/tdenewstuff/knewstuff.h b/tdenewstuff/knewstuff.h
index 55d6db9b4..e76b6603b 100644
--- a/tdenewstuff/knewstuff.h
+++ b/tdenewstuff/knewstuff.h
@@ -33,7 +33,7 @@ namespace KNS {
 class Engine;
 class Entry;
 
-KDE_EXPORT TDEAction* standardAction(const TQString& what,
+TDE_EXPORT TDEAction* standardAction(const TQString& what,
                         const TQObject *recvr,
                         const char *slot,
                         TDEActionCollection* parent,
@@ -66,7 +66,7 @@ KDE_EXPORT TDEAction* standardAction(const TQString& what,
  *
  * @since 3.3
  */
-class KDE_EXPORT TDENewStuff
+class TDE_EXPORT TDENewStuff
 {
   public:
     /**
diff --git a/tdenewstuff/knewstuffgeneric.h b/tdenewstuff/knewstuffgeneric.h
index 36feb1a77..2fa6af58c 100644
--- a/tdenewstuff/knewstuffgeneric.h
+++ b/tdenewstuff/knewstuffgeneric.h
@@ -39,7 +39,7 @@ class TDEConfig;
  * \par Maintainer:
  * Josef Spillner ([email protected])
  */
-class KDE_EXPORT TDENewStuffGeneric : public TDENewStuff
+class TDE_EXPORT TDENewStuffGeneric : public TDENewStuff
 {
   public:
     /**
diff --git a/tdenewstuff/knewstuffsecure.h b/tdenewstuff/knewstuffsecure.h
index bb07a8637..2c8172888 100644
--- a/tdenewstuff/knewstuffsecure.h
+++ b/tdenewstuff/knewstuffsecure.h
@@ -37,7 +37,7 @@ to the standard TDENewStuff class.
 
 @author Andras Mantia <[email protected]>
 */
-class KDE_EXPORT TDENewStuffSecure : public  TQObject, public TDENewStuff
+class TDE_EXPORT TDENewStuffSecure : public  TQObject, public TDENewStuff
 {
   TQ_OBJECT
 
diff --git a/tdenewstuff/provider.h b/tdenewstuff/provider.h
index 0c62edca1..be8a777f9 100644
--- a/tdenewstuff/provider.h
+++ b/tdenewstuff/provider.h
@@ -44,7 +44,7 @@ namespace KNS {
  * \par Maintainer:
  * Timothy Pearson ([email protected])
  */
-class KDE_EXPORT Provider : public TQObject
+class TDE_EXPORT Provider : public TQObject
 {
     TQ_OBJECT
   public:
@@ -188,7 +188,7 @@ class KDE_EXPORT Provider : public TQObject
  * the main provider database for this specific application.
  * It should probably not be used directly by the application.
  */
-class KDE_EXPORT ProviderLoader : public TQObject
+class TDE_EXPORT ProviderLoader : public TQObject
 {
     TQ_OBJECT
   public:
diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp
index 78b0e1edf..f8eb86f91 100644
--- a/tdeprint/cups/cupsdconf2/main.cpp
+++ b/tdeprint/cups/cupsdconf2/main.cpp
@@ -30,7 +30,7 @@ static TDECmdLineOptions options[] =
 	TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
 	TDECmdLineArgs::init(argc,argv,"cupsdconf",
 			   I18N_NOOP("A CUPS configuration tool"),
diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp
index 466c75853..923890c0e 100644
--- a/tdeprint/management/kaddprinterwizard.cpp
+++ b/tdeprint/management/kaddprinterwizard.cpp
@@ -12,7 +12,7 @@ static TDECmdLineOptions options[] =
 	TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
 	TDECmdLineArgs::init(argc, argv, "kaddprinterwizard",
 			I18N_NOOP("Start the add printer wizard"),
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index c3e1e474c..402f30824 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-	KDE_EXPORT KDEDModule *create_tdeprintd(const TQCString& name)
+	TDE_EXPORT KDEDModule *create_tdeprintd(const TQCString& name)
 	{
 		return new KDEPrintd(name);
 	}
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index 8ba04447a..e2d899e3c 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -55,7 +55,7 @@ protected:
 
 extern "C"
 {
-	void* init_tdeprint_tool_escputil() KDE_EXPORT;
+	void* init_tdeprint_tool_escputil() TDE_EXPORT;
 	void* init_tdeprint_tool_escputil()
 	{
 		return new EscpFactory;
diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp
index 412e4d195..0a234b518 100644
--- a/tderandr/randr.cpp
+++ b/tderandr/randr.cpp
@@ -102,7 +102,7 @@ public:
 	XRRScreenConfiguration* config;
 };
 
-KDE_EXPORT RandRScreen::RandRScreen(int screenIndex)
+TDE_EXPORT RandRScreen::RandRScreen(int screenIndex)
 	: d(new RandRScreenPrivate())
 	, m_screen(screenIndex)
 	, m_shownDialog(NULL)
@@ -111,12 +111,12 @@ KDE_EXPORT RandRScreen::RandRScreen(int screenIndex)
 	setOriginal();
 }
 
-KDE_EXPORT RandRScreen::~RandRScreen()
+TDE_EXPORT RandRScreen::~RandRScreen()
 {
 	delete d;
 }
 
-KDE_EXPORT void RandRScreen::loadSettings()
+TDE_EXPORT void RandRScreen::loadSettings()
 {
 	if (d->config) {
 		XRRFreeScreenConfigInfo(d->config);
@@ -176,14 +176,14 @@ KDE_EXPORT void RandRScreen::loadSettings()
 	}
 }
 
-KDE_EXPORT void RandRScreen::setOriginal()
+TDE_EXPORT void RandRScreen::setOriginal()
 {
 	m_originalSize = m_currentSize;
 	m_originalRotation = m_currentRotation;
 	m_originalRefreshRate = m_currentRefreshRate;
 }
 
-KDE_EXPORT bool RandRScreen::applyProposed()
+TDE_EXPORT bool RandRScreen::applyProposed()
 {
 	//kdDebug() << k_funcinfo << " size " << (SizeID)proposedSize() << ", rotation " << proposedRotation() << ", refresh " << refreshRateIndexToHz(proposedSize(), proposedRefreshRate()) << endl;
 
@@ -227,7 +227,7 @@ KDE_EXPORT bool RandRScreen::applyProposed()
 	return false;
 }
 
-KDE_EXPORT bool RandRScreen::applyProposedAndConfirm()
+TDE_EXPORT bool RandRScreen::applyProposedAndConfirm()
 {
 	if (proposedChanged()) {
 		setOriginal();
@@ -246,7 +246,7 @@ KDE_EXPORT bool RandRScreen::applyProposedAndConfirm()
 	return true;
 }
 
-KDE_EXPORT bool RandRScreen::confirm()
+TDE_EXPORT bool RandRScreen::confirm()
 {
 	// uncomment the line below and edit out the KTimerDialog stuff to get
 	// a version which works on today's tdelibs (no accept dialog is presented)
@@ -280,19 +280,19 @@ KDE_EXPORT bool RandRScreen::confirm()
         return acceptDialog.exec();
 }
 
-KDE_EXPORT void RandRScreen::shownDialogDestroyed()
+TDE_EXPORT void RandRScreen::shownDialogDestroyed()
 {
     m_shownDialog = NULL;
     disconnect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
 }
 
-KDE_EXPORT void RandRScreen::desktopResized()
+TDE_EXPORT void RandRScreen::desktopResized()
 {
 	if( m_shownDialog != NULL )
 		KDialog::centerOnScreen(m_shownDialog, m_screen);
 }
 
-KDE_EXPORT TQString RandRScreen::changedMessage() const
+TDE_EXPORT TQString RandRScreen::changedMessage() const
 {
 	if (currentRefreshRate() == -1)
 		return i18n("New configuration:\nResolution: %1 x %2\nOrientation: %3")
@@ -307,24 +307,24 @@ KDE_EXPORT TQString RandRScreen::changedMessage() const
 			.arg(currentRefreshRateDescription());
 }
 
-KDE_EXPORT bool RandRScreen::changedFromOriginal() const
+TDE_EXPORT bool RandRScreen::changedFromOriginal() const
 {
 	return m_currentSize != m_originalSize || m_currentRotation != m_originalRotation || m_currentRefreshRate != m_originalRefreshRate;
 }
 
-KDE_EXPORT void RandRScreen::proposeOriginal()
+TDE_EXPORT void RandRScreen::proposeOriginal()
 {
 	m_proposedSize = m_originalSize;
 	m_proposedRotation = m_originalRotation;
 	m_proposedRefreshRate = m_originalRefreshRate;
 }
 
-KDE_EXPORT bool RandRScreen::proposedChanged() const
+TDE_EXPORT bool RandRScreen::proposedChanged() const
 {
 	return m_currentSize != m_proposedSize || m_currentRotation != m_proposedRotation || m_currentRefreshRate != m_proposedRefreshRate;
 }
 
-KDE_EXPORT TQString RandRScreen::rotationName(int rotation, bool pastTense, bool capitalised)
+TDE_EXPORT TQString RandRScreen::rotationName(int rotation, bool pastTense, bool capitalised)
 {
 	if (!pastTense)
 		switch (rotation) {
@@ -378,7 +378,7 @@ KDE_EXPORT TQString RandRScreen::rotationName(int rotation, bool pastTense, bool
 	}
 }
 
-KDE_EXPORT TQPixmap RandRScreen::rotationIcon(int rotation) const
+TDE_EXPORT TQPixmap RandRScreen::rotationIcon(int rotation) const
 {
 	// Adjust icons for current screen orientation
 	if (!(m_currentRotation & RR_Rotate_0) && rotation & (RR_Rotate_0 | RR_Rotate_90 | RR_Rotate_180 | RR_Rotate_270)) {
@@ -417,7 +417,7 @@ KDE_EXPORT TQPixmap RandRScreen::rotationIcon(int rotation) const
 	}
 }
 
-KDE_EXPORT TQString RandRScreen::currentRotationDescription() const
+TDE_EXPORT TQString RandRScreen::currentRotationDescription() const
 {
 	TQString ret = rotationName(m_currentRotation & RotateMask);
 
@@ -433,7 +433,7 @@ KDE_EXPORT TQString RandRScreen::currentRotationDescription() const
 	return ret;
 }
 
-KDE_EXPORT int RandRScreen::rotationIndexToDegree(int rotation) const
+TDE_EXPORT int RandRScreen::rotationIndexToDegree(int rotation) const
 {
 	switch (rotation & RotateMask) {
 		case RR_Rotate_90:
@@ -450,7 +450,7 @@ KDE_EXPORT int RandRScreen::rotationIndexToDegree(int rotation) const
 	}
 }
 
-KDE_EXPORT int RandRScreen::rotationDegreeToIndex(int degree) const
+TDE_EXPORT int RandRScreen::rotationDegreeToIndex(int degree) const
 {
 	switch (degree) {
 		case 90:
@@ -467,27 +467,27 @@ KDE_EXPORT int RandRScreen::rotationDegreeToIndex(int degree) const
 	}
 }
 
-KDE_EXPORT int RandRScreen::currentPixelWidth() const
+TDE_EXPORT int RandRScreen::currentPixelWidth() const
 {
 	return m_pixelSizes[m_currentSize].width();
 }
 
-KDE_EXPORT int RandRScreen::currentPixelHeight() const
+TDE_EXPORT int RandRScreen::currentPixelHeight() const
 {
 	return m_pixelSizes[m_currentSize].height();
 }
 
-KDE_EXPORT int RandRScreen::currentMMWidth() const
+TDE_EXPORT int RandRScreen::currentMMWidth() const
 {
 	return m_pixelSizes[m_currentSize].width();
 }
 
-KDE_EXPORT int RandRScreen::currentMMHeight() const
+TDE_EXPORT int RandRScreen::currentMMHeight() const
 {
 	return m_pixelSizes[m_currentSize].height();
 }
 
-KDE_EXPORT TQStringList RandRScreen::refreshRates(int size) const
+TDE_EXPORT TQStringList RandRScreen::refreshRates(int size) const
 {
 	int nrates;
 	TQStringList ret;
@@ -514,22 +514,22 @@ KDE_EXPORT TQStringList RandRScreen::refreshRates(int size) const
 	return ret;
 }
 
-KDE_EXPORT TQString RandRScreen::refreshRateDirectDescription(int rate) const
+TDE_EXPORT TQString RandRScreen::refreshRateDirectDescription(int rate) const
 {
 	return i18n("Refresh rate in Hertz (Hz)", "%1 Hz").arg(rate);
 }
 
-KDE_EXPORT TQString RandRScreen::refreshRateIndirectDescription(int size, int index) const
+TDE_EXPORT TQString RandRScreen::refreshRateIndirectDescription(int size, int index) const
 {
 	return i18n("Refresh rate in Hertz (Hz)", "%1 Hz").arg(refreshRateIndexToHz(size, index));
 }
 
-KDE_EXPORT TQString RandRScreen::refreshRateDescription(int size, int index) const
+TDE_EXPORT TQString RandRScreen::refreshRateDescription(int size, int index) const
 {
 	return refreshRates(size)[index];
 }
 
-KDE_EXPORT bool RandRScreen::proposeRefreshRate(int index)
+TDE_EXPORT bool RandRScreen::proposeRefreshRate(int index)
 {
 	if (index >= 0 && (int)refreshRates(proposedSize()).count() > index) {
 		m_proposedRefreshRate = index;
@@ -539,22 +539,22 @@ KDE_EXPORT bool RandRScreen::proposeRefreshRate(int index)
 	return false;
 }
 
-KDE_EXPORT int RandRScreen::currentRefreshRate() const
+TDE_EXPORT int RandRScreen::currentRefreshRate() const
 {
 	return m_currentRefreshRate;
 }
 
-KDE_EXPORT TQString RandRScreen::currentRefreshRateDescription() const
+TDE_EXPORT TQString RandRScreen::currentRefreshRateDescription() const
 {
 	return refreshRateIndirectDescription(m_currentSize, m_currentRefreshRate);
 }
 
-KDE_EXPORT int RandRScreen::proposedRefreshRate() const
+TDE_EXPORT int RandRScreen::proposedRefreshRate() const
 {
 	return m_proposedRefreshRate;
 }
 
-KDE_EXPORT int RandRScreen::refreshRateHzToIndex(int size, int hz) const
+TDE_EXPORT int RandRScreen::refreshRateHzToIndex(int size, int hz) const
 {
 	int nrates;
 	short* rates = XRRRates(tqt_xdisplay(), m_screen, (SizeID)size, &nrates);
@@ -570,7 +570,7 @@ KDE_EXPORT int RandRScreen::refreshRateHzToIndex(int size, int hz) const
 	return -1;
 }
 
-KDE_EXPORT int RandRScreen::refreshRateIndexToHz(int size, int index) const
+TDE_EXPORT int RandRScreen::refreshRateIndexToHz(int size, int index) const
 {
 	int nrates;
 	short* rates = XRRRates(tqt_xdisplay(), m_screen, (SizeID)size, &nrates);
@@ -585,22 +585,22 @@ KDE_EXPORT int RandRScreen::refreshRateIndexToHz(int size, int index) const
 	return rates[index];
 }
 
-KDE_EXPORT int RandRScreen::numSizes() const
+TDE_EXPORT int RandRScreen::numSizes() const
 {
 	return m_pixelSizes.count();
 }
 
-KDE_EXPORT const TQSize& RandRScreen::pixelSize(int index) const
+TDE_EXPORT const TQSize& RandRScreen::pixelSize(int index) const
 {
 	return m_pixelSizes[index];
 }
 
-KDE_EXPORT const TQSize& RandRScreen::mmSize(int index) const
+TDE_EXPORT const TQSize& RandRScreen::mmSize(int index) const
 {
 	return m_mmSizes[index];
 }
 
-KDE_EXPORT int RandRScreen::sizeIndex(TQSize pixelSize) const
+TDE_EXPORT int RandRScreen::sizeIndex(TQSize pixelSize) const
 {
 	for (uint i = 0; i < m_pixelSizes.count(); i++)
 		if (m_pixelSizes[i] == pixelSize)
@@ -609,37 +609,37 @@ KDE_EXPORT int RandRScreen::sizeIndex(TQSize pixelSize) const
 	return -1;
 }
 
-KDE_EXPORT int RandRScreen::rotations() const
+TDE_EXPORT int RandRScreen::rotations() const
 {
 	return m_rotations;
 }
 
-KDE_EXPORT int RandRScreen::currentRotation() const
+TDE_EXPORT int RandRScreen::currentRotation() const
 {
 	return m_currentRotation;
 }
 
-KDE_EXPORT int RandRScreen::currentSize() const
+TDE_EXPORT int RandRScreen::currentSize() const
 {
 	return m_currentSize;
 }
 
-KDE_EXPORT int RandRScreen::proposedRotation() const
+TDE_EXPORT int RandRScreen::proposedRotation() const
 {
 	return m_proposedRotation;
 }
 
-KDE_EXPORT void RandRScreen::proposeRotation(int newRotation)
+TDE_EXPORT void RandRScreen::proposeRotation(int newRotation)
 {
 	m_proposedRotation = newRotation & OrientationMask;
 }
 
-KDE_EXPORT int RandRScreen::proposedSize() const
+TDE_EXPORT int RandRScreen::proposedSize() const
 {
 	return m_proposedSize;
 }
 
-KDE_EXPORT bool RandRScreen::proposeSize(int newSize)
+TDE_EXPORT bool RandRScreen::proposeSize(int newSize)
 {
 	if ((int)m_pixelSizes.count() > newSize) {
 		m_proposedSize = newSize;
@@ -649,7 +649,7 @@ KDE_EXPORT bool RandRScreen::proposeSize(int newSize)
 	return false;
 }
 
-KDE_EXPORT void RandRScreen::load(TDEConfig& config)
+TDE_EXPORT void RandRScreen::load(TDEConfig& config)
 {
 	config.setGroup(TQString("Screen%1").arg(m_screen));
 
@@ -659,7 +659,7 @@ KDE_EXPORT void RandRScreen::load(TDEConfig& config)
 	proposeRotation(rotationDegreeToIndex(config.readNumEntry("rotation", 0)) + (config.readBoolEntry("reflectX") ? ReflectX : 0) + (config.readBoolEntry("reflectY") ? ReflectY : 0));
 }
 
-KDE_EXPORT void RandRScreen::save(TDEConfig& config) const
+TDE_EXPORT void RandRScreen::save(TDEConfig& config) const
 {
 	config.setGroup(TQString("Screen%1").arg(m_screen));
 	config.writeEntry("width", currentPixelWidth());
@@ -670,7 +670,7 @@ KDE_EXPORT void RandRScreen::save(TDEConfig& config) const
 	config.writeEntry("reflectY", (bool)(currentRotation() & ReflectMask) == ReflectY);
 }
 
-KDE_EXPORT RandRDisplay::RandRDisplay()
+TDE_EXPORT RandRDisplay::RandRDisplay()
 	: m_valid(true)
 {
 	// Check extension
@@ -713,76 +713,76 @@ KDE_EXPORT RandRDisplay::RandRDisplay()
 	setCurrentScreen(TQApplication::desktop()->primaryScreen());
 }
 
-KDE_EXPORT bool RandRDisplay::isValid() const
+TDE_EXPORT bool RandRDisplay::isValid() const
 {
 	return m_valid;
 }
 
-KDE_EXPORT const TQString& RandRDisplay::errorCode() const
+TDE_EXPORT const TQString& RandRDisplay::errorCode() const
 {
 	return m_errorCode;
 }
 
-KDE_EXPORT int RandRDisplay::eventBase() const
+TDE_EXPORT int RandRDisplay::eventBase() const
 {
 	return m_eventBase;
 }
 
-KDE_EXPORT int RandRDisplay::screenChangeNotifyEvent() const
+TDE_EXPORT int RandRDisplay::screenChangeNotifyEvent() const
 {
 	return m_eventBase + RRScreenChangeNotify;
 }
 
-KDE_EXPORT int RandRDisplay::errorBase() const
+TDE_EXPORT int RandRDisplay::errorBase() const
 {
 	return m_errorBase;
 }
 
-KDE_EXPORT const TQString& RandRDisplay::version() const
+TDE_EXPORT const TQString& RandRDisplay::version() const
 {
 	return m_version;
 }
 
-KDE_EXPORT void RandRDisplay::setCurrentScreen(int index)
+TDE_EXPORT void RandRDisplay::setCurrentScreen(int index)
 {
 	m_currentScreenIndex = index;
 	m_currentScreen = m_screens.at(m_currentScreenIndex);
 	Q_ASSERT(m_currentScreen);
 }
 
-KDE_EXPORT int RandRDisplay::screenIndexOfWidget(TQWidget* widget)
+TDE_EXPORT int RandRDisplay::screenIndexOfWidget(TQWidget* widget)
 {
 	int ret = TQApplication::desktop()->screenNumber(widget);
 	return ret != -1 ? ret : TQApplication::desktop()->primaryScreen();
 }
 
-KDE_EXPORT int RandRDisplay::currentScreenIndex() const
+TDE_EXPORT int RandRDisplay::currentScreenIndex() const
 {
 	return m_currentScreenIndex;
 }
 
-KDE_EXPORT void RandRDisplay::refresh()
+TDE_EXPORT void RandRDisplay::refresh()
 {
 	for (RandRScreen* s = m_screens.first(); s; s = m_screens.next())
 		s->loadSettings();
 }
 
-KDE_EXPORT int RandRDisplay::numScreens() const
+TDE_EXPORT int RandRDisplay::numScreens() const
 {
 	return m_numScreens;
 }
 
-KDE_EXPORT RandRScreen* RandRDisplay::screen(int index)
+TDE_EXPORT RandRScreen* RandRDisplay::screen(int index)
 {
 	return m_screens.at(index);
 }
 
-KDE_EXPORT RandRScreen* RandRDisplay::currentScreen()
+TDE_EXPORT RandRScreen* RandRDisplay::currentScreen()
 {
 	return m_currentScreen;
 }
 
-KDE_EXPORT bool RandRDisplay::loadDisplay(TDEConfig& config, bool loadScreens)
+TDE_EXPORT bool RandRDisplay::loadDisplay(TDEConfig& config, bool loadScreens)
 {
 	if (loadScreens)
 		for (RandRScreen* s = m_screens.first(); s; s = m_screens.next())
@@ -791,19 +791,19 @@ KDE_EXPORT bool RandRDisplay::loadDisplay(TDEConfig& config, bool loadScreens)
 	return applyOnStartup(config);
 }
 
-KDE_EXPORT bool RandRDisplay::applyOnStartup(TDEConfig& config)
+TDE_EXPORT bool RandRDisplay::applyOnStartup(TDEConfig& config)
 {
 	config.setGroup("Display");
 	return config.readBoolEntry("ApplyOnStartup", false);
 }
 
-KDE_EXPORT bool RandRDisplay::syncTrayApp(TDEConfig& config)
+TDE_EXPORT bool RandRDisplay::syncTrayApp(TDEConfig& config)
 {
 	config.setGroup("Display");
 	return config.readBoolEntry("SyncTrayApp", false);
 }
 
-KDE_EXPORT void RandRDisplay::saveDisplay(TDEConfig& config, bool applyOnStartup, bool syncTrayApp)
+TDE_EXPORT void RandRDisplay::saveDisplay(TDEConfig& config, bool applyOnStartup, bool syncTrayApp)
 {
 	Q_ASSERT(!config.isReadOnly());
 
@@ -815,7 +815,7 @@ KDE_EXPORT void RandRDisplay::saveDisplay(TDEConfig& config, bool applyOnStartup
 		s->save(config);
 }
 
-KDE_EXPORT void RandRDisplay::applyProposed(bool confirm)
+TDE_EXPORT void RandRDisplay::applyProposed(bool confirm)
 {
 	for (int screenIndex = 0; screenIndex < numScreens(); screenIndex++) {
 		if (screen(screenIndex)->proposedChanged()) {
@@ -827,7 +827,7 @@ KDE_EXPORT void RandRDisplay::applyProposed(bool confirm)
 	}
 }
 
-KDE_EXPORT bool RandRDisplay::showTestConfigurationDialog()
+TDE_EXPORT bool RandRDisplay::showTestConfigurationDialog()
 {
 	RandRScreen* firstScreen = screen(0);
 	if (firstScreen) {
@@ -838,7 +838,7 @@ KDE_EXPORT bool RandRDisplay::showTestConfigurationDialog()
 	}
 }
 
-KDE_EXPORT bool RandRScreen::showTestConfigurationDialog()
+TDE_EXPORT bool RandRScreen::showTestConfigurationDialog()
 {
 	// uncomment the line below and edit out the KTimerDialog stuff to get
 	// a version which works on today's tdelibs (no accept dialog is presented)
@@ -872,7 +872,7 @@ KDE_EXPORT bool RandRScreen::showTestConfigurationDialog()
         return acceptDialog.exec();
 }
 
-KDE_EXPORT int RandRScreen::pixelCount( int index ) const
+TDE_EXPORT int RandRScreen::pixelCount( int index ) const
 {
 	TQSize sz = pixelSize(index);
 	return sz.width() * sz.height();
diff --git a/tdersync/tdersync.cpp b/tdersync/tdersync.cpp
index 828b4ce71..e83f22088 100644
--- a/tdersync/tdersync.cpp
+++ b/tdersync/tdersync.cpp
@@ -60,7 +60,7 @@
 
 #define CONFIGURATION_FILE_SEPARATOR ';'
 
-KDE_EXPORT KRsync::KRsync (TQObject* parent, const char* name)
+TDE_EXPORT KRsync::KRsync (TQObject* parent, const char* name)
                 : TQObject (parent, name), m_progressDialog(0), m_progressDialogExists(false), m_bSettingsLoaded(false), m_bInSpecialSync(false)
 {
     loadSettings();
@@ -77,7 +77,7 @@ KDE_EXPORT KRsync::KRsync (TQObject* parent, const char* name)
     redirectPass = ""; // FIXME: just a workaround for konq deficiencies
 }
 
-KDE_EXPORT KRsync::~KRsync()
+TDE_EXPORT KRsync::~KRsync()
 {
 
 }
@@ -152,7 +152,7 @@ close_master:
 /**
 creates the unidirectional sync subprocess
 */
-KDE_EXPORT bool KRsync::syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
+TDE_EXPORT bool KRsync::syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
     int fd[2];
     int rc, flags;
     thisFn = TQString();
@@ -291,7 +291,7 @@ KDE_EXPORT bool KRsync::syncUnidirectional(TQString synccommand, TQString syncfl
 /**
 creates the bidirectional sync subprocess
 */
-KDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
+TDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
     int fd[2];
     int rc, flags;
     thisFn = TQString();
@@ -430,7 +430,7 @@ KDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncfla
 /**
 writes one chunk of data to stdin of child process
 */
-KDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) {
+TDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) {
     if (outBufPos >= 0 && outBuf) {
 #if 0
         TQString debug;
@@ -447,7 +447,7 @@ KDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) {
 /**
 manages initial communication setup including password queries
 */
-KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len) {
+TDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len) {
     TQString buf;
     buf.setLatin1(buffer,len);
     int pos;
@@ -562,7 +562,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_
 /**
 manages initial communication setup including password queries
 */
-KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath) {
+TDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath) {
     TQString buf;
     buf.setLatin1(buffer,len);
     int pos;
@@ -746,7 +746,7 @@ Forced close of the connection
 This function gets called from the application side of the universe,
 it shouldn't send any response.
  */
-KDE_EXPORT void KRsync::closeConnection(){
+TDE_EXPORT void KRsync::closeConnection(){
     myDebug( << "closeConnection()" << endl);
     shutdownConnection(true, false);
 }
@@ -754,7 +754,7 @@ KDE_EXPORT void KRsync::closeConnection(){
 /**
 Closes the connection
  */
-KDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){
+TDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){
     if (childPid) {
         kill(childPid,SIGTERM); // We may not have permission...
         childPid = 0;
@@ -775,7 +775,7 @@ KDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){
 //
 // --------------------------------------------------------------------------------------------
 
-KDE_EXPORT void KRsync::saveSettings()
+TDE_EXPORT void KRsync::saveSettings()
 {
   TDEConfig cfg ("rsyncrc", false, false);
   cfg.setGroup ("General");
@@ -784,7 +784,7 @@ KDE_EXPORT void KRsync::saveSettings()
   cfg.sync();
 }
 
-KDE_EXPORT void KRsync::loadSettings()
+TDE_EXPORT void KRsync::loadSettings()
 {
   if (m_bSettingsLoaded)
     return;
@@ -798,7 +798,7 @@ KDE_EXPORT void KRsync::loadSettings()
   m_bSettingsLoaded = true;
 }
 
-KDE_EXPORT void KRsync::executeLogoutAutoSync()
+TDE_EXPORT void KRsync::executeLogoutAutoSync()
 {
   for (TQStringList::Iterator i(cfgautosync_onlogout_list.begin()); i != cfgautosync_onlogout_list.end(); ++i) {
 	setCurrentDirectoryURL(*i);
@@ -808,7 +808,7 @@ KDE_EXPORT void KRsync::executeLogoutAutoSync()
   }
 }
 
-KDE_EXPORT TQString KRsync::findLocalFolderByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findLocalFolderByName(TQString folderurl)
 {
   TQString folderurl_stripped;
   folderurl_stripped = folderurl;
@@ -827,7 +827,7 @@ KDE_EXPORT TQString KRsync::findLocalFolderByName(TQString folderurl)
   return NULL;
 }
 
-KDE_EXPORT TQString KRsync::findSyncMethodByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findSyncMethodByName(TQString folderurl)
 {
   TQString folderurl_stripped;
   folderurl_stripped = folderurl;
@@ -846,7 +846,7 @@ KDE_EXPORT TQString KRsync::findSyncMethodByName(TQString folderurl)
   return NULL;
 }
 
-KDE_EXPORT TQString KRsync::findLoginSyncEnabledByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findLoginSyncEnabledByName(TQString folderurl)
 {
   TQString folderurl_stripped;
   folderurl_stripped = folderurl;
@@ -865,7 +865,7 @@ KDE_EXPORT TQString KRsync::findLoginSyncEnabledByName(TQString folderurl)
   return NULL;
 }
 
-KDE_EXPORT TQString KRsync::findLogoutSyncEnabledByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findLogoutSyncEnabledByName(TQString folderurl)
 {
   TQString folderurl_stripped;
   folderurl_stripped = folderurl;
@@ -884,7 +884,7 @@ KDE_EXPORT TQString KRsync::findLogoutSyncEnabledByName(TQString folderurl)
   return NULL;
 }
 
-KDE_EXPORT TQString KRsync::findTimedSyncEnabledByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findTimedSyncEnabledByName(TQString folderurl)
 {
   TQString folderurl_stripped;
   folderurl_stripped = folderurl;
@@ -903,7 +903,7 @@ KDE_EXPORT TQString KRsync::findTimedSyncEnabledByName(TQString folderurl)
   return NULL;
 }
 
-KDE_EXPORT int KRsync::deleteLocalFolderByName(TQString folderurl)
+TDE_EXPORT int KRsync::deleteLocalFolderByName(TQString folderurl)
 {
   TQString folderurl_stripped;
   folderurl_stripped = folderurl;
@@ -923,7 +923,7 @@ KDE_EXPORT int KRsync::deleteLocalFolderByName(TQString folderurl)
   return 1;
 }
 
-KDE_EXPORT int KRsync::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval)
+TDE_EXPORT int KRsync::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval)
 {
   TQString folderurl_stripped;
   folderurl_stripped = folderurl;
@@ -938,12 +938,12 @@ KDE_EXPORT int KRsync::addLocalFolderByName(TQString folderurl, TQString remoteu
   return 1;
 }
 
-KDE_EXPORT void KRsync::setCurrentDirectoryURL (KURL url)
+TDE_EXPORT void KRsync::setCurrentDirectoryURL (KURL url)
 {
 	m_pURL = url;
 }
 
-KDE_EXPORT void KRsync::slotSetup()
+TDE_EXPORT void KRsync::slotSetup()
 {
 	KURL url = m_pURL;
 
@@ -981,7 +981,7 @@ KDE_EXPORT void KRsync::slotSetup()
 	connect (m_configDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotSetupCancelled()));
 }
 
-KDE_EXPORT void KRsync::slotSetupOK()
+TDE_EXPORT void KRsync::slotSetupOK()
 {
 	KURL url = m_pURL;
 
@@ -1019,12 +1019,12 @@ KDE_EXPORT void KRsync::slotSetupOK()
 	emit setupDone();
 }
 
-KDE_EXPORT void KRsync::slotSetupCancelled()
+TDE_EXPORT void KRsync::slotSetupCancelled()
 {
 	emit setupDone();
 }
 
-KDE_EXPORT void KRsync::slotRsyncCancelled()
+TDE_EXPORT void KRsync::slotRsyncCancelled()
 {
         shutdownConnection(true, true);
         if (m_progressDialogExists == true) {
@@ -1034,7 +1034,7 @@ KDE_EXPORT void KRsync::slotRsyncCancelled()
         emit transferDone();
 }
 
-KDE_EXPORT void KRsync::slotUnisonCancelled()
+TDE_EXPORT void KRsync::slotUnisonCancelled()
 {
         shutdownConnection(true, true);
         if (m_progressDialogExists == true) {
@@ -1046,7 +1046,7 @@ KDE_EXPORT void KRsync::slotUnisonCancelled()
         emit transferDone();
 }
 
-KDE_EXPORT void KRsync::slotSync()
+TDE_EXPORT void KRsync::slotSync()
 {
 	KURL url = m_pURL;
 
diff --git a/tdespell2/backgroundchecker.h b/tdespell2/backgroundchecker.h
index 6f9163b26..b80c338fb 100644
--- a/tdespell2/backgroundchecker.h
+++ b/tdespell2/backgroundchecker.h
@@ -46,7 +46,7 @@ namespace KSpell2
      * @author Zack Rusin <[email protected]>
      * @short class used for spell checking in the background
      */
-    class KDE_EXPORT BackgroundChecker : public TQObject
+    class TDE_EXPORT BackgroundChecker : public TQObject
     {
         TQ_OBJECT
     public:
diff --git a/tdespell2/broker.h b/tdespell2/broker.h
index 2ccc63635..3bd0ba46f 100644
--- a/tdespell2/broker.h
+++ b/tdespell2/broker.h
@@ -44,7 +44,7 @@ namespace KSpell2
      * KSpell2 class, you can think of it as the kernel or manager
      * of the KSpell2 architecture.
      */
-    class KDE_EXPORT Broker : public TQObject,
+    class TDE_EXPORT Broker : public TQObject,
                    public TDEShared
     {
         TQ_OBJECT
diff --git a/tdespell2/client.h b/tdespell2/client.h
index c115b3847..ddf54af4b 100644
--- a/tdespell2/client.h
+++ b/tdespell2/client.h
@@ -37,7 +37,7 @@ namespace KSpell2
      * I don't really feel like writting my own KLibFactory
      * that would load anything else then TQObject derivatives.
      */
-    class KDE_EXPORT Client : public TQObject
+    class TDE_EXPORT Client : public TQObject
     {
         TQ_OBJECT
     public:
diff --git a/tdespell2/filter.h b/tdespell2/filter.h
index ded339841..b2ba00ae5 100644
--- a/tdespell2/filter.h
+++ b/tdespell2/filter.h
@@ -61,7 +61,7 @@ namespace KSpell2
      * @author Zack Rusin <[email protected]>
      * @short used to split text into words
      */
-    class KDE_EXPORT Filter
+    class TDE_EXPORT Filter
     {
     public:
         static Filter *defaultFilter();
diff --git a/tdespell2/settings.h b/tdespell2/settings.h
index 34590ecb8..1dc29a378 100644
--- a/tdespell2/settings.h
+++ b/tdespell2/settings.h
@@ -31,7 +31,7 @@ namespace KSpell2
 {
     class Broker;
 
-    class KDE_EXPORT Settings
+    class TDE_EXPORT Settings
     {
     public:
         ~Settings();
diff --git a/tdespell2/ui/configwidget.h b/tdespell2/ui/configwidget.h
index 071e83272..fa06f10dc 100644
--- a/tdespell2/ui/configwidget.h
+++ b/tdespell2/ui/configwidget.h
@@ -27,7 +27,7 @@
 namespace KSpell2
 {
     class Broker;
-    class KDE_EXPORT ConfigWidget : public TQWidget
+    class TDE_EXPORT ConfigWidget : public TQWidget
     {
         TQ_OBJECT
     public:
diff --git a/tdespell2/ui/dialog.h b/tdespell2/ui/dialog.h
index a531408bf..a3f20e4eb 100644
--- a/tdespell2/ui/dialog.h
+++ b/tdespell2/ui/dialog.h
@@ -27,7 +27,7 @@ namespace KSpell2
 {
     class Filter;
     class BackgroundChecker;
-    class KDE_EXPORT Dialog : public KDialogBase
+    class TDE_EXPORT Dialog : public KDialogBase
     {
         TQ_OBJECT
     public:
diff --git a/tdestyles/highcontrast/config/highcontrastconfig.cpp b/tdestyles/highcontrast/config/highcontrastconfig.cpp
index a570a6eab..ce43f45bd 100644
--- a/tdestyles/highcontrast/config/highcontrastconfig.cpp
+++ b/tdestyles/highcontrast/config/highcontrastconfig.cpp
@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "highcontrastconfig.h"
 
-extern "C" KDE_EXPORT TQWidget* 
+extern "C" TDE_EXPORT TQWidget* 
 allocate_tdestyle_config(TQWidget* parent)
 {
     return new HighContrastStyleConfig(parent);
diff --git a/tdestyles/plastik/config/plastikconf.cpp b/tdestyles/plastik/config/plastikconf.cpp
index 35dd2a1b2..5da07beb1 100644
--- a/tdestyles/plastik/config/plastikconf.cpp
+++ b/tdestyles/plastik/config/plastikconf.cpp
@@ -39,7 +39,7 @@ DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-	KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
+	TDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
 	{
 		TDEGlobal::locale()->insertCatalogue("tdestyle_plastik_config");
 		return new PlastikStyleConfig(parent);
diff --git a/tdeui/kdetrayproxy/module.cpp b/tdeui/kdetrayproxy/module.cpp
index 5da30bab8..5d5155670 100644
--- a/tdeui/kdetrayproxy/module.cpp
+++ b/tdeui/kdetrayproxy/module.cpp
@@ -25,7 +25,7 @@ KDETrayModule::KDETrayModule( const TQCString& obj )
     }
 
 extern "C" 
-KDE_EXPORT KDEDModule *create_kdetrayproxy( const TQCString& obj )
+TDE_EXPORT KDEDModule *create_kdetrayproxy( const TQCString& obj )
     {
     return new KDETrayModule( obj );
     }
diff --git a/tdewallet/backend/tdewalletbackend.h b/tdewallet/backend/tdewalletbackend.h
index 71c1da120..f469a9d60 100644
--- a/tdewallet/backend/tdewalletbackend.h
+++ b/tdewallet/backend/tdewalletbackend.h
@@ -36,7 +36,7 @@ class MD5Digest;
 
 /* @internal
  */
-class KDE_EXPORT Backend {
+class TDE_EXPORT Backend {
 	public:
 		Backend(const TQString& name = "kdewallet", bool isPath = false);
 		~Backend();
diff --git a/tdewallet/backend/tdewalletentry.h b/tdewallet/backend/tdewalletentry.h
index 4261fc439..9a9836208 100644
--- a/tdewallet/backend/tdewalletentry.h
+++ b/tdewallet/backend/tdewalletentry.h
@@ -31,7 +31,7 @@ namespace TDEWallet {
 
 /* @internal
  */
-class KDE_EXPORT Entry {
+class TDE_EXPORT Entry {
 	public:
 		Entry();
 		~Entry();
diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h
index 830eb10d9..4dae72c6c 100644
--- a/win/tdelibs_export_win.h
+++ b/win/tdelibs_export_win.h
@@ -26,7 +26,7 @@
 #define KDE_IMPORT __declspec(dllimport)
 
 #ifdef MAKE_TDECORE_LIB
-# define TDECORE_EXPORT KDE_EXPORT
+# define TDECORE_EXPORT TDE_EXPORT
 #else
 # ifndef TDECORE_EXPORT
 #  define TDECORE_EXPORT KDE_IMPORT //for apps and other libs
@@ -34,15 +34,15 @@
 #endif
 
 #ifdef MAKE_KDEWIN32_LIB
-# define KDEWIN32_EXPORT KDE_EXPORT
+# define KDEWIN32_EXPORT TDE_EXPORT
 #else
 # define KDEWIN32_EXPORT KDE_IMPORT
 #endif
 
 /* some classes, i.e. KDock* already use EXPORT_* macro: define it too */
 #ifdef MAKE_TDEUI_LIB
-# define TDEUI_EXPORT KDE_EXPORT
-# define EXPORT_DOCKCLASS KDE_EXPORT
+# define TDEUI_EXPORT TDE_EXPORT
+# define EXPORT_DOCKCLASS TDE_EXPORT
 #elif KDE_MAKE_LIB
 # define TDEUI_EXPORT KDE_IMPORT
 # define EXPORT_DOCKCLASS KDE_IMPORT /* for library build export docklass by default */
@@ -52,101 +52,101 @@
 #endif
 
 #ifdef MAKE_TDEFX_LIB
-# define TDEFX_EXPORT  KDE_EXPORT
+# define TDEFX_EXPORT  TDE_EXPORT
 #else
 # define TDEFX_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_TDEPRINT_LIB
-# define TDEPRINT_EXPORT  KDE_EXPORT
+# define TDEPRINT_EXPORT  TDE_EXPORT
 #else
 # define TDEPRINT_EXPORT KDE_IMPORT
 #endif
 
 #ifndef TDEIO_EXPORT
 # ifdef MAKE_TDEIO_LIB
-#  define TDEIO_EXPORT KDE_EXPORT
+#  define TDEIO_EXPORT TDE_EXPORT
 # else
 #  define TDEIO_EXPORT KDE_IMPORT
 # endif
 #endif
 
 #ifdef MAKE_DCOP_LIB
-# define DCOP_EXPORT KDE_EXPORT
+# define DCOP_EXPORT TDE_EXPORT
 #else
 # define DCOP_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_TDEPARTS_LIB
-# define TDEPARTS_EXPORT KDE_EXPORT
+# define TDEPARTS_EXPORT TDE_EXPORT
 #else
 # define TDEPARTS_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_KTEXTEDITOR_LIB
-# define KTEXTEDITOR_EXPORT KDE_EXPORT
+# define KTEXTEDITOR_EXPORT TDE_EXPORT
 #else
 # define KTEXTEDITOR_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_KABC_LIB
-# define KABC_EXPORT KDE_EXPORT
+# define KABC_EXPORT TDE_EXPORT
 #else
 # define KABC_EXPORT KDE_IMPORT
 #endif
 
 
 #ifdef MAKE_KVCARD_LIB
-# define KVCARD_EXPORT KDE_EXPORT
+# define KVCARD_EXPORT TDE_EXPORT
 #else
 # define KVCARD_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_TDERESOURCES_LIB
-# define TDERESOURCES_EXPORT KDE_EXPORT
+# define TDERESOURCES_EXPORT TDE_EXPORT
 #else
 # define TDERESOURCES_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_TDESU_LIB
-# define TDESU_EXPORT KDE_EXPORT
+# define TDESU_EXPORT TDE_EXPORT
 #else
 # define TDESU_EXPORT KDE_IMPORT
 #endif
 
 // all TDEStyle libs
 #ifdef MAKE_TDESTYLE_LIB
-# define TDESTYLE_EXPORT KDE_EXPORT
+# define TDESTYLE_EXPORT TDE_EXPORT
 #else
 # define TDESTYLE_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_KMDI_LIB
-# define KMDI_EXPORT  KDE_EXPORT
+# define KMDI_EXPORT  TDE_EXPORT
 #else
 # define KMDI_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_TDEUTILS_LIB
-# define TDEUTILS_EXPORT  KDE_EXPORT
+# define TDEUTILS_EXPORT  TDE_EXPORT
 #else
 # define TDEUTILS_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_KATEPARTINTERFACES_LIB
-# define KATEPARTINTERFACES_EXPORT  KDE_EXPORT
+# define KATEPARTINTERFACES_EXPORT  TDE_EXPORT
 #else
 # define KATEPARTINTERFACES_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_KATEPART_LIB
-# define KATEPART_EXPORT  KDE_EXPORT
+# define KATEPART_EXPORT  TDE_EXPORT
 #else
 # define KATEPART_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_TDEHTML_LIB
-# define TDEHTML_EXPORT KDE_EXPORT
+# define TDEHTML_EXPORT TDE_EXPORT
 #else
 # define TDEHTML_EXPORT KDE_IMPORT
 #endif