diff --git a/include/bx/float4x4_t.h b/include/bx/float4x4_t.h
index 3339e0a..269dd63 100644
--- a/include/bx/float4x4_t.h
+++ b/include/bx/float4x4_t.h
@@ -3,8 +3,8 @@
  * License: https://github.com/bkaradzic/bx#license-bsd-2-clause
  */
 
-#ifndef BX_SIMDX4_H_HEADER_GUARD
-#define BX_SIMDX4_H_HEADER_GUARD
+#ifndef BX_FLOAT4X4_H_HEADER_GUARD
+#define BX_FLOAT4X4_H_HEADER_GUARD
 
 #include "simd_t.h"
 
@@ -155,4 +155,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // BX_SIMDX4_H_HEADER_GUARD
+#endif // BX_FLOAT4X4_H_HEADER_GUARD
diff --git a/include/bx/handlealloc.h b/include/bx/handlealloc.h
index 7b10209..aad39cd 100644
--- a/include/bx/handlealloc.h
+++ b/include/bx/handlealloc.h
@@ -151,8 +151,6 @@ namespace bx
 		static const uint16_t invalid = UINT16_MAX;
 
 		HandleListT()
-			: m_front(invalid)
-			, m_back(invalid)
 		{
 			reset();
 		}
@@ -250,6 +248,8 @@ namespace bx
 		void reset()
 		{
 			memset(m_links, 0xff, sizeof(m_links) );
+			m_front = invalid;
+			m_back  = invalid;
 		}
 
 	private: