diff --git a/include/bx/float4_sse.h b/include/bx/float4_sse.h
index d520acc..f75a1d8 100644
--- a/include/bx/float4_sse.h
+++ b/include/bx/float4_sse.h
@@ -403,4 +403,4 @@ IMPLEMENT_TEST(xyzw , 0xf);
 #define float4_floor float4_floor_ni
 #include "float4_ni.h"
 
-#endif // __FLOAT4_SSE_H__
+#endif // BX_FLOAT4_SSE_H_HEADER_GUARD
diff --git a/include/bx/handlealloc.h b/include/bx/handlealloc.h
index 84bc316..1250f23 100644
--- a/include/bx/handlealloc.h
+++ b/include/bx/handlealloc.h
@@ -169,4 +169,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __HANDLE_ALLOC_H__
+#endif // BX_HANDLE_ALLOC_H_HEADER_GUARD
diff --git a/include/compat/mingw/alloca.h b/include/compat/mingw/alloca.h
index 196379c..2cc6e9a 100644
--- a/include/compat/mingw/alloca.h
+++ b/include/compat/mingw/alloca.h
@@ -1,6 +1,6 @@
-#ifndef __MINGW32__ALLOCA_H__
-#define __MINGW32__ALLOCA_H__
+#ifndef MINGW32_ALLOCA_H_HEADER_GUARD
+#define MINGW32_ALLOCA_H_HEADER_GUARD
 
 #include <malloc.h>
 
-#endif // __MINGW32__ALLOCA_H__
+#endif // MINGW32_ALLOCA_H_HEADER_GUARD