diff -aur openwbem-3.2.2.orig/configure openwbem-3.2.2.new/configure
--- openwbem-3.2.2.orig/configure	2006-10-20 01:08:04.000000000 +0200
+++ openwbem-3.2.2.new/configure	2009-08-15 17:52:06.000000000 +0200
@@ -6711,8 +6711,7 @@
 ostream.h \
 istream \
 istream.h \
-hash_map \
-ext/hash_map \
+backward/hash_map \
 cxxabi.h \
 
 do
diff -aur openwbem-3.2.2.orig/src/cim/OW_CIMDateTime.cpp openwbem-3.2.2.new/src/cim/OW_CIMDateTime.cpp
--- openwbem-3.2.2.orig/src/cim/OW_CIMDateTime.cpp	2005-02-03 01:52:41.000000000 +0100
+++ openwbem-3.2.2.new/src/cim/OW_CIMDateTime.cpp	2009-08-15 16:02:25.000000000 +0200
@@ -50,6 +50,8 @@
 #else
 #include <iostream>
 #endif
+#include <cstring>
+#include <cstdlib>
 
 namespace OW_NAMESPACE
 {
diff -aur openwbem-3.2.2.orig/src/cimom/server/OW_Platform.cpp openwbem-3.2.2.new/src/cimom/server/OW_Platform.cpp
--- openwbem-3.2.2.orig/src/cimom/server/OW_Platform.cpp	2005-05-12 18:12:37.000000000 +0200
+++ openwbem-3.2.2.new/src/cimom/server/OW_Platform.cpp	2009-08-15 19:39:16.000000000 +0200
@@ -34,6 +34,7 @@
  * @author Bart Whiteley
  */
 
+#include <cstdlib>
 #include "OW_config.h"
 #include "OW_Platform.hpp"
 #include "OW_ConfigOpts.hpp"
diff -aur openwbem-3.2.2.orig/src/cimom/server/OW_PlatformSignal.cpp openwbem-3.2.2.new/src/cimom/server/OW_PlatformSignal.cpp
--- openwbem-3.2.2.orig/src/cimom/server/OW_PlatformSignal.cpp	2005-03-22 03:20:00.000000000 +0100
+++ openwbem-3.2.2.new/src/cimom/server/OW_PlatformSignal.cpp	2009-08-15 19:49:50.000000000 +0200
@@ -35,6 +35,7 @@
 #include "OW_Platform.hpp"
 #include "OW_PlatformSignal.hpp"
 #include "OW_UserUtils.hpp"
+#include <cstring>
 #include <ostream>
 
 namespace OW_NAMESPACE
diff -aur openwbem-3.2.2.orig/src/common/OW_BaseStreamBuffer.cpp openwbem-3.2.2.new/src/common/OW_BaseStreamBuffer.cpp
--- openwbem-3.2.2.orig/src/common/OW_BaseStreamBuffer.cpp	2005-02-03 01:52:44.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_BaseStreamBuffer.cpp	2009-08-15 16:04:58.000000000 +0200
@@ -40,6 +40,7 @@
 #include "OW_Assertion.hpp"
 #include <iostream> // for cerr
 #include <cstring> // for memcpy
+#include <cstdio>
 
 namespace OW_NAMESPACE
 {
diff -aur openwbem-3.2.2.orig/src/common/OW_Cache.hpp openwbem-3.2.2.new/src/common/OW_Cache.hpp
--- openwbem-3.2.2.orig/src/common/OW_Cache.hpp	2005-02-03 01:52:44.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_Cache.hpp	2009-08-15 17:05:41.000000000 +0200
@@ -41,6 +41,7 @@
 #include "OW_MutexLock.hpp"
 #include "OW_CIMNULL.hpp"
 #include <list>
+#include <ext/hash_map>
 
 // The classes and functions defined in this file are not meant for general
 // use, they are internal implementation details.  They may change at any time.
diff -aur openwbem-3.2.2.orig/src/common/OW_DataStreams.hpp openwbem-3.2.2.new/src/common/OW_DataStreams.hpp
--- openwbem-3.2.2.orig/src/common/OW_DataStreams.hpp	2005-02-03 01:52:44.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_DataStreams.hpp	2009-08-15 16:07:25.000000000 +0200
@@ -49,6 +49,7 @@
 #include <streambuf.h>
 #endif
 #include <vector>
+#include <cstdio>
 
 // The classes and functions defined in this file are not meant for general
 // use, they are internal implementation details.  They may change at any time.
diff -aur openwbem-3.2.2.orig/src/common/OW_HashMap.hpp openwbem-3.2.2.new/src/common/OW_HashMap.hpp
--- openwbem-3.2.2.orig/src/common/OW_HashMap.hpp	2005-02-12 00:00:40.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_HashMap.hpp	2009-08-15 17:52:34.000000000 +0200
@@ -50,6 +50,7 @@
 #endif
 #ifndef OW_HASH_SPECIALIZED_INCLUDE_GUARD_
 #define OW_HASH_SPECIALIZED_INCLUDE_GUARD_
+
 #if defined(OW_HAVE_HASH_MAP) || defined(OW_HAVE_EXT_HASH_MAP)
 #include "OW_String.hpp"
 
diff -aur openwbem-3.2.2.orig/src/common/OW_IstreamBufIterator.hpp openwbem-3.2.2.new/src/common/OW_IstreamBufIterator.hpp
--- openwbem-3.2.2.orig/src/common/OW_IstreamBufIterator.hpp	2005-02-03 01:52:44.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_IstreamBufIterator.hpp	2009-08-15 16:26:38.000000000 +0200
@@ -40,7 +40,7 @@
 #else
 #include <iostream>
 #endif
-
+#include <cstdio>
 
 namespace OW_NAMESPACE
 {
diff -aur openwbem-3.2.2.orig/src/common/OW_LogMessagePatternFormatter.cpp openwbem-3.2.2.new/src/common/OW_LogMessagePatternFormatter.cpp
--- openwbem-3.2.2.orig/src/common/OW_LogMessagePatternFormatter.cpp	2005-02-03 01:52:45.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_LogMessagePatternFormatter.cpp	2009-08-15 16:10:54.000000000 +0200
@@ -45,6 +45,7 @@
 
 #include <vector>
 #include <cstdlib> // for strtol
+#include <limits.h>
 
 extern "C"
 {
diff -aur openwbem-3.2.2.orig/src/common/OW_PosixFile.cpp openwbem-3.2.2.new/src/common/OW_PosixFile.cpp
--- openwbem-3.2.2.orig/src/common/OW_PosixFile.cpp	2005-02-03 01:52:45.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_PosixFile.cpp	2009-08-15 16:13:54.000000000 +0200
@@ -47,7 +47,7 @@
 		#include <unistd.h>
 	#endif
 #endif
-
+#include <cstring>
 
 namespace OW_NAMESPACE
 {
diff -aur openwbem-3.2.2.orig/src/common/OW_StackTrace.cpp openwbem-3.2.2.new/src/common/OW_StackTrace.cpp
--- openwbem-3.2.2.orig/src/common/OW_StackTrace.cpp	2005-02-03 01:52:45.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_StackTrace.cpp	2009-08-15 16:20:12.000000000 +0200
@@ -54,6 +54,7 @@
 #include "OW_Array.hpp"
 #include <fstream>
 #include <iostream>	// for cerr
+#include <cstdlib>
 
 #if defined(OW_HAVE_BACKTRACE)
 #include <execinfo.h>
diff -aur openwbem-3.2.2.orig/src/common/OW_StringStream.hpp openwbem-3.2.2.new/src/common/OW_StringStream.hpp
--- openwbem-3.2.2.orig/src/common/OW_StringStream.hpp	2005-02-03 01:52:45.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_StringStream.hpp	2009-08-15 15:49:22.000000000 +0200
@@ -49,7 +49,7 @@
 #else
 #include <streambuf.h>
 #endif
-
+#include <cstdio>
 namespace OW_NAMESPACE
 {
 
diff -aur openwbem-3.2.2.orig/src/common/OW_TempFileStream.cpp openwbem-3.2.2.new/src/common/OW_TempFileStream.cpp
--- openwbem-3.2.2.orig/src/common/OW_TempFileStream.cpp	2005-02-03 01:52:45.000000000 +0100
+++ openwbem-3.2.2.new/src/common/OW_TempFileStream.cpp	2009-08-15 16:23:04.000000000 +0200
@@ -43,6 +43,7 @@
 #include "OW_TmpFile.hpp"
 #include "OW_Assertion.hpp"
 #include <cstring>
+#include <cstdio>
 
 namespace OW_NAMESPACE
 {
diff -aur openwbem-3.2.2.orig/src/mof/OW_MOFCompiler.cpp openwbem-3.2.2.new/src/mof/OW_MOFCompiler.cpp
--- openwbem-3.2.2.orig/src/mof/OW_MOFCompiler.cpp	2005-02-11 22:18:31.000000000 +0100
+++ openwbem-3.2.2.new/src/mof/OW_MOFCompiler.cpp	2009-08-15 20:08:39.000000000 +0200
@@ -32,6 +32,7 @@
  * @author Dan Nuffer
  */
 
+#include <limits.h>
 #include "OW_MOFCompiler.hpp"
 #include "OW_Format.hpp"
 #include "OW_MOFParserDecls.hpp"
diff -aur openwbem-3.2.2.orig/src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp openwbem-3.2.2.new/src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp
--- openwbem-3.2.2.orig/src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp	2006-09-12 22:04:17.000000000 +0200
+++ openwbem-3.2.2.new/src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp	2009-08-15 19:17:34.000000000 +0200
@@ -19,6 +19,7 @@
  *
  */
 
+#include <cstring>
 #include "cmpisrv.h"
 #include "OW_CIMException.hpp"
 #include "OW_CIMProperty.hpp"
diff -aur openwbem-3.2.2.orig/src/providerifcs/cmpi/common/cmpiInstance.cpp openwbem-3.2.2.new/src/providerifcs/cmpi/common/cmpiInstance.cpp
--- openwbem-3.2.2.orig/src/providerifcs/cmpi/common/cmpiInstance.cpp	2006-09-11 18:38:07.000000000 +0200
+++ openwbem-3.2.2.new/src/providerifcs/cmpi/common/cmpiInstance.cpp	2009-08-15 19:23:59.000000000 +0200
@@ -19,6 +19,7 @@
  *
  */
 
+#include <cstring>
 #include "cmpisrv.h"
 #include "OW_CIMInstance.hpp"
 
diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/OW_FTABLERef.hpp openwbem-3.2.2.new/src/providerifcs/npi/OW_FTABLERef.hpp
--- openwbem-3.2.2.orig/src/providerifcs/npi/OW_FTABLERef.hpp	2005-02-03 01:52:52.000000000 +0100
+++ openwbem-3.2.2.new/src/providerifcs/npi/OW_FTABLERef.hpp	2009-08-15 19:04:23.000000000 +0200
@@ -29,7 +29,7 @@
 *******************************************************************************/
 #ifndef OW_FTABLE_REF_HPP_
 #define OW_FTABLE_REF_HPP_
-//#include <string.h>
+#include <cstring>
 #include "OW_config.h"
 #include "OW_CIMOMHandleIFC.hpp"
 #include "OW_CIMDataType.hpp"
diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIAssociatorProviderProxy.cpp openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIAssociatorProviderProxy.cpp
--- openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIAssociatorProviderProxy.cpp	2005-02-03 01:52:52.000000000 +0100
+++ openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIAssociatorProviderProxy.cpp	2009-08-15 18:52:31.000000000 +0200
@@ -27,6 +27,9 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
+#include <cstring>
+#include <cstdlib>
+
 #include "OW_config.h"
 #include "OW_FTABLERef.hpp"
 #include "OW_NPIAssociatorProviderProxy.hpp"
diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIInstanceProviderProxy.cpp openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIInstanceProviderProxy.cpp
--- openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIInstanceProviderProxy.cpp	2005-02-03 01:52:52.000000000 +0100
+++ openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIInstanceProviderProxy.cpp	2009-08-15 19:11:13.000000000 +0200
@@ -27,6 +27,7 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
+#include <cstdlib>
 #include "OW_config.h"
 #include "OW_FTABLERef.hpp"
 #include "OW_NPIInstanceProviderProxy.hpp"
diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIProviderIFCUtils.hpp openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIProviderIFCUtils.hpp
--- openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIProviderIFCUtils.hpp	2005-02-03 01:52:52.000000000 +0100
+++ openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIProviderIFCUtils.hpp	2009-08-15 19:11:52.000000000 +0200
@@ -27,6 +27,7 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
+#include <cstdlib>
 #ifndef OW_NPI_PROFIDER_IFC_UTILS_HPP_
 #define OW_NPI_PROFIDER_IFC_UTILS_HPP_
 #include "OW_config.h"
diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/common/NPIExternal.cpp openwbem-3.2.2.new/src/providerifcs/npi/common/NPIExternal.cpp
--- openwbem-3.2.2.orig/src/providerifcs/npi/common/NPIExternal.cpp	2005-02-03 01:52:52.000000000 +0100
+++ openwbem-3.2.2.new/src/providerifcs/npi/common/NPIExternal.cpp	2009-08-15 18:11:11.000000000 +0200
@@ -1,4 +1,6 @@
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "OW_config.h"
 #include "NPIExternal.hpp"
 #include "OW_CIMParamValue.hpp"
diff -aur openwbem-3.2.2.orig/src/repositories/hdb/OW_AssocDb.hpp openwbem-3.2.2.new/src/repositories/hdb/OW_AssocDb.hpp
--- openwbem-3.2.2.orig/src/repositories/hdb/OW_AssocDb.hpp	2005-04-20 22:09:38.000000000 +0200
+++ openwbem-3.2.2.new/src/repositories/hdb/OW_AssocDb.hpp	2009-08-15 17:57:42.000000000 +0200
@@ -49,6 +49,7 @@
 #include "OW_ResultHandlerIFC.hpp"
 #include "OW_IntrusiveReference.hpp"
 #include "OW_IntrusiveCountableBase.hpp"
+#include <cstring>
 
 namespace OW_NAMESPACE
 {