diff --git a/examples/common/font/font_manager.cpp b/examples/common/font/font_manager.cpp
index 0da5c17a0..13c92ce2e 100644
--- a/examples/common/font/font_manager.cpp
+++ b/examples/common/font/font_manager.cpp
@@ -3,7 +3,7 @@
  * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
  */
 
-#include <bx/macros.h>
+#include <bx/bx.h>
 
 #if BX_COMPILER_MSVC
 #	define generic GenericFromFreeType // WinRT language extensions see "generic" as a keyword... this is stupid
diff --git a/examples/common/nanovg/nanovg.cpp b/examples/common/nanovg/nanovg.cpp
index 4832fb421..3a0af013e 100644
--- a/examples/common/nanovg/nanovg.cpp
+++ b/examples/common/nanovg/nanovg.cpp
@@ -23,7 +23,7 @@
 
 #include "nanovg.h"
 
-#include <bx/macros.h>
+#include <bx/bx.h>
 
 BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4701) // error C4701: potentially uninitialized local variable 'cint' used
 // -Wunused-function and 4505 must be file scope, can't be disabled between push/pop.
diff --git a/include/bgfx/embedded_shader.h b/include/bgfx/embedded_shader.h
index 706386a4f..6dc121c22 100644
--- a/include/bgfx/embedded_shader.h
+++ b/include/bgfx/embedded_shader.h
@@ -6,7 +6,7 @@
 #ifndef BGFX_EMBEDDED_SHADER_H_HEADER_GUARD
 #define BGFX_EMBEDDED_SHADER_H_HEADER_GUARD
 
-#include <bx/macros.h>
+#include <bx/bx.h>
 #include "bgfx.h"
 
 #define BGFX_EMBEDDED_SHADER_DXBC(...)