Index: bf_basic/source/classes/sb.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_basic/source/classes/sb.cxx,v
retrieving revision 1.3
diff -u -r1.3 sb.cxx
--- bf_basic/source/classes/sb.cxx	26 Apr 2007 07:10:22 -0000	1.3
+++ bf_basic/source/classes/sb.cxx	21 Aug 2007 19:17:54 -0000
@@ -51,9 +51,6 @@
 #ifndef _LIST_HXX //autogen
 #include <tools/list.hxx>
 #endif
-#ifndef _SHL_HXX //autogen
-#include <tools/shl.hxx>
-#endif
 #ifndef _TOOLS_RC_HXX //autogen
 #include <tools/rc.hxx>
 #endif
@@ -709,19 +706,6 @@
 		pCLASSFAC = NULL;
 		RemoveFactory( pOLEFAC );
 		pOLEFAC = NULL;
-
-#ifdef DBG_UTIL
-	// SbiData braucht am Programm-Ende nicht abgeraeumt werden,
-	// aber wir wollen keine MLK's beim Purify
-	// Wo sollte es sonst geschehen???
-	SbiGlobals** pp = (SbiGlobals**) ::GetAppData( SHL_SBC );
-	SbiGlobals* p = *pp;
-	if( p )
-	{
-		delete p;
-		*pp = 0;
-	}
-#endif
 	}
 
     // #100326 Set Parent NULL in registered listeners
Index: bf_basic/source/classes/sbintern.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_basic/source/classes/sbintern.cxx,v
retrieving revision 1.2
diff -u -r1.2 sbintern.cxx
--- bf_basic/source/classes/sbintern.cxx	15 Mar 2007 15:06:02 -0000	1.2
+++ bf_basic/source/classes/sbintern.cxx	21 Aug 2007 19:17:54 -0000
@@ -33,10 +33,6 @@
  *
  ************************************************************************/
 
-#ifndef _SHL_HXX //autogen
-#include <tools/shl.hxx>
-#endif
-
 #include "sbintern.hxx"
 #include "sbunoobj.hxx"
 #include "token.hxx"				// Tokenizer
@@ -51,11 +47,9 @@
 
 SbiGlobals* GetSbData()
 {
-	SbiGlobals** pp = (SbiGlobals**) ::GetAppData( SHL_SBC );
-	SbiGlobals* p = *pp;
-	if( !p )
-		p = *pp = new SbiGlobals;
-	return p;
+    DBG_TESTSOLARMUTEX();
+    static SbiGlobals* s_pGlobals = new SbiGlobals;
+    return s_pGlobals;
 }
 
 SbiGlobals::SbiGlobals()
Index: bf_basic/source/classes/sbxmod.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_basic/source/classes/sbxmod.cxx,v
retrieving revision 1.2
diff -u -r1.2 sbxmod.cxx
--- bf_basic/source/classes/sbxmod.cxx	15 Mar 2007 15:06:25 -0000	1.2
+++ bf_basic/source/classes/sbxmod.cxx	21 Aug 2007 19:17:54 -0000
@@ -44,9 +44,6 @@
 #ifndef _SFXBRDCST_HXX //autogen
 #include <svtools/brdcst.hxx>
 #endif
-#ifndef _SHL_HXX //autogen
-#include <tools/shl.hxx>
-#endif
 #include <sbx.hxx>
 #include "sb.hxx"
 #include <sbjsmeth.hxx>
Index: bf_basic/source/runtime/basrdll.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_basic/source/runtime/basrdll.cxx,v
retrieving revision 1.3
diff -u -r1.3 basrdll.cxx
--- bf_basic/source/runtime/basrdll.cxx	19 Apr 2007 09:09:14 -0000	1.3
+++ bf_basic/source/runtime/basrdll.cxx	21 Aug 2007 19:17:55 -0000
@@ -33,9 +33,6 @@
  *
  ************************************************************************/
 
-#ifndef _SHL_HXX //autogen
-#include <tools/shl.hxx>
-#endif
 /*?*/ // #ifndef _SV_SVAPP_HXX //autogen
 /*?*/ // #include <vcl/svapp.hxx>
 /*?*/ // #endif
Index: bf_basic/source/sbx/sbxbase.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_basic/source/sbx/sbxbase.cxx,v
retrieving revision 1.2
diff -u -r1.2 sbxbase.cxx
--- bf_basic/source/sbx/sbxbase.cxx	15 Mar 2007 15:11:10 -0000	1.2
+++ bf_basic/source/sbx/sbxbase.cxx	21 Aug 2007 19:17:55 -0000
@@ -33,10 +33,6 @@
  *
  ************************************************************************/
 
-#ifndef _SHL_HXX //autogen
-#include <tools/shl.hxx>
-#endif
-
 #ifndef _STREAM_HXX //autogen
 #include <tools/stream.hxx>
 #endif
@@ -59,18 +55,9 @@
 
 SbxAppData* GetSbxData_Impl()
 {
-#ifndef DOS
-	SbxAppData** ppData = (SbxAppData**) ::GetAppData( SHL_SBX );
-	SbxAppData* p = *ppData;
-	if( !p )
-		p = *ppData  = new SbxAppData;
-	return p;
-#else
-	SbxAppData** ppData;
-	SbxAppData* p;
-	p = *ppData  = new SbxAppData;
-	return p;
-#endif
+    DBG_TESTSOLARMUTEX();
+    static SbxAppData* pAppData = new SbxAppData;
+    return pAppData;
 }
 
 SbxAppData::~SbxAppData()