Header include cleanups

database_info.c

@@ -17,6 +17,7 @@
 
 #include <stdint.h>
 
+#include <compat/strl.h>
 #include <retro_endianness.h>
 
 #include "list_special.h"

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"
 

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"

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;
 

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"

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>

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>
 

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"

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"

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"

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"

input/drivers_joypad/sdl_joypad.c

@@ -16,6 +16,8 @@
 
 #include <stdint.h>
 
+#include <compat/strl.h>
+
 #include "SDL.h"
 
 #include "../../configuration.h"

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"

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>
 

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>

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>

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>

menu/menu_driver.c

@@ -16,6 +16,7 @@
 
 #include <string.h>
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 

movie.c

@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include <rhash.h>
+#include <compat/strl.h>
 #include <retro_endianness.h>
 
 #include "configuration.h"

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>

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>
 

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"

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>

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>

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