diff --git a/include/bx/debug.h b/include/bx/debug.h
index 6a87c14..29f632c 100644
--- a/include/bx/debug.h
+++ b/include/bx/debug.h
@@ -10,7 +10,7 @@
 
 #if BX_PLATFORM_ANDROID
 #	include <android/log.h>
-#elif BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 || BX_PLATFORM_WINRT
+#elif BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT || BX_PLATFORM_XBOX360
 extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char* _str);
 #elif BX_PLATFORM_IOS || BX_PLATFORM_OSX
 #	if defined(__OBJC__)
@@ -47,7 +47,7 @@ namespace bx
 	{
 #if BX_PLATFORM_ANDROID
 		__android_log_write(ANDROID_LOG_DEBUG, "", _out);
-#elif BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 || BX_PLATFORM_WINRT
+#elif BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT || BX_PLATFORM_XBOX360
 		OutputDebugStringA(_out);
 #elif BX_PLATFORM_IOS || BX_PLATFORM_OSX
 #	if defined(__OBJC__)
diff --git a/include/bx/macros.h b/include/bx/macros.h
index 3aa481f..5e35c14 100644
--- a/include/bx/macros.h
+++ b/include/bx/macros.h
@@ -156,18 +156,18 @@
 
 #ifndef BX_CONFIG_CRT_FILE_READER_WRITER
 #	define BX_CONFIG_CRT_FILE_READER_WRITER (0 \
-				|BX_PLATFORM_ANDROID \
-				|BX_PLATFORM_FREEBSD \
-				|BX_PLATFORM_IOS \
-				|BX_PLATFORM_LINUX \
-				|BX_PLATFORM_OSX \
-				|BX_PLATFORM_QNX \
-				|BX_PLATFORM_WINDOWS \
-				)
+				|| BX_PLATFORM_ANDROID \
+				|| BX_PLATFORM_FREEBSD \
+				|| BX_PLATFORM_IOS \
+				|| BX_PLATFORM_LINUX \
+				|| BX_PLATFORM_OSX \
+				|| BX_PLATFORM_QNX \
+				|| BX_PLATFORM_WINDOWS \
+				? 1 : 0)
 #endif // BX_CONFIG_CRT_FILE_READER_WRITER
 
 #ifndef BX_CONFIG_SEMAPHORE_PTHREAD
-#	define BX_CONFIG_SEMAPHORE_PTHREAD (BX_PLATFORM_OSX|BX_PLATFORM_IOS)
+#	define BX_CONFIG_SEMAPHORE_PTHREAD (BX_PLATFORM_OSX || BX_PLATFORM_IOS)
 #endif // BX_CONFIG_SEMAPHORE_PTHREAD
 
 #ifndef BX_CONFIG_SUPPORTS_THREADING
diff --git a/include/bx/platform.h b/include/bx/platform.h
index bb88ca5..e5aa480 100644
--- a/include/bx/platform.h
+++ b/include/bx/platform.h
@@ -55,18 +55,18 @@
 #	define BX_PLATFORM_XBOX360 1
 #elif defined(_WIN32) || defined(_WIN64)
 // http://msdn.microsoft.com/en-us/library/6sehtctf.aspx
-#   if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
-#	    undef BX_PLATFORM_WINDOWS
-#	    if !defined(WINVER) && !defined(_WIN32_WINNT)
-        // Windows Server 2003 with SP1, Windows XP with SP2 and above
-#		    define WINVER 0x0502
-#		    define _WIN32_WINNT 0x0502
-#	    endif // !defined(WINVER) && !defined(_WIN32_WINNT)
-#	    define BX_PLATFORM_WINDOWS _WIN32_WINNT
-#   else
-#       undef BX_PLATFORM_WINRT
-#       define BX_PLATFORM_WINRT 1
-#   endif
+#	if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
+#		undef BX_PLATFORM_WINDOWS
+#		if !defined(WINVER) && !defined(_WIN32_WINNT)
+		// Windows Server 2003 with SP1, Windows XP with SP2 and above
+#			define WINVER 0x0502
+#			define _WIN32_WINNT 0x0502
+#		endif // !defined(WINVER) && !defined(_WIN32_WINNT)
+#		define BX_PLATFORM_WINDOWS _WIN32_WINNT
+#	else
+#		undef BX_PLATFORM_WINRT
+#		define BX_PLATFORM_WINRT 1
+#	endif
 #elif defined(__native_client__)
 // NaCl compiler defines __linux__
 #	undef BX_PLATFORM_NACL
@@ -178,7 +178,7 @@
 #elif BX_PLATFORM_WINDOWS
 #	define BX_PLATFORM_NAME "Windows"
 #elif BX_PLATFORM_WINRT
-#   define BX_PLATFORM_NAME "WinRT"
+#	define BX_PLATFORM_NAME "WinRT"
 #endif // BX_PLATFORM_
 
 #if BX_CPU_ARM