From 86b481c471d74e7a2af16b35fdeca5ac44ede375 Mon Sep 17 00:00:00 2001
From: bkaradzic <branimirkaradzic@gmail.com>
Date: Wed, 13 Nov 2013 21:55:44 -0800
Subject: [PATCH] Using language compliant header guards.

---
 include/bx/allocator.h        | 6 +++---
 include/bx/blockalloc.h       | 6 +++---
 include/bx/bx.h               | 6 +++---
 include/bx/cl.h               | 6 +++---
 include/bx/commandline.h      | 6 +++---
 include/bx/cpu.h              | 6 +++---
 include/bx/debug.h            | 6 +++---
 include/bx/endian.h           | 6 +++---
 include/bx/float4_neon.h      | 6 +++---
 include/bx/float4_ni.h        | 6 +++---
 include/bx/float4_ref.h       | 6 +++---
 include/bx/float4_sse.h       | 4 ++--
 include/bx/float4_swizzle.inl | 4 ++--
 include/bx/float4_t.h         | 6 +++---
 include/bx/float4x4_t.h       | 6 +++---
 include/bx/foreach.h          | 6 +++---
 include/bx/handlealloc.h      | 4 ++--
 include/bx/hash.h             | 6 +++---
 include/bx/macros.h           | 6 +++---
 include/bx/maputil.h          | 6 +++---
 include/bx/mutex.h            | 6 +++---
 include/bx/os.h               | 6 +++---
 include/bx/platform.h         | 6 +++---
 include/bx/radixsort.h        | 6 +++---
 include/bx/readerwriter.h     | 6 +++---
 include/bx/ringbuffer.h       | 6 +++---
 include/bx/rng.h              | 6 +++---
 include/bx/sem.h              | 6 +++---
 include/bx/spscqueue.h        | 6 +++---
 include/bx/string.h           | 6 +++---
 include/bx/thread.h           | 6 +++---
 include/bx/timer.h            | 6 +++---
 include/bx/uint32_t.h         | 6 +++---
 33 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/include/bx/allocator.h b/include/bx/allocator.h
index dbdc929..c110395 100644
--- a/include/bx/allocator.h
+++ b/include/bx/allocator.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
  
-#ifndef __BX_ALLOCATOR_H__
-#define __BX_ALLOCATOR_H__
+#ifndef BX_ALLOCATOR_H_HEADER_GUARD
+#define BX_ALLOCATOR_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -251,4 +251,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_ALLOCATOR_H__
+#endif // BX_ALLOCATOR_H_HEADER_GUARD
diff --git a/include/bx/blockalloc.h b/include/bx/blockalloc.h
index d25888a..ed2e162 100644
--- a/include/bx/blockalloc.h
+++ b/include/bx/blockalloc.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_BLOCKALLOC_H__
-#define __BX_BLOCKALLOC_H__
+#ifndef BX_BLOCKALLOC_H_HEADER_GUARD
+#define BX_BLOCKALLOC_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -96,4 +96,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_BLOCKALLOC_H__
+#endif // BX_BLOCKALLOC_H_HEADER_GUARD
diff --git a/include/bx/bx.h b/include/bx/bx.h
index 82804cc..c666777 100644
--- a/include/bx/bx.h
+++ b/include/bx/bx.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_H__
-#define __BX_H__
+#ifndef BX_H_HEADER_GUARD
+#define BX_H_HEADER_GUARD
 
 #include <stdint.h> // uint32_t
 #include <stdlib.h> // size_t
@@ -23,4 +23,4 @@ namespace bx
 // Annoying C++0x stuff..
 namespace std { namespace tr1 {}; using namespace tr1; }
 
-#endif // __BX_H__ 
+#endif // BX_H_HEADER_GUARD
diff --git a/include/bx/cl.h b/include/bx/cl.h
index 28cb6d0..158b309 100644
--- a/include/bx/cl.h
+++ b/include/bx/cl.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_CL_H__
-#define __BX_CL_H__
+#ifndef BX_CL_H_HEADER_GUARD
+#define BX_CL_H_HEADER_GUARD
 
 /// To implement OpenCL dynamic loading, define BX_CL_IMPLEMENTATION and
 /// #include <bx/cl.h> into .cpp file.
@@ -917,4 +917,4 @@ namespace bx
 
 #endif // __OPENCL_CL_H
 
-#endif // __BX_CL_H__
+#endif // BX_CL_H_HEADER_GUARD
diff --git a/include/bx/commandline.h b/include/bx/commandline.h
index d88073b..c5ca497 100644
--- a/include/bx/commandline.h
+++ b/include/bx/commandline.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_COMMANDLINE_H__
-#define __BX_COMMANDLINE_H__
+#ifndef BX_COMMANDLINE_H_HEADER_GUARD
+#define BX_COMMANDLINE_H_HEADER_GUARD
 
 #include "bx.h"
 #include "string.h"
@@ -161,4 +161,4 @@ namespace bx
 
 } // namespace bx
 
-#endif /// __BX_COMMANDLINE_H__
+#endif /// BX_COMMANDLINE_H_HEADER_GUARD
diff --git a/include/bx/cpu.h b/include/bx/cpu.h
index f3be6b1..70379ec 100644
--- a/include/bx/cpu.h
+++ b/include/bx/cpu.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_CPU_H__
-#define __BX_CPU_H__
+#ifndef BX_CPU_H_HEADER_GUARD
+#define BX_CPU_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -99,4 +99,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_CPU_H__
+#endif // BX_CPU_H_HEADER_GUARD
diff --git a/include/bx/debug.h b/include/bx/debug.h
index 9f15854..f3b7018 100644
--- a/include/bx/debug.h
+++ b/include/bx/debug.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_DEBUG_H__
-#define __BX_DEBUG_H__
+#ifndef BX_DEBUG_H_HEADER_GUARD
+#define BX_DEBUG_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -61,4 +61,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_DEBUG_H__
+#endif // BX_DEBUG_H_HEADER_GUARD
diff --git a/include/bx/endian.h b/include/bx/endian.h
index 4227807..eb61b6e 100644
--- a/include/bx/endian.h
+++ b/include/bx/endian.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_ENDIAN_H__
-#define __BX_ENDIAN_H__
+#ifndef BX_ENDIAN_H_HEADER_GUARD
+#define BX_ENDIAN_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -84,4 +84,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_ENDIAN_H__
+#endif // BX_ENDIAN_H_HEADER_GUARD
diff --git a/include/bx/float4_neon.h b/include/bx/float4_neon.h
index b84a1dd..c07d57d 100644
--- a/include/bx/float4_neon.h
+++ b/include/bx/float4_neon.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_FLOAT4_NEON_H__
-#define __BX_FLOAT4_NEON_H__
+#ifndef BX_FLOAT4_NEON_H_HEADER_GUARD
+#define BX_FLOAT4_NEON_H_HEADER_GUARD
 
 #include <arm_neon.h>
 
@@ -241,4 +241,4 @@ namespace bx
 #define float4_floor float4_floor_ni
 #include "float4_ni.h"
 
-#endif // __BX_FLOAT4_NEON_H__
+#endif // BX_FLOAT4_NEON_H_HEADER_GUARD
diff --git a/include/bx/float4_ni.h b/include/bx/float4_ni.h
index 9bc721b..7d84721 100644
--- a/include/bx/float4_ni.h
+++ b/include/bx/float4_ni.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_FLOAT4_NI_H__
-#define __BX_FLOAT4_NI_H__
+#ifndef BX_FLOAT4_NI_H_HEADER_GUARD
+#define BX_FLOAT4_NI_H_HEADER_GUARD
 
 namespace bx
 {
@@ -423,4 +423,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_FLOAT4_NI_H__
+#endif // BX_FLOAT4_NI_H_HEADER_GUARD
diff --git a/include/bx/float4_ref.h b/include/bx/float4_ref.h
index 42f9f0b..6341d7e 100644
--- a/include/bx/float4_ref.h
+++ b/include/bx/float4_ref.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_FLOAT4_REF_H__
-#define __BX_FLOAT4_REF_H__
+#ifndef BX_FLOAT4_REF_H_HEADER_GUARD
+#define BX_FLOAT4_REF_H_HEADER_GUARD
 
 #include <math.h> // sqrtf
 
@@ -551,4 +551,4 @@ IMPLEMENT_TEST(xyzw , 0xf);
 #define float4_floor float4_floor_ni
 #include "float4_ni.h"
 
-#endif // __BX_FLOAT4_REF_H__
+#endif // BX_FLOAT4_REF_H_HEADER_GUARD
diff --git a/include/bx/float4_sse.h b/include/bx/float4_sse.h
index ed7b847..d520acc 100644
--- a/include/bx/float4_sse.h
+++ b/include/bx/float4_sse.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_FLOAT4_SSE_H__
-#define __BX_FLOAT4_SSE_H__
+#ifndef BX_FLOAT4_SSE_H_HEADER_GUARD
+#define BX_FLOAT4_SSE_H_HEADER_GUARD
 
 #include <emmintrin.h> // __m128i
 #if defined(__SSE4_1__)
diff --git a/include/bx/float4_swizzle.inl b/include/bx/float4_swizzle.inl
index 559cfe0..52b3d81 100644
--- a/include/bx/float4_swizzle.inl
+++ b/include/bx/float4_swizzle.inl
@@ -3,9 +3,9 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_FLOAT4_T_H__
+#ifndef BX_FLOAT4_T_H_HEADER_GUARD
 #	error "xmacro file, must be included from float4_*.h"
-#endif // __BX_FLOAT4_T_H__
+#endif // BX_FLOAT4_T_H_HEADER_GUARD
 
 // included from float4_t.h
 IMPLEMENT_SWIZZLE(x, x, x, x)
diff --git a/include/bx/float4_t.h b/include/bx/float4_t.h
index 745a780..8fc5620 100644
--- a/include/bx/float4_t.h
+++ b/include/bx/float4_t.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_FLOAT4_T_H__
-#define __BX_FLOAT4_T_H__
+#ifndef BX_FLOAT4_T_H_HEADER_GUARD
+#define BX_FLOAT4_T_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -19,4 +19,4 @@
 #	include "float4_ref.h"
 #endif //
 
-#endif // __BX_FLOAT4_T_H__
+#endif // BX_FLOAT4_T_H_HEADER_GUARD
diff --git a/include/bx/float4x4_t.h b/include/bx/float4x4_t.h
index a5b9fd3..9a96b14 100644
--- a/include/bx/float4x4_t.h
+++ b/include/bx/float4x4_t.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_FLOAT4X4_H__
-#define __BX_FLOAT4x4_H__
+#ifndef BX_FLOAT4X4_H_HEADER_GUARD
+#define BX_FLOAT4x4_H_HEADER_GUARD
 
 #include "float4_t.h"
 
@@ -165,4 +165,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_FLOAT4X4_H__
+#endif // BX_FLOAT4X4_H_HEADER_GUARD
diff --git a/include/bx/foreach.h b/include/bx/foreach.h
index 886dde3..62368f2 100644
--- a/include/bx/foreach.h
+++ b/include/bx/foreach.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_FOREACH_H__
-#define __BX_FOREACH_H__
+#ifndef BX_FOREACH_H_HEADER_GUARD
+#define BX_FOREACH_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -68,4 +68,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_FOREACH_H__
+#endif // BX_FOREACH_H_HEADER_GUARD
diff --git a/include/bx/handlealloc.h b/include/bx/handlealloc.h
index 1f97cf1..84bc316 100644
--- a/include/bx/handlealloc.h
+++ b/include/bx/handlealloc.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_HANDLE_ALLOC_H__
-#define __BX_HANDLE_ALLOC_H__
+#ifndef BX_HANDLE_ALLOC_H_HEADER_GUARD
+#define BX_HANDLE_ALLOC_H_HEADER_GUARD
 
 #include "bx.h"
 #include "allocator.h"
diff --git a/include/bx/hash.h b/include/bx/hash.h
index 45560c1..9f02e9c 100644
--- a/include/bx/hash.h
+++ b/include/bx/hash.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_HASH_H__
-#define __BX_HASH_H__
+#ifndef BX_HASH_H_HEADER_GUARD
+#define BX_HASH_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -111,4 +111,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_HASH_H__
+#endif // BX_HASH_H_HEADER_GUARD
diff --git a/include/bx/macros.h b/include/bx/macros.h
index 03a1320..34d35f9 100644
--- a/include/bx/macros.h
+++ b/include/bx/macros.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_MACROS_H__
-#define __BX_MACROS_H__
+#ifndef BX_MACROS_H_HEADER_GUARD
+#define BX_MACROS_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -165,4 +165,4 @@
 #	define BX_CONFIG_SEMAPHORE_PTHREAD (BX_PLATFORM_OSX|BX_PLATFORM_IOS)
 #endif // BX_CONFIG_SEMAPHORE_PTHREAD
 
-#endif // __BX_MACROS_H__
+#endif // BX_MACROS_H_HEADER_GUARD
diff --git a/include/bx/maputil.h b/include/bx/maputil.h
index 94333a4..de22ea9 100644
--- a/include/bx/maputil.h
+++ b/include/bx/maputil.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_MAPUTIL_H__
-#define __BX_MAPUTIL_H__
+#ifndef BX_MAPUTIL_H_HEADER_GUARD
+#define BX_MAPUTIL_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -26,4 +26,4 @@ namespace bx
 	}
 } // namespace bx
 
-#endif // __BX_MAPUTIL_H__
+#endif // BX_MAPUTIL_H_HEADER_GUARD
diff --git a/include/bx/mutex.h b/include/bx/mutex.h
index e7fcf1a..fa26965 100644
--- a/include/bx/mutex.h
+++ b/include/bx/mutex.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_MUTEX_H__
-#define __BX_MUTEX_H__
+#ifndef BX_MUTEX_H_HEADER_GUARD
+#define BX_MUTEX_H_HEADER_GUARD
 
 #include "bx.h"
 #include "cpu.h"
@@ -130,4 +130,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_MUTEX_H__
+#endif // BX_MUTEX_H_HEADER_GUARD
diff --git a/include/bx/os.h b/include/bx/os.h
index 3785c66..9abcbc8 100644
--- a/include/bx/os.h
+++ b/include/bx/os.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_OS_H__
-#define __BX_OS_H__
+#ifndef BX_OS_H_HEADER_GUARD
+#define BX_OS_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -127,4 +127,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_OS_H__
+#endif // BX_OS_H_HEADER_GUARD
diff --git a/include/bx/platform.h b/include/bx/platform.h
index 3de31ce..f7aa323 100644
--- a/include/bx/platform.h
+++ b/include/bx/platform.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_PLATFORM_H__
-#define __BX_PLATFORM_H__
+#ifndef BX_PLATFORM_H_HEADER_GUARD
+#define BX_PLATFORM_H_HEADER_GUARD
 
 #define BX_COMPILER_CLANG 0
 #define BX_COMPILER_GCC 0
@@ -156,4 +156,4 @@
 typedef struct { long double x, y; } __float128;
 #endif // BX_COMPILER_CLANG && BX_PLATFORM_LINUX
 
-#endif // __BX_PLATFORM_H__
+#endif // BX_PLATFORM_H_HEADER_GUARD
diff --git a/include/bx/radixsort.h b/include/bx/radixsort.h
index 02ba753..e7833d7 100644
--- a/include/bx/radixsort.h
+++ b/include/bx/radixsort.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_RADIXSORT_H__
-#define __BX_RADIXSORT_H__
+#ifndef BX_RADIXSORT_H_HEADER_GUARD
+#define BX_RADIXSORT_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -162,4 +162,4 @@ done:
 
 } // namespace bx
 
-#endif // __BX_RADIXSORT_H__
+#endif // BX_RADIXSORT_H_HEADER_GUARD
diff --git a/include/bx/readerwriter.h b/include/bx/readerwriter.h
index 128c4c7..7419783 100644
--- a/include/bx/readerwriter.h
+++ b/include/bx/readerwriter.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
  
-#ifndef __BX_READERWRITER_H__
-#define __BX_READERWRITER_H__
+#ifndef BX_READERWRITER_H_HEADER_GUARD
+#define BX_READERWRITER_H_HEADER_GUARD
 
 #include <stdio.h>
 #include <string.h>
@@ -509,4 +509,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_READERWRITER_H__
+#endif // BX_READERWRITER_H_HEADER_GUARD
diff --git a/include/bx/ringbuffer.h b/include/bx/ringbuffer.h
index 2f21cd6..1dde1f4 100644
--- a/include/bx/ringbuffer.h
+++ b/include/bx/ringbuffer.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_RINGBUFFER_H__
-#define __BX_RINGBUFFER_H__
+#ifndef BX_RINGBUFFER_H_HEADER_GUARD
+#define BX_RINGBUFFER_H_HEADER_GUARD
 
 #include "bx.h"
 #include "cpu.h"
@@ -319,4 +319,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_RINGBUFFER_H__
+#endif // BX_RINGBUFFER_H_HEADER_GUARD
diff --git a/include/bx/rng.h b/include/bx/rng.h
index 9889e49..c8052dd 100644
--- a/include/bx/rng.h
+++ b/include/bx/rng.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_RNG_H__
-#define __BX_RNG_H__
+#ifndef BX_RNG_H_HEADER_GUARD
+#define BX_RNG_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -181,4 +181,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_RNG_H__
+#endif // BX_RNG_H_HEADER_GUARD
diff --git a/include/bx/sem.h b/include/bx/sem.h
index 43ccc4c..0e6f516 100644
--- a/include/bx/sem.h
+++ b/include/bx/sem.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_SEM_H__
-#define __BX_SEM_H__
+#ifndef BX_SEM_H_HEADER_GUARD
+#define BX_SEM_H_HEADER_GUARD
 
 #include "bx.h"
 #include "mutex.h"
@@ -221,4 +221,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_SEM_H__
+#endif // BX_SEM_H_HEADER_GUARD
diff --git a/include/bx/spscqueue.h b/include/bx/spscqueue.h
index 729924e..5f57fa8 100644
--- a/include/bx/spscqueue.h
+++ b/include/bx/spscqueue.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_SPSCQUEUE_H__
-#define __BX_SPSCQUEUE_H__
+#ifndef BX_SPSCQUEUE_H_HEADER_GUARD
+#define BX_SPSCQUEUE_H_HEADER_GUARD
 
 #include "bx.h"
 #include "cpu.h"
@@ -199,4 +199,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_RINGBUFFER_H__
+#endif // BX_RINGBUFFER_H_HEADER_GUARD
diff --git a/include/bx/string.h b/include/bx/string.h
index 7deb153..64a8e56 100644
--- a/include/bx/string.h
+++ b/include/bx/string.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_PRINTF_H__
-#define __BX_PRINTF_H__
+#ifndef BX_PRINTF_H_HEADER_GUARD
+#define BX_PRINTF_H_HEADER_GUARD
 
 #include "bx.h"
 #include <alloca.h>
@@ -342,4 +342,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_PRINTF_H__
+#endif // BX_PRINTF_H_HEADER_GUARD
diff --git a/include/bx/thread.h b/include/bx/thread.h
index b2f813c..e43c6cb 100644
--- a/include/bx/thread.h
+++ b/include/bx/thread.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_THREAD_H__
-#define __BX_THREAD_H__
+#ifndef BX_THREAD_H_HEADER_GUARD
+#define BX_THREAD_H_HEADER_GUARD
 
 #if BX_PLATFORM_POSIX
 #	include <pthread.h>
@@ -222,4 +222,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_THREAD_H__
+#endif // BX_THREAD_H_HEADER_GUARD
diff --git a/include/bx/timer.h b/include/bx/timer.h
index 75b629c..41876b9 100644
--- a/include/bx/timer.h
+++ b/include/bx/timer.h
@@ -3,8 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#ifndef __BX_TIMER_H__
-#define __BX_TIMER_H__
+#ifndef BX_TIMER_H_HEADER_GUARD
+#define BX_TIMER_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -55,4 +55,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_TIMER_H__
+#endif // BX_TIMER_H_HEADER_GUARD
diff --git a/include/bx/uint32_t.h b/include/bx/uint32_t.h
index 511347a..f06d1b0 100644
--- a/include/bx/uint32_t.h
+++ b/include/bx/uint32_t.h
@@ -23,8 +23,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE
 
-#ifndef __BX_UINT32_T_H__
-#define __BX_UINT32_T_H__
+#ifndef BX_UINT32_T_H_HEADER_GUARD
+#define BX_UINT32_T_H_HEADER_GUARD
 
 #include "bx.h"
 
@@ -632,4 +632,4 @@ namespace bx
 
 } // namespace bx
 
-#endif // __BX_UINT32_T_H__
+#endif // BX_UINT32_T_H_HEADER_GUARD