diff --git a/frontend/info/core_info.c b/frontend/info/core_info.c
index 20886e30e1..24b74a5220 100644
--- a/frontend/info/core_info.c
+++ b/frontend/info/core_info.c
@@ -14,14 +14,14 @@
  */
 
 #include "core_info.h"
-#include "general.h"
-#include "file.h"
-#include "file_ext.h"
-#include "file_extract.h"
-#include "config.def.h"
+#include "../../general.h"
+#include "../../file.h"
+#include "../../file_ext.h"
+#include "../../file_extract.h"
+#include "../../config.def.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif
 
 static void core_info_list_resolve_all_extensions(core_info_list_t *core_info_list)
diff --git a/frontend/info/core_info.h b/frontend/info/core_info.h
index 12ab79efa6..ae6830ff32 100644
--- a/frontend/info/core_info.h
+++ b/frontend/info/core_info.h
@@ -16,8 +16,8 @@
 #ifndef CORE_INFO_H_
 #define CORE_INFO_H_
 
-#include "conf/config_file.h"
-#include "file.h"
+#include "../../conf/config_file.h"
+#include "../file.h"
 #include <stddef.h>
 
 #ifdef __cplusplus
diff --git a/frontend/menu/file_list.c b/frontend/menu/file_list.c
index 317ce785a2..3bba3962f1 100644
--- a/frontend/menu/file_list.c
+++ b/frontend/menu/file_list.c
@@ -17,8 +17,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "file_list.h"
-#include "compat/strcasestr.h"
-#include "msvc/msvc_compat.h"
+#include "../../compat/strcasestr.h"
+#include "../../msvc/msvc_compat.h"
 #ifdef HAVE_RMENU_XUI
 #include <xui.h>
 #endif
diff --git a/frontend/menu/file_list.h b/frontend/menu/file_list.h
index 90facda034..d4056d50dd 100644
--- a/frontend/menu/file_list.h
+++ b/frontend/menu/file_list.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include "boolean.h"
+#include "../../boolean.h"
 
 struct item_file;
 typedef struct file_list
diff --git a/gfx/context/xdk_ctx.c b/gfx/context/xdk_ctx.c
index 61301779db..ea3dff6f28 100644
--- a/gfx/context/xdk_ctx.c
+++ b/gfx/context/xdk_ctx.c
@@ -15,6 +15,7 @@
  */
 
 #include "../../driver.h"
+#include "../gfx_common.h"
 
 #ifdef _XBOX
 #include "../../xdk/xdk_d3d.h"