diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h
index 81125b98fe..1936ac7e29 100644
--- a/libretro-common/include/retro_miscellaneous.h
+++ b/libretro-common/include/retro_miscellaneous.h
@@ -30,13 +30,17 @@
 #include <boolean.h>
 #include <retro_inline.h>
 
-#if defined(_WIN32) && !defined(_XBOX)
+#if defined(_WIN32)
+
+#if defined(_XBOX)
+#include <Xtl.h>
+#else
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
-#elif defined(_WIN32) && defined(_XBOX)
-#include <Xtl.h>
+#endif
+
 #endif
 
 #if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
diff --git a/verbosity.c b/verbosity.c
index 6853f6ecff..258d7c8379 100644
--- a/verbosity.c
+++ b/verbosity.c
@@ -39,11 +39,19 @@
 #include <android/log.h>
 #endif
 
-#if defined(_WIN32) && !defined(_XBOX)
+#if defined(_WIN32)
+
+#if defined(_XBOX)
+#include <Xtl.h>
+#else
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 
+#endif
+
 #include <file/file_path.h>
 #include <string/stdstring.h>
 #include <streams/file_stream.h>