From fab74e9c4aafba352d41a05482209e874c2f2a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Sat, 11 Feb 2017 09:12:16 -0800
Subject: [PATCH] Cleanup.

---
 examples/common/debugdraw/debugdraw.cpp | 2 +-
 src/bgfx.cpp                            | 2 +-
 src/bgfx_p.h                            | 2 +-
 src/image.h                             | 1 -
 src/renderer_mtl.mm                     | 1 -
 src/topology.cpp                        | 2 +-
 src/vertexdecl.cpp                      | 3 +--
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/examples/common/debugdraw/debugdraw.cpp b/examples/common/debugdraw/debugdraw.cpp
index ce9185cf7..7565966ec 100644
--- a/examples/common/debugdraw/debugdraw.cpp
+++ b/examples/common/debugdraw/debugdraw.cpp
@@ -10,7 +10,7 @@
 #include "../packrect.h"
 
 #include <bx/fpumath.h>
-#include <bx/radixsort.h>
+#include <bx/sort.h>
 #include <bx/uint32_t.h>
 #include <bx/crtimpl.h>
 #include <bx/handlealloc.h>
diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index cd60532a0..ecda66a15 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -1937,7 +1937,7 @@ namespace bgfx
 			}
 		}
 
-		qsort(scores, numScores, sizeof(int32_t), compareDescending);
+		bx::quickSort(scores, numScores, sizeof(int32_t), compareDescending);
 
 		RendererContextI* renderCtx = NULL;
 		for (uint32_t ii = 0; ii < numScores; ++ii)
diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index 59eed0e8c..be048e435 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -124,7 +124,7 @@ namespace bgfx
 #include <bx/endian.h>
 #include <bx/handlealloc.h>
 #include <bx/hash.h>
-#include <bx/radixsort.h>
+#include <bx/sort.h>
 #include <bx/ringbuffer.h>
 #include <bx/uint32_t.h>
 #include <bx/readerwriter.h>
diff --git a/src/image.h b/src/image.h
index 7d708ccb8..619fee778 100644
--- a/src/image.h
+++ b/src/image.h
@@ -6,7 +6,6 @@
 #ifndef BGFX_IMAGE_H_HEADER_GUARD
 #define BGFX_IMAGE_H_HEADER_GUARD
 
-#include <stdint.h>
 #include <bx/pixelformat.h>
 
 namespace bgfx
diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm
index 96506f780..edbd8a8eb 100644
--- a/src/renderer_mtl.mm
+++ b/src/renderer_mtl.mm
@@ -9,7 +9,6 @@
 
 #include "renderer_mtl.h"
 #include "renderer.h"
-#include "bx/bx.h"
 
 #if BX_PLATFORM_OSX
 #	include <Cocoa/Cocoa.h>
diff --git a/src/topology.cpp b/src/topology.cpp
index 3123d62fb..2804bc7dd 100644
--- a/src/topology.cpp
+++ b/src/topology.cpp
@@ -6,7 +6,7 @@
 #include <bx/allocator.h>
 #include <bx/debug.h>
 #include <bx/fpumath.h>
-#include <bx/radixsort.h>
+#include <bx/sort.h>
 #include <bx/uint32_t.h>
 
 #include "config.h"
diff --git a/src/vertexdecl.cpp b/src/vertexdecl.cpp
index 934133c38..a2d88a4ff 100644
--- a/src/vertexdecl.cpp
+++ b/src/vertexdecl.cpp
@@ -3,11 +3,10 @@
  * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
  */
 
-#include <string.h>
 #include <bx/debug.h>
 #include <bx/hash.h>
 #include <bx/readerwriter.h>
-#include <bx/radixsort.h>
+#include <bx/sort.h>
 #include <bx/string.h>
 #include <bx/uint32_t.h>