--- a/hotspot/src/share/vm/oops/generateOopMap.cpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/oops/generateOopMap.cpp	Tue Nov 23 13:22:55 2010 -0800
@@ -22,6 +22,16 @@
  *
  */
 
+#include "precompiled.hpp"
+#include "interpreter/bytecodeStream.hpp"
+#include "oops/generateOopMap.hpp"
+#include "oops/oop.inline.hpp"
+#include "oops/symbolOop.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/java.hpp"
+#include "runtime/relocator.hpp"
+#include "utilities/bitMap.inline.hpp"
+
 //
 //
 // Compute stack layouts for each instruction in method.
@@ -85,9 +95,6 @@
 //
 // (Note this comment is borrowed form the original author of the algorithm)
 
-#include "incls/_precompiled.incl"
-#include "incls/_generateOopMap.cpp.incl"
-
 // ComputeCallStack
 //
 // Specialization of SignatureIterator - compute the effects of a call