diff --git a/examples/07-callback/callback.cpp b/examples/07-callback/callback.cpp
index 4517905c4..960b5fa8d 100644
--- a/examples/07-callback/callback.cpp
+++ b/examples/07-callback/callback.cpp
@@ -8,8 +8,8 @@
 #include "imgui/imgui.h"
 
 #include <bx/allocator.h>
+#include <bx/file.h>
 #include <bx/string.h>
-#include <bx/crtimpl.h>
 
 #include "aviwriter.h"
 
diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp
index f34007a57..a3f1bacca 100644
--- a/examples/10-font/font.cpp
+++ b/examples/10-font/font.cpp
@@ -8,7 +8,7 @@
 
 #include <bx/timer.h>
 #include <bx/string.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 
 #include "font/font_manager.h"
 #include "font/text_buffer_manager.h"
diff --git a/examples/11-fontsdf/fontsdf.cpp b/examples/11-fontsdf/fontsdf.cpp
index 560c7c47e..aa653c802 100644
--- a/examples/11-fontsdf/fontsdf.cpp
+++ b/examples/11-fontsdf/fontsdf.cpp
@@ -8,7 +8,7 @@
 
 #include <bgfx/bgfx.h>
 #include <bx/timer.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 
 #include "font/font_manager.h"
 #include "font/text_metrics.h"
diff --git a/examples/13-stencil/stencil.cpp b/examples/13-stencil/stencil.cpp
index 7bdd4b1c5..aef98d7c4 100644
--- a/examples/13-stencil/stencil.cpp
+++ b/examples/13-stencil/stencil.cpp
@@ -8,8 +8,8 @@
 
 #include "common.h"
 #include "bgfx_utils.h"
+#include <bx/file.h>
 
-#include <bx/crtimpl.h>
 #include "camera.h"
 #include "imgui/imgui.h"
 
diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp
index 713083247..fa1b6a9c0 100644
--- a/examples/14-shadowvolumes/shadowvolumes.cpp
+++ b/examples/14-shadowvolumes/shadowvolumes.cpp
@@ -18,8 +18,8 @@ namespace stl = tinystl;
 #include <bx/allocator.h>
 #include <bx/hash.h>
 #include <bx/simd_t.h>
-#include <bx/fpumath.h>
-#include <bx/crtimpl.h>
+#include <bx/math.h>
+#include <bx/file.h>
 #include "entry/entry.h"
 #include "camera.h"
 #include "imgui/imgui.h"
diff --git a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp
index 96db3e217..10cd02a15 100644
--- a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp
+++ b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp
@@ -12,7 +12,7 @@
 #include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include "entry/entry.h"
 #include "bgfx_utils.h"
 #include "imgui/imgui.h"
diff --git a/examples/16-shadowmaps/shadowmaps.cpp b/examples/16-shadowmaps/shadowmaps.cpp
index a86f69ede..2980480c1 100644
--- a/examples/16-shadowmaps/shadowmaps.cpp
+++ b/examples/16-shadowmaps/shadowmaps.cpp
@@ -12,8 +12,8 @@
 
 #include <bgfx/bgfx.h>
 #include <bx/timer.h>
-#include <bx/fpumath.h>
-#include <bx/crtimpl.h>
+#include <bx/math.h>
+#include <bx/file.h>
 #include "entry/entry.h"
 #include "camera.h"
 #include "imgui/imgui.h"
diff --git a/examples/23-vectordisplay/vectordisplay.cpp b/examples/23-vectordisplay/vectordisplay.cpp
index 9b8016a5a..1121aa07c 100644
--- a/examples/23-vectordisplay/vectordisplay.cpp
+++ b/examples/23-vectordisplay/vectordisplay.cpp
@@ -12,7 +12,7 @@
 #include <float.h>  // FLT_EPSILON
 #include <alloca.h> // alloca
 
-#include <bx/fpumath.h>
+#include <bx/math.h>
 
 #include "vectordisplay.h"
 #include "bgfx_utils.h"
diff --git a/examples/27-terrain/terrain.cpp b/examples/27-terrain/terrain.cpp
index 3c8f74405..958f135cd 100644
--- a/examples/27-terrain/terrain.cpp
+++ b/examples/27-terrain/terrain.cpp
@@ -10,7 +10,7 @@
 #include "bounds.h"
 #include <bx/allocator.h>
 #include <bx/debug.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 
 namespace
 {
diff --git a/examples/common/bgfx_utils.cpp b/examples/common/bgfx_utils.cpp
index b394128e9..b761ffa9d 100644
--- a/examples/common/bgfx_utils.cpp
+++ b/examples/common/bgfx_utils.cpp
@@ -13,7 +13,7 @@ namespace stl = tinystl;
 #include <bgfx/bgfx.h>
 #include <bx/commandline.h>
 #include <bx/endian.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include <bx/readerwriter.h>
 #include <bx/string.h>
 #include "entry/entry.h"
diff --git a/examples/common/bounds.cpp b/examples/common/bounds.cpp
index 6a7e29577..4bff1a47f 100644
--- a/examples/common/bounds.cpp
+++ b/examples/common/bounds.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <bx/rng.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include "bounds.h"
 
 void aabbToObb(Obb& _obb, const Aabb& _aabb)
diff --git a/examples/common/camera.cpp b/examples/common/camera.cpp
index 52a6d1433..14f93d52c 100644
--- a/examples/common/camera.cpp
+++ b/examples/common/camera.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <bx/timer.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include "camera.h"
 #include "entry/entry.h"
 #include "entry/cmd.h"
diff --git a/examples/common/common.h b/examples/common/common.h
index b53aba269..19c71c2a2 100644
--- a/examples/common/common.h
+++ b/examples/common/common.h
@@ -7,7 +7,7 @@
 #define COMMON_H_HEADER_GUARD
 
 #include <bx/timer.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 
 #include "entry/entry.h"
 
diff --git a/examples/common/debugdraw/debugdraw.cpp b/examples/common/debugdraw/debugdraw.cpp
index 130a807e9..b3efea3e4 100644
--- a/examples/common/debugdraw/debugdraw.cpp
+++ b/examples/common/debugdraw/debugdraw.cpp
@@ -9,10 +9,9 @@
 #include "../bgfx_utils.h"
 #include "../packrect.h"
 
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include <bx/sort.h>
 #include <bx/uint32_t.h>
-#include <bx/crtimpl.h>
 #include <bx/handlealloc.h>
 
 struct DebugVertex
diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp
index bc6d956be..0ee0d5879 100644
--- a/examples/common/entry/entry.cpp
+++ b/examples/common/entry/entry.cpp
@@ -4,10 +4,9 @@
  */
 
 #include <bx/bx.h>
-#include <bgfx/bgfx.h>
-#include <bx/filepath.h>
-#include <bx/crtimpl.h>
+#include <bx/file.h>
 #include <bx/sort.h>
+#include <bgfx/bgfx.h>
 
 #include <time.h>
 
diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp
index 6e6ce18ec..07c3b2173 100644
--- a/examples/common/entry/entry_sdl.cpp
+++ b/examples/common/entry/entry_sdl.cpp
@@ -30,7 +30,6 @@ BX_PRAGMA_DIAGNOSTIC_POP()
 #include <bx/thread.h>
 #include <bx/handlealloc.h>
 #include <bx/readerwriter.h>
-#include <bx/crtimpl.h>
 #include <tinystl/allocator.h>
 #include <tinystl/string.h>
 
diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp
index 081baa9c9..356c5ba4e 100644
--- a/examples/common/imgui/imgui.cpp
+++ b/examples/common/imgui/imgui.cpp
@@ -6,9 +6,8 @@
 #include <bgfx/bgfx.h>
 #include <bgfx/embedded_shader.h>
 #include <bx/allocator.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include <bx/timer.h>
-#include <bx/crtimpl.h>
 #include <ocornut-imgui/imgui.h>
 
 #include "imgui.h"
diff --git a/examples/common/nanovg/nanovg_bgfx.cpp b/examples/common/nanovg/nanovg_bgfx.cpp
index e9b1e482d..22e579035 100644
--- a/examples/common/nanovg/nanovg_bgfx.cpp
+++ b/examples/common/nanovg/nanovg_bgfx.cpp
@@ -31,7 +31,6 @@
 
 #include <bx/bx.h>
 #include <bx/allocator.h>
-#include <bx/crtimpl.h>
 #include <bx/uint32_t.h>
 
 BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4244); // warning C4244: '=' : conversion from '' to '', possible loss of data
diff --git a/examples/common/ps/particle_system.cpp b/examples/common/ps/particle_system.cpp
index 26f48c7ee..2c9356794 100644
--- a/examples/common/ps/particle_system.cpp
+++ b/examples/common/ps/particle_system.cpp
@@ -11,7 +11,6 @@
 #include "../packrect.h"
 
 #include <bx/easing.h>
-#include <bx/crtimpl.h>
 #include <bx/handlealloc.h>
 
 #include "vs_particle.bin.h"
diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index 7fd7e7a47..95f664bd4 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -19,7 +19,7 @@
 #	include <remotery/lib/Remotery.c>
 #endif // BGFX_CONFIG_PROFILER_REMOTERY_BUILD_LIB
 
-#include <bx/crtimpl.h>
+#include <bx/file.h>
 #include <bx/mutex.h>
 
 #include "topology.h"
diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index 31f54b528..8a1d1e8ff 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -117,7 +117,7 @@ namespace bgfx
 
 #include <bx/bx.h>
 #include <bx/debug.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include <bx/float4x4_t.h>
 #include <bx/endian.h>
 #include <bx/handlealloc.h>
diff --git a/src/topology.cpp b/src/topology.cpp
index 2804bc7dd..5dfd80483 100644
--- a/src/topology.cpp
+++ b/src/topology.cpp
@@ -5,7 +5,7 @@
 
 #include <bx/allocator.h>
 #include <bx/debug.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include <bx/sort.h>
 #include <bx/uint32_t.h>
 
diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp
index 9812763bb..9ba3dfb5e 100644
--- a/tools/geometryc/geometryc.cpp
+++ b/tools/geometryc/geometryc.cpp
@@ -54,8 +54,8 @@ namespace stl = tinystl;
 #include <bx/timer.h>
 #include <bx/hash.h>
 #include <bx/uint32_t.h>
-#include <bx/fpumath.h>
-#include <bx/crtimpl.h>
+#include <bx/math.h>
+#include <bx/file.h>
 
 #include "bounds.h"
 
diff --git a/tools/shaderc/shaderc.h b/tools/shaderc/shaderc.h
index 84189c633..f10fc9725 100644
--- a/tools/shaderc/shaderc.h
+++ b/tools/shaderc/shaderc.h
@@ -61,7 +61,7 @@ namespace bgfx
 #include <bx/uint32_t.h>
 #include <bx/string.h>
 #include <bx/hash.h>
-#include <bx/crtimpl.h>
+#include <bx/file.h>
 #include "../../src/vertexdecl.h"
 
 namespace bgfx
diff --git a/tools/texturev/texturev.cpp b/tools/texturev/texturev.cpp
index f60b39304..861873465 100644
--- a/tools/texturev/texturev.cpp
+++ b/tools/texturev/texturev.cpp
@@ -9,7 +9,7 @@
 #include <bx/os.h>
 #include <bx/filepath.h>
 #include <bx/uint32_t.h>
-#include <bx/fpumath.h>
+#include <bx/math.h>
 #include <bx/easing.h>
 #include <entry/entry.h>
 #include <entry/input.h>
@@ -19,7 +19,8 @@
 
 #include <dirent.h>
 
-#include <bx/crtimpl.h>
+#include <bx/file.h>
+#include <bx/process.h>
 
 #include <tinystl/allocator.h>
 #include <tinystl/vector.h>