diff --git a/tests/handle_bench.cpp b/tests/handle_bench.cpp
index 08ecb6b..2d041c8 100644
--- a/tests/handle_bench.cpp
+++ b/tests/handle_bench.cpp
@@ -5,7 +5,6 @@
 
 #include <bx/timer.h>
 #include <bx/handlealloc.h>
-#include <bx/maputil.h>
 
 #include <tinystl/allocator.h>
 #include <tinystl/unordered_map.h>
@@ -15,6 +14,19 @@
 #include <stdio.h>
 #include <assert.h>
 
+template<typename MapType>
+bool mapRemove(MapType& _map, const typename MapType::value_type::first_type& _first)
+{
+	typename MapType::const_iterator it = _map.find(_first);
+	if (it != _map.end() )
+	{
+		_map.erase(it);
+		return true;
+	}
+
+	return false;
+}
+
 int main()
 {
 	const uint32_t numElements   = 4<<10;
@@ -37,7 +49,7 @@ int main()
 
 			for (uint32_t jj = 0; jj < numElements; ++jj)
 			{
-				bool ok = bx::mapRemove(map, uint64_t(jj) );
+				bool ok = mapRemove(map, uint64_t(jj) );
 				assert(ok); BX_UNUSED(ok);
 			}
 
@@ -65,7 +77,7 @@ int main()
 
 			for (uint32_t jj = 0; jj < numElements; ++jj)
 			{
-				bool ok = bx::mapRemove(map, uint64_t(jj) );
+				bool ok = mapRemove(map, uint64_t(jj) );
 				assert(ok); BX_UNUSED(ok);
 			}
 
diff --git a/tests/math_test.cpp b/tests/math_test.cpp
index 278bddb..90f661e 100644
--- a/tests/math_test.cpp
+++ b/tests/math_test.cpp
@@ -484,12 +484,12 @@ TEST_CASE("fract", "[math][libm]")
 TEST_CASE("ldexp", "[math][libm]")
 {
 	STATIC_REQUIRE(  1389.0f == bx::ldexp(86.8125, 4) );
-	STATIC_REQUIRE(0.437500f == bx::ldexp(7.0f, -4.0f) );
-	STATIC_REQUIRE(bx::isEqual(-0.0f, bx::ldexp(-0.0f, 10.0f), 0.000000001f) );
+	STATIC_REQUIRE(0.437500f == bx::ldexp(7.0f, -4) );
+	STATIC_REQUIRE(bx::isEqual(-0.0f, bx::ldexp(-0.0f, 10), 0.000000001f) );
 
-	STATIC_REQUIRE(0x1p127f  == bx::ldexp(1.0f,  127.0f) );
-	STATIC_REQUIRE(0x1p-126f == bx::ldexp(1.0f, -126.0f) );
-	STATIC_REQUIRE(0x1p24f   == bx::ldexp(1.0f,   24.0f) );
+	STATIC_REQUIRE(0x1p127f  == bx::ldexp(1.0f,  127) );
+	STATIC_REQUIRE(0x1p-126f == bx::ldexp(1.0f, -126) );
+	STATIC_REQUIRE(0x1p24f   == bx::ldexp(1.0f,   24) );
 
 	bx::WriterI* writer = bx::getNullOut();
 	bx::Error err;