diff -r 490bb6c0df7c -r d70ee55535f4 hotspot/src/cpu/zero/vm/interp_masm_zero.cpp
--- a/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp	Tue Nov 27 10:13:20 2012 +0100
+++ b/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp	Tue Nov 27 14:20:21 2012 +0100
@@ -37,11 +37,6 @@
 #include "runtime/basicLock.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/sharedRuntime.hpp"
-#ifdef TARGET_OS_FAMILY_linux
-# include "thread_linux.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_bsd
-# include "thread_bsd.inline.hpp"
-#endif
+#include "runtime/thread.inline.hpp"
 
 // This file is intentionally empty