diff --git a/runtime/bin/eventhandler_win.h b/runtime/bin/eventhandler_win.h
index fc6af0d8ef1..0dd3bb6235b 100644
--- a/runtime/bin/eventhandler_win.h
+++ b/runtime/bin/eventhandler_win.h
@@ -14,7 +14,7 @@
 #include <mswsock.h>
 
 #include "bin/builtin.h"
-#include "platform/thread.h"
+#include "bin/thread.h"
 
 
 namespace dart {
diff --git a/runtime/bin/thread_android.cc b/runtime/bin/thread_android.cc
index 246cd346d78..eefdaac114f 100644
--- a/runtime/bin/thread_android.cc
+++ b/runtime/bin/thread_android.cc
@@ -5,7 +5,7 @@
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
-#include "platform/thread.h"
+#include "bin/thread.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/time.h>  // NOLINT
diff --git a/runtime/bin/thread_linux.cc b/runtime/bin/thread_linux.cc
index aedd8d96d1c..ca1c5561f13 100644
--- a/runtime/bin/thread_linux.cc
+++ b/runtime/bin/thread_linux.cc
@@ -5,7 +5,7 @@
 #include "platform/globals.h"
 #if defined(TARGET_OS_LINUX)
 
-#include "platform/thread.h"
+#include "bin/thread.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/resource.h>  // NOLINT
diff --git a/runtime/bin/thread_win.cc b/runtime/bin/thread_win.cc
index beca34aeedf..f1486c17d90 100644
--- a/runtime/bin/thread_win.cc
+++ b/runtime/bin/thread_win.cc
@@ -5,7 +5,7 @@
 #include "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
-#include "platform/thread.h"
+#include "bin/thread.h"
 
 #include <process.h>  // NOLINT
 
diff --git a/runtime/vm/os_win.cc b/runtime/vm/os_win.cc
index 9b8b25b7719..2b21653c791 100644
--- a/runtime/vm/os_win.cc
+++ b/runtime/vm/os_win.cc
@@ -6,7 +6,6 @@
 #if defined(TARGET_OS_WINDOWS)
 
 #include "vm/os.h"
-#include "vm/vtune.h"
 
 #include <malloc.h>  // NOLINT
 #include <process.h>  // NOLINT
@@ -14,7 +13,8 @@
 
 #include "platform/utils.h"
 #include "platform/assert.h"
-#include "platform/thread.h"
+#include "vm/thread.h"
+#include "vm/vtune.h"
 
 namespace dart {
 
diff --git a/runtime/vm/thread_android.cc b/runtime/vm/thread_android.cc
index 246cd346d78..750005efdca 100644
--- a/runtime/vm/thread_android.cc
+++ b/runtime/vm/thread_android.cc
@@ -5,7 +5,7 @@
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
-#include "platform/thread.h"
+#include "vm/thread.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/time.h>  // NOLINT
diff --git a/runtime/vm/thread_linux.cc b/runtime/vm/thread_linux.cc
index aedd8d96d1c..df7ec1d9de8 100644
--- a/runtime/vm/thread_linux.cc
+++ b/runtime/vm/thread_linux.cc
@@ -5,7 +5,7 @@
 #include "platform/globals.h"
 #if defined(TARGET_OS_LINUX)
 
-#include "platform/thread.h"
+#include "vm/thread.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/resource.h>  // NOLINT
diff --git a/runtime/vm/thread_win.cc b/runtime/vm/thread_win.cc
index beca34aeedf..415efbcbfd9 100644
--- a/runtime/vm/thread_win.cc
+++ b/runtime/vm/thread_win.cc
@@ -5,7 +5,7 @@
 #include "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
-#include "platform/thread.h"
+#include "vm/thread.h"
 
 #include <process.h>  // NOLINT