From 075aea2289b04d9f446981450315172e3b5d5358 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 6 Sep 2016 00:56:00 +0200
Subject: [PATCH] Header include cleanups

---
 database_info.c                        | 1 +
 gfx/common/drm_common.c                | 2 ++
 gfx/drivers_font/vulkan_raster_font.c  | 4 ++++
 gfx/drivers_shader/shader_vulkan.cpp   | 4 +++-
 gfx/video_context_driver.c             | 1 +
 gfx/video_driver.c                     | 1 +
 gfx/video_thread_wrapper.c             | 1 +
 input/drivers/udev_input.c             | 1 +
 input/drivers/x11_input.c              | 1 +
 input/drivers_joypad/linuxraw_joypad.c | 2 ++
 input/drivers_joypad/parport_joypad.c  | 2 ++
 input/drivers_joypad/sdl_joypad.c      | 2 ++
 input/drivers_joypad/udev_joypad.c     | 1 +
 input/input_config.c                   | 1 +
 menu/cbs/menu_cbs_deferred_push.c      | 1 +
 menu/drivers/materialui.c              | 1 +
 menu/menu_content.c                    | 1 +
 menu/menu_driver.c                     | 1 +
 movie.c                                | 1 +
 network/netplay/netplay.c              | 1 +
 network/netplay/netplay_common.c       | 2 ++
 network/netplay/netplay_net.c          | 2 ++
 tasks/task_overlay.c                   | 1 +
 tasks/task_save_state.c                | 1 +
 verbosity.h                            | 2 --
 25 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/database_info.c b/database_info.c
index e426b14de2..c184b5451a 100644
--- a/database_info.c
+++ b/database_info.c
@@ -17,6 +17,7 @@
 
 #include <stdint.h>
 
+#include <compat/strl.h>
 #include <retro_endianness.h>
 
 #include "list_special.h"
diff --git a/gfx/common/drm_common.c b/gfx/common/drm_common.c
index e10ff8bc3d..32ec085889 100644
--- a/gfx/common/drm_common.c
+++ b/gfx/common/drm_common.c
@@ -13,6 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+
 #include "../../configuration.h"
 #include "../../verbosity.h"
 
diff --git a/gfx/drivers_font/vulkan_raster_font.c b/gfx/drivers_font/vulkan_raster_font.c
index f8633f090e..ce45783e37 100644
--- a/gfx/drivers_font/vulkan_raster_font.c
+++ b/gfx/drivers_font/vulkan_raster_font.c
@@ -13,6 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
+
+#include <compat/strl.h>
+
 #include "../common/vulkan_common.h"
 
 #include "../font_driver.h"
diff --git a/gfx/drivers_shader/shader_vulkan.cpp b/gfx/drivers_shader/shader_vulkan.cpp
index 50e32f4d06..dbd999f306 100644
--- a/gfx/drivers_shader/shader_vulkan.cpp
+++ b/gfx/drivers_shader/shader_vulkan.cpp
@@ -23,12 +23,14 @@
 #include <string.h>
 #include <math.h>
 
+#include <compat/strl.h>
+#include <formats/image.h>
+
 #include "slang_reflection.hpp"
 
 #include "../video_shader_driver.h"
 #include "../../verbosity.h"
 #include "../../msg_hash.h"
-#include "../../libretro-common/include/formats/image.h"
 
 using namespace std;
 
diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c
index de7a09cca9..83cf7befbb 100644
--- a/gfx/video_context_driver.c
+++ b/gfx/video_context_driver.c
@@ -16,6 +16,7 @@
 
 #include <string.h>
 
+#include <compat/strl.h>
 #include <string/stdstring.h>
 
 #include "video_context_driver.h"
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 45f7c00f2a..6de579cec6 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -24,6 +24,7 @@
 #include <rthreads/rthreads.h>
 #endif
 
+#include <compat/strl.h>
 #include <retro_common_api.h>
 #include <file/config_file.h>
 #include <features/features_cpu.h>
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index d3ab8b6e9c..f1057ed297 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <limits.h>
 
+#include <compat/strl.h>
 #include <features/features_cpu.h>
 #include <rthreads/rthreads.h>
 
diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 912a1418b0..8c21698cf7 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -37,6 +37,7 @@
 #endif
 
 #include <file/file_path.h>
+#include <compat/strl.h>
 #include <string/stdstring.h>
 
 #include "../drivers_keyboard/keyboard_event_udev.h"
diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c
index ffde2e4b7e..020bbc5290 100644
--- a/input/drivers/x11_input.c
+++ b/input/drivers/x11_input.c
@@ -20,6 +20,7 @@
 #include <X11/keysym.h>
 
 #include <boolean.h>
+#include <compat/strl.h>
 
 #include "../input_config.h"
 #include "../input_joypad_driver.h"
diff --git a/input/drivers_joypad/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c
index 63c70838a9..d56a86b709 100644
--- a/input/drivers_joypad/linuxraw_joypad.c
+++ b/input/drivers_joypad/linuxraw_joypad.c
@@ -24,6 +24,8 @@
 #include <sys/inotify.h>
 #include <linux/joystick.h>
 
+#include <compat/strl.h>
+
 #include "../common/epoll_common.h"
 #include "../input_autodetect.h"
 #include "../input_driver.h"
diff --git a/input/drivers_joypad/parport_joypad.c b/input/drivers_joypad/parport_joypad.c
index ba7897b702..367acc8c87 100644
--- a/input/drivers_joypad/parport_joypad.c
+++ b/input/drivers_joypad/parport_joypad.c
@@ -23,6 +23,8 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
+#include <compat/strl.h>
+
 #include "../input_autodetect.h"
 #include "../input_driver.h"
 #include "../../configuration.h"
diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c
index a57e6bcf48..7586bf0e51 100644
--- a/input/drivers_joypad/sdl_joypad.c
+++ b/input/drivers_joypad/sdl_joypad.c
@@ -16,6 +16,8 @@
 
 #include <stdint.h>
 
+#include <compat/strl.h>
+
 #include "SDL.h"
 
 #include "../../configuration.h"
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index 48ea5bbd48..4ce0c082a7 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -29,6 +29,7 @@
 #include <linux/input.h>
 
 #include <retro_inline.h>
+#include <compat/strl.h>
 #include <string/stdstring.h>
 
 #include "../input_autodetect.h"
diff --git a/input/input_config.c b/input/input_config.c
index e8cbb6b1c8..51ba02ec03 100644
--- a/input/input_config.c
+++ b/input/input_config.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index ffa0bdba7b..82a4ac425d 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 #include <lists/string_list.h>
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 52234e281b..f8f1db2804 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -22,6 +22,7 @@
 #include <limits.h>
 
 #include <compat/posix_string.h>
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <formats/image.h>
 #include <gfx/math/matrix_4x4.h>
diff --git a/menu/menu_content.c b/menu/menu_content.c
index 13dd34434c..f207170646 100644
--- a/menu/menu_content.c
+++ b/menu/menu_content.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <retro_assert.h>
 #include <streams/file_stream.h>
 #include <file/file_path.h>
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 4293c135d6..92a838f957 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -16,6 +16,7 @@
 
 #include <string.h>
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
diff --git a/movie.c b/movie.c
index 745cd2ffbf..d7f0366660 100644
--- a/movie.c
+++ b/movie.c
@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include <rhash.h>
+#include <compat/strl.h>
 #include <retro_endianness.h>
 
 #include "configuration.h"
diff --git a/network/netplay/netplay.c b/network/netplay/netplay.c
index d8e59e9986..2df2bf6a02 100644
--- a/network/netplay/netplay.c
+++ b/network/netplay/netplay.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <compat/strl.h>
 #include <net/net_compat.h>
 #include <net/net_socket.h>
 #include <retro_endianness.h>
diff --git a/network/netplay/netplay_common.c b/network/netplay/netplay_common.c
index 600e55b613..dba2eef948 100644
--- a/network/netplay/netplay_common.c
+++ b/network/netplay/netplay_common.c
@@ -14,6 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+
 #include "netplay_private.h"
 #include <net/net_socket.h>
 
diff --git a/network/netplay/netplay_net.c b/network/netplay/netplay_net.c
index f273bdd7a0..91dfc88615 100644
--- a/network/netplay/netplay_net.c
+++ b/network/netplay/netplay_net.c
@@ -14,6 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+
 #include "netplay_private.h"
 
 #include "../../autosave.h"
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 881a57ff4a..a56c594fa6 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -15,6 +15,7 @@
 
 #include <stdlib.h>
 
+#include <compat/strl.h>
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>
 #include <file/config_file.h>
diff --git a/tasks/task_save_state.c b/tasks/task_save_state.c
index 7172c60a05..04f246a6de 100644
--- a/tasks/task_save_state.c
+++ b/tasks/task_save_state.c
@@ -26,6 +26,7 @@
 #endif
 #include <errno.h>
 
+#include <compat/strl.h>
 #include <lists/string_list.h>
 #include <streams/file_stream.h>
 #include <file/file_path.h>
diff --git a/verbosity.h b/verbosity.h
index 1902ccbc5b..e551cad77b 100644
--- a/verbosity.h
+++ b/verbosity.h
@@ -21,8 +21,6 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
-#include <compat/posix_string.h>
-#include <compat/strl.h>
 
 RETRO_BEGIN_DECLS