diff -r 490bb6c0df7c -r d70ee55535f4 hotspot/src/os/windows/vm/thread_windows.inline.hpp
--- a/hotspot/src/os/windows/vm/thread_windows.inline.hpp	Tue Nov 27 10:13:20 2012 +0100
+++ b/hotspot/src/os/windows/vm/thread_windows.inline.hpp	Tue Nov 27 14:20:21 2012 +0100
@@ -25,6 +25,10 @@
 #ifndef OS_WINDOWS_VM_THREAD_WINDOWS_INLINE_HPP
 #define OS_WINDOWS_VM_THREAD_WINDOWS_INLINE_HPP
 
+#ifndef SHARE_VM_RUNTIME_THREAD_INLINE_HPP_SCOPE
+#error "This file should only be included from thread.inline.hpp"
+#endif
+
 #include "runtime/atomic.hpp"
 #include "runtime/prefetch.hpp"
 #include "runtime/thread.hpp"