diff --git a/frontend/frontend.c b/frontend/frontend.c
index 9d1d853b33..19d229935b 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -34,7 +34,10 @@
 #include "../driver.h"
 #include "../paths.h"
 #include "../retroarch.h"
+
+#ifndef HAVE_MAIN
 #include "../runloop.h"
+#endif
 
 /**
  * main_exit:
diff --git a/gfx/drivers_font/d3d_w32_font.cpp b/gfx/drivers_font/d3d_w32_font.cpp
index 35d6e26f43..5f4d8d9453 100644
--- a/gfx/drivers_font/d3d_w32_font.cpp
+++ b/gfx/drivers_font/d3d_w32_font.cpp
@@ -22,9 +22,10 @@
 #include "../font_driver.h"
 
 #include "../../configuration.h"
-#include "../../runloop.h"
 
+#ifdef HAVE_D3D9
 #include "../include/d3d9/d3dx9core.h"
+#endif
 
 typedef struct
 {
diff --git a/gfx/drivers_font/xdk1_xfonts.c b/gfx/drivers_font/xdk1_xfonts.c
index a953fb5e72..e0a357d80f 100644
--- a/gfx/drivers_font/xdk1_xfonts.c
+++ b/gfx/drivers_font/xdk1_xfonts.c
@@ -23,7 +23,6 @@
 #include "../drivers/d3d.h"
 
 #include "../font_driver.h"
-#include "../../runloop.h"
 
 typedef struct
 {
diff --git a/gfx/drivers_font/xdk360_fonts.cpp b/gfx/drivers_font/xdk360_fonts.cpp
index 3e8f84339c..e0e00ebc57 100644
--- a/gfx/drivers_font/xdk360_fonts.cpp
+++ b/gfx/drivers_font/xdk360_fonts.cpp
@@ -18,13 +18,8 @@
 
 #include <string/stdstring.h>
 
-#ifdef HAVE_CONFIG_H
-#include "../../runloop.h"
-#endif
-
 #include "../d3d/d3d.h"
 #include "../font_driver.h"
-#include "../../runloop.h"
 
 #include "../drivers/d3d_shaders/font.hlsl.d3d9.h"
 
@@ -630,7 +625,6 @@ static void xdk360_free_font(void *data)
 
 static void xdk360_render_msg_post(xdk360_video_font_t * font)
 {
-   /* Cache the global pointer into a register */
    LPDIRECT3DDEVICE d3dr = font->d3d->dev;
 
    d3d_set_texture(d3dr, 0, NULL);