diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 67f442f..48478cc 100644
--- UnoControls/source/base/multiplexer.cxx
+++ UnoControls/source/base/multiplexer.cxx
@@ -44,8 +44,8 @@
 //	includes of other projects
 //____________________________________________________________________________________________________________
 
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 
 //____________________________________________________________________________________________________________
@@ -551,7 +551,7 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer(	const	Reference< XWindow
 	}
 	else
 	{
-		VOS_ENSHURE( sal_False, "unknown listener" );
+		OSL_ENSURE( sal_False, "unknown listener" );
 	}
 }
 
@@ -583,7 +583,7 @@ void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer(	const	Reference< XWin
 	}
 	else
 	{
-		VOS_ENSHURE( sal_False, "unknown listener" );
+		OSL_ENSURE( sal_False, "unknown listener" );
 	}
 }
 
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 257c1e1..9dcfd3d 100644
--- UnoControls/source/controls/framecontrol.cxx
+++ UnoControls/source/controls/framecontrol.cxx
@@ -74,8 +74,8 @@
 #include <cppuhelper/typeprovider.hxx>
 #endif
 
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 
 //______________________________________________________________________________________________________________
@@ -410,7 +410,7 @@ void FrameControl::setFastPropertyValue_NoBroadcast(			sal_Int32	nHandle	,
 		case PROPERTYHANDLE_LOADERARGUMENTS		:		rValue >>= m_seqLoaderArguments ;
 														break ;
 
-		default	:										VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+		default	:										OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
 	}
 }
 
@@ -434,7 +434,7 @@ void FrameControl::getFastPropertyValue(	Any&		rRet	,
 		case PROPERTYHANDLE_FRAME			:		rRet <<= m_xFrame ;
 							   						break ;
 
-		default	:			                        VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+		default	:			                        OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
 	}
 }
 
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index dc841a6..ca62d59 100644
--- basic/inc/pch/precompiled_basic.hxx
+++ basic/inc/pch/precompiled_basic.hxx
@@ -283,7 +283,7 @@
 #include "vcl/wintypes.hxx"
 #include "vcl/wrkwin.hxx"
 
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
 #include "vos/macros.hxx"
 #include "vos/mutex.hxx"
 
diff --git a/basic/source/app/jstest.cxx b/basic/source/app/jstest.cxx
index 53f2f86..4744fc4 100644
--- basic/source/app/jstest.cxx
+++ basic/source/app/jstest.cxx
@@ -143,7 +143,7 @@
 
 #include <basic/hilight.hxx>
 
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 #ifndef _VOS_NO_NAMESPACE
 using namespace vos;
@@ -881,7 +881,7 @@ void JSTestApp::TestHighlighter(HighlighterLanguage eLanguage)
 	if (!bSuccess)
 	{
 		printf("#### THE 1. TEST FAILED!!!!\n");
-		VOS_ENSHURE(FALSE, "#### THE 1. TEST FAILED!!!!");
+		OSL_ENSURE(FALSE, "#### THE 1. TEST FAILED!!!!");
 	}
 	else
 		printf("#### THE 1. SUCCEEDED!!!!\n");
@@ -906,7 +906,7 @@ void JSTestApp::TestHighlighter(HighlighterLanguage eLanguage)
 	if (!bSuccess)
 	{
 		printf("#### THE 2. TEST FAILED!!!!\n");
-		VOS_ENSHURE(FALSE, "#### THE 2. TEST FAILED!!!!");
+		OSL_ENSURE(FALSE, "#### THE 2. TEST FAILED!!!!");
 	}
 	else
 		printf("#### THE 2. SUCCEEDED!!!!\n");
@@ -927,7 +927,7 @@ void JSTestApp::TestHighlighter(HighlighterLanguage eLanguage)
 	if (!bSuccess)
 	{
 		printf("#### THE 3. TEST FAILED!!!!\n");
-		VOS_ENSHURE(FALSE, "#### THE 3. TEST FAILED!!!!");
+		OSL_ENSURE(FALSE, "#### THE 3. TEST FAILED!!!!");
 	}
 	else
 		printf("#### THE 3. SUCCEEDED!!!!\n");
@@ -947,7 +947,7 @@ void JSTestApp::TestHighlighter(HighlighterLanguage eLanguage)
 	if (!bSuccess)
 	{
 		printf("#### THE 4. TEST FAILED!!!!\n");
-		VOS_ENSHURE(FALSE, "#### THE 4. TEST FAILED!!!!");
+		OSL_ENSURE(FALSE, "#### THE 4. TEST FAILED!!!!");
 	}
 	else
 		printf("#### THE 4. SUCCEEDED!!!!\n");
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 2243bd6..1d5b579 100644
--- comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -45,8 +45,8 @@
 #ifndef _OSL_MUTEX_HXX_
 #include <osl/mutex.hxx>
 #endif
-#ifndef _VOS_DIAGNOSE_HXX_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _VOS_MACROS_HXX_
 #include <vos/macros.hxx>
@@ -155,25 +155,25 @@ struct AttacherIndex_Impl
 #if 0
 bool AttachedObject_Impl::operator<( const AttachedObject_Impl & r ) const
 {
-    VOS_ENSHURE( FALSE, "not implemented" );
+    OSL_ENSURE( FALSE, "not implemented" );
     return FALSE;
     return this < &r;
 }
 
 bool AttachedObject_Impl::operator==( const AttachedObject_Impl & r ) const
 {
-    VOS_ENSHURE( FALSE, "not implemented" );
+    OSL_ENSURE( FALSE, "not implemented" );
     return this == &r;
 }
 
 bool AttacherIndex_Impl::operator<( const AttacherIndex_Impl & r ) const
 {
-    VOS_ENSHURE( FALSE, "not implemented" );
+    OSL_ENSURE( FALSE, "not implemented" );
     return this < &r;
 }
 bool AttacherIndex_Impl::operator==( const AttacherIndex_Impl & r ) const
 {
-    VOS_ENSHURE( FALSE, "not implemented" );
+    OSL_ENSURE( FALSE, "not implemented" );
     return this == &r;
 }
 #endif
@@ -1072,7 +1072,7 @@ void SAL_CALL ImplEventAttacherManager::read(const Reference< XObjectInputStream
         // Ganze richtig sein. Sonst ist etwas voellig daneben gegangen.
         if( nRealLen > nLen || nVersion == 1 )
         {
-            VOS_ENSHURE( sal_False, "ImplEventAttacherManager::read(): Fatal Error, wrong object length" );
+            OSL_ENSURE( sal_False, "ImplEventAttacherManager::read(): Fatal Error, wrong object length" );
         }
         else
         {
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx
index 76cf2bb..2cef91a 100644
--- comphelper/source/xml/attributelist.cxx
+++ comphelper/source/xml/attributelist.cxx
@@ -39,8 +39,8 @@
 #ifndef _ATTRIBUTE_LIST_HXX
 #include <comphelper/attributelist.hxx>
 #endif
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 
 #include <vector>
@@ -155,7 +155,7 @@ void AttributeList::Clear()
 {
 	m_pImpl->vecAttribute.clear();
 
-	VOS_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!");
+	OSL_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!");
 }
 
 void AttributeList::RemoveAttribute( const OUString sName )
@@ -179,7 +179,7 @@ void AttributeList::SetAttributeList( const uno::Reference< ::com::sun::star::xm
 
 void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star::xml::sax::XAttributeList >  &r )
 {
-	VOS_ENSURE( r.is(), "r isn't!" );
+	OSL_ENSURE( r.is(), "r isn't!" );
 
 	sal_Int32 nMax = r->getLength();
 	sal_Int32 nTotalSize = m_pImpl->vecAttribute.size() + nMax;
@@ -192,7 +192,7 @@ void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star:
 			r->getValueByIndex( i )));
 	}
 
-	VOS_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()");
+	OSL_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()");
 }
 
 } // namespace comphelper
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index 871aa44..2af1582 100644
--- extensions/inc/pch/precompiled_extensions.hxx
+++ extensions/inc/pch/precompiled_extensions.hxx
@@ -544,7 +544,7 @@
 #include "vcl/fldunit.hxx"
 
 #include "vos/conditn.hxx"
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
 #include "vos/macros.hxx"
 #include "vos/module.hxx"
 #include "vos/mutex.hxx"
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index af1d1e4..9a16d8e 100644
--- extensions/source/ole/unoobjw.cxx
+++ extensions/source/ole/unoobjw.cxx
@@ -47,7 +47,7 @@
 #include <tools/postsys.h>
 
 
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <vos/refernce.hxx>
 #include <tools/debug.hxx>
 
diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx
index 771d74c..cee3b17 100644
--- extensions/source/plugin/base/multiplx.cxx
+++ extensions/source/plugin/base/multiplx.cxx
@@ -35,7 +35,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <plugin/multiplx.hxx>
 
 //	---------------------------------------------------------------------
@@ -114,7 +114,7 @@ void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::st
 	}
 	else
 	{
-		VOS_ENSHURE( sal_False, "unknown listener" );
+		OSL_ENSURE( sal_False, "unknown listener" );
 	}
 }
 
@@ -142,7 +142,7 @@ void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< ::com::sun
 	}
 	else
 	{
-		VOS_ENSHURE( sal_False, "unknown listener" );
+		OSL_ENSURE( sal_False, "unknown listener" );
 	}
 }
 
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index 9351b88..e778dce 100644
--- extensions/test/sax/testsax.cxx
+++ extensions/test/sax/testsax.cxx
@@ -43,7 +43,7 @@
 #include <rtl/wstring.hxx>
 #include <osl/time.h>
 //#include <vos/dynload.hxx>
-//#include <vos/diagnose.hxx>
+//#include <osl/diagnose.h>
 #include <usr/weak.hxx>
 #include <tools/string.hxx>
 #include <vos/conditn.hxx>
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index fc003e0..d41a255 100644
--- extensions/workben/pythonautotest.cxx
+++ extensions/workben/pythonautotest.cxx
@@ -42,7 +42,7 @@
 
 #include <rtl/ustring.hxx>
 #include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
 #include <usr/ustring.hxx>
diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx
index 15b4af3..73d466a 100644
--- extensions/workben/pythontest.cxx
+++ extensions/workben/pythontest.cxx
@@ -43,7 +43,7 @@
 
 #include <rtl/ustring.hxx>
 #include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
 #include <usr/ustring.hxx>
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 5fdbd19..607e4bd 100644
--- extensions/workben/testcomponent.cxx
+++ extensions/workben/testcomponent.cxx
@@ -50,7 +50,7 @@
 //#include <com/sun/star/registry/ stardiv/uno/repos/simplreg.hxx>
 
 #include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
 #include <usr/ustring.hxx>
diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx
index 03961de..0aed67a 100644
--- extensions/workben/testresource.cxx
+++ extensions/workben/testresource.cxx
@@ -41,7 +41,7 @@
 
 #include <rtl/ustring.hxx>
 #include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
 
@@ -86,14 +86,14 @@ void MyApp::Main()
 	Args.getArray()[0].setINT32( 1000 );
 
 	BOOL b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL();
-	VOS_ENSHURE( b, "hasString" );
+	OSL_ENSURE( b, "hasString" );
 
 	UString aStr = xResLoader->invoke( L"getString", Args, OutPos, OutArgs ).getString();
-	VOS_ENSHURE( aStr == L"Hello", "getString" );
+	OSL_ENSURE( aStr == L"Hello", "getString" );
 	
 	Args.getArray()[0].setINT32( 1001 );
 	b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL();
-	VOS_ENSHURE( !b, "!hasString" );
+	OSL_ENSURE( !b, "!hasString" );
 
 	xReg->revokeImplementation( aDllName, XSimpleRegistryRef() );
 }
diff --git a/filter/source/xsltdialog/attributelist.cxx b/filter/source/xsltdialog/attributelist.cxx
index 17e0c81..ca71fe8 100644
--- filter/source/xsltdialog/attributelist.cxx
+++ filter/source/xsltdialog/attributelist.cxx
@@ -39,8 +39,8 @@
 #ifndef _ATTRIBUTE_LIST_HXX
 #include "attributelist.hxx"
 #endif
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 
 #include <vector>
@@ -153,7 +153,7 @@ void AttributeList::Clear()
 {
 	m_pImpl->vecAttribute.clear();
 
-	VOS_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!");
+	OSL_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!");
 }
 
 void AttributeList::RemoveAttribute( const OUString sName )
@@ -177,7 +177,7 @@ void AttributeList::SetAttributeList( const uno::Reference< ::com::sun::star::xm
 
 void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star::xml::sax::XAttributeList >  &r )
 {
-	VOS_ENSURE( r.is(), "r isn't!" );
+	OSL_ENSURE( r.is(), "r isn't!" );
 
 	sal_Int32 nMax = r->getLength();
 	sal_Int32 nTotalSize = m_pImpl->vecAttribute.size() + nMax;
@@ -190,5 +190,5 @@ void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star:
 			r->getValueByIndex( i )));
 	}
 
-	VOS_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()");
+	OSL_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()");
 }
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 0db16b0..8afc0a7 100644
--- i18npool/source/localedata/saxparser.cxx
+++ i18npool/source/localedata/saxparser.cxx
@@ -55,7 +55,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
 
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 #include "LocaleNode.hxx"
 
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index d9fee8a..96eed44 100644
--- package/source/manifest/UnoRegister.cxx
+++ package/source/manifest/UnoRegister.cxx
@@ -48,8 +48,8 @@
 #ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #endif
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _ZIP_PACKAGE_HXX
 #include <ZipPackage.hxx>
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 30bf638..162ce3f 100644
--- package/source/zippackage/ZipPackage.cxx
+++ package/source/zippackage/ZipPackage.cxx
@@ -415,7 +415,7 @@ void ZipPackage::parseManifest()
 							bManifestParsed = sal_True;
 						}
 						else
-							VOS_ENSURE ( 0, "Couldn't get a ManifestReader!" ); // throw RuntimeException?
+							OSL_ENSURE ( 0, "Couldn't get a ManifestReader!" ); // throw RuntimeException?
 					}
 	
 					// now hide the manifest.xml file from user
@@ -1005,7 +1005,7 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
 	}
 	catch ( ::com::sun::star::io::IOException & r )
 	{
-		VOS_ENSURE( 0, "Error adding mimetype to the ZipOutputStream" );
+		OSL_ENSURE( 0, "Error adding mimetype to the ZipOutputStream" );
 		throw WrappedTargetException( 
 				OUString( RTL_CONSTASCII_USTRINGPARAM ( "Error adding mimetype to the ZipOutputStream!" ) ),
 				static_cast < OWeakObject * > ( this ), 
@@ -1163,7 +1163,7 @@ sal_Bool ZipPackage::writeFileIsTemp()
 			}
 			else
 			{
-				VOS_ENSURE ( 0, "Couldn't get a ManifestWriter!" );
+				OSL_ENSURE ( 0, "Couldn't get a ManifestWriter!" );
 				IOException aException;
 				throw WrappedTargetException( 
 						OUString( RTL_CONSTASCII_USTRINGPARAM ( "Couldn't get a ManifestWriter!" ) ),
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index 177addd..f3a56be 100644
--- package/source/zippackage/ZipPackageEntry.cxx
+++ package/source/zippackage/ZipPackageEntry.cxx
@@ -41,8 +41,8 @@
 #ifndef _COM_SUN_STAR_PACKAGE_ZIP_ZIPCONSTANTS_HPP_
 #include <com/sun/star/packages/zip/ZipConstants.hpp>
 #endif
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 
 #if defined( OSL_DEBUG )
@@ -104,7 +104,7 @@ void SAL_CALL ZipPackageEntry::setName( const OUString& aName )
 
 	const sal_Unicode *pChar = aName.getStr();
 	if(pChar == 0 || pChar != 0) {
-        VOS_ENSURE ( Impl_IsValidChar (pChar, static_cast < sal_Int16 > ( aName.getLength() ), sal_False), "Invalid character in new zip package entry name!");
+        OSL_ENSURE ( Impl_IsValidChar (pChar, static_cast < sal_Int16 > ( aName.getLength() ), sal_False), "Invalid character in new zip package entry name!");
     }
 	aEntry.sName = aName;
 
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 7c81527..af0b527 100644
--- package/source/zippackage/ZipPackageFolder.cxx
+++ package/source/zippackage/ZipPackageFolder.cxx
@@ -56,8 +56,8 @@
 #ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPCONSTANTS_HPP_
 #include <com/sun/star/packages/zip/ZipConstants.hpp>
 #endif
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _OSL_TIME_H_
 #include <osl/time.h>
@@ -317,12 +317,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
 		}
 		catch ( ZipException& )
 		{
-			VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+			OSL_ENSURE( 0, "Error writing ZipOutputStream" );
 			bWritingFailed = sal_True;
 		}
 		catch ( IOException& )
 		{
-			VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+			OSL_ENSURE( 0, "Error writing ZipOutputStream" );
 			bWritingFailed = sal_True;
 		}
 	}
@@ -409,7 +409,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
 
 				if ( !xStream.is() )
 				{
-					VOS_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+					OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
 					bWritingFailed = sal_True;
 					continue;
 				}
@@ -462,14 +462,14 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
     					}
     					else
     					{
-    						VOS_ENSURE( 0, "The package component requires that every stream either be FROM a package or it must support XSeekable!" );
+    						OSL_ENSURE( 0, "The package component requires that every stream either be FROM a package or it must support XSeekable!" );
     						continue;
 	    				}
 					}
 				}
 				catch ( Exception& )
 				{
-					VOS_ENSURE( 0, "The stream provided to the package component has problems!" );
+					OSL_ENSURE( 0, "The stream provided to the package component has problems!" );
 					bWritingFailed = sal_True;
 					continue;
 				}
@@ -539,7 +539,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
 					if ( !xStream.is() )
 					{
 						// Make sure that we actually _got_ a new one !
-						VOS_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+						OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
 						continue;
 					}
 				}
@@ -567,12 +567,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
 				}
 				catch ( ZipException& )
 				{
-					VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+					OSL_ENSURE( 0, "Error writing ZipOutputStream" );
 					bWritingFailed = sal_True;
 				}
 				catch ( IOException& )
 				{
-					VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+					OSL_ENSURE( 0, "Error writing ZipOutputStream" );
 					bWritingFailed = sal_True;
 				}
 			}
@@ -594,7 +594,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
 					if ( !xStream.is() )
 					{
 						// Make sure that we actually _got_ a new one !
-						VOS_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+						OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
 						continue;
 					}
 				}
@@ -624,12 +624,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
 				}
 				catch ( ZipException& )
 				{
-					VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+					OSL_ENSURE( 0, "Error writing ZipOutputStream" );
 					bWritingFailed = sal_True;
 				}
 				catch ( IOException& )
 				{
-					VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+					OSL_ENSURE( 0, "Error writing ZipOutputStream" );
 					bWritingFailed = sal_True;
 				}
 
@@ -709,7 +709,7 @@ void ZipPackageFolder::releaseUpwardRef( void )
 	}
 	clearParent();
 
-	VOS_ENSURE ( m_refCount == 1, "Ref-count is not 1!" );
+	OSL_ENSURE ( m_refCount == 1, "Ref-count is not 1!" );
 #endif
 }
 
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 91442c2..cdbcbd8 100644
--- package/source/zippackage/ZipPackageStream.cxx
+++ package/source/zippackage/ZipPackageStream.cxx
@@ -74,8 +74,8 @@
 #include <EncryptedDataHeader.hxx>
 #endif
 
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 
 #ifndef _WRAPSTREAMFORSHARE_HXX_
@@ -453,12 +453,12 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
 	}
 	catch (ZipException &)//rException)
 	{
-		VOS_ENSURE( 0, "ZipException thrown");//rException.Message);
+		OSL_ENSURE( 0, "ZipException thrown");//rException.Message);
 		return Reference < io::XInputStream > ();
 	}
 	catch (Exception &)
 	{
-		VOS_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
+		OSL_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
 		return Reference < io::XInputStream > ();
 	}
 }
@@ -486,12 +486,12 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream(  )
 	}
 	catch (ZipException &)//rException)
 	{
-		VOS_ENSURE( 0,"ZipException thrown");//rException.Message);
+		OSL_ENSURE( 0,"ZipException thrown");//rException.Message);
 		return Reference < io::XInputStream > ();
 	}
 	catch (Exception &)
 	{
-		VOS_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
+		OSL_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
 		return Reference < io::XInputStream > ();
 	}
 }
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 921b5a1..9d73d6e 100644
--- sax/test/saxdemo.cxx
+++ sax/test/saxdemo.cxx
@@ -59,7 +59,7 @@
 #include <cppuhelper/implbase3.hxx>
 
 #include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::rtl;
 using namespace ::std;
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index 525e1af..1fa63f3 100644
--- sax/test/testcomponent.cxx
+++ sax/test/testcomponent.cxx
@@ -50,7 +50,7 @@
 #include <cppuhelper/servicefactory.hxx>
 
 #include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::rtl;
 using namespace ::cppu;
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 39199ec..7563732 100644
--- sd/inc/pch/precompiled_sd.hxx
+++ sd/inc/pch/precompiled_sd.hxx
@@ -918,7 +918,7 @@
 #include "vcl/wintypes.hxx"
 #include "vcl/wrkwin.hxx"
 
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
 #include "vos/module.hxx"
 #include "vos/mutex.hxx"
 #include "vos/thread.hxx"
diff --git a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
index cbd711c..ac50236 100644
--- sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
+++ sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
@@ -38,7 +38,7 @@
 
 #include "taskpane/TaskPaneControlFactory.hxx"
 
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 namespace sd { namespace toolpanel {
 
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 1a8eb44..1016400 100644
--- sfx2/inc/pch/precompiled_sfx2.hxx
+++ sfx2/inc/pch/precompiled_sfx2.hxx
@@ -670,7 +670,7 @@
 #include "vcl/timer.hxx"
 #include "vcl/unohelp.hxx"
 #include "vcl/wintypes.hxx"
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
 #include "vos/module.hxx"
 #include "vos/mutex.hxx"
 #include "vos/security.hxx"
diff --git a/sfx2/source/doc/attributelist.cxx b/sfx2/source/doc/attributelist.cxx
index 0ac39f6..35ca5a2 100644
--- sfx2/source/doc/attributelist.cxx
+++ sfx2/source/doc/attributelist.cxx
@@ -41,8 +41,8 @@
 #ifndef _ATTRIBUTE_LIST_HXX
 #include <attributelist.hxx>
 #endif
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 
 #include <vector>
@@ -155,7 +155,7 @@ void AttributeList::Clear()
 {
 	m_pImpl->vecAttribute.clear();
 
-	VOS_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!");
+	OSL_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!");
 }
 
 void AttributeList::RemoveAttribute( const OUString sName )
@@ -179,7 +179,7 @@ void AttributeList::SetAttributeList( const uno::Reference< ::com::sun::star::xm
 
 void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star::xml::sax::XAttributeList >  &r )
 {
-	VOS_ENSURE( r.is(), "r isn't!" );
+	OSL_ENSURE( r.is(), "r isn't!" );
 
 	sal_Int32 nMax = r->getLength();
 	sal_Int32 nTotalSize = m_pImpl->vecAttribute.size() + nMax;
@@ -192,6 +192,6 @@ void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star:
 			r->getValueByIndex( i )));
 	}
 
-	VOS_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()");
+	OSL_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()");
 }
 
diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx
index 846d0dc..64ee0aa 100644
--- ucb/inc/pch/precompiled_ucb.hxx
+++ ucb/inc/pch/precompiled_ucb.hxx
@@ -182,7 +182,7 @@
 #include "ucbhelper/macros.hxx"
 #include "ucbhelper/proxydecider.hxx"
 
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
 #include "vos/mutex.hxx"
 #include "vos/ref.hxx"
 #include "vos/refernce.hxx"
diff --git a/vos/inc/vos/diagnose.hxx b/vos/inc/vos/diagnose.hxx
deleted file mode 100644
index 75e57b5..0000000
--- vos/inc/vos/diagnose.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: diagnose.hxx,v $
- *
- *  $Revision: 1.4 $
- *
- *  last change: $Author: hr $ $Date: 2006/06/20 04:05:07 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
- *
- *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
- *
- ************************************************************************/
-
-
-#ifndef _VOS_DIAGNOSE_H_
-#define _VOS_DIAGNOSE_H_
-
-
-#ifndef _OSL_DIAGNOSE_H_
-	#include <osl/diagnose.h>
-#endif
-
-
-/*
-	Diagnostic support
-*/
-
-#define VOS_THIS_FILE       __FILE__
-
-#define VOS_DEBUG_ONLY(s)	_OSL_DEBUG_ONLY(s)
-#define VOS_TRACE           _OSL_TRACE
-#define VOS_ASSERT(c) 	    _OSL_ASSERT(c, VOS_THIS_FILE, __LINE__)
-#define VOS_VERIFY(c)		OSL_VERIFY(c)
-#define VOS_ENSHURE(c, m)   _OSL_ENSURE(c, VOS_THIS_FILE, __LINE__, m)
-#define VOS_ENSURE(c, m)    _OSL_ENSURE(c, VOS_THIS_FILE, __LINE__, m)
-
-#define VOS_PRECOND(c, m)  	VOS_ENSHURE(c, m)
-#define VOS_POSTCOND(c, m) 	VOS_ENSHURE(c, m)
-
-#endif /* _VOS_DIAGNOSE_H_ */
-
-
diff --git a/vos/inc/vos/ref.hxx b/vos/inc/vos/ref.hxx
index 5403eb6..3a0a203 100644
--- vos/inc/vos/ref.hxx
+++ vos/inc/vos/ref.hxx
@@ -50,8 +50,8 @@
 #ifndef _VOS_REFERNCE_HXX_
 #	include <vos/refernce.hxx>
 #endif
-#ifndef _VOS_DIAGNOSE_HXX_
-#	include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#	include <osl/diagnose.h>
 #endif
 
 namespace vos
diff --git a/vos/inc/vos/ref.inl b/vos/inc/vos/ref.inl
index 6540458..5116be5 100644
--- vos/inc/vos/ref.inl
+++ vos/inc/vos/ref.inl
@@ -117,28 +117,28 @@ inline void ORef<T>::operator= (T* pBody)
 template <class T>
 inline T& ORef<T>::operator() () const
 {
-	VOS_PRECOND(m_refBody, "ORef::operator(): can't deref nil body!");
+	OSL_PRECOND(m_refBody, "ORef::operator(): can't deref nil body!");
 	return *m_refBody;
 }
 
 template <class T>
 inline T& ORef<T>::operator* () const 
 {
-	VOS_PRECOND(m_refBody, "ORef::operator*: can't deref nil body!");
+	OSL_PRECOND(m_refBody, "ORef::operator*: can't deref nil body!");
 	return *m_refBody;
 }
 
 template <class T>
 inline T* ORef<T>::operator->() const 
 {
-	VOS_PRECOND(m_refBody, "ORef::operator->: nil body!");
+	OSL_PRECOND(m_refBody, "ORef::operator->: nil body!");
 	return m_refBody;
 }
 
 template <class T>
 inline T& ORef<T>::getBody() const
 {
-	VOS_PRECOND(m_refBody, "ORef::getBody(): can't deref nil body!");
+	OSL_PRECOND(m_refBody, "ORef::getBody(): can't deref nil body!");
 	return *m_refBody;
 }
 
diff --git a/vos/inc/vos/refobj.hxx b/vos/inc/vos/refobj.hxx
index b6d5a4d..af39b02 100644
--- vos/inc/vos/refobj.hxx
+++ vos/inc/vos/refobj.hxx
@@ -47,8 +47,8 @@
 #ifndef _VOS_REFERNCE_HXX_
 #	include <vos/refernce.hxx>
 #endif
-#ifndef _VOS_DIAGNOSE_HXX_
-#	include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#	include <osl/diagnose.h>
 #endif
 
 namespace vos
diff --git a/vos/inc/vos/refobj.inl b/vos/inc/vos/refobj.inl
index 0e6dc03..77fc062 100644
--- vos/inc/vos/refobj.inl
+++ vos/inc/vos/refobj.inl
@@ -45,7 +45,7 @@ ORefObj<T>::ORefObj(const T& Obj)
 template <class T>
 inline ORefObj<T>::~ORefObj()
 {
-	VOS_ASSERT(m_RefCount.referenced() == 0);
+	OSL_ASSERT(m_RefCount.referenced() == 0);
 }
 
 template <class T>
diff --git a/vos/source/conditn.cxx b/vos/source/conditn.cxx
index 0b14e7a..828f3e9 100644
--- vos/source/conditn.cxx
+++ vos/source/conditn.cxx
@@ -37,7 +37,7 @@
 #include <osl/time.h>
 #endif
 #include <vos/conditn.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 using namespace vos;
 
diff --git a/vos/source/module.cxx b/vos/source/module.cxx
index 8c4d55c..2da53f8 100644
--- vos/source/module.cxx
+++ vos/source/module.cxx
@@ -35,7 +35,7 @@
 
 
 #include <vos/module.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 using namespace vos;
 
@@ -63,7 +63,7 @@ OModule::~OModule()
 
 sal_Bool OModule::load(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode)
 {
-    VOS_ASSERT(ustrModuleName);
+    OSL_ASSERT(ustrModuleName);
     
     unload();
     
@@ -88,8 +88,8 @@ sal_Bool OModule::isLoaded()
 
 void *OModule::getSymbol(const rtl::OUString& strSymbolName)
 {
-    VOS_ASSERT(strSymbolName);
-    VOS_ASSERT(m_Module);
+    OSL_ASSERT(strSymbolName);
+    OSL_ASSERT(m_Module);
 	return ( osl_getSymbol( m_Module, strSymbolName.pData ) );
 }
 
diff --git a/vos/source/mutex.cxx b/vos/source/mutex.cxx
index 76d186c..b426fec 100644
--- vos/source/mutex.cxx
+++ vos/source/mutex.cxx
@@ -33,7 +33,7 @@
  *
  ************************************************************************/
 
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <vos/object.hxx>
 #include <vos/mutex.hxx>
 
diff --git a/vos/source/object.cxx b/vos/source/object.cxx
index 642d927..05a8ec9 100644
--- vos/source/object.cxx
+++ vos/source/object.cxx
@@ -38,7 +38,7 @@
 #include <rtl/alloc.h>
 #include <rtl/memory.h>
 
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 #include <vos/object.hxx>
 
@@ -65,7 +65,7 @@ void* OObject::operator new(size_t size)
 {
    void* p = rtl_allocateMemory(size);
 
-   VOS_ASSERT(p != NULL);
+   OSL_ASSERT(p != NULL);
 
    return (p);
 }
@@ -92,7 +92,7 @@ const OClassInfo& OObject::getClassInfo() const
 
 sal_Bool OObject::isKindOf(const OClassInfo& rClass) const
 {
-    VOS_ASSERT(this != NULL);
+    OSL_ASSERT(this != NULL);
 
     const OClassInfo& rClassThis = getClassInfo();
 
@@ -129,7 +129,7 @@ OObject* OClassInfo::createObject(const OCreateParam& rParam) const
 
 sal_Bool OClassInfo::isDerivedFrom(const OClassInfo& rClass) const
 {
-	VOS_ASSERT(this != NULL);
+	OSL_ASSERT(this != NULL);
 
 	const OClassInfo* pClassThis = this;
 
@@ -146,7 +146,7 @@ sal_Bool OClassInfo::isDerivedFrom(const OClassInfo& rClass) const
 
 const OClassInfo* OClassInfo::getClassInfo(const sal_Char* pClassName)
 {
-	VOS_ASSERT(pClassName != NULL);
+	OSL_ASSERT(pClassName != NULL);
 
 	const OClassInfo* pClass = &VOS_CLASSINFO(VOS_NAMESPACE(OObject, vos));
 	
@@ -163,7 +163,7 @@ const OClassInfo* OClassInfo::getClassInfo(const sal_Char* pClassName)
 
 VOS_CLASSINIT::VOS_CLASSINIT(register OClassInfo* pNewClass)
 {
-	VOS_ASSERT(pNewClass != NULL);
+	OSL_ASSERT(pNewClass != NULL);
 
 	OClassInfo* pClassRoot = (OClassInfo*)&VOS_CLASSINFO(VOS_NAMESPACE(OObject, vos));
 	
diff --git a/vos/source/pipe.cxx b/vos/source/pipe.cxx
index f4d4de4..0db2016 100644
--- vos/source/pipe.cxx
+++ vos/source/pipe.cxx
@@ -35,7 +35,7 @@
 
 
 #include <vos/pipe.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 using namespace vos;
 
@@ -66,8 +66,8 @@ OPipe::OPipe( const rtl::OUString& strName, TPipeOption Options)
 									(oslPipeOptions)Options, 
 									NULL) );
 	
-	VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
-	VOS_POSTCOND((*m_pPipeRef)(), "OPipe(): creation of pipe failed!\n");
+	OSL_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
+	OSL_POSTCOND((*m_pPipeRef)(), "OPipe(): creation of pipe failed!\n");
 }
 
 /*****************************************************************************/
@@ -83,8 +83,8 @@ OPipe::OPipe( const rtl::OUString& strName,
 								   (oslPipeOptions)Options, 
 								   (oslSecurity)rSecurity));
 	
-	VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
-	VOS_POSTCOND((*m_pPipeRef)(), "OPipe(): creation of pipe failed!\n");
+	OSL_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
+	OSL_POSTCOND((*m_pPipeRef)(), "OPipe(): creation of pipe failed!\n");
 }
 
 /*****************************************************************************/
@@ -94,7 +94,7 @@ OPipe::OPipe(const OPipe& pipe) :
 OReference(), OObject()
 {
 	
-	VOS_ASSERT(pipe.m_pPipeRef != 0);
+	OSL_ASSERT(pipe.m_pPipeRef != 0);
 
 	m_pPipeRef= pipe.m_pPipeRef;
 
@@ -136,7 +136,7 @@ sal_Bool OPipe::create( const rtl::OUString& strName, TPipeOption Options )
 								   (oslPipeOptions)Options, 
 								   NULL));
 
-	VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
+	OSL_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
 
 	return (*m_pPipeRef)() != 0;
 }
@@ -161,7 +161,7 @@ sal_Bool OPipe::create( const rtl::OUString& strName,
 								   (oslPipeOptions)Options, 
 								   (oslSecurity)rSecurity));
 
-	VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
+	OSL_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
 
 	return (*m_pPipeRef)() != 0;
 }
@@ -171,7 +171,7 @@ sal_Bool OPipe::create( const rtl::OUString& strName,
 /*****************************************************************************/
 OPipe& OPipe::operator= (const OPipe& pipe)
 {
-	VOS_PRECOND(pipe.m_pPipeRef != 0, "OPipe::operator=: tried to assign an empty/invalid pipe\n");
+	OSL_PRECOND(pipe.m_pPipeRef != 0, "OPipe::operator=: tried to assign an empty/invalid pipe\n");
 
 	if (m_pPipeRef == pipe.m_pPipeRef)
 		return *this;
@@ -196,7 +196,7 @@ OPipe& OPipe::operator= (const OPipe& pipe)
 /*****************************************************************************/
 OPipe::operator oslPipe() const
 {
-	VOS_ASSERT(m_pPipeRef);
+	OSL_ASSERT(m_pPipeRef);
 	return (*m_pPipeRef)();
 }
 
@@ -306,7 +306,7 @@ OStreamPipe::OStreamPipe(oslPipe Pipe) :
 OStreamPipe::OStreamPipe(const OStreamPipe& pipe) :
 OPipe(), IStream()
 {
-	VOS_ASSERT(pipe.m_pPipeRef != 0);
+	OSL_ASSERT(pipe.m_pPipeRef != 0);
 
 	m_pPipeRef= pipe.m_pPipeRef;
 
@@ -336,7 +336,7 @@ OStreamPipe& OStreamPipe::operator=(oslPipe Pipe)
 
 	m_pPipeRef= new PipeRef(Pipe);
 
-	VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
+	OSL_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
 
 	return *this;
 }
@@ -356,7 +356,7 @@ OStreamPipe& OStreamPipe::operator= (const OPipe& pipe)
 /*****************************************************************************/
 sal_Int32 OStreamPipe::read(void* pBuffer, sal_uInt32 n) const
 {
-	VOS_ASSERT(m_pPipeRef && (*m_pPipeRef)());
+	OSL_ASSERT(m_pPipeRef && (*m_pPipeRef)());
 
 	/* loop until all desired bytes were read or an error occured */
 	sal_Int32 BytesRead= 0;
@@ -387,7 +387,7 @@ sal_Int32 OStreamPipe::read(void* pBuffer, sal_uInt32 n) const
 /*****************************************************************************/
 sal_Int32 OStreamPipe::write(const void* pBuffer, sal_uInt32 n)
 {
-	VOS_ASSERT(m_pPipeRef && (*m_pPipeRef)());
+	OSL_ASSERT(m_pPipeRef && (*m_pPipeRef)());
 
 	/* loop until all desired bytes were send or an error occured */
 	sal_Int32 BytesSend= 0;
diff --git a/vos/source/process.cxx b/vos/source/process.cxx
index a616532..227ce63 100644
--- vos/source/process.cxx
+++ vos/source/process.cxx
@@ -42,7 +42,7 @@
 #endif
 
 #include "vos/process.hxx"
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
 #include <osl/file.hxx>
 
 #define MAX_RESOURCES	100
diff --git a/vos/source/refernce.cxx b/vos/source/refernce.cxx
index 28a081a..8f06992 100644
--- vos/source/refernce.cxx
+++ vos/source/refernce.cxx
@@ -35,7 +35,7 @@
 
 
 #include <limits.h>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 #include <vos/refernce.hxx>
 
@@ -53,7 +53,7 @@ OReference::OReference()
 
 OReference::~OReference() 
 {
-	VOS_ASSERT(m_RefCount.referenced() == 0);
+	OSL_ASSERT(m_RefCount.referenced() == 0);
 }
 
 IReference::RefCount OReference::acquire() 
diff --git a/vos/source/security.cxx b/vos/source/security.cxx
index eeaf046..cb33330 100644
--- vos/source/security.cxx
+++ vos/source/security.cxx
@@ -35,7 +35,7 @@
 
 
 #include <vos/security.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 using namespace vos;
 
@@ -81,7 +81,7 @@ sal_Bool OSecurity::logonUser( const rtl::OUString& strName,
 
 sal_Bool OSecurity::getUserIdent( rtl::OUString& strIdent) const
 {
-	VOS_ASSERT(m_oslSecurity);
+	OSL_ASSERT(m_oslSecurity);
 	
     return osl_getUserIdent( m_oslSecurity, &strIdent.pData );
 }
@@ -89,7 +89,7 @@ sal_Bool OSecurity::getUserIdent( rtl::OUString& strIdent) const
 
 sal_Bool OSecurity::getUserName( rtl::OUString& strName ) const
 {
-	VOS_ASSERT(m_oslSecurity);
+	OSL_ASSERT(m_oslSecurity);
 
     return osl_getUserName( m_oslSecurity, &strName.pData );
 }
@@ -97,7 +97,7 @@ sal_Bool OSecurity::getUserName( rtl::OUString& strName ) const
 
 sal_Bool OSecurity::getHomeDir( rtl::OUString& strDirectory) const
 {
-	VOS_ASSERT(m_oslSecurity);
+	OSL_ASSERT(m_oslSecurity);
 	
     return osl_getHomeDir(m_oslSecurity, &strDirectory.pData );
 }
@@ -105,14 +105,14 @@ sal_Bool OSecurity::getHomeDir( rtl::OUString& strDirectory) const
 
 sal_Bool OSecurity::getConfigDir( rtl::OUString& strDirectory ) const
 {
-	VOS_ASSERT(m_oslSecurity);
+	OSL_ASSERT(m_oslSecurity);
 	
     return osl_getConfigDir( m_oslSecurity, &strDirectory.pData );
 }
 
 sal_Bool OSecurity::isAdministrator() const
 {
-	VOS_ASSERT(m_oslSecurity);
+	OSL_ASSERT(m_oslSecurity);
 
     return osl_isAdministrator(m_oslSecurity);
 }
diff --git a/vos/source/signal.cxx b/vos/source/signal.cxx
index 7f6c7ad..a0f8f57 100644
--- vos/source/signal.cxx
+++ vos/source/signal.cxx
@@ -34,7 +34,7 @@
  ************************************************************************/
 
 
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <vos/object.hxx>
 #include <vos/signal.hxx>
 
diff --git a/vos/source/socket.cxx b/vos/source/socket.cxx
index 20edc40..5c25093 100644
--- vos/source/socket.cxx
+++ vos/source/socket.cxx
@@ -41,7 +41,7 @@
 #include <osl/time.h>
 #endif
 #include <vos/socket.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 //#include <osl/tools.h>
 
 using namespace vos;
@@ -183,7 +183,7 @@ OInetSocketAddr::OInetSocketAddr()
 OInetSocketAddr::OInetSocketAddr(oslSocketAddr Addr) :
 	OSocketAddr(Addr)
 {
-	VOS_ASSERT(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyInet);
+	OSL_ASSERT(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyInet);
 }
 
 /*****************************************************************************/
@@ -205,7 +205,7 @@ OInetSocketAddr::OInetSocketAddr(const rtl::OUString& ustrAddrOrHostname, sal_In
 		if(m_SockAddr)
 		{
 			// set port will fail if addrtype is not osl_Socket_FamilyInet
-			VOS_VERIFY(osl_setInetPortOfSocketAddr(m_SockAddr, Port));
+			OSL_VERIFY(osl_setInetPortOfSocketAddr(m_SockAddr, Port));
 		}
 	}
 }
@@ -216,7 +216,7 @@ OInetSocketAddr::OInetSocketAddr(const rtl::OUString& ustrAddrOrHostname, sal_In
 OInetSocketAddr::OInetSocketAddr(const OInetSocketAddr& sa) :
 	OSocketAddr(sa)
 {
-	VOS_ASSERT(getFamily() == TFamily_Inet);
+	OSL_ASSERT(getFamily() == TFamily_Inet);
 }   
 
 /*****************************************************************************/
@@ -225,7 +225,7 @@ OInetSocketAddr::OInetSocketAddr(const OInetSocketAddr& sa) :
 OInetSocketAddr::OInetSocketAddr(const OSocketAddr& sa) :
 	OSocketAddr(sa)
 {
-	VOS_ASSERT(sa.getFamily() == TFamily_Inet);
+	OSL_ASSERT(sa.getFamily() == TFamily_Inet);
 }   
 
 /*****************************************************************************/
@@ -240,7 +240,7 @@ OInetSocketAddr::~OInetSocketAddr()
 /*****************************************************************************/
 void OInetSocketAddr::operator= (oslSocketAddr Addr)
 {
-	VOS_PRECOND(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyInet, 
+	OSL_PRECOND(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyInet, 
 				"oslSocketAddr not of type osl_Socket_FamilyInet!");
 
 	OSocketAddr::operator=(Addr);
@@ -259,7 +259,7 @@ sal_Bool OInetSocketAddr::operator== (oslSocketAddr Addr)
 /*****************************************************************************/
 OInetSocketAddr& OInetSocketAddr::operator=(const OInetSocketAddr& Addr)
 {
-	VOS_ASSERT(Addr.getFamily() == TFamily_Inet);
+	OSL_ASSERT(Addr.getFamily() == TFamily_Inet);
 
 	OSocketAddr::operator=(Addr);
 
@@ -271,7 +271,7 @@ OInetSocketAddr& OInetSocketAddr::operator=(const OInetSocketAddr& Addr)
 /*****************************************************************************/
 OInetSocketAddr& OInetSocketAddr::operator=(const OSocketAddr& Addr)
 {
-	VOS_ASSERT(Addr.getFamily() == TFamily_Inet);
+	OSL_ASSERT(Addr.getFamily() == TFamily_Inet);
 
 	OSocketAddr::operator=(Addr);
 
@@ -347,7 +347,7 @@ sal_Bool OInetSocketAddr::setAddr(const rtl::OUString& ustrAddrOrHostname)
 		}
 
 		// set port will fail if addrtype is not osl_Socket_FamilyInet
-		VOS_VERIFY(osl_setInetPortOfSocketAddr(m_SockAddr, Port));
+		OSL_VERIFY(osl_setInetPortOfSocketAddr(m_SockAddr, Port));
 
 	}
 
@@ -376,7 +376,7 @@ OIpxSocketAddr::OIpxSocketAddr()
 OIpxSocketAddr::OIpxSocketAddr(oslSocketAddr Addr) :
 	OSocketAddr(Addr)
 {
-	VOS_ASSERT(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyIpx);
+	OSL_ASSERT(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyIpx);
 }
 
 /*****************************************************************************/
@@ -395,7 +395,7 @@ OIpxSocketAddr::OIpxSocketAddr(const rtl::OUString&,
 OIpxSocketAddr::OIpxSocketAddr(const OIpxSocketAddr& sa) :
 	OSocketAddr(sa)
 {
-	VOS_ASSERT(sa.getFamily() == TFamily_Ipx);
+	OSL_ASSERT(sa.getFamily() == TFamily_Ipx);
 }
 
 
@@ -405,7 +405,7 @@ OIpxSocketAddr::OIpxSocketAddr(const OIpxSocketAddr& sa) :
 OIpxSocketAddr::OIpxSocketAddr(const OSocketAddr& sa) :
 	OSocketAddr(sa)
 {
-	VOS_ASSERT(sa.getFamily() == TFamily_Ipx);
+	OSL_ASSERT(sa.getFamily() == TFamily_Ipx);
 }
 
 /*****************************************************************************/
@@ -421,7 +421,7 @@ OIpxSocketAddr::~OIpxSocketAddr()
 /*****************************************************************************/
 void OIpxSocketAddr::operator= (oslSocketAddr Addr)
 {
-	VOS_PRECOND(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyIpx, 
+	OSL_PRECOND(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyIpx, 
 			"oslSocketAddr not of type osl_Socket_FamilyIpx!");
 
 	OSocketAddr::operator=(Addr);
@@ -440,7 +440,7 @@ sal_Bool OIpxSocketAddr::operator== (oslSocketAddr Addr)
 /*****************************************************************************/
 OIpxSocketAddr& OIpxSocketAddr::operator=(const OIpxSocketAddr& Addr)
 {
-	VOS_ASSERT(Addr.getFamily() == TFamily_Ipx);
+	OSL_ASSERT(Addr.getFamily() == TFamily_Ipx);
 
 	OSocketAddr::operator=(Addr);
 
@@ -452,7 +452,7 @@ OIpxSocketAddr& OIpxSocketAddr::operator=(const OIpxSocketAddr& Addr)
 /*****************************************************************************/
 OIpxSocketAddr& OIpxSocketAddr::operator=(const OSocketAddr& Addr)
 {
-	VOS_ASSERT(Addr.getFamily() == TFamily_Ipx);
+	OSL_ASSERT(Addr.getFamily() == TFamily_Ipx);
 
 	OSocketAddr::operator=(Addr);
 
@@ -532,8 +532,8 @@ OSocket::OSocket(TSocketType Type,
 									 (oslSocketType)Type, 
 									 (oslProtocol)Protocol));
 	
-	VOS_POSTCOND(m_pSockRef != 0, "OSocket(): new failed.\n");
-	VOS_POSTCOND((*m_pSockRef)(), "OSocket(): creation of socket failed!\n");
+	OSL_POSTCOND(m_pSockRef != 0, "OSocket(): new failed.\n");
+	OSL_POSTCOND((*m_pSockRef)(), "OSocket(): creation of socket failed!\n");
 }
 
 /*****************************************************************************/
@@ -546,7 +546,7 @@ ISocketTypes(), OReference(), OObject()
 	m_pSendTimeout = 0;
 	m_pSockRef=0;
     
-	VOS_ASSERT(sock.m_pSockRef != 0);
+	OSL_ASSERT(sock.m_pSockRef != 0);
 
     if ( sock.m_pSockRef !=0 )
     {    
@@ -603,7 +603,7 @@ sal_Bool OSocket::create(TSocketType Type,
 									 (oslSocketType)Type, 
 									 (oslProtocol)Protocol));
 
-	VOS_POSTCOND(m_pSockRef != 0, "OSocket(): new failed.\n");
+	OSL_POSTCOND(m_pSockRef != 0, "OSocket(): new failed.\n");
 
 	return (*m_pSockRef)() != 0;
 }
@@ -613,7 +613,7 @@ sal_Bool OSocket::create(TSocketType Type,
 /*****************************************************************************/
 OSocket& OSocket::operator= (const OSocket& sock)
 {
-	VOS_PRECOND(sock.m_pSockRef != 0, "OSocket::operator=: tried to assign an empty/invalid socket\n");
+	OSL_PRECOND(sock.m_pSockRef != 0, "OSocket::operator=: tried to assign an empty/invalid socket\n");
 
 	if (m_pSockRef == sock.m_pSockRef)
 		return *this;
@@ -641,7 +641,7 @@ OSocket& OSocket::operator= (const OSocket& sock)
 /*****************************************************************************/
 OSocket::operator oslSocket() const
 {
-	VOS_ASSERT(m_pSockRef);
+	OSL_ASSERT(m_pSockRef);
 	return (*m_pSockRef)();
 }
 
@@ -673,7 +673,7 @@ void OSocket::close()
 /*****************************************************************************/
 void OSocket::getLocalAddr(OSocketAddr& sa) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -686,7 +686,7 @@ void OSocket::getLocalAddr(OSocketAddr& sa) const
 /*****************************************************************************/
 sal_Int32 OSocket::getLocalPort() const 
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
 	sal_Int32 Port= OSL_INVALID_PORT;
 
@@ -709,7 +709,7 @@ sal_Int32 OSocket::getLocalPort() const
 /*****************************************************************************/
 OSocket::TResult OSocket::getLocalHost( rtl::OUString& pBuffer) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -736,7 +736,7 @@ OSocket::TResult OSocket::getLocalHost( rtl::OUString& pBuffer) const
 /*****************************************************************************/
 void OSocket::getPeerAddr(OSocketAddr& sa) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -749,7 +749,7 @@ void OSocket::getPeerAddr(OSocketAddr& sa) const
 /*****************************************************************************/
 sal_Int32 OSocket::getPeerPort() const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     sal_Int32 Port= OSL_INVALID_PORT;
     
@@ -772,7 +772,7 @@ sal_Int32 OSocket::getPeerPort() const
 /*****************************************************************************/
 OSocket::TResult OSocket::getPeerHost( rtl::OUString& pBuffer ) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {
@@ -799,7 +799,7 @@ OSocket::TResult OSocket::getPeerHost( rtl::OUString& pBuffer ) const
 /*****************************************************************************/
 sal_Bool OSocket::bind(const OSocketAddr& Addr)
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {
@@ -841,7 +841,7 @@ void OSocket::setRecvTimeout(const TimeValue* pTimeout)
 /*****************************************************************************/
 sal_Bool OSocket::isRecvReady(const TimeValue* pTimeout) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -856,7 +856,7 @@ sal_Bool OSocket::isRecvReady(const TimeValue* pTimeout) const
 /*****************************************************************************/
 sal_Bool OSocket::isSendReady(const TimeValue* pTimeout) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {
@@ -871,7 +871,7 @@ sal_Bool OSocket::isSendReady(const TimeValue* pTimeout) const
 /*****************************************************************************/
 sal_Bool OSocket::isExceptionPending(const TimeValue* pTimeout) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -890,7 +890,7 @@ sal_Int32 OSocket::getOption(TSocketOption Option,
 					       sal_uInt32 BufferLen,
 					       TSocketOptionLevel Level) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {
@@ -912,7 +912,7 @@ sal_Bool OSocket::setOption(TSocketOption Option,
 						   sal_uInt32 BufferLen,
 						   TSocketOptionLevel Level) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -932,7 +932,7 @@ sal_Bool OSocket::setOption(TSocketOption Option,
 /*****************************************************************************/
 sal_Bool OSocket::enableNonBlockingMode(sal_Bool On)
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -947,7 +947,7 @@ sal_Bool OSocket::enableNonBlockingMode(sal_Bool On)
 /*****************************************************************************/
 sal_Bool OSocket::isNonBlockingMode() const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -962,7 +962,7 @@ sal_Bool OSocket::isNonBlockingMode() const
 /*****************************************************************************/
 OSocket::TSocketType OSocket::getType() const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -1157,7 +1157,7 @@ sal_Int32 OSocket::setTcpNoDelay(sal_Int32 sz) const
 //void OSocket::getError(sal_Char* pBuffer, sal_uInt32 nSize) const
 void OSocket::getError( rtl::OUString& pBuffer ) const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());    
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());    
 
     if (m_pSockRef && (*m_pSockRef)())
 		osl_getLastSocketErrorDescription((*m_pSockRef)(), &pBuffer.pData );
@@ -1170,7 +1170,7 @@ void OSocket::getError( rtl::OUString& pBuffer ) const
 /*****************************************************************************/
 OSocket::TSocketError OSocket::getError() const
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());    
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());    
 
     if (m_pSockRef && (*m_pSockRef)())
 		return (TSocketError)osl_getLastSocketError((*m_pSockRef)());
@@ -1236,7 +1236,7 @@ void OAcceptorSocket::close()
 /*****************************************************************************/
 sal_Bool OAcceptorSocket::listen(sal_Int32 MaxPendingConnections)
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -1255,7 +1255,7 @@ OSocket::TResult OAcceptorSocket::acceptConnection(OStreamSocket& connection)
 	if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout)) 
 		return TResult_TimedOut;
 
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
     OStreamSocket aSocket;
     
     if ( m_pSockRef && (*m_pSockRef)() )
@@ -1287,7 +1287,7 @@ OSocket::TResult OAcceptorSocket::acceptConnection(OStreamSocket& connection,
 	if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout)) 
 		return TResult_TimedOut;
 
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -1420,7 +1420,7 @@ sal_Int32 OStreamSocket::read(void* pBuffer, sal_uInt32 n) const
 	if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout)) 
 		return 0;
 
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ! ( m_pSockRef && (*m_pSockRef)() ) )
     {
@@ -1467,7 +1467,7 @@ sal_Int32 OStreamSocket::write(const void* pBuffer, sal_uInt32 n)
 	if (m_pSendTimeout && ! isSendReady(m_pSendTimeout))
 		return 0;
 
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ! ( m_pSockRef && (*m_pSockRef)() ) )
     {
@@ -1520,7 +1520,7 @@ sal_Int32 OStreamSocket::recv(void* pBuffer,
 	if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout))
 		return 0;
 
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ! ( m_pSockRef && (*m_pSockRef)() ) )
     {
@@ -1543,7 +1543,7 @@ sal_Int32 OStreamSocket::send(const void* pBuffer,
 	if (m_pSendTimeout && ! isSendReady(m_pSendTimeout)) 
 		return 0;
 	
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ! ( m_pSockRef && (*m_pSockRef)() ) )
     {
@@ -1561,7 +1561,7 @@ sal_Int32 OStreamSocket::send(const void* pBuffer,
 /*****************************************************************************/
 sal_Bool OStreamSocket::shutdown(TSocketDirection Direction)
 {
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {
@@ -1611,7 +1611,7 @@ OSocket::TResult OConnectorSocket::connect(const OSocketAddr& Addr,
 										   const TimeValue* pTimeout)
 {
 	
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
     {    
@@ -1667,7 +1667,7 @@ sal_Int32 ODatagramSocket::recvFrom(void* pBuffer,
 	if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout)) 
 		return 0;
 
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ! ( m_pSockRef && (*m_pSockRef)() ) )
     {
@@ -1717,7 +1717,7 @@ sal_Int32 ODatagramSocket::sendTo(const OSocketAddr& ReceiverAddr,
 	if (m_pSendTimeout && ! isSendReady(m_pSendTimeout)) 
 		return 0;
 
-	VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+	OSL_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ( m_pSockRef && (*m_pSockRef)() ) )
     {
diff --git a/vos/source/thread.cxx b/vos/source/thread.cxx
index 2dd926a..a70ef36 100644
--- vos/source/thread.cxx
+++ vos/source/thread.cxx
@@ -36,7 +36,7 @@
 #ifndef _OSL_TIME_H_
 #include <osl/time.h>
 #endif
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <vos/object.hxx>
 #include <vos/thread.hxx>
 
@@ -86,7 +86,7 @@ OThread::~OThread()
 
 sal_Bool OThread::create() 
 {
-	VOS_ASSERT(m_hThread == 0);	// only one running thread per instance
+	OSL_ASSERT(m_hThread == 0);	// only one running thread per instance
 
     m_hThread = osl_createSuspendedThread(
         threadWorkerFunction_impl, (void*)this);
@@ -98,7 +98,7 @@ sal_Bool OThread::create()
 
 sal_Bool OThread::createSuspended() 
 {
-	VOS_ASSERT(m_hThread == 0);	// only one running thread per instance
+	OSL_ASSERT(m_hThread == 0);	// only one running thread per instance
 
 	m_hThread= osl_createSuspendedThread(threadWorkerFunction_impl, (void*)this);
 	return m_hThread != 0;
@@ -106,14 +106,14 @@ sal_Bool OThread::createSuspended()
 
 void OThread::suspend() 
 {
-	VOS_ASSERT(m_hThread != 0);	// use only on running thread
+	OSL_ASSERT(m_hThread != 0);	// use only on running thread
 
 	osl_suspendThread(m_hThread);
 }
 
 void OThread::resume() 
 {
-	VOS_ASSERT(m_hThread != 0);	// use only on running thread
+	OSL_ASSERT(m_hThread != 0);	// use only on running thread
 
 	osl_resumeThread(m_hThread);
 }
@@ -136,7 +136,7 @@ OThread::TThreadIdentifier OThread::getCurrentIdentifier()
 void OThread::join() 
 {
 	if (m_hThread) {
-		VOS_ASSERT(getCurrentIdentifier() != getIdentifier());
+		OSL_ASSERT(getCurrentIdentifier() != getIdentifier());
 		osl_joinWithThread(m_hThread);
 	}
 }
@@ -226,7 +226,7 @@ VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OThreadData, vos),
 OThreadData::OThreadData( oslThreadKeyCallbackFunction pCallback )
 {
     m_hKey = osl_createThreadKey( pCallback );
-	VOS_VERIFY(m_hKey);
+	OSL_VERIFY(m_hKey);
 }
 
 OThreadData::~OThreadData()
@@ -236,14 +236,14 @@ OThreadData::~OThreadData()
 
 sal_Bool OThreadData::setData(void *pData)
 {
-	VOS_ASSERT(m_hKey != 0);
+	OSL_ASSERT(m_hKey != 0);
 
 	return (osl_setThreadKeyData(m_hKey, pData));
 }
 
 void *OThreadData::getData()
 {
-	VOS_ASSERT(m_hKey != 0);
+	OSL_ASSERT(m_hKey != 0);
 
 	return (osl_getThreadKeyData(m_hKey));
 }
diff --git a/vos/source/timer.cxx b/vos/source/timer.cxx
index 5da24fe..38239ff 100644
--- vos/source/timer.cxx
+++ vos/source/timer.cxx
@@ -38,7 +38,7 @@
 #endif
 
 #include <vos/timer.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <vos/ref.hxx>
 #include <vos/thread.hxx>
 #include <vos/conditn.hxx>
@@ -157,7 +157,7 @@ void OTimer::start()
 
 		OTimerManager *pManager = OTimerManager::getTimerManager();
 
-		VOS_ASSERT(pManager);
+		OSL_ASSERT(pManager);
 
 		if ( pManager != 0 )
 		{
@@ -170,7 +170,7 @@ void OTimer::stop()
 {
 	OTimerManager *pManager = OTimerManager::getTimerManager();
 
-	VOS_ASSERT(pManager);
+	OSL_ASSERT(pManager);
 
 	if ( pManager != 0 )
 	{
@@ -182,7 +182,7 @@ sal_Bool OTimer::isTicking() const
 {
 	OTimerManager *pManager = OTimerManager::getTimerManager();
 
-	VOS_ASSERT(pManager);
+	OSL_ASSERT(pManager);
 
 	if (pManager)
 		return pManager->lookupTimer(this);
@@ -202,7 +202,7 @@ sal_Bool OTimer::isExpired() const
 
 sal_Bool OTimer::expiresBefore(const OTimer* pTimer) const
 {
-	VOS_ASSERT(pTimer);
+	OSL_ASSERT(pTimer);
 
 	if ( pTimer != 0 )
 	{
@@ -284,7 +284,7 @@ OTimerManager::OTimerManager()
 {
 	OGuard Guard(&m_Access);
 
-	VOS_ASSERT(m_pManager == 0);
+	OSL_ASSERT(m_pManager == 0);
 
 	m_pManager = this;
 
@@ -321,7 +321,7 @@ OTimerManager* OTimerManager::getTimerManager()
 
 sal_Bool OTimerManager::registerTimer(OTimer* pTimer)
 {
-	VOS_ASSERT(pTimer);
+	OSL_ASSERT(pTimer);
 
 	if ( pTimer == 0 )
 	{
@@ -362,7 +362,7 @@ sal_Bool OTimerManager::registerTimer(OTimer* pTimer)
 
 sal_Bool OTimerManager::unregisterTimer(OTimer* pTimer)
 {
-	VOS_ASSERT(pTimer);
+	OSL_ASSERT(pTimer);
 
 	if ( pTimer == 0 )
 	{
@@ -390,7 +390,7 @@ sal_Bool OTimerManager::unregisterTimer(OTimer* pTimer)
 
 sal_Bool OTimerManager::lookupTimer(const OTimer* pTimer) 
 {
-	VOS_ASSERT(pTimer);
+	OSL_ASSERT(pTimer);
 
 	if ( pTimer == 0 )
 	{
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 30c9c46..6430222 100644
--- xmlhelp/source/cxxhelp/provider/content.cxx
+++ xmlhelp/source/cxxhelp/provider/content.cxx
@@ -78,8 +78,8 @@
 #ifndef _COM_SUN_STAR_UCB_XPERSISTENTPROPERTYSET_HPP_
 #include <com/sun/star/ucb/XPersistentPropertySet.hpp>
 #endif
-#ifndef _VOS_DIAGNOSE_HXX_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
 #include <ucbhelper/contentidentifier.hxx>
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index fa1d811..bac0a44 100644
--- xmlhelp/source/cxxhelp/provider/databases.cxx
+++ xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -39,8 +39,8 @@
 #ifndef BERKELEYDBPROXY_DB_HXX_
 #include "db.hxx"
 #endif
-#ifndef _VOS_DIAGNOSE_HXX_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _OSL_THREAD_H_
 #include <osl/thread.h>
@@ -326,7 +326,7 @@ rtl::OUString Databases::getInstallPathAsSystemPath()
 		bool bla =
 			osl::FileBase::E_None ==
 			osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath );
-        VOS_ENSURE( bla,"HelpProvider, no installpath" );
+        OSL_ENSURE( bla,"HelpProvider, no installpath" );
 #else                    
         osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath );		
 #endif
@@ -899,7 +899,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
 			{
 				it->second = Reference< XHierarchicalNameAccess >( xIfc, UNO_QUERY );
 				
-				VOS_ENSURE( it->second.is(),
+				OSL_ENSURE( it->second.is(),
 							"ContentProvider::createPackage - "
 							"Got no hierarchical name access!" );
 				
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 0a192a4..527f1a5 100644
--- xmlhelp/source/cxxhelp/provider/provider.cxx
+++ xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -46,8 +46,8 @@
 #ifndef _OSL_FILE_HXX_
 #include <osl/file.hxx>
 #endif
-#ifndef _VOS_DIAGNOSE_HXX_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
 #include <ucbhelper/contentidentifier.hxx>
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 124f57a..92c6cd0 100644
--- xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -43,8 +43,8 @@
 #endif
 
 #include <string.h>
-#ifndef _VOS_DIAGNOSE_HXX_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _OSL_THREAD_H_
 #include <osl/thread.h>
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index ffad2ac..0e561d5 100644
--- xmlhelp/source/treeview/tvread.cxx
+++ xmlhelp/source/treeview/tvread.cxx
@@ -41,8 +41,8 @@
 #ifndef _RTL_USTRBUF_HXX_
 #include <rtl/ustrbuf.hxx>
 #endif
-#ifndef _VOS_DIAGNOSE_HXX_
-#include <vos/diagnose.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _TREEVIEW_TVREAD_HXX_
 #include "tvread.hxx"
