--- autodoc/source/tools/filecoll.cxx.~1.8.~	2005-09-07 21:12:43.000000000 +0200
+++ autodoc/source/tools/filecoll.cxx	2005-12-24 20:50:22.000000000 +0100
@@ -41,6 +41,9 @@
 #include <cosv/ploc_dir.hxx>
 
 
+#include <stdio.h>
+
+
 FileCollector::FileCollector( uintt i_nRoughNrOfFiles )
     // :    aFoundFiles
 {
--- sal/inc/internal/allocator.hxx.~1.4.~	2005-09-08 16:25:55.000000000 +0200
+++ sal/inc/internal/allocator.hxx	2005-12-24 21:09:16.000000000 +0100
@@ -175,7 +175,7 @@
 /* REQUIRED BY STLPort (see stlport '_alloc.h'): 
    Hack for compilers that do not support member 
    template classes (e.g. MSVC 6) */
-namespace _STL
+namespace stlp_std
 {
 	template<class T, class U>
 	inline sal::Allocator<U> & __stl_alloc_rebind (sal::Allocator<T> & a, U const *)