diff --git a/examples/13-stencil/stencil.cpp b/examples/13-stencil/stencil.cpp
index 773bdda0..a560ee9b 100644
--- a/examples/13-stencil/stencil.cpp
+++ b/examples/13-stencil/stencil.cpp
@@ -9,7 +9,7 @@
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bx/readerwriter.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 4084359b..83b01094 100644
--- a/examples/14-shadowvolumes/shadowvolumes.cpp
+++ b/examples/14-shadowvolumes/shadowvolumes.cpp
@@ -21,11 +21,11 @@ using namespace std::tr1;
 
 #include <bgfx/bgfx.h>
 #include <bx/timer.h>
-#include <bx/readerwriter.h>
 #include <bx/allocator.h>
 #include <bx/hash.h>
 #include <bx/float4_t.h>
 #include <bx/fpumath.h>
+#include <bx/crtimpl.h>
 #include "entry/entry.h"
 #include "camera.h"
 #include "imgui/imgui.h"
diff --git a/examples/16-shadowmaps/shadowmaps.cpp b/examples/16-shadowmaps/shadowmaps.cpp
index 1e8ddaee..25847c70 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/readerwriter.h>
 #include <bx/fpumath.h>
+#include <bx/crtimpl.h>
 #include "entry/entry.h"
 #include "camera.h"
 #include "imgui/imgui.h"
diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp
index 1fb0497b..03cf82b5 100644
--- a/examples/common/entry/entry.cpp
+++ b/examples/common/entry/entry.cpp
@@ -6,7 +6,7 @@
 #include <bx/bx.h>
 #include <bgfx/bgfx.h>
 #include <bx/string.h>
-#include <bx/readerwriter.h>
+#include <bx/crtimpl.h>
 
 #include <time.h>
 
diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp
index 4cdc5f30..38b2a3fc 100644
--- a/examples/common/imgui/imgui.cpp
+++ b/examples/common/imgui/imgui.cpp
@@ -28,6 +28,7 @@
 #include <bx/uint32_t.h>
 #include <bx/fpumath.h>
 #include <bx/handlealloc.h>
+#include <bx/crtimpl.h>
 
 #include "imgui.h"
 #include "ocornut_imgui.h"
diff --git a/examples/common/nanovg/nanovg_bgfx.cpp b/examples/common/nanovg/nanovg_bgfx.cpp
index 1da34bd7..e5795ad2 100644
--- a/examples/common/nanovg/nanovg_bgfx.cpp
+++ b/examples/common/nanovg/nanovg_bgfx.cpp
@@ -30,6 +30,7 @@
 
 #include <bx/bx.h>
 #include <bx/allocator.h>
+#include <bx/crtimpl.h>
 
 BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4244); // warning C4244: '=' : conversion from '' to '', possible loss of data
 
diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index 295936ea..5881a678 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -18,6 +18,8 @@
 #	include <remotery/lib/Remotery.c>
 #endif // BGFX_CONFIG_PROFILER_REMOTERY_BUILD_LIB
 
+#include <bx/crtimpl.h>
+
 namespace bgfx
 {
 #define BGFX_MAIN_THREAD_MAGIC UINT32_C(0x78666762)
@@ -982,13 +984,13 @@ namespace bgfx
 		{
 			m_sortKeys[ii] = SortKey::remapView(m_sortKeys[ii], m_viewRemap);
 		}
-		bx::radixSort64(m_sortKeys, s_ctx->m_tempKeys, m_sortValues, s_ctx->m_tempValues, m_num);
+		bx::radixSort(m_sortKeys, s_ctx->m_tempKeys, m_sortValues, s_ctx->m_tempValues, m_num);
 
 		for (uint32_t ii = 0, num = m_num; ii < num; ++ii)
 		{
 			m_blitKeys[ii] = BlitKey::remapView(m_blitKeys[ii], m_viewRemap);
 		}
-		bx::radixSort32(m_blitKeys, (uint32_t*)&s_ctx->m_tempKeys, m_numBlitItems);
+		bx::radixSort(m_blitKeys, (uint32_t*)&s_ctx->m_tempKeys, m_numBlitItems);
 	}
 
 	RenderFrame::Enum renderFrame()
diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index ee578365..0de27535 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -504,7 +504,7 @@ namespace bgfx
 			{
 				uint32_t* tempKeys = (uint32_t*)alloca(sizeof(m_keys) );
 				uint32_t* tempValues = (uint32_t*)alloca(sizeof(m_values) );
-				bx::radixSort32(m_keys, tempKeys, m_values, tempValues, m_num);
+				bx::radixSort(m_keys, tempKeys, m_values, tempValues, m_num);
 				return true;
 			}