misc: Only include rbpaths.h and string-extra.h in places that need it

(Don't include rbpaths.h in settings.h, or string-extra.h in rbpaths.h)

Build-tested on rocker, erosq, mini2g, nano2g,
                xduoox3, clipzip, dx50, and uisim

Change-Id: If32e9c9910f5c8247a655cb64522b84d6d7ccbb5

apps/gui/icon.c

@@ -28,6 +28,7 @@
 #include "screen_access.h"
 #include "icons.h"
 #include "settings.h"
+#include "rbpaths.h"
 #include "bmp.h"
 #include "filetypes.h"
 #include "language.h"

apps/gui/skin_engine/skin_engine.c

@@ -27,6 +27,7 @@
 #include "action.h"
 #include "crc32.h"
 #include "settings.h"
+#include "rbpaths.h"
 #include "wps.h"
 #include "file.h"
 #include "misc.h"

apps/menus/eq_menu.c

@@ -31,6 +31,7 @@
 #include "menu.h"
 #include "action.h"
 #include "settings.h"
+#include "rbpaths.h"
 #include "screens.h"
 #include "icons.h"
 #include "font.h"

apps/menus/playlist_menu.c

@@ -26,6 +26,7 @@
 #include "lang.h"
 #include "action.h"
 #include "settings.h"
+#include "string-extra.h"
 #include "menu.h"
 #include "playlist_menu.h"
 

apps/menus/recording_menu.c

@@ -30,6 +30,7 @@
 #include "menu.h"
 #include "button.h"
 #include "settings.h"
+#include "rbpaths.h"
 #include "screens.h"
 #include "icons.h"
 #include "font.h"

apps/menus/settings_menu.c

@@ -27,6 +27,7 @@
 #include "lang.h"
 #include "action.h"
 #include "settings.h"
+#include "rbpaths.h"
 #include "menu.h"
 #include "open_plugin.h"
 #include "keyboard.h"

apps/menus/theme_menu.c

@@ -27,6 +27,7 @@
 #include "lang.h"
 #include "action.h"
 #include "settings.h"
+#include "rbpaths.h"
 #include "menu.h"
 #include "tree.h"
 #include "list.h"

apps/playlist_catalog.c

@@ -36,6 +36,7 @@
 #include "onplay.h"
 #include "playlist.h"
 #include "settings.h"
+#include "rbpaths.h"
 #include "splash.h"
 #include "tree.h"
 #include "yesno.h"

apps/radio/presets.c

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include "settings.h"
+#include "rbpaths.h"
 #include "general.h"
 #include "radio.h"
 #include "tuner.h"

apps/radio/radioart.c

@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include "system.h"
-#include "settings.h"
+#include "rbpaths.h"
 #include "radio.h"
 #include "buffering.h"
 #include "playback.h" /* bufopen_user_data */

apps/scrobbler.c

@@ -31,11 +31,11 @@ http://www.audioscrobbler.net/wiki/Portable_Player_Logging
 #include "kernel.h"
 #include "audio.h"
 #include "core_alloc.h"
-#include "settings.h"
+#include "rbpaths.h"
 #include "ata_idle_notify.h"
 #include "pathfuncs.h"
 #include "appevents.h"
-
+#include "string-extra.h"
 #if CONFIG_RTC
 #include "time.h"
 #include "timefuncs.h"

apps/settings.h

@@ -32,7 +32,6 @@
 #include "button.h"
 #include "audio.h"
 #include "dsp_proc_settings.h"
-#include "rbpaths.h"
 
 struct opt_items {
     unsigned const char* string;

apps/settings_list.c

@@ -32,6 +32,7 @@
 #include "backlight.h"
 #include "sound.h"
 #include "settings.h"
+#include "rbpaths.h"
 #include "settings_list.h"
 #include "usb.h"
 #include "audio.h"

apps/shortcuts.c

@@ -33,6 +33,7 @@
 #include "list.h"
 #include "settings.h"
 #include "settings_list.h"
+#include "string-extra.h"
 #include "lang.h"
 #include "menu.h"
 #include "misc.h"

firmware/drivers/audio/erosqlinux_codec.c

@@ -20,9 +20,6 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#define RB_FILESYSTEM_OS  // VERY important this is before settings.h
-                          // because that pulls in rbpaths.h which breaks open()
-
 //#define LOGF_ENABLE
 
 #include "config.h"

firmware/export/rbpaths.h

@@ -24,8 +24,6 @@
 
 #include <stdbool.h>
 #include "autoconf.h"
-#include "string-extra.h"
-
 
 /* name of directory where configuration, fonts and other data
  * files are stored */

firmware/font.c

@@ -34,6 +34,7 @@
 #include "system.h"
 #include "kernel.h"
 #include "lcd.h"
+#include "string-extra.h"
 #include "font.h"
 #include "file.h"
 #include "core_alloc.h"