diff --git a/include/bx/platform.h b/include/bx/platform.h
index 37a77ad..e0031ec 100644
--- a/include/bx/platform.h
+++ b/include/bx/platform.h
@@ -11,10 +11,10 @@
 #define BX_ARCH_64BIT 0
 
 // Compiler
-#define BX_COMPILER_CLANG           0
-#define BX_COMPILER_CLANG_ANALYZER  0
-#define BX_COMPILER_GCC             0
-#define BX_COMPILER_MSVC            0
+#define BX_COMPILER_CLANG          0
+#define BX_COMPILER_CLANG_ANALYZER 0
+#define BX_COMPILER_GCC            0
+#define BX_COMPILER_MSVC           0
 
 // Endianess
 #define BX_CPU_ENDIAN_BIG    0
@@ -80,34 +80,34 @@
 #endif //
 
 // http://sourceforge.net/apps/mediawiki/predef/index.php?title=Architectures
-#if defined(__arm__)     || \
-	defined(__aarch64__) || \
-	defined(_M_ARM)
+#if defined(__arm__)     \
+ || defined(__aarch64__) \
+ || defined(_M_ARM)
 #	undef  BX_CPU_ARM
 #	define BX_CPU_ARM 1
 #	define BX_CACHE_LINE_SIZE 64
-#elif defined(__MIPSEL__)     || \
-	  defined(__mips_isa_rev) || \
-	  defined(__mips64)
+#elif defined(__MIPSEL__)     \
+ ||   defined(__mips_isa_rev) \
+ ||   defined(__mips64)
 #	undef  BX_CPU_MIPS
 #	define BX_CPU_MIPS 1
 #	define BX_CACHE_LINE_SIZE 64
-#elif defined(_M_PPC)        || \
-	  defined(__powerpc__)   || \
-	  defined(__powerpc64__)
+#elif defined(_M_PPC)        \
+ ||   defined(__powerpc__)   \
+ ||   defined(__powerpc64__)
 #	undef  BX_CPU_PPC
 #	define BX_CPU_PPC 1
 #	define BX_CACHE_LINE_SIZE 128
-#elif defined(__riscv)   || \
-	  defined(__riscv__) || \
-	  defined(RISCVEL)
+#elif defined(__riscv)   \
+ ||   defined(__riscv__) \
+ ||   defined(RISCVEL)
 #	undef  BX_CPU_RISCV
 #	define BX_CPU_RISCV 1
 #	define BX_CACHE_LINE_SIZE 64
-#elif defined(_M_IX86)    || \
-	  defined(_M_X64)     || \
-	  defined(__i386__)   || \
-	  defined(__x86_64__)
+#elif defined(_M_IX86)    \
+ ||   defined(_M_X64)     \
+ ||   defined(__i386__)   \
+ ||   defined(__x86_64__)
 #	undef  BX_CPU_X86
 #	define BX_CPU_X86 1
 #	define BX_CACHE_LINE_SIZE 64
@@ -117,14 +117,14 @@
 #	define BX_CACHE_LINE_SIZE 64
 #endif //
 
-#if defined(__x86_64__)    || \
-	defined(_M_X64)        || \
-	defined(__aarch64__)   || \
-	defined(__64BIT__)     || \
-	defined(__mips64)      || \
-	defined(__powerpc64__) || \
-	defined(__ppc64__)     || \
-	defined(__LP64__)
+#if defined(__x86_64__)    \
+ || defined(_M_X64)        \
+ || defined(__aarch64__)   \
+ || defined(__64BIT__)     \
+ || defined(__mips64)      \
+ || defined(__powerpc64__) \
+ || defined(__ppc64__)     \
+ || defined(__LP64__)
 #	undef  BX_ARCH_64BIT
 #	define BX_ARCH_64BIT 64
 #else
@@ -211,8 +211,8 @@
 #	undef  BX_PLATFORM_HURD
 #	define BX_PLATFORM_HURD 1
 #elif defined(__NX__)
-# undef BX_PLATFORM_NX
-# define BX_PLATFORM_NX 1
+#	undef  BX_PLATFORM_NX
+#	define BX_PLATFORM_NX 1
 #endif //
 
 #if !BX_CRT_NONE
@@ -246,47 +246,47 @@
 #	endif // BX_CRT_*
 #endif // !BX_CRT_NONE
 
-#define BX_PLATFORM_POSIX (0      \
-		|| BX_PLATFORM_ANDROID    \
-		|| BX_PLATFORM_BSD        \
-		|| BX_PLATFORM_EMSCRIPTEN \
-		|| BX_PLATFORM_HURD       \
-		|| BX_PLATFORM_IOS        \
-		|| BX_PLATFORM_LINUX      \
-		|| BX_PLATFORM_NX         \
-		|| BX_PLATFORM_OSX        \
-		|| BX_PLATFORM_PS4        \
-		|| BX_PLATFORM_RPI        \
-		|| BX_PLATFORM_STEAMLINK  \
-		)
+#define BX_PLATFORM_POSIX (0   \
+	||  BX_PLATFORM_ANDROID    \
+	||  BX_PLATFORM_BSD        \
+	||  BX_PLATFORM_EMSCRIPTEN \
+	||  BX_PLATFORM_HURD       \
+	||  BX_PLATFORM_IOS        \
+	||  BX_PLATFORM_LINUX      \
+	||  BX_PLATFORM_NX         \
+	||  BX_PLATFORM_OSX        \
+	||  BX_PLATFORM_PS4        \
+	||  BX_PLATFORM_RPI        \
+	||  BX_PLATFORM_STEAMLINK  \
+	)
 
-#define BX_PLATFORM_NONE !(0      \
-		|| BX_PLATFORM_ANDROID    \
-		|| BX_PLATFORM_BSD        \
-		|| BX_PLATFORM_EMSCRIPTEN \
-		|| BX_PLATFORM_HURD       \
-		|| BX_PLATFORM_IOS        \
-		|| BX_PLATFORM_LINUX      \
-		|| BX_PLATFORM_NX         \
-		|| BX_PLATFORM_OSX        \
-		|| BX_PLATFORM_PS4        \
-		|| BX_PLATFORM_RPI        \
-		|| BX_PLATFORM_STEAMLINK  \
-		|| BX_PLATFORM_WINDOWS    \
-		|| BX_PLATFORM_WINRT      \
-		|| BX_PLATFORM_XBOXONE    \
-		)
+#define BX_PLATFORM_NONE !(0   \
+	||  BX_PLATFORM_ANDROID    \
+	||  BX_PLATFORM_BSD        \
+	||  BX_PLATFORM_EMSCRIPTEN \
+	||  BX_PLATFORM_HURD       \
+	||  BX_PLATFORM_IOS        \
+	||  BX_PLATFORM_LINUX      \
+	||  BX_PLATFORM_NX         \
+	||  BX_PLATFORM_OSX        \
+	||  BX_PLATFORM_PS4        \
+	||  BX_PLATFORM_RPI        \
+	||  BX_PLATFORM_STEAMLINK  \
+	||  BX_PLATFORM_WINDOWS    \
+	||  BX_PLATFORM_WINRT      \
+	||  BX_PLATFORM_XBOXONE    \
+	)
 
 #if BX_COMPILER_GCC
-#	define BX_COMPILER_NAME "GCC " \
-				BX_STRINGIZE(__GNUC__) "." \
-				BX_STRINGIZE(__GNUC_MINOR__) "." \
-				BX_STRINGIZE(__GNUC_PATCHLEVEL__)
+#	define BX_COMPILER_NAME "GCC "       \
+		BX_STRINGIZE(__GNUC__) "."       \
+		BX_STRINGIZE(__GNUC_MINOR__) "." \
+		BX_STRINGIZE(__GNUC_PATCHLEVEL__)
 #elif BX_COMPILER_CLANG
-#	define BX_COMPILER_NAME "Clang " \
-				BX_STRINGIZE(__clang_major__) "." \
-				BX_STRINGIZE(__clang_minor__) "." \
-				BX_STRINGIZE(__clang_patchlevel__)
+#	define BX_COMPILER_NAME "Clang "      \
+		BX_STRINGIZE(__clang_major__) "." \
+		BX_STRINGIZE(__clang_minor__) "." \
+		BX_STRINGIZE(__clang_patchlevel__)
 #elif BX_COMPILER_MSVC
 #	if BX_COMPILER_MSVC >= 1910 // Visual Studio 2017
 #		define BX_COMPILER_NAME "MSVC 15.0"
@@ -311,10 +311,10 @@
 #elif BX_PLATFORM_BSD
 #	define BX_PLATFORM_NAME "BSD"
 #elif BX_PLATFORM_EMSCRIPTEN
-#	define BX_PLATFORM_NAME "asm.js " \
-				BX_STRINGIZE(__EMSCRIPTEN_major__) "." \
-				BX_STRINGIZE(__EMSCRIPTEN_minor__) "." \
-				BX_STRINGIZE(__EMSCRIPTEN_tiny__)
+#	define BX_PLATFORM_NAME "asm.js "          \
+		BX_STRINGIZE(__EMSCRIPTEN_major__) "." \
+		BX_STRINGIZE(__EMSCRIPTEN_minor__) "." \
+		BX_STRINGIZE(__EMSCRIPTEN_tiny__)
 #elif BX_PLATFORM_HURD
 #	define BX_PLATFORM_NAME "Hurd"
 #elif BX_PLATFORM_IOS