Merge "Disassemble Thumb2 vstm/vldm/vstr/vldr/vpush/vpop/vmov/vmrs." into dalvik-dev
diff --git a/runtime/arch/x86/thread_x86.cc b/runtime/arch/x86/thread_x86.cc
index 42789cb..39bad58 100644
--- a/runtime/arch/x86/thread_x86.cc
+++ b/runtime/arch/x86/thread_x86.cc
@@ -21,7 +21,7 @@
#include "asm_support_x86.h"
#include "base/macros.h"
-#include "thread.h"
+#include "thread-inl.h"
#include "thread_list.h"
#if defined(__APPLE__)
diff --git a/runtime/atomic.cc b/runtime/atomic.cc
index c91db79..47cee6a 100644
--- a/runtime/atomic.cc
+++ b/runtime/atomic.cc
@@ -23,7 +23,7 @@
#include "base/mutex.h"
#include "base/stl_util.h"
#include "base/stringprintf.h"
-#include "thread.h"
+#include "thread-inl.h"
#endif
namespace art {