From 271975954fd7dfca3435276f45793b21c620024d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Dec 2015 15:55:26 +0100
Subject: [PATCH] move camera_driver.h header incldue out of driver.h

---
 camera/drivers/android.c      | 3 ++-
 camera/drivers/nullcamera.c   | 2 +-
 camera/drivers/rwebcam.c      | 4 +++-
 camera/drivers/video4linux2.c | 4 +++-
 driver.c                      | 1 +
 driver.h                      | 1 -
 dynamic.c                     | 1 +
 menu/menu_setting.c           | 1 +
 runloop.c                     | 1 +
 9 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/camera/drivers/android.c b/camera/drivers/android.c
index 06e923d4e6..db2ff79217 100644
--- a/camera/drivers/android.c
+++ b/camera/drivers/android.c
@@ -16,7 +16,8 @@
  */
 
 #include <glsym/glsym.h>
-#include "../../driver.h"
+
+#include "../camera_driver.h"
 #include "../../gfx/video_texture.h"
 
 typedef struct android_camera
diff --git a/camera/drivers/nullcamera.c b/camera/drivers/nullcamera.c
index beacb6542a..f989ed26f3 100644
--- a/camera/drivers/nullcamera.c
+++ b/camera/drivers/nullcamera.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
+#include "../camera_driver.h"
 
 static void *nullcamera_init(const char *device, uint64_t caps,
       unsigned width, unsigned height)
diff --git a/camera/drivers/rwebcam.c b/camera/drivers/rwebcam.c
index 99355355bc..8e07fda6a4 100644
--- a/camera/drivers/rwebcam.c
+++ b/camera/drivers/rwebcam.c
@@ -14,8 +14,10 @@
  */
 
 #include <stdint.h>
+
 #include <boolean.h>
-#include "../../driver.h"
+
+#include "../camera_driver.h"
 
 /* forward declarations */
 void *RWebCamInit(uint64_t caps, unsigned width, unsigned height);
diff --git a/camera/drivers/video4linux2.c b/camera/drivers/video4linux2.c
index f06a4a96ce..325cfbb48f 100644
--- a/camera/drivers/video4linux2.c
+++ b/camera/drivers/video4linux2.c
@@ -32,13 +32,15 @@
 #include <linux/videodev2.h>
 
 #include <memmap.h>
+
+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <gfx/scaler/scaler.h>
 #include <retro_stat.h>
 
 #include <compat/strl.h>
 
-#include "../../general.h"
+#include "../camera_driver.h"
 #include "../../performance.h"
 #include "../../verbosity.h"
 
diff --git a/driver.c b/driver.c
index ed0ce77300..acbac4b376 100644
--- a/driver.c
+++ b/driver.c
@@ -23,6 +23,7 @@
 #include "verbosity.h"
 #include "audio/audio_driver.h"
 #include "audio/audio_resampler_driver.h"
+#include "camera/camera_driver.h"
 #include "location/location_driver.h"
 
 #ifdef HAVE_MENU
diff --git a/driver.h b/driver.h
index a6a09a0cd0..e90ff5ece1 100644
--- a/driver.h
+++ b/driver.h
@@ -27,7 +27,6 @@
 
 #include "libretro_private.h"
 
-#include "camera/camera_driver.h"
 #include "record/record_driver.h"
 
 #include "libretro_version_1.h"
diff --git a/dynamic.c b/dynamic.c
index b209246c05..bc8b9d9dc5 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "audio/audio_driver.h"
+#include "camera/camera_driver.h"
 #include "location/location_driver.h"
 #include "performance.h"
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 5c57f886fc..dfb9d3ab44 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -38,6 +38,7 @@
 #include "../driver.h"
 #include "../general.h"
 #include "../dynamic.h"
+#include "../camera/camera_driver.h"
 #include "../location/location_driver.h"
 #include "../audio/audio_driver.h"
 #include "../audio/audio_resampler_driver.h"
diff --git a/runloop.c b/runloop.c
index 999cfc5409..265827ec23 100644
--- a/runloop.c
+++ b/runloop.c
@@ -42,6 +42,7 @@
 #include "rewind.h"
 #include "dir_list_special.h"
 #include "audio/audio_driver.h"
+#include "camera/camera_driver.h"
 
 #include "msg_hash.h"