diff --git a/source/lib/allocators/shared_ptr.h b/source/lib/allocators/shared_ptr.h index 6a4ce76e5a..7ba5ed828d 100644 --- a/source/lib/allocators/shared_ptr.h +++ b/source/lib/allocators/shared_ptr.h @@ -27,7 +27,6 @@ #include "lib/debug.h" #include "lib/status.h" #include "lib/sysdep/rtl.h" // rtl_AllocateAligned -#include "lib/types.h" #include #include diff --git a/source/lib/file/file_system.h b/source/lib/file/file_system.h index 46fca70670..02db05c527 100644 --- a/source/lib/file/file_system.h +++ b/source/lib/file/file_system.h @@ -31,7 +31,6 @@ #include "lib/posix/posix_filesystem.h" #include "lib/posix/posix_types.h" #include "lib/status.h" -#include "lib/types.h" #include diff --git a/source/lib/precompiled.h b/source/lib/precompiled.h index 19fcee4b0e..f4005e125b 100644 --- a/source/lib/precompiled.h +++ b/source/lib/precompiled.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2025 Wildfire Games. +/* Copyright (C) 2026 Wildfire Games. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -66,7 +66,6 @@ #include "lib/sysdep/arch.h" #include "lib/sysdep/os.h" #include "lib/sysdep/stl.h" -#include "lib/types.h" #include "lib/debug.h" #include "lib/lib.h" #include "lib/secure_crt.h" diff --git a/source/lib/sysdep/os/osx/osx_atlas.mm b/source/lib/sysdep/os/osx/osx_atlas.mm index 79f85fa802..70f3b515c4 100644 --- a/source/lib/sysdep/os/osx/osx_atlas.mm +++ b/source/lib/sysdep/os/osx/osx_atlas.mm @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2026 Wildfire Games. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -25,7 +25,6 @@ #import "osx_atlas.h" -#include "lib/types.h" #include "ps/CStr.h" void startNewAtlasProcess(const std::vector& mods) diff --git a/source/lib/types.h b/source/lib/types.h deleted file mode 100644 index d827dfea60..0000000000 --- a/source/lib/types.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 2026 Wildfire Games. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* - * convenient type aliases (shorter than stdint.h's uintN_t) - */ - -#ifndef INCLUDED_TYPES -#define INCLUDED_TYPES - -#include - -#endif // #ifndef INCLUDED_TYPES diff --git a/source/network/NetClientTurnManager.h b/source/network/NetClientTurnManager.h index 06742c2d40..f83bb30432 100644 --- a/source/network/NetClientTurnManager.h +++ b/source/network/NetClientTurnManager.h @@ -19,7 +19,6 @@ #define INCLUDED_NETCLIENTTURNMANAGER #include "lib/code_annotation.h" -#include "lib/types.h" #include "network/NetMessage.h" #include "ps/CStr.h" #include "simulation2/system/TurnManager.h" diff --git a/source/ps/scripting/JSInterface_ModIo.cpp b/source/ps/scripting/JSInterface_ModIo.cpp index be7c588864..5112b32039 100644 --- a/source/ps/scripting/JSInterface_ModIo.cpp +++ b/source/ps/scripting/JSInterface_ModIo.cpp @@ -20,7 +20,6 @@ #include "JSInterface_ModIo.h" #include "lib/debug.h" -#include "lib/types.h" #include "ps/CLogger.h" #include "ps/ModIo.h" #include "scriptinterface/FunctionWrapper.h" diff --git a/source/simulation2/system/LocalTurnManager.h b/source/simulation2/system/LocalTurnManager.h index 578f93ac9b..ca32f1b079 100644 --- a/source/simulation2/system/LocalTurnManager.h +++ b/source/simulation2/system/LocalTurnManager.h @@ -18,7 +18,6 @@ #ifndef INCLUDED_LOCALTURNMANAGER #define INCLUDED_LOCALTURNMANAGER -#include "lib/types.h" #include "simulation2/helpers/Player.h" #include "simulation2/system/TurnManager.h"