diff --git a/examples/common/entry/cmd.cpp b/examples/common/entry/cmd.cpp
index 47bbb73b3..7c6c3c993 100644
--- a/examples/common/entry/cmd.cpp
+++ b/examples/common/entry/cmd.cpp
@@ -10,7 +10,7 @@
 
 #include <bx/allocator.h>
 #include <bx/hash.h>
-#include <bx/tokenizecmd.h>
+#include <bx/commandline.h>
 
 #include "dbg.h"
 #include "cmd.h"
diff --git a/scripts/geometryc.lua b/scripts/geometryc.lua
index 2663da83d..902b310ca 100644
--- a/scripts/geometryc.lua
+++ b/scripts/geometryc.lua
@@ -25,6 +25,10 @@ project "geometryc"
 		path.join(BGFX_DIR, "examples/common/bounds.**"),
 	}
 
+	links {
+		"bx",
+	}
+
 	configuration { "mingw-*" }
 		targetextension ".exe"
 
diff --git a/scripts/shaderc.lua b/scripts/shaderc.lua
index 4975e31f2..e642b6b05 100644
--- a/scripts/shaderc.lua
+++ b/scripts/shaderc.lua
@@ -107,6 +107,10 @@ project "shaderc"
 		"OptimizeSpeed",
 	}
 
+	links {
+		"bx",
+	}
+
 	configuration { "vs*" }
 		includedirs {
 			path.join(GLSL_OPTIMIZER, "src/glsl/msvc"),
diff --git a/scripts/texturec.lua b/scripts/texturec.lua
index aeb226115..3800caa6d 100644
--- a/scripts/texturec.lua
+++ b/scripts/texturec.lua
@@ -37,6 +37,10 @@ project "texturec"
 		path.join(BGFX_DIR, "tools/texturec/**.h"),
 	}
 
+	links {
+		"bx",
+	}
+
 	configuration { "mingw-*" }
 		targetextension ".exe"
 
diff --git a/scripts/texturev.lua b/scripts/texturev.lua
index 2cfd106a8..02103739d 100644
--- a/scripts/texturev.lua
+++ b/scripts/texturev.lua
@@ -21,6 +21,7 @@ project ("texturev")
 	links {
 		"example-common",
 		"bgfx",
+		"bx",
 	}
 
 	if _OPTIONS["with-sdl"] then
diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp
index 7a6a18f3c..c18a39723 100644
--- a/tools/geometryc/geometryc.cpp
+++ b/tools/geometryc/geometryc.cpp
@@ -61,7 +61,6 @@ namespace stl = tinystl;
 #include <bx/hash.h>
 #include <bx/uint32_t.h>
 #include <bx/fpumath.h>
-#include <bx/tokenizecmd.h>
 #include <bx/crtimpl.h>
 
 #include "bounds.h"
diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp
index c8120e045..693986408 100644
--- a/tools/shaderc/shaderc.cpp
+++ b/tools/shaderc/shaderc.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "shaderc.h"
-#include <bx/tokenizecmd.h>
+#include <bx/commandline.h>
 
 #define MAX_TAGS 256
 extern "C"