diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c
index 60e87e3a3d..67e7aca4df 100644
--- a/gfx/drivers/d3d8.c
+++ b/gfx/drivers/d3d8.c
@@ -1005,7 +1005,7 @@ static void d3d8_set_nonblock_state(void *data, bool state)
 #ifdef _XBOX
    d3d8_set_render_state(d3d->dev, D3D8_PRESENTATIONINTERVAL,
          interval ?
-         D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
+         D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE
          );
 #else
    d3d->needs_restore = true;
@@ -1511,9 +1511,7 @@ static void d3d8_get_overlay_interface(void *data,
 
 static void d3d8_update_title(video_frame_info_t *video_info)
 {
-#ifdef _XBOX
-   const ui_window_t *window      = NULL;
-#else
+#ifndef _XBOX
    const ui_window_t *window      = ui_companion_driver_get_window_ptr();
 #endif
 
diff --git a/gfx/drivers_font/xdk1_xfonts.c b/gfx/drivers_font/xdk1_xfonts.c
index ccfc7b8542..3e7e425e81 100644
--- a/gfx/drivers_font/xdk1_xfonts.c
+++ b/gfx/drivers_font/xdk1_xfonts.c
@@ -22,8 +22,8 @@
 #endif
 
 #include "../drivers/d3d.h"
-#include "../drivers/d3d_common.h"
-#include "../drivers/d3d8_common.h"
+#include "../common/d3d_common.h"
+#include "../common/d3d8_common.h"
 
 #include "../font_driver.h"