--- old/src/share/vm/utilities/ostream.cpp	2010-11-16 18:22:37.000000000 +0100
+++ new/src/share/vm/utilities/ostream.cpp	2010-11-16 18:22:37.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,27 @@
  *
  */
 
-# include "incls/_precompiled.incl"
-# include "incls/_ostream.cpp.incl"
+#include "precompiled.hpp"
+#include "compiler/compileLog.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/hpi.hpp"
+#include "utilities/defaultStream.hpp"
+#include "utilities/ostream.hpp"
+#include "utilities/top.hpp"
+#include "utilities/xmlstream.hpp"
+#ifdef TARGET_OS_FAMILY_linux
+# include "hpi_linux.hpp"
+# include "os_linux.inline.hpp"
+#endif
+#ifdef TARGET_OS_FAMILY_solaris
+# include "hpi_solaris.hpp"
+# include "os_solaris.inline.hpp"
+#endif
+#ifdef TARGET_OS_FAMILY_windows
+# include "hpi_windows.hpp"
+# include "os_windows.inline.hpp"
+#endif
 
 extern "C" void jio_print(const char* s); // Declarationtion of jvm method