cleanup include headers

core/cheats.cpp

@@ -25,6 +25,7 @@
 #include "reios/reios.h"
 #include "cfg/cfg.h"
 #include "cfg/ini.h"
+#include "cfg/option.h"
 #include "emulator.h"
 
 const WidescreenCheat CheatManager::widescreen_cheats[] =

core/emulator.cpp

@@ -24,6 +24,7 @@
 #include "imgread/common.h"
 #include "hw/naomi/naomi_cart.h"
 #include "reios/reios.h"
+#include "hw/sh4/modules/mmu.h"
 #include "hw/sh4/sh4_if.h"
 #include "hw/sh4/sh4_mem.h"
 #include "hw/sh4/sh4_sched.h"
@@ -32,7 +33,6 @@
 #include "oslib/audiostream.h"
 #include "debug/gdb_server.h"
 #include "hw/pvr/Renderer_if.h"
-#include "rend/TexCache.h"
 #include "hw/arm7/arm7_rec.h"
 #include "network/ggpo.h"
 #include "hw/mem/mem_watch.h"

core/emulator.h

@@ -20,14 +20,13 @@
  */
 #pragma once
 #include "types.h"
+
 #include <atomic>
-#include <map>
-#include <vector>
 #include <future>
-#include <string>
-#include <memory>
-#include <utility>
+#include <map>
 #include <mutex>
+#include <utility>
+#include <vector>
 
 void loadGameSpecificSettings();
 void SaveSettings();

core/hw/aica/aica_if.cpp

@@ -13,6 +13,7 @@
 #include "profiler/dc_profiler.h"
 #include "hw/sh4/dyna/blockmanager.h"
 #include "hw/arm7/arm7.h"
+#include "cfg/option.h"
 
 #include <ctime>
 

core/hw/aica/sgc_if.cpp

@@ -27,7 +27,6 @@
 #include "hw/gdrom/gdrom_if.h"
 #include "cfg/option.h"
 #include "serialize.h"
-#include "hw/hwreg.h"
 
 #include <algorithm>
 #include <cmath>

core/hw/bba/rtl8139c.h

@@ -17,10 +17,10 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
+#include "types.h"
+
 #include <climits>
 #include <cinttypes>
-#include "types.h"
-#include "hw/sh4/sh4_sched.h"
 
 typedef u8 uint8_t;
 typedef u16 uint16_t;

core/hw/gdrom/gdromv3.cpp

@@ -5,11 +5,13 @@
 
 #include "gdromv3.h"
 #include "gdrom_if.h"
+#include "cfg/option.h"
 #include "hw/holly/holly_intc.h"
 #include "hw/holly/sb.h"
 #include "hw/sh4/modules/dmac.h"
 #include "hw/sh4/sh4_interpreter.h"
 #include "hw/sh4/sh4_mem.h"
+#include "hw/sh4/sh4_mmr.h"
 #include "hw/sh4/sh4_sched.h"
 #include "imgread/common.h"
 #include "serialize.h"

core/hw/holly/sb_mem.cpp

@@ -12,7 +12,7 @@
 #include "hw/modem/modem.h"
 #include "hw/naomi/naomi.h"
 #include "hw/pvr/pvr_mem.h"
-#include "hw/sh4/sh4_mem.h"
+#include "hw/mem/_vmem.h"
 #include "reios/reios.h"
 #include "hw/bba/bba.h"
 #include "cfg/option.h"

core/hw/maple/maple_devs.cpp

@@ -4,7 +4,6 @@
 #include "hw/pvr/spg.h"
 #include "oslib/audiostream.h"
 #include "oslib/oslib.h"
-#include "cfg/option.h"
 #include "hw/aica/sgc_if.h"
 #include <zlib.h>
 

core/hw/maple/maple_if.cpp

@@ -6,7 +6,6 @@
 #include "hw/sh4/sh4_mem.h"
 #include "hw/sh4/sh4_sched.h"
 #include "network/ggpo.h"
-#include "input/gamepad_device.h"
 
 enum MaplePattern
 {

core/hw/maple/maple_jvs.cpp

@@ -16,8 +16,6 @@
 	 You should have received a copy of the GNU General Public License
 	 along with flycast.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include <array>
-#include <memory>
 #include "maple_devs.h"
 #include "hw/naomi/naomi_cart.h"
 #include <xxhash.h>
@@ -26,6 +24,10 @@
 #include "cfg/option.h"
 #include "network/output.h"
 
+#include <algorithm>
+#include <array>
+#include <memory>
+
 #define LOGJVS(...) DEBUG_LOG(JVS, __VA_ARGS__)
 
 u8 *EEPROM;

core/hw/mem/mem_watch.h

@@ -24,7 +24,6 @@
 #include "hw/pvr/pvr_mem.h"
 #include "hw/pvr/elan.h"
 #include "rend/TexCache.h"
-#include <array>
 #include <unordered_map>
 
 namespace memwatch

core/hw/modem/modem.cpp

@@ -25,10 +25,13 @@
 #include "modem_regs.h"
 #include "hw/holly/holly_intc.h"
 #include "hw/sh4/sh4_sched.h"
-#include "oslib/oslib.h"
 #include "network/picoppp.h"
 #include "serialize.h"
 
+#ifndef NDEBUG
+#include "oslib/oslib.h"
+#endif
+
 #define MODEM_COUNTRY_RES 0
 #define MODEM_COUNTRY_JAP 1
 #define MODEM_COUNTRY_USA 2

core/hw/naomi/naomi.cpp

@@ -2,14 +2,13 @@
 	This file is a mix of my code, Zezu's, and duno wtf-else (most likely ElSemi's ?)
 */
 #include "types.h"
-#include "cfg/cfg.h"
 #include "hw/holly/sb.h"
 #include "hw/sh4/sh4_mem.h"
 #include "hw/holly/holly_intc.h"
 #include "hw/maple/maple_cfg.h"
 #include "hw/sh4/sh4_sched.h"
-#include "hw/sh4/modules/dmac.h"
 #include "hw/aica/aica_if.h"
+#include "hw/hwreg.h"
 
 #include "naomi.h"
 #include "naomi_cart.h"
@@ -18,6 +17,8 @@
 #include "serialize.h"
 #include "network/output.h"
 
+#include <algorithm>
+
 //#define NAOMI_COMM
 
 static NaomiM3Comm m3comm;

core/hw/naomi/naomi_cart.h

@@ -1,10 +1,11 @@
 #pragma once
 
-#include <algorithm>
-#include <string>
 #include "types.h"
 #include "emulator.h"
 
+#include <string>
+#include <vector>
+
 struct RomBootID
 {
 	char boardName[16];

core/hw/naomi/naomi_flashrom.cpp

@@ -20,7 +20,6 @@
  */
 #include "naomi_flashrom.h"
 #include "hw/flashrom/flashrom.h"
-#include "hw/holly/sb_mem.h"
 #include "hw/maple/maple_devs.h"
 #include "cfg/option.h"
 

core/hw/naomi/naomi_m3comm.cpp

@@ -30,6 +30,8 @@
 #include "hw/sh4/sh4_mem.h"
 #include "network/naomi_network.h"
 #include "emulator.h"
+#include "rend/gui.h"
+
 #include <chrono>
 #include <memory>
 

core/hw/pvr/Renderer_if.cpp

@@ -1,12 +1,12 @@
 #include "Renderer_if.h"
 #include "spg.h"
-#include "hw/pvr/pvr_mem.h"
 #include "rend/TexCache.h"
 #include "rend/transform_matrix.h"
 #include "cfg/option.h"
 #include "emulator.h"
 #include "serialize.h"
 #include "hw/holly/holly_intc.h"
+#include "hw/sh4/sh4_if.h"
 #include "profiler/fc_profiler.h"
 
 #include <mutex>

core/hw/pvr/elan.cpp

@@ -55,16 +55,14 @@
 #include "ta_ctx.h"
 #include "hw/holly/holly_intc.h"
 #include "hw/holly/sb.h"
-#include "hw/pvr/Renderer_if.h"
-#include "hw/sh4/sh4_sched.h"
 #include "hw/sh4/sh4_mem.h"
-#include "emulator.h"
+#include "hw/sh4/sh4_mmr.h"
 #include "serialize.h"
 #include "elan_struct.h"
 #include "network/ggpo.h"
+#include "cfg/option.h"
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtx/transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
 namespace elan {

core/hw/pvr/pvr_sb_regs.cpp

@@ -9,6 +9,7 @@
 #include "hw/holly/sb.h"
 #include "hw/sh4/modules/dmac.h"
 #include "hw/sh4/sh4_mem.h"
+#include "hw/sh4/sh4_mmr.h"
 
 static void RegWrite_SB_C2DST(u32 addr, u32 data)
 {

core/hw/pvr/spg.cpp

@@ -3,12 +3,15 @@
 #include "hw/holly/holly_intc.h"
 #include "hw/holly/sb.h"
 #include "hw/sh4/sh4_sched.h"
-#include "input/gamepad_device.h"
 #include "oslib/oslib.h"
-#include "rend/TexCache.h"
 #include "hw/maple/maple_if.h"
 #include "serialize.h"
 #include "network/ggpo.h"
+#include "hw/pvr/Renderer_if.h"
+
+#ifdef TEST_AUTOMATION
+#include "input/gamepad_device.h"
+#endif
 
 //SPG emulation; Scanline/Raster beam registers & interrupts
 

core/hw/pvr/ta_ctx.cpp

@@ -3,6 +3,10 @@
 #include "cfg/option.h"
 #include "Renderer_if.h"
 #include "serialize.h"
+#include "stdclass.h"
+
+#include <mutex>
+#include <vector>
 
 extern u32 fskip;
 static int RenderCount;

core/hw/pvr/ta_ctx.h

@@ -3,9 +3,11 @@
 #include "ta_structs.h"
 #include "pvr_regs.h"
 #include "helper_classes.h"
-#include "stdclass.h"
 #include "oslib/oslib.h"
 
+#include <algorithm>
+#include <vector>
+
 class BaseTextureCacheData;
 struct N2LightModel;
 

core/hw/pvr/ta_vtx.cpp

@@ -11,7 +11,7 @@
 #include "cfg/option.h"
 
 #include <algorithm>
-#include <cmath>
+#include <utility>
 
 #define TACALL DYNACALL
 #ifdef NDEBUG

core/hw/sh4/dyna/blockmanager.cpp

@@ -13,6 +13,7 @@
 #include "hw/sh4/sh4_mem.h"
 #include "hw/sh4/sh4_opcode_list.h"
 #include "hw/sh4/sh4_sched.h"
+#include "hw/sh4/modules/mmu.h"
 
 
 #if defined(__unix__) && defined(DYNA_OPROF)

core/hw/sh4/dyna/driver.cpp

@@ -7,10 +7,8 @@
 
 #include "hw/sh4/sh4_mem.h"
 #include "hw/sh4/modules/mmu.h"
-#include "cfg/option.h"
 
 #include <ctime>
-#include <cfloat>
 
 #include "blockmanager.h"
 #include "ngen.h"

core/hw/sh4/dyna/shil.cpp

@@ -2,6 +2,7 @@
 
 #include "types.h"
 #include "hw/sh4/sh4_mem.h"
+#include "hw/sh4/sh4_mmr.h"
 
 #include "ngen.h"
 #include "hw/sh4/sh4_core.h"

core/hw/sh4/dyna/ssa.h

@@ -21,7 +21,6 @@
 #include <cstdio>
 #include <set>
 #include <map>
-#include <cmath>
 #include "types.h"
 #include "decoder.h"
 #include "hw/sh4/modules/mmu.h"

core/hw/sh4/dyna/ssa_regalloc.h

@@ -19,13 +19,15 @@
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <map>
-#include <deque>
 #include "types.h"
 #include "decoder.h"
 #include "hw/sh4/modules/mmu.h"
 #include "ssa.h"
 
+#include <deque>
+#include <map>
+#include <vector>
+
 #define ssa_printf(...) DEBUG_LOG(DYNAREC, __VA_ARGS__)
 
 template<typename nreg_t, typename nregf_t, bool AllocVec2 = false>

core/hw/sh4/interpr/sh4_interpreter.cpp

@@ -10,7 +10,6 @@
 #include "../sh4_interrupts.h"
 #include "hw/sh4/sh4_mem.h"
 #include "../sh4_sched.h"
-#include "hw/holly/sb.h"
 #include "../sh4_cache.h"
 #include "debug/gdb_server.h"
 

core/hw/sh4/interpr/sh4_opcodes.cpp

@@ -9,9 +9,14 @@
 #include "hw/sh4/sh4_mmr.h"
 #include "hw/sh4/sh4_core.h"
 #include "hw/sh4/modules/ccn.h"
+#include "hw/sh4/modules/mmu.h"
 #include "hw/sh4/sh4_interrupts.h"
-#include "hw/sh4/sh4_cache.h"
 #include "debug/gdb_server.h"
+#include "hw/sh4/dyna/decoder.h"
+
+#ifdef STRICT_MODE
+#include "hw/sh4/sh4_cache.h"
+#endif
 
 #define iNimp cpu_iNimp
 

core/hw/sh4/modules/cpg.cpp

@@ -1,4 +1,4 @@
-#include "types.h"
+#include "hw/hwreg.h"
 #include "hw/sh4/sh4_mmr.h"
 
 //Init term res

core/hw/sh4/modules/fastmmu.cpp

@@ -25,8 +25,6 @@
 #ifdef FAST_MMU
 
 #include "hw/mem/_vmem.h"
-
-#include "ccn.h"
 #include "hw/sh4/sh4_mem.h"
 
 extern TLB_Entry UTLB[64];

core/hw/sh4/modules/mmu.cpp

@@ -1,4 +1,5 @@
 #include "mmu.h"
+#include "hw/mem/_vmem.h"
 #include "hw/sh4/sh4_if.h"
 #include "hw/sh4/sh4_interrupts.h"
 #include "hw/sh4/sh4_core.h"
@@ -20,15 +21,11 @@ This is mostly hacked-on as the core was never meant to have mmu support
 There are two modes, one with 'full' mmu emulation (for wince/bleem/wtfever)
 and a fast-hack mode for 1mb sqremaps (for katana)
 */
-#include "mmu.h"
-#include "hw/sh4/sh4_if.h"
+#ifndef FAST_MMU
 #include "ccn.h"
-#include "hw/sh4/sh4_interrupts.h"
-#include "hw/sh4/sh4_if.h"
+#endif
 #include "hw/sh4/sh4_mem.h"
 
-#include "hw/mem/_vmem.h"
-
 //#define TRACE_WINCE_SYSCALLS
 
 #ifdef TRACE_WINCE_SYSCALLS

core/hw/sh4/modules/mmu.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "types.h"
 #include "hw/sh4/sh4_mmr.h"
-#include "hw/mem/_vmem.h"
 #include "cfg/option.h"
 #include "hw/sh4/dyna/ngen.h"
 

core/hw/sh4/modules/rtc.cpp

@@ -1,7 +1,7 @@
 /*
 	The rtc isn't working on dreamcast I'm told
 */
-#include "types.h"
+#include "hw/hwreg.h"
 #include "hw/sh4/sh4_mmr.h"
 
 //Init term res

core/hw/sh4/modules/ubc.cpp

@@ -1,6 +1,6 @@
 //ubc is disabled on dreamcast and can't be used ... but kos-debug uses it !...
 
-#include "types.h"
+#include "hw/hwreg.h"
 #include "hw/sh4/sh4_mmr.h"
 
 //Init term res

core/hw/sh4/modules/wince.h

@@ -16,9 +16,9 @@
     You should have received a copy of the GNU General Public License
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
+#ifdef TRACE_WINCE_SYSCALLS
 #include "hw/sh4/sh4_sched.h"
 
-#ifdef TRACE_WINCE_SYSCALLS
 #define	PUserKData 			0x00005800
 #define	SYSHANDLE_OFFSET	0x004
 #define	SYS_HANDLE_BASE		64

core/hw/sh4/sh4_mem.cpp

@@ -9,9 +9,13 @@
 #include "sh4_mmr.h"
 #include "hw/pvr/elan.h"
 #include "hw/pvr/pvr_mem.h"
-#include "hw/sh4/sh4_core.h"
+#include "cfg/option.h"
 #include "hw/mem/_vmem.h"
+#include "hw/sh4/modules/mmu.h"
+
+#ifdef STRICT_MODE
 #include "sh4_cache.h"
+#endif
 
 //main system mem
 VArray2 mem_b;

core/hw/sh4/sh4_mem.h

@@ -6,7 +6,7 @@
 extern VArray2 mem_b;
 
 #include "hw/mem/_vmem.h"
-#include "modules/mmu.h"
+#include "sh4_if.h"
 
 #ifdef _MSC_VER
 	typedef u8 (DYNACALL *ReadMem8Func)(u32 addr);

core/hw/sh4/sh4_mmr.cpp

@@ -1,7 +1,6 @@
 /*
 	Sh4 internal register routing (P4 & 'area 7')
 */
-#include <array>
 #include "types.h"
 #include "sh4_mmr.h"
 
@@ -11,6 +10,9 @@
 #include "modules/modules.h"
 #include "sh4_cache.h"
 
+#include <array>
+#include <map>
+
 //64bytes of sq // now on context ~
 
 std::array<u8, OnChipRAM_SIZE> OnChipRAM;

core/hw/sh4/sh4_sched.cpp

@@ -1,8 +1,10 @@
 #include "types.h"
-#include "sh4_interrupts.h"
-#include "sh4_core.h"
+#include "sh4_if.h"
 #include "sh4_sched.h"
 
+#include <algorithm>
+#include <vector>
+
 //sh4 scheduler
 
 /*

core/input/gamepad_device.cpp

@@ -24,11 +24,10 @@
 #include "emulator.h"
 #include "hw/maple/maple_devs.h"
 #include "hw/naomi/card_reader.h"
-#include "stdclass.h"
 
 #include <algorithm>
-#include <climits>
-#include <fstream>
+#include <mutex>
+#include <vector>
 
 #define MAPLE_PORT_CFG_PREFIX "maple_"
 
@@ -49,6 +48,7 @@ std::mutex GamepadDevice::_gamepads_mutex;
 
 #ifdef TEST_AUTOMATION
 #include "hw/sh4/sh4_sched.h"
+#include <cstdio>
 static FILE *record_input;
 #endif
 

core/input/keyboard_device.h

@@ -18,6 +18,7 @@
 */
 #pragma once
 #include "types.h"
+#include "cfg/option.h"
 #include "gamepad_device.h"
 #include "rend/gui.h"
 #include <memory>

core/input/mouse.cpp

@@ -17,6 +17,7 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include "mouse.h"
+#include "cfg/option.h"
 #include "rend/gui.h"
 
 // Mouse buttons

core/linux-dist/main.cpp

@@ -4,16 +4,17 @@
 #include "types.h"
 
 #if defined(__unix__) || defined(__SWITCH__)
-#include "hw/sh4/dyna/blockmanager.h"
 #include "log/LogManager.h"
 #include "emulator.h"
 #include "rend/mainui.h"
 #include "oslib/directory.h"
 #include "oslib/oslib.h"
+#include "stdclass.h"
 
-#include <cstdarg>
 #include <csignal>
+#include <string>
 #include <unistd.h>
+#include <vector>
 
 #if defined(__SWITCH__)
 #include "nswitch.h"

core/linux/common.cpp

@@ -10,6 +10,8 @@
 #include <sys/time.h>
 #if defined(__linux__) && !defined(__ANDROID__)
   #include <sys/personality.h>
+#endif
+#if !defined(TARGET_BSD) && !defined(__ANDROID__) && defined(TARGET_VIDEOCORE)
   #include <dlfcn.h>
 #endif
 #include <unistd.h>

core/network/ggpo.cpp

@@ -71,20 +71,22 @@ static void getLocalInput(MapleInputState inputState[4])
 #include "emulator.h"
 #include "rend/gui.h"
 #include "hw/mem/mem_watch.h"
-#include "hw/sh4/sh4_sched.h"
 #include <string.h>
 #include <chrono>
 #include <thread>
 #include <mutex>
 #include <unordered_map>
 #include <numeric>
-#include <xxhash.h>
 #include "imgui/imgui.h"
 #include "miniupnp.h"
 #include "hw/naomi/naomi_cart.h"
 
 //#define SYNC_TEST 1
 
+#ifdef SYNC_TEST
+#include <xxhash.h>
+#endif
+
 namespace ggpo
 {
 using namespace std::chrono;

core/network/miniupnp.cpp

@@ -20,9 +20,11 @@
 #ifndef FEAT_NO_MINIUPNPC
 #include <miniupnpc.h>
 #include <upnpcommands.h>
-#include "types.h"
+#include "log/Log.h"
 #include "miniupnp.h"
 
+#include <string>
+
 #ifndef UPNP_LOCAL_PORT_ANY
 #define UPNP_LOCAL_PORT_ANY 0
 #endif

core/network/miniupnp.h

@@ -17,11 +17,14 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
-#include <vector>
-#include <utility>
 #ifndef FEAT_NO_MINIUPNPC
 #include <miniupnpc.h>
 
+#include <cstring>
+#include <string>
+#include <utility>
+#include <vector>
+
 class MiniUPnP
 {
 public:

core/network/naomi_network.cpp

@@ -20,6 +20,8 @@
 #include "hw/naomi/naomi_cart.h"
 #include "hw/naomi/naomi_flashrom.h"
 #include "cfg/option.h"
+#include "rend/gui.h"
+
 #include <chrono>
 #include <thread>
 

core/network/naomi_network.h

@@ -20,11 +20,13 @@
 #include "types.h"
 #include "net_platform.h"
 #include "miniupnp.h"
-#include "rend/gui.h"
 #include "cfg/option.h"
 #include "emulator.h"
+
+#include <algorithm>
 #include <atomic>
 #include <future>
+#include <vector>
 
 class NaomiNetwork
 {

core/network/picoppp.cpp

@@ -24,7 +24,10 @@
 #endif
 
 #include "stdclass.h"
+
+#ifdef BBA_PCAPNG_DUMP
 #include "oslib/oslib.h"
+#endif
 
 #ifdef __MINGW32__
 #define _POSIX_SOURCE
@@ -43,7 +46,6 @@ extern "C" {
 #include "net_platform.h"
 
 #include "types.h"
-#include "cfg/cfg.h"
 #include "picoppp.h"
 #include "miniupnp.h"
 #include "reios/reios.h"

core/oslib/audiobackend_alsa.cpp

@@ -2,6 +2,7 @@
 #include "audiostream.h"
 #include <alsa/asoundlib.h>
 #include "cfg/cfg.h"
+#include "cfg/option.h"
 
 class AlsaAudioBackend : public AudioBackend
 {

core/oslib/audiobackend_coreaudio.cpp

@@ -13,6 +13,7 @@
  */
 #if defined(__APPLE__)
 #include "audiostream.h"
+#include "cfg/option.h"
 #include "stdclass.h"
 
 #include <atomic>

core/oslib/audiobackend_directsound.cpp

@@ -1,6 +1,7 @@
 #include "build.h"
 #if defined(_WIN32) && !defined(TARGET_UWP)
 #include "audiostream.h"
+#include "cfg/option.h"
 #include <initguid.h>
 #include <dsound.h>
 #include <vector>

core/oslib/audiobackend_oboe.cpp

@@ -18,6 +18,7 @@
 */
 #ifdef USE_OBOE
 #include "audiostream.h"
+#include "cfg/option.h"
 #include <oboe/Oboe.h>
 #include <vector>
 #include <algorithm>

core/oslib/audiobackend_omx.cpp

@@ -1,5 +1,6 @@
 #if USE_OMX
 #include "audiostream.h"
+#include "cfg/option.h"
 #include <IL/OMX_Broadcom.h>
 #include <unistd.h>
 

core/oslib/audiobackend_pulseaudio.cpp

@@ -1,5 +1,6 @@
 #ifdef USE_PULSEAUDIO
 #include "audiostream.h"
+#include "cfg/option.h"
 #include <pulse/pulseaudio.h>
 
 class PulseAudioBackend : public AudioBackend

core/oslib/audiobackend_sdl2.cpp

@@ -2,10 +2,12 @@
 
 #include <SDL.h>
 #include "audiostream.h"
+#include "cfg/option.h"
 #include "stdclass.h"
 
-#include <mutex>
+#include <algorithm>
 #include <atomic>
+#include <mutex>
 
 class SDLAudioBackend : AudioBackend
 {

core/oslib/audiostream.cpp

@@ -1,5 +1,5 @@
 #include "audiostream.h"
-#include <memory>
+#include "cfg/option.h"
 
 struct SoundFrame { s16 l; s16 r; };
 

core/oslib/audiostream.h

@@ -1,9 +1,10 @@
 #pragma once
 #include "types.h"
-#include "cfg/option.h"
-#include <vector>
+
 #include <algorithm>
 #include <atomic>
+#include <string>
+#include <vector>
 
 class AudioBackend
 {

core/rec-x64/rec_x64.cpp

@@ -11,7 +11,6 @@ using namespace Xbyak::util;
 #include "types.h"
 #include "hw/sh4/sh4_opcode_list.h"
 #include "hw/sh4/dyna/ngen.h"
-#include "hw/sh4/modules/ccn.h"
 #include "hw/sh4/modules/mmu.h"
 #include "hw/sh4/sh4_interrupts.h"
 

core/reios/descrambl.cpp

@@ -7,7 +7,8 @@
 */
 
 #include "descrambl.h"
-#include <algorithm>
+
+#include <utility>
 
 #define MAXCHUNK (2048*1024)
 

core/reios/gdrom_hle.cpp

@@ -16,6 +16,7 @@
 #include "hw/holly/holly_intc.h"
 #include "reios.h"
 #include "imgread/common.h"
+#include "hw/sh4/modules/mmu.h"
 
 #include <algorithm>
 

core/reios/reios.cpp

@@ -18,7 +18,6 @@
 #include "hw/sh4/sh4_core.h"
 #undef r
 #include "hw/sh4/sh4_mem.h"
-#include "hw/holly/sb_mem.h"
 #include "hw/holly/sb.h"
 #include "hw/naomi/naomi_cart.h"
 #include "font.h"
@@ -28,6 +27,7 @@
 #include "imgread/common.h"
 #include "imgread/isofs.h"
 #include "oslib/oslib.h"
+#include "hw/sh4/sh4_mmr.h"
 
 #include <map>
 

core/rend/CustomTexture.cpp

@@ -18,7 +18,6 @@
  */
 #include "TexCache.h"
 #include "CustomTexture.h"
-#include "cfg/cfg.h"
 #include "oslib/directory.h"
 #include "cfg/option.h"
 #include "oslib/oslib.h"

core/rend/TexCache.cpp

@@ -3,7 +3,6 @@
 #include "deps/xbrz/xbrz.h"
 #include "hw/pvr/pvr_mem.h"
 #include "hw/mem/_vmem.h"
-#include "hw/sh4/modules/mmu.h"
 
 #include <algorithm>
 #include <mutex>

core/rend/TexCache.h

@@ -6,8 +6,10 @@
 #include <algorithm>
 #include <array>
 #include <atomic>
-#include <memory>
+#include <string>
 #include <unordered_map>
+#include <vector>
+#include <utility>
 
 extern const u8 *vq_codebook;
 extern u32 palette_index;

core/rend/boxart/boxart.h

@@ -19,10 +19,13 @@
 #pragma once
 #include "scraper.h"
 #include "stdclass.h"
-#include <unordered_map>
-#include <memory>
+
 #include <future>
+#include <memory>
 #include <mutex>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 struct GameMedia;
 

core/rend/boxart/gamesdb.h

@@ -16,10 +16,13 @@
     You should have received a copy of the GNU General Public License
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include <map>
 #include "scraper.h"
 #include "json.hpp"
 
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace nlohmann;
 
 class TheGamesDb : public Scraper

core/rend/boxart/scraper.h

@@ -17,13 +17,13 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <string>
-#include <memory>
-#include <vector>
 
 #include "types.h"
 #include "json.hpp"
 
+#include <string>
+#include <vector>
+
 using namespace nlohmann;
 
 struct GameBoxart

core/rend/dx11/dx11_renderer.cpp

@@ -22,6 +22,7 @@
 #include "hw/pvr/pvr_mem.h"
 #include "rend/gui.h"
 #include "rend/tileclip.h"
+#include "rend/sorter.h"
 
 const D3D11_INPUT_ELEMENT_DESC MainLayout[]
 {

core/rend/dx11/dx11_renderer.h

@@ -25,7 +25,6 @@
 #include "dx11_quad.h"
 #include "dx11_texture.h"
 #include "dx11_shaders.h"
-#include "rend/sorter.h"
 #include "dx11_renderstate.h"
 #include "dx11_naomi2.h"
 #ifndef LIBRETRO

core/rend/dx11/oit/dx11_oitrenderer.cpp

@@ -22,10 +22,8 @@
 #include "../dx11context.h"
 #include "../dx11_renderer.h"
 #include "rend/transform_matrix.h"
-#include "../dx11_quad.h"
 #include "../dx11_texture.h"
 #include "dx11_oitshaders.h"
-#include "rend/sorter.h"
 #include "../dx11_renderstate.h"
 #include "dx11_oitbuffers.h"
 #include "dx11_oitshaders.h"

core/rend/dx9/d3d_overlay.cpp

@@ -20,6 +20,7 @@
 #include "rend/osd.h"
 #include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp>
+#include <tuple>
 
 void D3DOverlay::drawQuad(const RECT& rect, D3DCOLOR color)
 {

core/rend/gl4/gl4naomi2.cpp

@@ -17,6 +17,7 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "gl4naomi2.h"
+#include "rend/gl4/gl4.h"
 
 extern const char *N2VertexShader;
 extern const char *N2ColorShader;

core/rend/gl4/gl4naomi2.h

@@ -18,7 +18,6 @@
  */
 #pragma once
 #include "gl4.h"
-#include "rend/gles/naomi2.h"
 
 class N2Vertex4Source : public OpenGl4Source
 {

core/rend/gl4/gldraw.cpp

@@ -18,9 +18,9 @@
 */
 #include "gl4.h"
 #include "rend/gles/glcache.h"
+#include "rend/gles/naomi2.h"
 #include "rend/tileclip.h"
 #include "rend/osd.h"
-#include "gl4naomi2.h"
 
 static gl4PipelineShader* CurrentShader;
 extern u32 gcflip;

core/rend/gl4/gles.cpp

@@ -22,7 +22,11 @@
 #include "rend/osd.h"
 #include "glsl.h"
 #include "gl4naomi2.h"
+#include "rend/gles/naomi2.h"
+
+#ifdef LIBRETRO
 #include "rend/gles/postprocess.h"
+#endif
 
 //Fragment and vertex shaders code
 

core/rend/gles/gldraw.cpp

@@ -1,6 +1,5 @@
 #include "glcache.h"
 #include "gles.h"
-#include "rend/sorter.h"
 #include "rend/tileclip.h"
 #include "rend/osd.h"
 #include "naomi2.h"

core/rend/gles/gles.cpp

@@ -1,6 +1,5 @@
 #include "glcache.h"
 #include "gles.h"
-#include "cfg/cfg.h"
 #include "hw/pvr/ta.h"
 #ifndef LIBRETRO
 #include "rend/gui.h"
@@ -15,6 +14,10 @@
 #include "naomi2.h"
 #include "rend/gles/postprocess.h"
 
+#ifdef TEST_AUTOMATION
+#include "cfg/cfg.h"
+#endif
+
 #include <cmath>
 
 #ifdef GLES

core/rend/gles/gltex.cpp

@@ -3,8 +3,7 @@
 #include "hw/pvr/pvr_mem.h"
 #include "rend/TexCache.h"
 
-#include <cstdio>
-#include <cstdlib>
+#include <memory>
 
 GlTextureCache TexCache;
 

core/rend/gles/postprocess.cpp

@@ -17,9 +17,9 @@
     You should have received a copy of the GNU General Public License
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <array>
 #include "postprocess.h"
-#include "cfg/option.h"
+
+#include <array>
 
 PostProcessor postProcessor;
 

core/rend/gui.cpp

@@ -16,23 +16,18 @@
     You should have received a copy of the GNU General Public License
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
  */
-
-#include <mutex>
 #include "gui.h"
 #include "osd.h"
 #include "cfg/cfg.h"
 #include "hw/maple/maple_if.h"
 #include "hw/maple/maple_devs.h"
-#include "hw/naomi/naomi_cart.h"
 #include "imgui/imgui.h"
 #include "imgui/roboto_medium.h"
 #include "network/net_handshake.h"
 #include "network/ggpo.h"
 #include "wsi/context.h"
 #include "input/gamepad_device.h"
-#include "input/mouse.h"
 #include "gui_util.h"
-#include "gui_android.h"
 #include "game_scanner.h"
 #include "version.h"
 #include "oslib/oslib.h"
@@ -51,6 +46,12 @@
 #include "sdl/sdl.h"
 #endif
 
+#ifdef __ANDROID__
+#include "gui_android.h"
+#endif
+
+#include <mutex>
+
 static bool game_started;
 
 int insetLeft, insetRight, insetTop, insetBottom;
@@ -432,6 +433,7 @@ void gui_set_insets(int left, int right, int top, int bottom)
 
 #if 0
 #include "oslib/timeseries.h"
+#include <vector>
 TimeSeries renderTimes;
 TimeSeries vblankTimes;
 

core/rend/gui.h

@@ -18,7 +18,8 @@
  */
 #pragma once
 #include "types.h"
-#include "cfg/option.h"
+
+#include <string>
 
 void gui_init();
 void gui_initFonts();

core/rend/gui_util.cpp

@@ -27,7 +27,6 @@
 #include "oslib/directory.h"
 #include "imgui/imgui.h"
 #include "imgui/imgui_internal.h"
-#include "hw/maple/maple_devs.h"
 #define STBI_ONLY_JPEG
 #define STBI_ONLY_PNG
 #include <stb_image.h>

core/rend/gui_util.h

@@ -18,14 +18,17 @@
  */
 #pragma once
 
-#include <string>
-
 #include "types.h"
+#include "cfg/option.h"
 #include "imgui/imgui.h"
 #include "imgui/imgui_internal.h"
 #include "gui.h"
 #include "emulator.h"
-#include "stdclass.h"
+
+#include <algorithm>
+#include <chrono>
+#include <future>
+#include <string>
 
 typedef bool (*StringCallback)(bool cancelled, std::string selection);
 

core/rend/mainui.cpp

@@ -16,8 +16,7 @@
     You should have received a copy of the GNU General Public License
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <chrono>
-#include <thread>
+
 #include "mainui.h"
 #include "hw/pvr/Renderer_if.h"
 #include "gui.h"
@@ -27,7 +26,9 @@
 #include "emulator.h"
 #include "imgui_driver.h"
 #include "profiler/fc_profiler.h"
+
 #include <chrono>
+#include <thread>
 
 static bool mainui_enabled;
 u32 MainFrameCount;

core/rend/norend/norend.cpp

@@ -1,4 +1,5 @@
 #include "hw/pvr/ta.h"
+#include "hw/pvr/ta_ctx.h"
 #include "hw/pvr/Renderer_if.h"
 
 struct norend : Renderer

core/rend/osd.cpp

@@ -18,8 +18,7 @@
 #include "types.h"
 #include "input/gamepad.h"
 #include "input/gamepad_device.h"
-#include "TexCache.h"
-#include "hw/maple/maple_devs.h"
+#include "stdclass.h"
 #ifdef LIBRETRO
 #include "vmu_xhair.h"
 #endif

core/rend/sorter.h

@@ -15,7 +15,6 @@
 	 along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "types.h"
 #include "hw/pvr/ta_ctx.h"
 
 // Use the first vertex as provoking vertex for flat-shaded triangles

core/rend/vulkan/drawer.cpp

@@ -20,6 +20,7 @@
 */
 #include "drawer.h"
 #include "hw/pvr/pvr_mem.h"
+#include "rend/sorter.h"
 
 TileClipping BaseDrawer::SetTileClip(u32 val, vk::Rect2D& clipRect)
 {

core/rend/vulkan/drawer.h

@@ -19,7 +19,6 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
-#include "rend/sorter.h"
 #include "rend/tileclip.h"
 #include "rend/transform_matrix.h"
 #include "vulkan.h"

core/rend/vulkan/oit/oit_drawer.cpp

@@ -20,6 +20,7 @@
 */
 #include "oit_drawer.h"
 #include "hw/pvr/pvr_mem.h"
+#include "rend/sorter.h"
 
 #include <algorithm>
 

core/rend/vulkan/oit/oit_drawer.h

@@ -19,7 +19,6 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
-#include "rend/sorter.h"
 #include "rend/transform_matrix.h"
 #include "../vulkan.h"
 #include "../buffer.h"

core/rend/vulkan/oit/oit_shaders.h

@@ -23,6 +23,8 @@
 #include "../utils.h"
 #include "cfg/option.h"
 
+#include <map>
+
 enum class Pass { Depth, Color, OIT };
 
 class OITShaderManager

core/rend/vulkan/overlay.cpp

@@ -18,10 +18,10 @@
     You should have received a copy of the GNU General Public License
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "texture.h"
-#include "hw/maple/maple_devs.h"
 #include "overlay.h"
+#include "texture.h"
 #include "cfg/option.h"
+#include "hw/maple/maple_cfg.h"
 #include "rend/osd.h"
 #ifdef LIBRETRO
 #include "vmu_xhair.h"

core/rend/vulkan/pipeline.cpp

@@ -21,7 +21,6 @@
 #include "pipeline.h"
 #include "hw/pvr/Renderer_if.h"
 #include "rend/osd.h"
-#include "quad.h"
 
 void PipelineManager::CreateModVolPipeline(ModVolMode mode, int cullMode, bool naomi2)
 {

core/rend/vulkan/texture.cpp

@@ -19,7 +19,6 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include "texture.h"
-#include "utils.h"
 
 #include <algorithm>
 #include <memory>