diff --git a/libretro-common/include/audio/audio_mix.h b/libretro-common/include/audio/audio_mix.h
index 1b66065d70..3b59dff689 100644
--- a/libretro-common/include/audio/audio_mix.h
+++ b/libretro-common/include/audio/audio_mix.h
@@ -27,7 +27,11 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#ifdef _WIN32
+#include <direct.h>
+#else
 #include <unistd.h>
+#endif
 
 #include <formats/rwav.h>
 #include <audio/audio_resampler.h>
diff --git a/menu/menu_event.c b/menu/menu_event.c
index d0e732be12..1f65ae4212 100644
--- a/menu/menu_event.c
+++ b/menu/menu_event.c
@@ -1,4 +1,4 @@
-#if defined(_WIN32) && defined(_MSC_VER) && !defined(_XBOX)
+#if defined(_WIN32) && defined(_MSC_VER) && !defined(_XBOX)
 
 #endif
 /*  RetroArch - A frontend for libretro.
@@ -44,7 +44,7 @@
 #include "../configuration.h"
 #include "../runloop.h"
 
-static unsigned char menu_keyboard_key_state[RETROK_LAST];
+static unsigned char menu_keyboard_key_state[RETROK_LAST] = {0};
 
 static int menu_event_pointer(unsigned *action)
 {