diff --git a/driver.c b/driver.c
index 54b97d56ff..757c816864 100644
--- a/driver.c
+++ b/driver.c
@@ -291,7 +291,7 @@ void driver_set_nonblock_state(void)
 
 /**
  * driver_update_system_av_info:
- * @info               : pointer to new A/V info
+ * @data               : pointer to new A/V info
  *
  * Update the system Audio/Video information. 
  * Will reinitialize audio/video drivers.
@@ -299,9 +299,10 @@ void driver_set_nonblock_state(void)
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-bool driver_update_system_av_info(const struct retro_system_av_info *info)
+bool driver_update_system_av_info(const void *data)
 {
-   struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
+   const struct retro_system_av_info *info = (const struct retro_system_av_info*)data;
+   struct retro_system_av_info *av_info    = video_viewport_get_system_av_info();
 
    memcpy(av_info, info, sizeof(*av_info));
    event_command(EVENT_CMD_REINIT);
diff --git a/driver.h b/driver.h
index 3c806a99db..e7ca2830e9 100644
--- a/driver.h
+++ b/driver.h
@@ -24,8 +24,6 @@
 #include <boolean.h>
 #include <compat/posix_string.h>
 
-#include "libretro.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -275,7 +273,7 @@ void driver_set_refresh_rate(float hz);
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-bool driver_update_system_av_info(const struct retro_system_av_info *info);
+bool driver_update_system_av_info(const void *data);
 
 /**
  * find_driver_index:
diff --git a/input/common/input_x11_common.c b/input/common/input_x11_common.c
index 5d9fe5e387..e6b5013440 100644
--- a/input/common/input_x11_common.c
+++ b/input/common/input_x11_common.c
@@ -14,6 +14,7 @@
  */
 
 #include "input_x11_common.h"
+#include "../../libretro.h"
 
 static bool x11_mouse_wu;
 static bool x11_mouse_wd;
diff --git a/input/input_keymaps.h b/input/input_keymaps.h
index 8aeac14f9b..8917d8946e 100644
--- a/input/input_keymaps.h
+++ b/input/input_keymaps.h
@@ -19,7 +19,8 @@
 
 #include <file/config_file.h>
 #include <stdint.h>
-#include "../driver.h"
+
+#include "../libretro.h"
 
 #ifdef __cplusplus
 extern "C" {