diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 86d498d3d2..55569ea56b 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -201,7 +201,7 @@ void find_audio_driver(void)
 {
    int i = find_driver_index("audio_driver", g_settings.audio.driver);
    if (i >= 0)
-      driver.audio = audio_driver_find_handle(i);
+      driver.audio = (const audio_driver_t*)audio_driver_find_handle(i);
    else
    {
       unsigned d;
@@ -212,7 +212,7 @@ void find_audio_driver(void)
          RARCH_LOG_OUTPUT("\t%s\n", audio_driver_find_ident(d));
       RARCH_WARN("Going to default to first audio driver...\n");
 
-      driver.audio = audio_driver_find_handle(0);
+      driver.audio = (const audio_driver_t*)audio_driver_find_handle(0);
 
       if (!driver.audio)
          rarch_fail(1, "find_audio_driver()");
diff --git a/audio/drivers/xaudio.c b/audio/drivers/xaudio.c
index 630e4e646d..c744f6aa50 100644
--- a/audio/drivers/xaudio.c
+++ b/audio/drivers/xaudio.c
@@ -36,7 +36,7 @@ static void *xa_init(const char *device, unsigned rate, unsigned latency)
    if (latency < 8)
       latency = 8; /* Do not allow shenanigans. */
 
-   xa_t *xa = (xa_t*)calloc(1, sizeof(*xa));
+   xa = (xa_t*)calloc(1, sizeof(*xa));
    if (!xa)
       return NULL;
 
diff --git a/camera/camera_driver.c b/camera/camera_driver.c
index 9f88e5eb29..3d3eb03097 100644
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@@ -107,7 +107,7 @@ void find_camera_driver(void)
 {
    int i = find_driver_index("camera_driver", g_settings.camera.driver);
    if (i >= 0)
-      driver.camera = camera_driver_find_handle(i);
+      driver.camera = (const camera_driver_t*)camera_driver_find_handle(i);
    else
    {
       unsigned d;
@@ -119,7 +119,7 @@ void find_camera_driver(void)
        
       RARCH_WARN("Going to default to first camera driver...\n");
        
-      driver.camera = camera_driver_find_handle(0);
+      driver.camera = (const camera_driver_t*)camera_driver_find_handle(0);
        
       if (!driver.camera)
          rarch_fail(1, "find_camera_driver()");
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index da9a4468e2..38f27b815d 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -149,7 +149,7 @@ void find_video_driver(void)
 
    i = find_driver_index("video_driver", g_settings.video.driver);
    if (i >= 0)
-      driver.video = video_driver_find_handle(i);
+      driver.video = (const video_driver_t*)video_driver_find_handle(i);
    else
    {
       unsigned d;
@@ -160,7 +160,7 @@ void find_video_driver(void)
          RARCH_LOG_OUTPUT("\t%s\n", video_driver_find_ident(d));
       RARCH_WARN("Going to default to first video driver...\n");
 
-      driver.video = video_driver_find_handle(0);
+      driver.video = (const video_driver_t*)video_driver_find_handle(0);
 
       if (!driver.video)
          rarch_fail(1, "find_video_driver()");
diff --git a/input/input_driver.c b/input/input_driver.c
index 0784929532..788a66dc99 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -136,7 +136,7 @@ void find_input_driver(void)
 {
    int i = find_driver_index("input_driver", g_settings.input.driver);
    if (i >= 0)
-      driver.input = input_driver_find_handle(i);
+      driver.input = (const input_driver_t*)input_driver_find_handle(i);
    else
    {
       unsigned d;
@@ -147,7 +147,7 @@ void find_input_driver(void)
          RARCH_LOG_OUTPUT("\t%s\n", input_driver_find_ident(d));
       RARCH_WARN("Going to default to first input driver...\n");
 
-      driver.input = input_driver_find_handle(0);
+      driver.input = (const input_driver_t*)input_driver_find_handle(0);
 
       if (!driver.input)
          rarch_fail(1, "find_input_driver()");
diff --git a/location/location_driver.c b/location/location_driver.c
index e764d3961b..b63fabc646 100644
--- a/location/location_driver.c
+++ b/location/location_driver.c
@@ -103,7 +103,7 @@ void find_location_driver(void)
 {
    int i = find_driver_index("location_driver", g_settings.location.driver);
    if (i >= 0)
-      driver.location = location_driver_find_handle(i);
+      driver.location = (const location_driver_t*)location_driver_find_handle(i);
    else
    {
       unsigned d;
@@ -115,7 +115,7 @@ void find_location_driver(void)
        
       RARCH_WARN("Going to default to first location driver...\n");
        
-      driver.location = location_driver_find_handle(0);
+      driver.location = (const location_driver_t*)location_driver_find_handle(0);
 
       if (!driver.location)
          rarch_fail(1, "find_location_driver()");
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index b8dd2b1a76..0e243da3bc 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -116,7 +116,7 @@ void find_menu_driver(void)
 {
    int i = find_driver_index("menu_driver", g_settings.menu.driver);
    if (i >= 0)
-      driver.menu_ctx = menu_driver_find_handle(i);
+      driver.menu_ctx = (const menu_ctx_driver_t*)menu_driver_find_handle(i);
    else
    {
       unsigned d;
@@ -127,7 +127,7 @@ void find_menu_driver(void)
          RARCH_LOG_OUTPUT("\t%s\n", menu_driver_find_ident(d));
       RARCH_WARN("Going to default to first menu driver...\n");
 
-      driver.menu_ctx = menu_driver_find_handle(0);
+      driver.menu_ctx = (const menu_ctx_driver_t*)menu_driver_find_handle(0);
 
       if (!driver.menu_ctx)
          rarch_fail(1, "find_menu_driver()");
diff --git a/osk/osk_driver.c b/osk/osk_driver.c
index 7997d196cb..580b627f46 100644
--- a/osk/osk_driver.c
+++ b/osk/osk_driver.c
@@ -103,7 +103,7 @@ void find_osk_driver(void)
 {
    int i = find_driver_index("osk_driver", g_settings.osk.driver);
    if (i >= 0)
-      driver.osk = osk_driver_find_handle(i);
+      driver.osk = (const input_osk_driver_t*)osk_driver_find_handle(i);
    else
    {
       unsigned d;
@@ -115,7 +115,7 @@ void find_osk_driver(void)
 
       RARCH_WARN("Going to default to first OSK driver...\n");
        
-      driver.osk = osk_driver_find_handle(0);
+      driver.osk = (const input_osk_driver_t*)osk_driver_find_handle(0);
        
       if (!driver.osk)
          rarch_fail(1, "find_osk_driver()");