diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index bfbe2cfb37..0b2f9ccb17 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -20,6 +20,8 @@
 #include <xgraphics.h>
 #endif
 
+#include <formats/image.h>
+
 #include "d3d.h"
 #include "../video_viewport.h"
 #include "../video_monitor.h"
@@ -1521,7 +1523,7 @@ static bool d3d_overlay_load(void *data,
 {
    unsigned i, y;
    d3d_video_t *d3d = (d3d_video_t*)data;
-   const texture_image *images = (const texture_image*)
+   const struct texture_image *images = (const struct texture_image*)
       image_data;
 
    if (!d3d)
diff --git a/input/input_driver.c b/input/input_driver.c
index b5c4c5559d..b3c655c324 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -183,7 +183,7 @@ input_driver_t *input_driver_get_ptr(void)
    driver_t            *driver = driver_get_ptr();
    if (!driver)
       return NULL;
-   return driver->input_data;
+   return (input_driver_t*)driver->input_data;
 }
 
 /**