diff -r b02f361c324e -r 0cf4eccf130f hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp
--- a/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp	Fri Nov 30 11:44:05 2012 -0800
+++ b/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp	Fri Nov 30 15:23:16 2012 -0800
@@ -23,8 +23,8 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
-#include "assembler_x86.inline.hpp"
+#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/threadLocalStorage.hpp"