--- a/hotspot/src/cpu/x86/vm/runtime_x86_64.cpp	Fri Nov 30 11:44:05 2012 -0800
+++ b/hotspot/src/cpu/x86/vm/runtime_x86_64.cpp	Fri Nov 30 15:23:16 2012 -0800
@@ -24,12 +24,11 @@
 
 #include "precompiled.hpp"
 #ifdef COMPILER2
-#include "asm/assembler.hpp"
-#include "assembler_x86.inline.hpp"
+#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.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"