diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index c5a4d50403..e1857a32e2 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -26,7 +26,8 @@
 
 #include "../command_event.h"
 #include "../configuration.h"
-#include "../general.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../performance.h"
 #include "../verbosity.h"
 #include "../list_special.h"
diff --git a/camera/camera_driver.c b/camera/camera_driver.c
index eeee9f1a15..673393f581 100644
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@@ -18,7 +18,9 @@
 
 #include "camera_driver.h"
 
-#include "../general.h"
+#include "../configuration.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../list_special.h"
 #include "../verbosity.h"
 
diff --git a/general.h b/general.h
index 5f78d20946..60c53d1c52 100644
--- a/general.h
+++ b/general.h
@@ -33,21 +33,4 @@
 #define PACKAGE_VERSION "1.3.3"
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * retro_fail:
- * @error_code  : Error code.
- * @error       : Error message to show.
- *
- * Sanely kills the program.
- **/
-void retro_fail(int error_code, const char *error);
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 5201abb8d9..6b14e1c09c 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -27,7 +27,8 @@
 #include "video_context_driver.h"
 #include "../record/record_driver.h"
 #include "../config.def.h"
-#include "../general.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../performance.h"
 #include "../list_special.h"
 #include "../libretro_version_1.h"
diff --git a/input/input_driver.c b/input/input_driver.c
index ad9f2d84eb..1607311420 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -16,9 +16,12 @@
 
 #include <string.h>
 
+#include "input_driver.h"
+
 #include "input_remapping.h"
 
-#include "../general.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../movie.h"
 #include "../list_special.h"
 #include "../verbosity.h"
diff --git a/location/location_driver.c b/location/location_driver.c
index 850d54ab3e..18a4108ddc 100644
--- a/location/location_driver.c
+++ b/location/location_driver.c
@@ -18,7 +18,9 @@
 
 #include "location_driver.h"
 
-#include "../general.h"
+#include "../configuration.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../system.h"
 #include "../list_special.h"
 #include "../verbosity.h"
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index ccdb2416cb..03ad9e5278 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -29,7 +29,7 @@
 
 #include "../content.h"
 #include "../core_info.h"
-#include "../general.h"
+#include "../retroarch.h"
 #include "../system.h"
 #include "../defaults.h"
 #include "../frontend/frontend.h"
diff --git a/movie.c b/movie.c
index ca37a6b9ac..e56f960fae 100644
--- a/movie.c
+++ b/movie.c
@@ -21,10 +21,12 @@
 #include <rhash.h>
 #include <retro_endianness.h>
 
+#include "configuration.h"
 #include "movie.h"
 #include "libretro_version_1.h"
 #include "content.h"
-#include "general.h"
+#include "retroarch.h"
+#include "runloop.h"
 #include "msg_hash.h"
 #include "verbosity.h"
 
diff --git a/movie.h b/movie.h
index 0c36f2c399..1e5d4f4d05 100644
--- a/movie.h
+++ b/movie.h
@@ -37,7 +37,7 @@ typedef struct bsv_movie bsv_movie_t;
 
 enum rarch_movie_type
 {
-   RARCH_MOVIE_PLAYBACK,
+   RARCH_MOVIE_PLAYBACK = 0,
    RARCH_MOVIE_RECORD
 };
 
diff --git a/retroarch.h b/retroarch.h
index f9245d5cf4..c58fb58944 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -173,6 +173,15 @@ const char *rarch_get_current_savefile_dir(void);
 
 bool rarch_game_options_validate(char *s, size_t len, bool mkdir);
 
+/**
+ * retro_fail:
+ * @error_code  : Error code.
+ * @error       : Error message to show.
+ *
+ * Sanely kills the program.
+ **/
+void retro_fail(int error_code, const char *error);
+
 #ifdef __cplusplus
 }
 #endif