diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp
index 49f7ae4a6..1184f2055 100644
--- a/examples/common/entry/entry_windows.cpp
+++ b/examples/common/entry/entry_windows.cpp
@@ -9,11 +9,13 @@
 
 #include <bgfx/platform.h>
 
-#include <bx/uint32_t.h>
-#include <bx/thread.h>
 #include <bx/mutex.h>
 #include <bx/handlealloc.h>
+#include <bx/os.h>
+#include <bx/thread.h>
 #include <bx/timer.h>
+#include <bx/uint32_t.h>
+
 #include <tinystl/allocator.h>
 #include <tinystl/string.h>
 
diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index 9874cd74b..d35d3b7dc 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -20,6 +20,8 @@
 #endif // BGFX_CONFIG_PROFILER_REMOTERY_BUILD_LIB
 
 #include <bx/crtimpl.h>
+#include <bx/mutex.h>
+
 #include "topology.h"
 
 BX_ERROR_RESULT(BGFX_ERROR_TEXTURE_VALIDATION,  BX_MAKEFOURCC('b', 'g', 0, 1) );