From 99d3ddf99872762415c4143085ac3266baebca53 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 29 Nov 2015 02:02:34 +0100
Subject: [PATCH] Cleanups

---
 frontend/frontend.c        | 5 ++++-
 frontend/frontend_driver.c | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index f8b69d8c95..8b7af73ba1 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -16,13 +16,16 @@
  */
 
 #include <file/file_path.h>
+#include <retro_assert.h>
 #include <retro_stat.h>
 #include <rthreads/async_job.h>
 
 #include "frontend.h"
+
+#include "../defaults.h"
+#include "../driver.h"
 #include "../system.h"
 #include "../driver.h"
-#include "../general.h"
 #include "../retroarch.h"
 #include "../runloop.h"
 #include "../runloop_data.h"
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index bce144de42..1af9e51288 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -17,6 +17,9 @@
 #include <string.h>
 
 #include "frontend_driver.h"
+#ifndef IS_SALAMANDER
+#include "../driver.h"
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"