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

5 files changed, 5 insertions, 0 deletions

diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index 683025629b..49d35c133b 100644
--- a/apps/menus/eq_menu.c
+++ b/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"
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c
index dfb9d73d62..3122a4090f 100644
--- a/apps/menus/playlist_menu.c
+++ b/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"
 
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index c3187afbef..a870a5ee9b 100644
--- a/apps/menus/recording_menu.c
+++ b/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"
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 0b7516f749..4202298fa3 100644
--- a/apps/menus/settings_menu.c
+++ b/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"
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c
index 4a81c5cadf..2a50ed44b5 100644
--- a/apps/menus/theme_menu.c
+++ b/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"