diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
index 96d65e9a..9190db9d 100644
--- a/kamera/tdeioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -53,7 +53,7 @@ using namespace TDEIO;
 
 extern "C"
 {
-	KDE_EXPORT int kdemain(int argc, char **argv);
+	TDE_EXPORT int kdemain(int argc, char **argv);
 
 #ifdef HAVE_GPHOTO2_5
 	static void frontendCameraStatus(GPContext *context, const char *status, void *data);
diff --git a/kfaxview/libkfaximage/kfaximage.h b/kfaxview/libkfaximage/kfaximage.h
index f24d47eb..56f6cc43 100644
--- a/kfaxview/libkfaximage/kfaximage.h
+++ b/kfaxview/libkfaximage/kfaximage.h
@@ -50,7 +50,7 @@ class pagenode;
 #define KFAX_DPI_SUPERFINE	TQPoint(406,392)
 
 
-class KDE_EXPORT KFaxImage : public TQObject
+class TDE_EXPORT KFaxImage : public TQObject
 {
     TQ_OBJECT
   
diff --git a/kghostview/displayoptions.h b/kghostview/displayoptions.h
index 78ecc0d4..34a10588 100644
--- a/kghostview/displayoptions.h
+++ b/kghostview/displayoptions.h
@@ -24,7 +24,7 @@
 class TDECmdLineArgs;
 class TDEConfig;
 
-class KDE_EXPORT DisplayOptions 
+class TDE_EXPORT DisplayOptions 
 {
 	public:
 	DisplayOptions();
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index 3859b675..9a1e23da 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -77,7 +77,7 @@ public:
      */
     virtual bool closeURL();
 
-    KDE_EXPORT static TDEAboutData* createAboutData();
+    TDE_EXPORT static TDEAboutData* createAboutData();
 
 public slots:
     /**
diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h
index d0ac9550..612a6d21 100644
--- a/kghostview/kgvfactory.h
+++ b/kghostview/kgvfactory.h
@@ -25,7 +25,7 @@
 class TDEInstance;
 class TDEAboutData;
 
-class KDE_EXPORT KGVFactory : public KParts::Factory
+class TDE_EXPORT KGVFactory : public KParts::Factory
 {
     public:
         KGVFactory();
diff --git a/kghostview/kgvshell.h b/kghostview/kgvshell.h
index 98915ec6..1c90673d 100644
--- a/kghostview/kgvshell.h
+++ b/kghostview/kgvshell.h
@@ -35,7 +35,7 @@ class TDEPopupMenu;
 class DisplayOptions;
 class FullScreenFilter;
 
-class KDE_EXPORT KGVShell : public KParts::MainWindow
+class TDE_EXPORT KGVShell : public KParts::MainWindow
 {
     TQ_OBJECT
   
diff --git a/kuickshow/src/main.cpp b/kuickshow/src/main.cpp
index f2633626..547b249b 100644
--- a/kuickshow/src/main.cpp
+++ b/kuickshow/src/main.cpp
@@ -36,7 +36,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)
 {
     TDEAboutData about(
 	  "kuickshow", I18N_NOOP( "KuickShow" ), KUICKSHOWVERSION,
diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h
index b697c01e..2f36f843 100644
--- a/kview/kimageviewer/canvas.h
+++ b/kview/kimageviewer/canvas.h
@@ -67,7 +67,7 @@ namespace KImageViewer
  * until it's finished. So if you're using this interface please get in contact
  * with me.
  */
-class KDE_EXPORT Canvas
+class TDE_EXPORT Canvas
 {
 	public:
 		/**
diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h
index 7334c16b..38372cfb 100644
--- a/kview/kimageviewer/viewer.h
+++ b/kview/kimageviewer/viewer.h
@@ -45,7 +45,7 @@ namespace KImageViewer
  * until it's finished. So if you're using this interface please get in contact
  * with me.
  */
-class KDE_EXPORT Viewer : public KParts::ReadWritePart
+class TDE_EXPORT Viewer : public KParts::ReadWritePart
 {
 	TQ_OBJECT
   
diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h
index f9ea3e73..b0d90d18 100644
--- a/kview/kviewcanvas/kimagecanvas.h
+++ b/kview/kviewcanvas/kimagecanvas.h
@@ -39,7 +39,7 @@ class KPixmap;
  * @author Matthias Kretz <kretz@kde.org>
  * @version $Id$
  */
-class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
+class TDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
 {
 	TQ_OBJECT
   
diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h
index 691b40c4..dae95c9a 100644
--- a/kview/kviewviewer/kviewviewer.h
+++ b/kview/kviewviewer/kviewviewer.h
@@ -42,7 +42,7 @@ class KDirWatch;
 template<class T>
 class TQCache;
 
-class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface
+class TDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface
 {
 	TQ_OBJECT
   
diff --git a/kview/main.cpp b/kview/main.cpp
index 9faba378..6d1e8227 100644
--- a/kview/main.cpp
+++ b/kview/main.cpp
@@ -31,7 +31,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 )
 {
 	TDEAboutData about( "kview", I18N_NOOP( "KView" ),
 			KVIEW_VERSION, description,
diff --git a/tdefile-plugins/ps/gscreator.cpp b/tdefile-plugins/ps/gscreator.cpp
index 88601a4c..e654efeb 100644
--- a/tdefile-plugins/ps/gscreator.cpp
+++ b/tdefile-plugins/ps/gscreator.cpp
@@ -81,7 +81,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         return new GSCreator;
     }
diff --git a/tdefile-plugins/raw/kcamerarawplugin.cpp b/tdefile-plugins/raw/kcamerarawplugin.cpp
index 6ac4759c..dd367f65 100644
--- a/tdefile-plugins/raw/kcamerarawplugin.cpp
+++ b/tdefile-plugins/raw/kcamerarawplugin.cpp
@@ -38,8 +38,8 @@ typedef KGenericFactory<KCameraRawPlugin> RawFactory;
 
 K_EXPORT_COMPONENT_FACTORY(tdefile_raw, RawFactory("tdefile_raw"))
 
-#ifndef KDE_EXPORT
-# define KDE_EXPORT
+#ifndef TDE_EXPORT
+# define TDE_EXPORT
 #endif
 
 /* Main entry point into raw parser */