diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 92784b1d0d44..526240dd83a3 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -90,7 +90,7 @@ BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVer
     return 0 == aF2.Kill();
 }
 
-#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (__MINGW32__) || defined( OS2 )
+#if defined( UNX ) || defined( PM2 ) || defined (__MINGW32__) || defined( OS2 )
 int main ( int argc, char ** argv)
 {
 #else
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 2d22379865b0..4511dec60328 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2128,7 +2128,7 @@ void SfxDispatcher::SetSlotFilter
 
 //--------------------------------------------------------------------
 EXTERN_C
-#if defined( PM2 ) && !defined( CSET )
+#if defined( PM2 )
 int _stdcall
 #else
 #ifdef WNT
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index a014b53f44db..d0578d2bf4c2 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -47,7 +47,7 @@ DBG_NAME(SfxInterface)
 //====================================================================
 
 EXTERN_C
-#if defined( PM2 ) && !defined( CSET )
+#if defined( PM2 )
 int _stdcall
 #else
 #ifdef WNT
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 1438842defa4..e7cd266b0d6b 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -934,7 +934,7 @@ UINT32 UHashMap::getId( const OUString& rCompareString )
 SvxUnoPropertyMapProvider aSvxMapProvider;
 
 EXTERN_C
-#if defined( PM2 ) && !defined( CSET )
+#if defined( PM2 )
 int _stdcall
 #else
 #ifdef WNT