diff --git a/libretro-common/audio/audio_mix.c b/libretro-common/audio/audio_mix.c
index 74dad087ee..f94fedbb5c 100644
--- a/libretro-common/audio/audio_mix.c
+++ b/libretro-common/audio/audio_mix.c
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <memalign.h>
 
+#include <retro_environment.h>
+
 #if defined(__SSE2__)
 #include <emmintrin.h>
 #elif defined(__ALTIVEC__)
diff --git a/libretro-common/audio/resampler/drivers/sinc_resampler.c b/libretro-common/audio/resampler/drivers/sinc_resampler.c
index 47e99983e8..d3a9f7c6d4 100644
--- a/libretro-common/audio/resampler/drivers/sinc_resampler.c
+++ b/libretro-common/audio/resampler/drivers/sinc_resampler.c
@@ -27,6 +27,7 @@
 #include <math.h>
 #include <string.h>
 
+#include <retro_environment.h>
 #include <retro_inline.h>
 #include <filters.h>
 #include <memalign.h>
diff --git a/libretro-common/include/retro_endianness.h b/libretro-common/include/retro_endianness.h
index 141816bc45..aefffef802 100644
--- a/libretro-common/include/retro_endianness.h
+++ b/libretro-common/include/retro_endianness.h
@@ -81,12 +81,9 @@ static INLINE uint64_t SWAP64(uint64_t val)
 #  undef MSB_FIRST
 #endif
 
-#if defined(_MSC_VER) && !defined(_XBOX)
-#include <winsock2.h>
-#endif
-
 #ifdef _MSC_VER
-#if _M_IX86 || _M_AMD64 || _M_ARM || _M_ARM64
+/* MSVC pre-defines macros depending on target arch */
+#if defined (_M_IX86) || defined (_M_AMD64) || defined (_M_ARM) || defined (_M_ARM64)
 #define LSB_FIRST 1
 #elif _M_PPC
 #define MSB_FIRST 1