diff --git a/frontend/frontend.c b/frontend/frontend.c
index c979f40ecc..8ad35366bc 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -18,6 +18,7 @@
 #include "../driver.h"
 #include "frontend.h"
 #include "../general.h"
+#include "../settings.h"
 #include <file/file_path.h>
 
 #if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
diff --git a/general.c b/general.c
index d773e9b658..8aa402447b 100644
--- a/general.c
+++ b/general.c
@@ -16,6 +16,7 @@
  */
 
 #include "general.h"
+#include "settings.h"
 #include "dynamic.h"
 #include <file/file_path.h>
 
diff --git a/general.h b/general.h
index 723a1b5255..a91e80b40e 100644
--- a/general.h
+++ b/general.h
@@ -838,36 +838,6 @@ extern struct defaults g_defaults;
 
 /* Public functions. */
 
-/**
- * config_load:
- *
- * Loads a config file and reads all the values into memory.
- *
- */
-void config_load(void);
-
-const char *config_get_default_camera(void);
-const char *config_get_default_location(void);
-const char *config_get_default_osk(void);
-const char *config_get_default_video(void);
-const char *config_get_default_audio(void);
-const char *config_get_default_audio_resampler(void);
-const char *config_get_default_input(void);
-const char *config_get_default_joypad(void);
-#ifdef HAVE_MENU
-const char *config_get_default_menu(void);
-#endif
-
-/**
- * config_save_file:
- * @path            : Path that shall be written to.
- *
- * Writes a config file to disk.
- *
- * Returns: true (1) on success, otherwise returns false (0).
- */
-bool config_save_file(const char *path);
-
 void rarch_main_state_new(void);
 void rarch_main_state_free(void);
 
diff --git a/retroarch.c b/retroarch.c
index c7325aecaa..582fba2d66 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -28,6 +28,7 @@
 #include <file/file_path.h>
 #include <file/dir_list.h>
 #include "general.h"
+#include "settings.h"
 #include <compat/strl.h>
 #include "screenshot.h"
 #include "performance.h"
diff --git a/settings.c b/settings.c
index 42a5b1011a..713fd74302 100644
--- a/settings.c
+++ b/settings.c
@@ -21,6 +21,7 @@
 #include "config.def.h"
 #include <file/file_path.h>
 #include "input/input_common.h"
+#include "settings.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/settings.h b/settings.h
new file mode 100644
index 0000000000..b2ee254323
--- /dev/null
+++ b/settings.h
@@ -0,0 +1,67 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_SETTINGS_H__
+#define __RARCH_SETTINGS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+const char *config_get_default_camera(void);
+
+const char *config_get_default_location(void);
+
+const char *config_get_default_osk(void);
+
+const char *config_get_default_video(void);
+
+const char *config_get_default_audio(void);
+
+const char *config_get_default_audio_resampler(void);
+
+const char *config_get_default_input(void);
+
+const char *config_get_default_joypad(void);
+
+#ifdef HAVE_MENU
+const char *config_get_default_menu(void);
+#endif
+
+/**
+ * config_load:
+ *
+ * Loads a config file and reads all the values into memory.
+ *
+ */
+void config_load(void);
+
+/**
+ * config_save_file:
+ * @path            : Path that shall be written to.
+ *
+ * Writes a config file to disk.
+ *
+ * Returns: true (1) on success, otherwise returns false (0).
+ */
+bool config_save_file(const char *path);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/settings_data.c b/settings_data.c
index da242a3c71..8b82ae69cd 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -24,6 +24,7 @@
 #include "config.def.h"
 #include "retroarch_logger.h"
 #include "file_ext.h"
+#include "settings.h"
 
 #if defined(__CELLOS_LV2__)
 #include <sdk_version.h>