--- a/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp	Tue Nov 27 10:13:20 2012 +0100
+++ b/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp	Tue Nov 27 14:20:21 2012 +0100
@@ -38,14 +38,9 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "runtime/thread.inline.hpp"
 #include "stack_zero.inline.hpp"
 #include "utilities/top.hpp"
-#ifdef TARGET_OS_FAMILY_linux
-# include "thread_linux.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_bsd
-# include "thread_bsd.inline.hpp"
-#endif
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif