diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h
index 5d5c1fa284..04f2d6e3f4 100644
--- a/gfx/common/gl_common.h
+++ b/gfx/common/gl_common.h
@@ -33,15 +33,12 @@
 #include "../video_coord_array.h"
 #include "../video_driver.h"
 #include "../drivers/gl_symlinks.h"
+#include <glsym/glsym.h>
 
 RETRO_BEGIN_DECLS
 
 #define MAX_FENCES 4
 
-#ifndef ARB_sync
-typedef struct __GLsync *GLsync;
-#endif
-
 typedef struct gl
 {
    GLenum internal_fmt;
diff --git a/input/input_driver.c b/input/input_driver.c
index abfba95a91..b2e216c191 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -806,6 +806,9 @@ void input_menu_keys_pressed(void *data, retro_bits_t* p_new_state)
    uint8_t port_max                             = 
       settings->bools.input_all_users_control_menu 
       ? max_users : 1;
+	
+   joypad_info.joy_idx                          = 0;
+   joypad_info.auto_binds                       = NULL;
 
    RARCH_INPUT_STATE_CLEAR_PTR( p_new_state );