From ebcd50679db572b4adb9d325b46854a63ef5899e Mon Sep 17 00:00:00 2001
From: Arthur Eubanks <ayueubanks@gmail.com>
Date: Sun, 20 Apr 2025 18:29:17 -0700
Subject: [PATCH] Include dependent headers harder

Prepares for changing some includes in StdString.h
---
 src/RageFileManager.h                       | 1 +
 src/RageLog.cpp                             | 1 +
 src/RageSoundReader_Vorbisfile.cpp          | 1 +
 src/RageUtil.h                              | 2 +-
 src/RageUtil_CircularBuffer.h               | 2 ++
 src/arch/Dialog/Dialog.h                    | 2 ++
 src/archutils/Unix/CrashHandler.cpp         | 1 +
 src/archutils/Unix/CrashHandlerInternal.cpp | 1 +
 src/archutils/Unix/SignalHandler.cpp        | 1 +
 9 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/RageFileManager.h b/src/RageFileManager.h
index fdbc1cfcf7..2c8d675449 100644
--- a/src/RageFileManager.h
+++ b/src/RageFileManager.h
@@ -4,6 +4,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include "global.h"
 
 /** @brief Constants for working with the RageFileManager. */
 namespace RageFileManagerUtil
diff --git a/src/RageLog.cpp b/src/RageLog.cpp
index 7f93c42b3d..40fb4627c2 100644
--- a/src/RageLog.cpp
+++ b/src/RageLog.cpp
@@ -6,6 +6,7 @@
 #include "RageThreads.h"
 
 #include <ctime>
+#include <cstdarg>
 #include <map>
 #include <vector>
 
diff --git a/src/RageSoundReader_Vorbisfile.cpp b/src/RageSoundReader_Vorbisfile.cpp
index 8090d73d78..81180960da 100644
--- a/src/RageSoundReader_Vorbisfile.cpp
+++ b/src/RageSoundReader_Vorbisfile.cpp
@@ -12,6 +12,7 @@
 #endif
 
 #include <cerrno>
+#include <cstdarg>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
diff --git a/src/RageUtil.h b/src/RageUtil.h
index d9b9321d46..bb368423e5 100644
--- a/src/RageUtil.h
+++ b/src/RageUtil.h
@@ -5,10 +5,10 @@
 
 #include "global.h"
 
-#include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
 #include <map>
 #include <random>
 #include <sstream>
diff --git a/src/RageUtil_CircularBuffer.h b/src/RageUtil_CircularBuffer.h
index 93f8ea3649..f3946a8e06 100644
--- a/src/RageUtil_CircularBuffer.h
+++ b/src/RageUtil_CircularBuffer.h
@@ -3,6 +3,8 @@
 #ifndef RAGE_UTIL_CIRCULAR_BUFFER
 #define RAGE_UTIL_CIRCULAR_BUFFER
 
+#include <cstring>
+
 /* Lock-free circular buffer.  This should be threadsafe if one thread is reading
  * and another is writing. */
 template<class T>
diff --git a/src/arch/Dialog/Dialog.h b/src/arch/Dialog/Dialog.h
index d115c85b6d..a16ef20905 100644
--- a/src/arch/Dialog/Dialog.h
+++ b/src/arch/Dialog/Dialog.h
@@ -1,6 +1,8 @@
 #ifndef DIALOG_BOX_H
 #define DIALOG_BOX_H
 
+#include "global.h"
+
 namespace Dialog
 {
 	/* ID can be used to identify a class of messages, for "don't display this
diff --git a/src/archutils/Unix/CrashHandler.cpp b/src/archutils/Unix/CrashHandler.cpp
index 634dfed375..3c9aa1cebb 100644
--- a/src/archutils/Unix/CrashHandler.cpp
+++ b/src/archutils/Unix/CrashHandler.cpp
@@ -5,6 +5,7 @@
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
diff --git a/src/archutils/Unix/CrashHandlerInternal.cpp b/src/archutils/Unix/CrashHandlerInternal.cpp
index 36db7d9d52..1f5d615dfa 100644
--- a/src/archutils/Unix/CrashHandlerInternal.cpp
+++ b/src/archutils/Unix/CrashHandlerInternal.cpp
@@ -2,6 +2,7 @@
 #include "CrashHandlerInternal.h"
 
 #include <csignal>
+#include <cstring>
 
 const char *itoa( unsigned n )
 {
diff --git a/src/archutils/Unix/SignalHandler.cpp b/src/archutils/Unix/SignalHandler.cpp
index c717adb1ae..9f20ce26b2 100644
--- a/src/archutils/Unix/SignalHandler.cpp
+++ b/src/archutils/Unix/SignalHandler.cpp
@@ -9,6 +9,7 @@
 #endif
 
 #include <cerrno>
+#include <cstring>
 #include <memory>
 #include <vector>