diff --git binfilter/inc/bf_sfx2/docfac.hxx binfilter/inc/bf_sfx2/docfac.hxx
index 085d11c..646b87d 100644
--- binfilter/inc/bf_sfx2/docfac.hxx
+++ binfilter/inc/bf_sfx2/docfac.hxx
@@ -635,7 +635,7 @@ extern "C"
             Factory().RegisterInitFactory( &InitFactory    );                    \
     }																		  \
                                                                               \
-    SfxObjectShell*	__EXPORT Class::CreateObject(SfxObjectCreateMode eMode)	  \
+    SfxObjectShell* Class::CreateObject(SfxObjectCreateMode eMode)	  \
     {																		  \
         SfxCreateExtern_TYPE fCreate = (SfxCreateExtern_TYPE)			\
             GetFunc##LibName( "CreateObj" #Class "Dll");            \
diff --git svtools/source/contnr/svlbox.cxx svtools/source/contnr/svlbox.cxx
index 6eb2860..989a5b7 100644
--- svtools/source/contnr/svlbox.cxx
+++ svtools/source/contnr/svlbox.cxx
@@ -1696,7 +1696,7 @@ sal_Int8 SvLBox::AcceptDrop( const AcceptDropEvent& rEvt )
         }
         else
         {
-            DBG_ASSERT( pDDSource, "SvLBox::QueryDrop(): SourceBox == 0 (__EXPORT?)" );
+            DBG_ASSERT( pDDSource, "SvLBox::QueryDrop(): SourceBox == 0" );
             if( !( pEntry && pDDSource->GetModel() == this->GetModel()
                     && DND_ACTION_MOVE == rEvt.mnAction
                     && ( pEntry->nEntryFlags & SV_ENTRYFLAG_DISABLE_DROP ) ))
diff --git tools/inc/tools/solar.h tools/inc/tools/solar.h
index 0ecaf58..8b72805 100644
--- tools/inc/tools/solar.h
+++ tools/inc/tools/solar.h
@@ -88,7 +88,6 @@ typedef sal_uInt32			UINT32;	/* typedef unsigned int    UINT32; previously "unsi
 #define DELETEZ( p )	( delete p,p = 0 )
 
 #define __READONLY_DATA 		const
-#define __EXPORT
 
 #ifdef WNT
 #if defined (_MSC_VER) && ( _MSC_VER < 1200 )
diff --git sfx2/inc/sfx2/childwin.hxx sfx2/inc/sfx2/childwin.hxx
index f3e058a..5de9fba 100644
--- sfx2/inc/sfx2/childwin.hxx
+++ sfx2/inc/sfx2/childwin.hxx
@@ -313,7 +313,7 @@ public:
                     SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\
                     return pWin; \
                 } \
-        sal_uInt16	__EXPORT Class::GetChildWindowId () \
+        sal_uInt16 Class::GetChildWindowId () \
                 { return MyID; } \
         void	Class::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags)	 \
                 {	\