stdstring header include cleanups

LibretroAdmin · LibretroAdmin · commit 35db4dae6f96 · 2026-04-02T08:23:36.000+02:00
diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c
@@ -18,7 +18,6 @@
 #include <stdlib.h>
 
 #include <lists/string_list.h>
-#include <string/stdstring.h>
 
 #include <alsa/asoundlib.h>
 #include <alsa/pcm.h>
@@ -209,7 +208,6 @@ static struct string_list *alsa_microphone_device_list_new(const void *data)
 
 static void alsa_microphone_device_list_free(const void *driver_context, struct string_list *devices)
 {
-   (void)driver_context;
    string_list_free(devices);
    /* Does nothing if devices is NULL */
 }
diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c
@@ -23,7 +23,6 @@
 
 #include <rthreads/rthreads.h>
 #include <queues/fifo_queue.h>
-#include <string/stdstring.h>
 #include <asm-generic/errno.h>
 
 #include "../audio_driver.h"
diff --git a/audio/drivers/wasapi.c b/audio/drivers/wasapi.c
@@ -18,7 +18,6 @@
 
 #include <lists/string_list.h>
 #include <queues/fifo_queue.h>
-#include <string/stdstring.h>
 
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
diff --git a/gfx/common/dxgi_common.c b/gfx/common/dxgi_common.c
@@ -14,7 +14,6 @@
  */
 
 #include <compat/strl.h>
-#include <string/stdstring.h>
 #include <retro_environment.h>
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/common/egl_common.c b/gfx/common/egl_common.c
@@ -18,8 +18,7 @@
 #endif
 
 #include <stdlib.h>
-
-#include <string/stdstring.h>
+#include <string.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
@@ -42,7 +42,6 @@
 
 #include <encodings/utf.h>
 #include <compat/strl.h>
-#include <string/stdstring.h>
 
 #ifdef HAVE_DBUS
 #include "dbus_common.h"
diff --git a/gfx/display_servers/dispserv_kms.c b/gfx/display_servers/dispserv_kms.c
@@ -16,9 +16,9 @@
  */
 
 #include <math.h>
+#include <string.h>
 
 #include <compat/strl.h>
-#include <string/stdstring.h>
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/gfx/display_servers/dispserv_x11.c b/gfx/display_servers/dispserv_x11.c
@@ -17,6 +17,7 @@
 
 /* We are targeting XRandR 1.2 here. */
 #include <math.h>
+#include <string.h>
 
 #include <compat/strl.h>
 #include <string/stdstring.h>
diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <string/stdstring.h>
+
 #include "gfx_display.h"
 
 #include "../configuration.h"
diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h
@@ -25,7 +25,6 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
-#include <string/stdstring.h>
 #include <formats/image.h>
 #include <gfx/math/matrix_4x4.h>
 
diff --git a/gfx/video_crt_switch.c b/gfx/video_crt_switch.c
@@ -24,13 +24,16 @@
 #include <math.h>
 
 #include <retro_common_api.h>
+#include <compat/strl.h>
+#include <string/stdstring.h>
+
+#include "gfx_display.h"
 #include "video_crt_switch.h"
 #include "video_display_server.h"
 #include "../core_info.h"
 #include "../verbosity.h"
 #include "../file_path_special.h"
 #include "../paths.h"
-#include "gfx_display.h"
 
 #include "../deps/switchres/switchres_wrapper.h"
 static sr_mode srm;
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
@@ -21,7 +21,6 @@
 
 #include <compat/strl.h>
 #include <features/features_cpu.h>
-#include <string/stdstring.h>
 
 #ifdef _3DS
 #include <3ds/types.h>
diff --git a/gfx/widgets/gfx_widget_generic_message.c b/gfx/widgets/gfx_widget_generic_message.c
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <compat/strl.h>
+#include <string/stdstring.h>
 
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
diff --git a/gfx/widgets/gfx_widget_leaderboard_display.c b/gfx/widgets/gfx_widget_leaderboard_display.c
@@ -15,7 +15,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <features/features_cpu.h>
+#include <string/stdstring.h>
 
 #include "../gfx_display.h"
 #include "../gfx_widgets.h"
diff --git a/gfx/widgets/gfx_widget_libretro_message.c b/gfx/widgets/gfx_widget_libretro_message.c
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <compat/strl.h>
+#include <string/stdstring.h>
 
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
diff --git a/gfx/widgets/gfx_widget_progress_message.c b/gfx/widgets/gfx_widget_progress_message.c
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <compat/strl.h>
+#include <string/stdstring.h>
 
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
diff --git a/gfx/widgets/gfx_widget_screenshot.c b/gfx/widgets/gfx_widget_screenshot.c
@@ -15,6 +15,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
 #include "../gfx_display.h"
diff --git a/menu/menu_explore.c b/menu/menu_explore.c
@@ -24,6 +24,7 @@
 #include <formats/rjson_helpers.h>
 #include <retro_endianness.h>
 #include <streams/file_stream.h>
+#include <string/stdstring.h>
 
 #include "menu_driver.h"
 #include "menu_cbs.h"

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`#include <stdlib.h>`
`19`	`19`
`20`	`20`	`#include <lists/string_list.h>`
`21`		`-#include <string/stdstring.h>`
`22`	`21`
`23`	`22`	`#include <alsa/asoundlib.h>`
`24`	`23`	`#include <alsa/pcm.h>`
`@@ -209,7 +208,6 @@ static struct string_list alsa_microphone_device_list_new(const void data)`
`209`	`208`
`210`	`209`	`static void alsa_microphone_device_list_free(const void driver_context, struct string_list devices)`
`211`	`210`	`{`
`212`		`- (void)driver_context;`
`213`	`211`	`string_list_free(devices);`
`214`	`212`	`/* Does nothing if devices is NULL */`
`215`	`213`	`}`