From 83f2ad500e3b1cbf42e94fb1bc745561f6061bd7 Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter1138@openttd.org>
Date: Wed, 17 May 2023 09:27:20 +0100
Subject: [PATCH] Codechange: stdarg.h include not needed as cstdarg is
 included.

---
 src/console.cpp          | 2 --
 src/debug.cpp            | 1 -
 src/game/game_text.cpp   | 2 --
 src/gamelog.cpp          | 2 --
 src/music/os2_m.cpp      | 1 -
 src/newgrf.cpp           | 2 --
 src/newgrf_debug_gui.cpp | 1 -
 src/openttd.cpp          | 1 -
 src/script/squirrel.cpp  | 2 --
 src/string.cpp           | 2 --
 src/string_func.h        | 1 -
 src/textbuf.cpp          | 1 -
 src/window.cpp           | 1 -
 13 files changed, 19 deletions(-)

diff --git a/src/console.cpp b/src/console.cpp
index fd0082e4be..96de9ac8b8 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -16,8 +16,6 @@
 #include "console_func.h"
 #include "settings_type.h"
 
-#include <stdarg.h>
-
 #include "safeguards.h"
 
 static const uint ICON_TOKEN_COUNT = 20;     ///< Maximum number of tokens in one command
diff --git a/src/debug.cpp b/src/debug.cpp
index 85c187afe8..c82d75236e 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -8,7 +8,6 @@
 /** @file debug.cpp Handling of printing debug messages. */
 
 #include "stdafx.h"
-#include <stdarg.h>
 #include "console_func.h"
 #include "debug.h"
 #include "string_func.h"
diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp
index 9db7e52ad6..25ca95cbdd 100644
--- a/src/game/game_text.cpp
+++ b/src/game/game_text.cpp
@@ -21,8 +21,6 @@
 #include "table/strings.h"
 #include "table/strgen_tables.h"
 
-#include <stdarg.h>
-
 #include "../safeguards.h"
 
 void CDECL StrgenWarningI(const std::string &msg)
diff --git a/src/gamelog.cpp b/src/gamelog.cpp
index 42c8290f71..43809e7758 100644
--- a/src/gamelog.cpp
+++ b/src/gamelog.cpp
@@ -18,8 +18,6 @@
 #include "timer/timer_game_tick.h"
 #include "rev.h"
 
-#include <stdarg.h>
-
 #include "safeguards.h"
 
 extern const SaveLoadVersion SAVEGAME_VERSION;  ///< current savegame version
diff --git a/src/music/os2_m.cpp b/src/music/os2_m.cpp
index 449caf3738..1c898138ad 100644
--- a/src/music/os2_m.cpp
+++ b/src/music/os2_m.cpp
@@ -18,7 +18,6 @@
 #define INCL_OS2MM
 #define INCL_WIN
 
-#include <stdarg.h>
 #include <os2.h>
 #include <os2me.h>
 
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index a89c47f12b..8c240e5d10 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -9,8 +9,6 @@
 
 #include "stdafx.h"
 
-#include <stdarg.h>
-
 #include "debug.h"
 #include "fileio_func.h"
 #include "engine_func.h"
diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp
index f903771303..c70ce6895f 100644
--- a/src/newgrf_debug_gui.cpp
+++ b/src/newgrf_debug_gui.cpp
@@ -8,7 +8,6 @@
 /** @file newgrf_debug_gui.cpp GUIs for debugging NewGRFs. */
 
 #include "stdafx.h"
-#include <stdarg.h>
 #include "core/backup_type.hpp"
 #include "window_gui.h"
 #include "window_func.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 62a55f223c..168d82bcb9 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -76,7 +76,6 @@
 
 #include "linkgraph/linkgraphschedule.h"
 
-#include <stdarg.h>
 #include <system_error>
 
 #include "safeguards.h"
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp
index 3154ef096c..a59b7cff64 100644
--- a/src/script/squirrel.cpp
+++ b/src/script/squirrel.cpp
@@ -19,8 +19,6 @@
 #include <../squirrel/sqvm.h>
 #include "../core/alloc_func.hpp"
 
-#include <stdarg.h>
-
 /**
  * In the memory allocator for Squirrel we want to directly use malloc/realloc, so when the OS
  * does not have enough memory the game does not go into unrecoverable error mode and kill the
diff --git a/src/string.cpp b/src/string.cpp
index 89ee7bad9d..c129c6426f 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -17,8 +17,6 @@
 
 #include "table/control_codes.h"
 
-#include <stdarg.h>
-#include <ctype.h> /* required for tolower() */
 #include <sstream>
 #include <iomanip>
 
diff --git a/src/string_func.h b/src/string_func.h
index 06ca838cd1..08e1600b73 100644
--- a/src/string_func.h
+++ b/src/string_func.h
@@ -24,7 +24,6 @@
 #ifndef STRING_FUNC_H
 #define STRING_FUNC_H
 
-#include <stdarg.h>
 #include <iosfwd>
 
 #include "core/bitmath_func.hpp"
diff --git a/src/textbuf.cpp b/src/textbuf.cpp
index e9e996a30e..807b004804 100644
--- a/src/textbuf.cpp
+++ b/src/textbuf.cpp
@@ -8,7 +8,6 @@
 /** @file textbuf.cpp Textbuffer handling. */
 
 #include "stdafx.h"
-#include <stdarg.h>
 
 #include "textbuf_type.h"
 #include "string_func.h"
diff --git a/src/window.cpp b/src/window.cpp
index d399318824..2233a5f42d 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -8,7 +8,6 @@
 /** @file window.cpp Windowing system, widgets and events */
 
 #include "stdafx.h"
-#include <stdarg.h>
 #include "company_func.h"
 #include "gfx_func.h"
 #include "console_func.h"