diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index c3625c000..0bda0cc99 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -19,7 +19,8 @@
 #		define WIN32_LEAN_AND_MEAN
 #	endif // WIN32_LEAN_AND_MEAN
 #	include <windows.h>
-#endif // BX_PLATFORM_OSX
+#	include <psapi.h>
+#endif // BX_PLATFORM_*
 
 BX_ERROR_RESULT(BGFX_ERROR_TEXTURE_VALIDATION,      BX_MAKEFOURCC('b', 'g', 0, 1) );
 BX_ERROR_RESULT(BGFX_ERROR_FRAME_BUFFER_VALIDATION, BX_MAKEFOURCC('b', 'g', 0, 2) );
@@ -2629,10 +2630,10 @@ namespace bgfx
 		HANDLE process = GetCurrentProcess();
 		DWORD size;
 		BOOL result = EnumProcessModules(process
-						, NULL
-						, 0
-						, &size
-						);
+			, NULL
+			, 0
+			, &size
+			);
 		if (0 != result)
 		{
 			HMODULE* modules = (HMODULE*)BX_STACK_ALLOC(size);
diff --git a/src/debug_renderdoc.cpp b/src/debug_renderdoc.cpp
index b4d01afd9..1116f9add 100644
--- a/src/debug_renderdoc.cpp
+++ b/src/debug_renderdoc.cpp
@@ -6,13 +6,6 @@
 #include "bgfx_p.h"
 
 #if BX_PLATFORM_WINDOWS || BX_PLATFORM_LINUX
-#	if BX_PLATFORM_WINDOWS
-#		ifndef WIN32_LEAN_AND_MEAN
-#			define WIN32_LEAN_AND_MEAN
-#		endif // WIN32_LEAN_AND_MEAN
-#		include <windows.h>
-#		include <psapi.h>
-#	endif // BX_PLATFORM_WINDOWS
 #	include <renderdoc/renderdoc_app.h>
 
 namespace bgfx