--- old/src/cpu/x86/vm/runtime_x86_32.cpp	2010-11-10 12:58:32.000000000 +0100
+++ new/src/cpu/x86/vm/runtime_x86_32.cpp	2010-11-10 12:58:32.000000000 +0100
@@ -22,9 +22,23 @@
  *
  */
 
+#include "precompiled.hpp"
+#ifdef COMPILER2
+#include "asm/assembler.hpp"
+#include "assembler_x86.inline.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "code/vmreg.hpp"
+#include "interpreter/interpreter.hpp"
+#include "nativeInst_x86.hpp"
+#include "opto/runtime.hpp"
+#include "runtime/interfaceSupport.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/vframeArray.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "vmreg_x86.inline.hpp"
+#endif
 
-#include "incls/_precompiled.incl"
-#include "incls/_runtime_x86_32.cpp.incl"
 
 #define __ masm->