diff -r 490bb6c0df7c -r d70ee55535f4 hotspot/src/share/vm/oops/oop.cpp
--- a/hotspot/src/share/vm/oops/oop.cpp	Tue Nov 27 10:13:20 2012 +0100
+++ b/hotspot/src/share/vm/oops/oop.cpp	Tue Nov 27 14:20:21 2012 +0100
@@ -27,19 +27,8 @@
 #include "classfile/javaClasses.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/thread.inline.hpp"
 #include "utilities/copy.hpp"
-#ifdef TARGET_OS_FAMILY_linux
-# include "thread_linux.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_solaris
-# include "thread_solaris.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_windows
-# include "thread_windows.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_bsd
-# include "thread_bsd.inline.hpp"
-#endif
 
 bool always_do_update_barrier = false;