5 files changed, 8 insertions, 4 deletions
diff --git a/src/os/linux/vm/mutex_linux.cpp b/src/os/linux/vm/mutex_linux.cpp
index 864aca7e8..a54ec992f 100644
--- a/src/os/linux/vm/mutex_linux.cpp
+++ b/src/os/linux/vm/mutex_linux.cpp
@@ -26,7 +26,7 @@
 #include "mutex_linux.inline.hpp"
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/mutex.hpp"
-#include "thread_linux.inline.hpp"
+#include "runtime/thread.inline.hpp"
 #include "utilities/events.hpp"
 
 // put OS-includes here
diff --git a/src/os/linux/vm/mutex_linux.inline.hpp b/src/os/linux/vm/mutex_linux.inline.hpp
index cde6dfe42..ff3ac285e 100644
--- a/src/os/linux/vm/mutex_linux.inline.hpp
+++ b/src/os/linux/vm/mutex_linux.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "os_linux.inline.hpp"
 #include "runtime/interfaceSupport.hpp"
-#include "thread_linux.inline.hpp"
+#include "runtime/thread.inline.hpp"
 
 
 // Reconciliation History
diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
index 4e72cb509..45dea5e95 100644
--- a/src/os/linux/vm/os_linux.cpp
+++ b/src/os/linux/vm/os_linux.cpp
@@ -53,11 +53,11 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "runtime/thread.inline.hpp"
 #include "runtime/threadCritical.hpp"
 #include "runtime/timer.hpp"
 #include "services/attachListener.hpp"
 #include "services/runtimeService.hpp"
-#include "thread_linux.inline.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
diff --git a/src/os/linux/vm/threadCritical_linux.cpp b/src/os/linux/vm/threadCritical_linux.cpp
index b1d9ab2aa..7cac3ca22 100644
--- a/src/os/linux/vm/threadCritical_linux.cpp
+++ b/src/os/linux/vm/threadCritical_linux.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "precompiled.hpp"
+#include "runtime/thread.inline.hpp"
 #include "runtime/threadCritical.hpp"
-#include "thread_linux.inline.hpp"
 
 // put OS-includes here
 # include <pthread.h>
diff --git a/src/os/linux/vm/thread_linux.inline.hpp b/src/os/linux/vm/thread_linux.inline.hpp
index 2a5dcddb7..f5c9e9c4b 100644
--- a/src/os/linux/vm/thread_linux.inline.hpp
+++ b/src/os/linux/vm/thread_linux.inline.hpp
@@ -25,6 +25,10 @@
 #ifndef OS_LINUX_VM_THREAD_LINUX_INLINE_HPP
 #define OS_LINUX_VM_THREAD_LINUX_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"