diff --git a/src/renderer.h b/src/renderer.h
index 9a13cc406..d31a6b2aa 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -7,7 +7,6 @@
 #define BGFX_RENDERER_H_HEADER_GUARD
 
 #include "bgfx_p.h"
-#include <memory>
 
 namespace bgfx
 {
@@ -313,7 +312,7 @@ namespace bgfx
 			data.m_parent = _parent;
 			m_hashMap.insert(stl::make_pair(_key, handle) );
 
-			return std::addressof(m_data[handle].m_value);
+			return bx::addressOf(m_data[handle].m_value);
 		}
 
 		Ty* find(uint64_t _key)
@@ -323,7 +322,7 @@ namespace bgfx
 			{
 				uint16_t handle = it->second;
 				m_alloc.touch(handle);
-				return std::addressof(m_data[handle].m_value);
+				return bx::addressOf(m_data[handle].m_value);
 			}
 
 			return NULL;