diff --git a/core/hw/holly/sb.h b/core/hw/holly/sb.h index a45899b318..1eec402ea9 100644 --- a/core/hw/holly/sb.h +++ b/core/hw/holly/sb.h @@ -5,7 +5,6 @@ #pragma once #include "types.h" #include "hw/hwreg.h" -#include u32 sb_ReadMem(u32 addr); void sb_WriteMem(u32 addr, u32 data); diff --git a/core/hw/mem/mem_watch.h b/core/hw/mem/mem_watch.h index b91b760604..4d1be89ee4 100644 --- a/core/hw/mem/mem_watch.h +++ b/core/hw/mem/mem_watch.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ +#pragma once #include "types.h" #include "addrspace.h" #include "hw/aica/aica_if.h" diff --git a/core/hw/naomi/systemsp.cpp b/core/hw/naomi/systemsp.cpp index a37f7d2cf0..995bf62ee1 100644 --- a/core/hw/naomi/systemsp.cpp +++ b/core/hw/naomi/systemsp.cpp @@ -36,6 +36,7 @@ #include "naomi_roms.h" #include "stdclass.h" #include +#include #ifdef DEBUG_SERIAL #define SERIAL_LOG(...) DEBUG_LOG(NAOMI, __VA_ARGS__) diff --git a/core/hw/naomi/systemsp.h b/core/hw/naomi/systemsp.h index a23ee5191e..45dae200a2 100644 --- a/core/hw/naomi/systemsp.h +++ b/core/hw/naomi/systemsp.h @@ -23,8 +23,6 @@ #include "hw/naomi/m4cartridge.h" #include "hw/flashrom/at93cxx.h" #include "serialize.h" -#include -#include #include #include diff --git a/core/hw/sh4/dyna/ssa.h b/core/hw/sh4/dyna/ssa.h index a2e34d9205..68f84d5585 100644 --- a/core/hw/sh4/dyna/ssa.h +++ b/core/hw/sh4/dyna/ssa.h @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License along with reicast. If not, see . */ +#pragma once #include #include #include diff --git a/core/hw/sh4/modules/fastmmu.cpp b/core/hw/sh4/modules/fastmmu.cpp index b0616f732b..e599d03b56 100644 --- a/core/hw/sh4/modules/fastmmu.cpp +++ b/core/hw/sh4/modules/fastmmu.cpp @@ -18,7 +18,6 @@ */ #include "mmu.h" #include "hw/sh4/sh4_if.h" -#include "hw/sh4/sh4_interrupts.h" #include "hw/sh4/sh4_core.h" #include "types.h" diff --git a/core/hw/sh4/modules/mmu.h b/core/hw/sh4/modules/mmu.h index c594f4dcf9..a7d3206c39 100644 --- a/core/hw/sh4/modules/mmu.h +++ b/core/hw/sh4/modules/mmu.h @@ -1,7 +1,6 @@ #pragma once #include "types.h" #include "hw/sh4/sh4_mmr.h" -#include "cfg/option.h" #include "hw/sh4/dyna/ngen.h" //Translation Types diff --git a/core/hw/sh4/modules/wince.h b/core/hw/sh4/modules/wince.h index 71f9c2d5c8..3967488a92 100644 --- a/core/hw/sh4/modules/wince.h +++ b/core/hw/sh4/modules/wince.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with reicast. If not, see . */ +#pragma once #ifdef TRACE_WINCE_SYSCALLS #include "hw/sh4/sh4_sched.h" diff --git a/core/hw/sh4/sh4_interpreter.h b/core/hw/sh4/sh4_interpreter.h index 9b9137e15a..80605b04f3 100644 --- a/core/hw/sh4/sh4_interpreter.h +++ b/core/hw/sh4/sh4_interpreter.h @@ -1,6 +1,5 @@ #pragma once #include "types.h" -#include "sh4_if.h" #undef sh4op #define sh4op(str) void DYNACALL str (u32 op) diff --git a/core/hw/sh4/sh4_mem.cpp b/core/hw/sh4/sh4_mem.cpp index ff8ee5e274..d44d309f8a 100644 --- a/core/hw/sh4/sh4_mem.cpp +++ b/core/hw/sh4/sh4_mem.cpp @@ -9,7 +9,6 @@ #include "sh4_mmr.h" #include "hw/pvr/elan.h" #include "hw/pvr/pvr_mem.h" -#include "cfg/option.h" #include "hw/mem/addrspace.h" #include "hw/sh4/modules/mmu.h" diff --git a/core/hw/sh4/sh4_opcode_list.h b/core/hw/sh4/sh4_opcode_list.h index 7f4ce37190..718d611642 100644 --- a/core/hw/sh4/sh4_opcode_list.h +++ b/core/hw/sh4/sh4_opcode_list.h @@ -2,6 +2,8 @@ #include "types.h" #include "sh4_interpreter.h" +#include + extern OpCallFP* OpPtr[0x10000]; typedef void OpDissasmFP(char* out,const char* const FormatString,u32 pc,u16 opcode); diff --git a/core/linux-dist/evdev_gamepad.h b/core/linux-dist/evdev_gamepad.h index cfbe273550..263868453b 100644 --- a/core/linux-dist/evdev_gamepad.h +++ b/core/linux-dist/evdev_gamepad.h @@ -1,3 +1,4 @@ +#pragma once #include "evdev.h" #include "input/gamepad_device.h" #include "oslib/oslib.h" diff --git a/core/log/StringUtil.h b/core/log/StringUtil.h index 15cd9a5f0e..a9b1625eb7 100644 --- a/core/log/StringUtil.h +++ b/core/log/StringUtil.h @@ -1,3 +1,4 @@ +#pragma once #include #ifdef _WIN32 diff --git a/core/lua/lua.h b/core/lua/lua.h index 28806c57bc..48ef341a0d 100644 --- a/core/lua/lua.h +++ b/core/lua/lua.h @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ -#include "build.h" +#pragma once #include namespace lua diff --git a/core/network/ggpo.h b/core/network/ggpo.h index 43a8870768..2b9889a15a 100644 --- a/core/network/ggpo.h +++ b/core/network/ggpo.h @@ -17,8 +17,8 @@ along with Flycast. If not, see . */ #pragma once -#include "types.h" #include +#include struct MapleInputState; diff --git a/core/network/net_serial_maxspeed.h b/core/network/net_serial_maxspeed.h index 3214a4f768..c564919a5f 100644 --- a/core/network/net_serial_maxspeed.h +++ b/core/network/net_serial_maxspeed.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ +#pragma once #include "hw/sh4/modules/modules.h" #include "net_platform.h" #include "cfg/option.h" diff --git a/core/network/null_modem.h b/core/network/null_modem.h index 69314b09ce..440ee589aa 100644 --- a/core/network/null_modem.h +++ b/core/network/null_modem.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ +#pragma once #include "hw/sh4/modules/modules.h" #include "net_platform.h" #include "cfg/option.h" diff --git a/core/oslib/oslib.h b/core/oslib/oslib.h index 7f0421ae8a..e6ad9c2e33 100644 --- a/core/oslib/oslib.h +++ b/core/oslib/oslib.h @@ -1,6 +1,5 @@ #pragma once #include "types.h" -#include #if defined(__SWITCH__) #include #endif diff --git a/core/oslib/virtmem.h b/core/oslib/virtmem.h index be2ad7c2f0..79b774d955 100644 --- a/core/oslib/virtmem.h +++ b/core/oslib/virtmem.h @@ -1,3 +1,4 @@ +#pragma once #include "types.h" namespace virtmem diff --git a/core/rend/boxart/gamesdb.h b/core/rend/boxart/gamesdb.h index bf9998bfc9..2433681f3f 100644 --- a/core/rend/boxart/gamesdb.h +++ b/core/rend/boxart/gamesdb.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ +#pragma once #include "scraper.h" #include "json.hpp" diff --git a/core/rend/boxart/http_client.h b/core/rend/boxart/http_client.h index 2b44aad1bf..846abc126c 100644 --- a/core/rend/boxart/http_client.h +++ b/core/rend/boxart/http_client.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ +#pragma once #include #include #include diff --git a/core/rend/vulkan/compiler.h b/core/rend/vulkan/compiler.h index 2025d7397c..cc4d7249dd 100644 --- a/core/rend/vulkan/compiler.h +++ b/core/rend/vulkan/compiler.h @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ +#pragma once #include "vulkan.h" class ShaderCompiler diff --git a/core/rend/vulkan/vulkan_renderer.h b/core/rend/vulkan/vulkan_renderer.h index d2119ef823..4c33919e0b 100644 --- a/core/rend/vulkan/vulkan_renderer.h +++ b/core/rend/vulkan/vulkan_renderer.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ +#pragma once #include "vulkan.h" #include "hw/pvr/Renderer_if.h" #include "hw/pvr/ta.h" diff --git a/core/sdl/sdl_gamepad.h b/core/sdl/sdl_gamepad.h index 05e0a450c9..f62ea604ac 100644 --- a/core/sdl/sdl_gamepad.h +++ b/core/sdl/sdl_gamepad.h @@ -1,3 +1,4 @@ +#pragma once #include "input/gamepad_device.h" #include "input/mouse.h" #include "oslib/oslib.h" diff --git a/core/windows/rawinput.h b/core/windows/rawinput.h index 1577264ac0..6406e350e3 100644 --- a/core/windows/rawinput.h +++ b/core/windows/rawinput.h @@ -16,9 +16,9 @@ You should have received a copy of the GNU General Public License along with Flycast. If not, see . */ +#pragma once #include "build.h" #ifndef TARGET_UWP -#include "input/gamepad_device.h" #include "input/keyboard_device.h" #include "input/mouse.h" #include