diff --git a/src/3rdparty/squirrel/squirrel/sqdebug.cpp b/src/3rdparty/squirrel/squirrel/sqdebug.cpp index 6ea958bbdf..8a6f15121a 100644 --- a/src/3rdparty/squirrel/squirrel/sqdebug.cpp +++ b/src/3rdparty/squirrel/squirrel/sqdebug.cpp @@ -12,7 +12,6 @@ #include "sqclosure.h" #include "sqstring.h" -#include "../../../core/alloc_func.hpp" #include "../../../string_func.h" #include "../../../safeguards.h" diff --git a/src/ini_load.cpp b/src/ini_load.cpp index 92a7f3284c..223d594fc5 100644 --- a/src/ini_load.cpp +++ b/src/ini_load.cpp @@ -8,7 +8,6 @@ /** @file ini_load.cpp Definition of the #IniLoadFile class, related to reading and storing '*.ini' files. */ #include "stdafx.h" -#include "core/alloc_func.hpp" #include "core/mem_func.hpp" #include "ini_type.h" #include "string_func.h" diff --git a/src/map.cpp b/src/map.cpp index 67fbd4da1e..315b89cba9 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -9,7 +9,6 @@ #include "stdafx.h" #include "debug.h" -#include "core/alloc_func.hpp" #include "water_map.h" #include "error_func.h" #include "string_func.h" diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp index 22fd8fcfa0..b658669984 100644 --- a/src/music/extmidi.cpp +++ b/src/music/extmidi.cpp @@ -10,7 +10,6 @@ #include "../stdafx.h" #include "../debug.h" #include "../string_func.h" -#include "../core/alloc_func.hpp" #include "../sound/sound_driver.hpp" #include "../video/video_driver.hpp" #include "../gfx_func.h" diff --git a/src/newgrf_storage.h b/src/newgrf_storage.h index 523faeec8c..fdc7e14138 100644 --- a/src/newgrf_storage.h +++ b/src/newgrf_storage.h @@ -10,7 +10,6 @@ #ifndef NEWGRF_STORAGE_H #define NEWGRF_STORAGE_H -#include "core/alloc_func.hpp" #include "core/pool_type.hpp" #include "tile_type.h" diff --git a/src/newgrf_townname.cpp b/src/newgrf_townname.cpp index e8727adff7..a1a3e1072e 100644 --- a/src/newgrf_townname.cpp +++ b/src/newgrf_townname.cpp @@ -14,7 +14,6 @@ #include "stdafx.h" #include "newgrf_townname.h" -#include "core/alloc_func.hpp" #include "string_func.h" #include "strings_internal.h" diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp index de1697107d..8ac0a5ccc9 100644 --- a/src/os/windows/win32.cpp +++ b/src/os/windows/win32.cpp @@ -23,7 +23,6 @@ #include #include "win32.h" #include "../../fios.h" -#include "../../core/alloc_func.hpp" #include "../../string_func.h" #include #include "../../language.h" diff --git a/src/saveload/strings_sl.cpp b/src/saveload/strings_sl.cpp index f638ef7c8c..b3b0283bdd 100644 --- a/src/saveload/strings_sl.cpp +++ b/src/saveload/strings_sl.cpp @@ -8,7 +8,6 @@ /** @file strings_sl.cpp Code handling saving and loading of strings */ #include "../stdafx.h" -#include "../core/alloc_func.hpp" #include "../string_func.h" #include "../strings_func.h" #include "saveload_internal.h" diff --git a/src/script/api/script_cargo.cpp b/src/script/api/script_cargo.cpp index a03b297628..712daa6ed3 100644 --- a/src/script/api/script_cargo.cpp +++ b/src/script/api/script_cargo.cpp @@ -10,7 +10,6 @@ #include "../../stdafx.h" #include "script_cargo.hpp" #include "../../economy_func.h" -#include "../../core/alloc_func.hpp" #include "../../core/bitmath_func.hpp" #include "../../strings_func.h" #include "../../settings_type.h" diff --git a/src/script/api/script_log.cpp b/src/script/api/script_log.cpp index f40d907b93..41182f2f3b 100644 --- a/src/script/api/script_log.cpp +++ b/src/script/api/script_log.cpp @@ -10,7 +10,6 @@ #include "../../stdafx.h" #include "script_log_types.hpp" #include "script_log.hpp" -#include "../../core/alloc_func.hpp" #include "../../debug.h" #include "../../window_func.h" #include "../../string_func.h" diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp index c6c3ff6bb8..258325b252 100644 --- a/src/script/squirrel.cpp +++ b/src/script/squirrel.cpp @@ -17,7 +17,6 @@ #include #include <../squirrel/sqpcheader.h> #include <../squirrel/sqvm.h> -#include "../core/alloc_func.hpp" /** * In the memory allocator for Squirrel we want to directly use malloc/realloc, so when the OS diff --git a/src/settingsgen/CMakeLists.txt b/src/settingsgen/CMakeLists.txt index 9e71393ed6..49e65c0971 100644 --- a/src/settingsgen/CMakeLists.txt +++ b/src/settingsgen/CMakeLists.txt @@ -6,7 +6,6 @@ if (NOT HOST_BINARY_DIR) set(sourcefiles settingsgen.cpp ../3rdparty/fmt/format.cc - ../core/alloc_func.cpp ../misc/getoptdata.cpp ../error.cpp ../ini_load.cpp diff --git a/src/sound/win32_s.cpp b/src/sound/win32_s.cpp index 5f77e10397..1bfc4e06ec 100644 --- a/src/sound/win32_s.cpp +++ b/src/sound/win32_s.cpp @@ -11,7 +11,6 @@ #include "../openttd.h" #include "../driver.h" #include "../mixer.h" -#include "../core/alloc_func.hpp" #include "../core/bitmath_func.hpp" #include "../core/math_func.hpp" #include "win32_s.h" diff --git a/src/sound/xaudio2_s.cpp b/src/sound/xaudio2_s.cpp index f3e743ba04..9f38939da5 100644 --- a/src/sound/xaudio2_s.cpp +++ b/src/sound/xaudio2_s.cpp @@ -12,7 +12,6 @@ #include "../driver.h" #include "../mixer.h" #include "../debug.h" -#include "../core/alloc_func.hpp" #include "../core/bitmath_func.hpp" #include "../core/math_func.hpp" diff --git a/src/strgen/CMakeLists.txt b/src/strgen/CMakeLists.txt index 40aff5556d..581f60eeb0 100644 --- a/src/strgen/CMakeLists.txt +++ b/src/strgen/CMakeLists.txt @@ -9,7 +9,6 @@ if (NOT HOST_BINARY_DIR) strgen.cpp strgen_base.cpp ../3rdparty/fmt/format.cc - ../core/alloc_func.cpp ../misc/getoptdata.cpp ../error.cpp ../string.cpp diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index f5057b3786..d30c973f6a 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -8,7 +8,6 @@ /** @file strgen_base.cpp Tool to create computer readable (stand-alone) translation files. */ #include "../stdafx.h" -#include "../core/alloc_func.hpp" #include "../core/endian_func.hpp" #include "../core/mem_func.hpp" #include "../error_func.h" diff --git a/src/string.cpp b/src/string.cpp index 8266b8527e..59785cfe90 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -9,7 +9,6 @@ #include "stdafx.h" #include "debug.h" -#include "core/alloc_func.hpp" #include "core/math_func.hpp" #include "error_func.h" #include "string_func.h" diff --git a/src/stringfilter.cpp b/src/stringfilter.cpp index 9ec17a7267..1696b4239f 100644 --- a/src/stringfilter.cpp +++ b/src/stringfilter.cpp @@ -8,7 +8,6 @@ /** @file stringfilter.cpp Searching and filtering using a stringterm. */ #include "stdafx.h" -#include "core/alloc_func.hpp" #include "string_func.h" #include "strings_func.h" #include "stringfilter_type.h" diff --git a/src/textbuf.cpp b/src/textbuf.cpp index a36bb12125..6d8401ddd3 100644 --- a/src/textbuf.cpp +++ b/src/textbuf.cpp @@ -16,7 +16,6 @@ #include "gfx_func.h" #include "gfx_layout.h" #include "window_func.h" -#include "core/alloc_func.hpp" #include "safeguards.h"