Merge pull request #51 from scribam/headers-include

Cleanup include headers

core/deps/xbrz/xbrz.cpp

@@ -358,7 +358,7 @@ template <> inline unsigned char rotateBlendInfo<ROT_180>(unsigned char b) { ret
 template <> inline unsigned char rotateBlendInfo<ROT_270>(unsigned char b) { return ((b << 6) | (b >> 2)) & 0xff; }
 
 
-#ifndef NDEBUG
+#if defined _MSC_VER && !defined NDEBUG
     int debugPixelX = -1;
     int debugPixelY = 12;
     __declspec(thread) bool breakIntoDebugger = false;
@@ -550,7 +550,7 @@ void scaleImage(const uint32_t* src, uint32_t* trg, int srcWidth, int srcHeight,
 
         for (int x = 0; x < srcWidth; ++x, out += Scaler::scale)
         {
-#ifndef NDEBUG
+#if defined _MSC_VER && !defined NDEBUG
             breakIntoDebugger = debugPixelX == x && debugPixelY == y;
 #endif
             //all those bounds checks have only insignificant impact on performance!

core/dispframe.cpp

@@ -1,7 +1,7 @@
-#include <csignal>
 #include "cfg/cfg.h"
 #include "rend/TexCache.h"
-#include "rend/rend.h"
+
+#include <csignal>
 
 extern cResetEvent rs;
 extern cResetEvent frame_finished;

core/hw/aica/aica.cpp

@@ -1,8 +1,7 @@
 #include "aica.h"
 #include "aica_if.h"
-#include "sgc_if.h"
 #include "aica_mem.h"
-#include <cmath>
+#include "sgc_if.h"
 #include "hw/holly/holly_intc.h"
 #include "hw/holly/sb.h"
 

core/hw/aica/aica.h

@@ -1,7 +1,5 @@
 #pragma once
 #include "types.h"
-#include "oslib/oslib.h"
-#include <cassert>
 
 #define SCIEB_addr 0x289C
 #define SCIPD_addr (0x289C+4)

core/hw/aica/aica_if.cpp

@@ -5,10 +5,9 @@
 */
 
 #include "aica_if.h"
-#include "hw/sh4/sh4_mem.h"
 #include "hw/holly/sb.h"
-#include "types.h"
 #include "hw/holly/holly_intc.h"
+#include "hw/sh4/sh4_mem.h"
 #include "hw/sh4/sh4_sched.h"
 
 #include <ctime>

core/hw/aica/aica_mem.cpp

@@ -1,7 +1,8 @@
 #include "aica_mem.h"
+#include "aica.h"
+#include "aica_if.h"
 #include "dsp.h"
 #include "sgc_if.h"
-#include "aica_if.h"
 
 u8 aica_reg[0x8000];
 

core/hw/aica/aica_mem.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "aica.h"
+#include "types.h"
 
 u32 libAICA_ReadReg(u32 addr,u32 size);
 void libAICA_WriteReg(u32 addr,u32 data,u32 size);

core/hw/aica/dsp.cpp

@@ -1,7 +1,4 @@
 #include "dsp.h"
-#include "aica_mem.h"
-#include "hw/aica/aica_if.h"
-#include "oslib/oslib.h"
 
 /*
 	DSP rec_v1
@@ -99,6 +96,10 @@ void DecodeInst(u32 *IPtr,_INST *i)
 }
 
 #if HOST_CPU == CPU_X86 && FEAT_DSPREC == DYNAREC_JIT
+#include "aica.h"
+#include "aica_mem.h"
+#include "aica_if.h"
+#include "oslib/oslib.h"
 #include "emitter/x86_emitter.h"
 
 const bool SUPPORT_NOFL=false;

core/hw/aica/dsp.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "aica.h"
+#include "types.h"
 
 struct dsp_t
 {

core/hw/aica/dsp_arm64.cpp

@@ -22,7 +22,8 @@
 #if HOST_CPU == CPU_ARM64 && FEAT_DSPREC != DYNAREC_NONE
 
 #include "dsp.h"
-#include "hw/aica/aica_if.h"
+#include "aica.h"
+#include "aica_if.h"
 #include "deps/vixl/aarch64/macro-assembler-aarch64.h"
 using namespace vixl::aarch64;
 

core/hw/aica/dsp_interp.cpp

@@ -4,12 +4,15 @@
 // Copyright (c) 2007-2009 R. Belmont and Richard Bannister, and others.
 // All rights reserved.
 //
-#include "dsp.h"
-#include "aica_if.h"
-#include "aica_mem.h"
+
+#include "build.h"
 
 #if FEAT_DSPREC != DYNAREC_JIT
 
+#include "dsp.h"
+#include "aica.h"
+#include "aica_if.h"
+
 #ifdef NDEBUG
 #undef verify
 #define verify(...)

core/hw/aica/dsp_x64.cpp

@@ -23,7 +23,8 @@
 
 #include <xbyak/xbyak.h>
 #include "dsp.h"
-#include "hw/aica/aica_if.h"
+#include "aica.h"
+#include "aica_if.h"
 #include "hw/mem/_vmem.h"
 
 #define CC_RW2RX(ptr) (ptr)

core/hw/aica/sgc_if.cpp

@@ -19,11 +19,15 @@
  */
 
 #include "sgc_if.h"
-#include "dsp.h"
+#include "aica.h"
+#include "aica_if.h"
 #include "aica_mem.h"
-#include "hw/aica/aica_if.h"
-#include <cmath>
+#include "dsp.h"
+#include "oslib/oslib.h"
+
 #include <algorithm>
+#include <cmath>
+
 using namespace std;
 #undef FAR
 

core/hw/aica/sgc_if.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "aica.h"
+#include "types.h"
 
 void AICA_Sample();
 void AICA_Sample32();

core/hw/arm7/arm7.cpp

@@ -1,6 +1,5 @@
 #include "arm7.h"
 #include "arm_mem.h"
-#include "virt_arm.h"
 
 #define arm_printf(...) DEBUG_LOG(AICA_ARM, __VA_ARGS__)
 
@@ -360,6 +359,8 @@ void update_armintc()
 // ARM7 Recompiler
 //
 
+#include "virt_arm.h"
+
 #if HOST_OS == OS_DARWIN
 #include <sys/mman.h>
 #endif

core/hw/arm7/arm_mem.cpp

@@ -1,7 +1,4 @@
 #include "arm_mem.h"
-#include "arm7.h"
-#include "types.h"
-#include "hw/aica/aica_if.h"
 
 #define REG_L (0x2D00)
 #define REG_M (0x2D04)

core/hw/arm7/vbaARM.cpp

@@ -1,7 +1,6 @@
 // nullAICA.cpp : Defines the entry point for the DLL application.
 //
 
-#include "types.h"
 #include "arm7.h"
 
 //called when plugin is used by emu (you should do first time init here)

core/hw/arm7/virt_arm.cpp

@@ -1,7 +1,9 @@
-#include "virt_arm.h"
+#include "build.h"
 
 #if HOST_CPU==CPU_X86 && FEAT_AREC != DYNAREC_NONE
 
+#include "virt_arm.h"
+
 namespace VARM
 {
 #define CPUReadByte(addr) (*(u8*)(addr))

core/hw/arm7/virt_arm.h

@@ -1,6 +1,6 @@
+#pragma once
 #include "types.h"
 
-
 void virt_arm_reset();
 void virt_arm_init();
 u32 DYNACALL virt_arm_op(u32 opcode);

core/hw/gdrom/gdrom_if.h

@@ -5,7 +5,6 @@
 //there were at least 4 gdrom implementations, ZGDROM, HLE, gdromv1 (never worked), gdromv2 (first release)
 //i removed the #defines to select them as they are now redundant, so this just becomes a part of
 //the code's history :)
-#include "gdromv3.h"
 
 void gdrom_reg_Init();
 void gdrom_reg_Term();

core/hw/gdrom/gdromv3.cpp

@@ -4,19 +4,12 @@
 */
 
 #include "gdromv3.h"
-
-#include "types.h"
-#include "hw/sh4/sh4_mem.h"
+#include "hw/holly/holly_intc.h"
 #include "hw/holly/sb.h"
 #include "hw/sh4/modules/dmac.h"
-#include "hw/sh4/sh4_core.h"
-#include "hw/holly/holly_intc.h"
-
-#include "hw/sh4/sh4_mmr.h"
-#include "hw/sh4/sh4_sched.h"
-
-#include "hw/sh4/sh4_sched.h"
 #include "hw/sh4/sh4_interpreter.h"
+#include "hw/sh4/sh4_mem.h"
+#include "hw/sh4/sh4_sched.h"
 
 int gdrom_schid;
 

core/hw/holly/holly_intc.cpp

@@ -1,9 +1,7 @@
-#include "types.h"
 #include "holly_intc.h"
-
-#include "hw/sh4/sh4_interrupts.h"
-#include "hw/holly/sb.h"
+#include "sb.h"
 #include "hw/maple/maple_if.h"
+#include "hw/sh4/sh4_interrupts.h"
 
 /*
 	ASIC Interrupt controller
@@ -91,11 +89,11 @@ void asic_RaiseInterrupt(HollyInterruptID inter)
 
 u32 Read_SB_ISTNRM(u32 addr)
 {
-	/* Note that the two highest bits indicate
-	 * the OR'ed result of all the bits in
-	 * SB_ISTEXT and SB_ISTERR, respectively,
-	 * and writes to these two bits are ignored. */
-	u32 tmp = SB_ISTNRM & 0x3FFFFFFF;
+	/* Note that the two highest bits indicate
+	 * the OR'ed result of all the bits in
+	 * SB_ISTEXT and SB_ISTERR, respectively,
+	 * and writes to these two bits are ignored. */
+	u32 tmp = SB_ISTNRM & 0x3FFFFFFF;
 
 	if (SB_ISTEXT)
 		tmp|=0x40000000;
@@ -108,8 +106,8 @@ u32 Read_SB_ISTNRM(u32 addr)
 
 void Write_SB_ISTNRM(u32 addr, u32 data)
 {
-	/* writing a 1 clears the interrupt */
-	SB_ISTNRM &= ~data;
+	/* writing a 1 clears the interrupt */
+	SB_ISTNRM &= ~data;
 
 	asic_RL2Pending();
 	asic_RL4Pending();

core/hw/holly/sb.cpp

@@ -3,16 +3,14 @@
 	This doesn't implement any functionality, only routing
 */
 
-#include "types.h"
 #include "sb.h"
-#include "hw/holly/holly_intc.h"
-#include "hw/pvr/pvr_sb_regs.h"
+#include "holly_intc.h"
+#include "hw/aica/aica_if.h"
 #include "hw/gdrom/gdrom_if.h"
 #include "hw/maple/maple_if.h"
-#include "hw/aica/aica_if.h"
 #include "hw/modem/modem.h"
-
 #include "hw/naomi/naomi.h"
+#include "hw/pvr/pvr_sb_regs.h"
 
 extern void dc_request_reset();
 

core/hw/holly/sb.h

@@ -3,10 +3,8 @@
 */
 
 #pragma once
-#include <array>
 #include "types.h"
-
-
+#include <array>
 
 u32 sb_ReadMem(u32 addr,u32 sz);
 void sb_WriteMem(u32 addr,u32 data,u32 sz);

core/hw/holly/sb_mem.cpp

@@ -4,18 +4,15 @@
 
 	Routing is mostly handled here, as well as flash/SRAM emulation
 */
-#include "types.h"
-#include "hw/sh4/sh4_mem.h"
-
 #include "sb_mem.h"
 #include "sb.h"
-#include "hw/pvr/pvr_mem.h"
-#include "hw/gdrom/gdrom_if.h"
 #include "hw/aica/aica_if.h"
-#include "hw/naomi/naomi.h"
-#include "hw/modem/modem.h"
-
 #include "hw/flashrom/flashrom.h"
+#include "hw/gdrom/gdrom_if.h"
+#include "hw/modem/modem.h"
+#include "hw/naomi/naomi.h"
+#include "hw/pvr/pvr_mem.h"
+#include "hw/sh4/sh4_mem.h"
 #include "reios/reios.h"
 
 MemChip *sys_rom;

core/hw/maple/maple_cfg.cpp

@@ -1,9 +1,6 @@
-#include "types.h"
-#include "maple_if.h"
-#include "maple_helper.h"
-#include "maple_devs.h"
 #include "maple_cfg.h"
-#include "cfg/cfg.h"
+#include "maple_helper.h"
+#include "maple_if.h"
 #include "hw/naomi/naomi_cart.h"
 #include "input/gamepad_device.h"
 

core/hw/maple/maple_cfg.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "types.h"
-#include "maple_devs.h"
 
 enum PlainJoystickButtonId
 {

core/hw/maple/maple_devs.cpp

@@ -1,18 +1,13 @@
-#include <memory>
-#include "types.h"
-#include "maple_if.h"
-#include "maple_helper.h"
 #include "maple_devs.h"
 #include "maple_cfg.h"
+#include "maple_helper.h"
 #include "cfg/cfg.h"
-#include "hw/naomi/naomi.h"
 #include "hw/naomi/naomi_cart.h"
 #include "hw/pvr/spg.h"
-#include "input/gamepad.h"
 #include "input/gamepad_device.h"
-#include <cmath>
-#include <ctime>
 
+#include <algorithm>
+#include <cstdlib>
 #include <zlib.h>
 #include <xxhash.h>
 

core/hw/maple/maple_devs.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <math.h>
 #include "types.h"
+#include <cmath>
 
 enum MapleDeviceType
 {

core/hw/maple/maple_if.cpp

@@ -1,18 +1,10 @@
-#include "types.h"
-#include <cstring>
-
 #include "maple_if.h"
 #include "maple_cfg.h"
-
-#include "cfg/cfg.h"
-
-#include "hw/sh4/sh4_interrupts.h"
-#include "hw/sh4/sh4_sched.h"
+#include "maple_helper.h"
+#include "hw/holly/holly_intc.h"
 #include "hw/holly/sb.h"
 #include "hw/sh4/sh4_mem.h"
-#include "types.h"
-#include "hw/holly/holly_intc.h"
-#include "hw/maple/maple_helper.h"
+#include "hw/sh4/sh4_sched.h"
 
 enum MaplePattern
 {

core/hw/maple/maple_if.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "types.h"
-#include "types.h"
 #include "maple_devs.h"
 
 extern maple_device* MapleDevices[4][6];

core/hw/mem/_vmem.cpp

@@ -1,8 +1,8 @@
 #include "_vmem.h"
 #include "vmem32.h"
 #include "hw/aica/aica_if.h"
-#include "hw/sh4/dyna/blockmanager.h"
 #include "hw/pvr/pvr_mem.h"
+#include "hw/sh4/dyna/blockmanager.h"
 #include "hw/sh4/sh4_mem.h"
 
 #define HANDLER_MAX 0x1F

core/hw/mem/vmem32.cpp

@@ -18,20 +18,18 @@
     You should have received a copy of the GNU General Public License
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include <unordered_set>
-#include <mutex>
-#include "build.h"
 #include "vmem32.h"
 #include "_vmem.h"
+#include "hw/sh4/dyna/ngen.h"
+#include "hw/sh4/modules/mmu.h"
+
+#include <unordered_set>
+#include <mutex>
 
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <sys/mman.h>
-#include <sys/stat.h>        /* For mode constants */
-#include <fcntl.h>           /* For O_* constants */
-#include <unistd.h>
-#include <cerrno>
 #ifdef __ANDROID__
 #include <linux/ashmem.h>
 #endif
@@ -41,10 +39,6 @@
 #define MAP_NOSYNC       0
 #endif
 
-#include "types.h"
-#include "hw/sh4/dyna/ngen.h"
-#include "hw/sh4/modules/mmu.h"
-
 extern bool VramLockedWriteOffset(size_t offset);
 extern cMutex vramlist_lock;
 

core/hw/mem/vmem32.h

@@ -18,6 +18,8 @@
     You should have received a copy of the GNU General Public License
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
+
 #include "_vmem.h"
 
 bool vmem32_init();

core/hw/modem/picoppp.h

@@ -18,6 +18,7 @@
     You should have received a copy of the GNU General Public License
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
 
 bool start_pico();
 void stop_pico();

core/hw/pvr/Renderer_if.cpp

@@ -1,10 +1,10 @@
 #include "Renderer_if.h"
-#include "ta.h"
-#include "hw/pvr/pvr_mem.h"
-#include "rend/TexCache.h"
-#include "rend/gui.h"
-#include "hw/mem/_vmem.h"
 #include "cheats.h"
+#include "hw/mem/_vmem.h"
+#include "hw/pvr/pvr_mem.h"
+#include "oslib/oslib.h"
+#include "rend/gui.h"
+#include "rend/TexCache.h"
 #include "wsi/context.h"
 
 #include <zlib.h>

core/hw/pvr/Renderer_if.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "types.h"
 #include "ta_ctx.h"
 
 extern u32 VertexCount;

core/hw/pvr/drkPvr.cpp

@@ -11,7 +11,6 @@
 
 #include "spg.h"
 #include "pvr_regs.h"
-#include "Renderer_if.h"
 #include "rend/TexCache.h"
 
 void libPvr_LockedBlockWrite (vram_block* block,u32 addr)

core/hw/pvr/pvr_mem.cpp

@@ -6,6 +6,7 @@
 */
 #include "pvr_mem.h"
 #include "Renderer_if.h"
+#include "ta.h"
 #include "hw/holly/sb.h"
 #include "hw/holly/holly_intc.h"
 
@@ -34,9 +35,9 @@ void YUV_init()
 
 	YUV_dest = TA_YUV_TEX_BASE & VRAM_MASK;
 	TA_YUV_TEX_CNT=0;
-	YUV_blockcount = (TA_YUV_TEX_CTRL.yuv_u_size + 1) * (TA_YUV_TEX_CTRL.yuv_v_size + 1);
+	YUV_blockcount = (TA_YUV_TEX_CTRL.yuv_u_size + 1) * (TA_YUV_TEX_CTRL.yuv_v_size + 1);
 
-	if (TA_YUV_TEX_CTRL.yuv_tex != 0)
+	if (TA_YUV_TEX_CTRL.yuv_tex != 0)
 	{
 		die ("YUV: Not supported configuration\n");
 		YUV_x_size=16;
@@ -44,8 +45,8 @@ void YUV_init()
 	}
 	else
 	{
-		YUV_x_size = (TA_YUV_TEX_CTRL.yuv_u_size + 1) * 16;
-		YUV_y_size = (TA_YUV_TEX_CTRL.yuv_v_size + 1) * 16;
+		YUV_x_size = (TA_YUV_TEX_CTRL.yuv_u_size + 1) * 16;
+		YUV_y_size = (TA_YUV_TEX_CTRL.yuv_v_size + 1) * 16;
 	}
 	YUV_index = 0;
 }
@@ -136,7 +137,7 @@ void YUV_data(u32* data , u32 count)
 		YUV_init();
 	}
 
-	u32 block_size = TA_YUV_TEX_CTRL.yuv_form == 0 ? 384 : 512;
+	u32 block_size = TA_YUV_TEX_CTRL.yuv_form == 0 ? 384 : 512;
 
 	verify(block_size==384); //no support for 512
 

core/hw/pvr/pvr_sb_regs.cpp

@@ -3,14 +3,12 @@
 	DMA hacks are here
 */
 
-#include "types.h"
+#include "pvr_sb_regs.h"
+#include "ta.h"
 #include "hw/holly/holly_intc.h"
 #include "hw/holly/sb.h"
 #include "hw/sh4/modules/dmac.h"
 #include "hw/sh4/sh4_mem.h"
-#include "pvr_sb_regs.h"
-#include "hw/sh4/sh4_mmr.h"
-#include "ta.h"
 
 void RegWrite_SB_C2DST(u32 addr, u32 data)
 {

core/hw/pvr/pvr_sb_regs.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "types.h"
 
 //Init/Term , global
 void pvr_sb_Init();

core/hw/pvr/spg.cpp

@@ -1,10 +1,9 @@
 #include "spg.h"
 #include "Renderer_if.h"
-#include "pvr_regs.h"
 #include "hw/holly/holly_intc.h"
-#include "oslib/oslib.h"
 #include "hw/sh4/sh4_sched.h"
 #include "input/gamepad_device.h"
+#include "oslib/oslib.h"
 
 //SPG emulation; Scanline/Raster beam registers & interrupts
 

core/hw/pvr/spg.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "types.h"
 
 bool spg_Init();
 void spg_Term();

core/hw/pvr/ta.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "ta_structs.h"
+#include "types.h"
+#include "ta_ctx.h"
 
 struct TA_context;
 

core/hw/pvr/ta_ctx.cpp

@@ -1,6 +1,4 @@
-#include "ta.h"
 #include "ta_ctx.h"
-
 #include "hw/sh4/sh4_sched.h"
 #include "oslib/oslib.h"
 
@@ -105,7 +103,7 @@ TA_context* rqueue;
 cResetEvent frame_finished;
 
 static double last_frame1, last_frame2;
-static u64 last_cycles1, last_cycles2;
+static u64 last_cycles1, last_cycles2;
 
 bool QueueRender(TA_context* ctx)
 {
@@ -115,8 +113,8 @@ bool QueueRender(TA_context* ctx)
  	//Speed is also limited via audio, but audio
  	//is sometimes not accurate enough (android, vista+)
 	u32 cycle_span = (u32)(sh4_sched_now64() - last_cycles2);
-	last_cycles2 = last_cycles1;
-	last_cycles1 = sh4_sched_now64();
+	last_cycles2 = last_cycles1;
+	last_cycles1 = sh4_sched_now64();
  	double time_span = os_GetSeconds() - last_frame2;
  	last_frame2 = last_frame1;
  	last_frame1 = os_GetSeconds();

core/hw/pvr/ta_ctx.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "ta.h"
+#include "types.h"
+#include "ta_structs.h"
 #include "pvr_regs.h"
 #include "helper_classes.h"
 

core/hw/pvr/ta_vtx.cpp

@@ -4,12 +4,13 @@
 
 	Parsing of the TA stream and generation of vertex data !
 */
-#include <cmath>
 #include "ta.h"
 #include "ta_ctx.h"
 #include "pvr_mem.h"
 #include "Renderer_if.h"
 
+#include <cmath>
+
 u32 ta_type_lut[256];
 extern int screen_height;
 

core/hw/sh4/dyna/blockmanager.h

@@ -1,10 +1,11 @@
 /*
 	In case you wonder, the extern "C" stuff are for the assembly code on beagleboard/pandora
 */
+#pragma once
+
 #include <memory>
 #include "types.h"
 #include "decoder.h"
-#pragma once
 
 typedef void (*DynarecCodeEntryPtr)();
 typedef std::shared_ptr<RuntimeBlockInfo> RuntimeBlockInfoPtr;

core/hw/sh4/dyna/regalloc.h

@@ -1,4 +1,4 @@
-#include <types.h>
+#include "types.h"
 #include "shil.h"
 
 #include <set>

core/hw/sh4/modules/ccn.cpp

@@ -3,7 +3,6 @@
 
 #include "types.h"
 #include "hw/sh4/sh4_mmr.h"
-#include "types.h"
 #include "ccn.h"
 #include "../sh4_core.h"
 #include "hw/pvr/pvr_mem.h"

core/hw/sh4/modules/dmac.cpp

@@ -12,7 +12,6 @@
 #include "dmac.h"
 #include "hw/sh4/sh4_interrupts.h"
 #include "hw/holly/holly_intc.h"
-#include "types.h"
 
 /*
 u32 DMAC_SAR[4];

core/imgread/ImgReader.cpp

@@ -1,7 +1,6 @@
 // nullGDR.cpp : Defines the entry point for the DLL application.
 //
 
-#include "ImgReader.h"
 //Get a copy of the operators for structs ... ugly , but works :)
 #include "common.h"
 

core/imgread/ImgReader.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include "types.h"
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>

core/imgread/cdi.cpp

@@ -1,7 +1,3 @@
-#include "types.h"
-
-
-
 #include "common.h"
 
 #include "deps/chdpsr/cdipsr.h"

core/imgread/common.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "gd_driver.h"
+#include "types.h"
 #include <vector>
 using namespace std;
 

core/imgread/cue.cpp

@@ -17,9 +17,8 @@
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <sstream>
-#include "types.h"
 #include "common.h"
+#include <sstream>
 
 extern string OS_dirname(string file);
 extern string normalize_path_separator(string path);

core/imgread/gd_driver.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "ImgReader.h"
+#include "types.h"
 
 typedef void DriveRead(u8 * buff,u32 StartSector,u32 SectorCount,u32 secsz);
 typedef void DriveGetToc(u32* toc,DiskArea area);

core/imgread/gdi.cpp

@@ -1,7 +1,6 @@
 #include "common.h"
-#include <ctype.h>
-#include <sstream>
 #include <algorithm>
+#include <sstream>
 
 // On windows, transform / to \\
 

core/imgread/ioctl.cpp

@@ -1,4 +1,4 @@
-#include "types.h"
+#include "build.h"
 
 #ifdef _WIN32
 #include "common.h"

core/input/gamepad_device.cpp

@@ -16,12 +16,14 @@
     You should have received a copy of the GNU General Public License
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
+
+#include "gamepad_device.h"
+#include "cfg/cfg.h"
+#include "oslib/oslib.h"
+#include "rend/gui.h"
+
 #include <algorithm>
 #include <climits>
-#include "gamepad_device.h"
-#include "rend/gui.h"
-#include "oslib/oslib.h"
-#include "cfg/cfg.h"
 
 #define MAPLE_PORT_CFG_PREFIX "maple_"
 

core/input/gamepad_device.h

@@ -18,11 +18,14 @@
  */
 
 #pragma once
-#include <memory>
-#include <mutex>
 #include "types.h"
 #include "mapping.h"
 
+#include <map>
+#include <memory>
+#include <mutex>
+#include <vector>
+
 class GamepadDevice
 {
 	typedef void (*input_detected_cb)(u32 code);

core/input/keyboard_device.h

@@ -19,7 +19,8 @@
 
 #pragma once
 #include "types.h"
-#include "mapping.h"
+
+#include <memory>
 
 class KeyboardDevice
 {

core/input/mapping.h

@@ -17,12 +17,13 @@
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <map>
-#include <memory>
-#include <cstdio>
+
 #include "types.h"
 #include "gamepad.h"
 
+#include <map>
+#include <memory>
+
 class InputMapping
 {
 public:

core/linux-dist/evdev.cpp

@@ -1,13 +1,14 @@
 #if defined(USE_EVDEV)
+#include "evdev.h"
+#include "evdev_gamepad.h"
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <linux/input.h>
+#include <unistd.h>
+
 #ifdef USE_UDEV
 #include <libudev.h>
 #endif
-#include "evdev.h"
-#include "evdev_gamepad.h"
 
 #define EVDEV_DEVICE_STRING "/dev/input/event%d"
 

core/linux-dist/evdev_gamepad.h

@@ -1,6 +1,10 @@
-#include "../input/gamepad_device.h"
-#include "oslib/oslib.h"
 #include "evdev.h"
+#include "input/gamepad_device.h"
+#include "oslib/oslib.h"
+
+#include <fcntl.h>
+#include <linux/input.h>
+#include <unistd.h>
 
 class EvdevGamepadDevice : public GamepadDevice
 {

core/linux-dist/joystick.cpp

@@ -1,10 +1,10 @@
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
 #include "joystick.h"
 
 #if defined(USE_JOYSTICK)
+#include <fcntl.h>
 #include <linux/joystick.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 	const u32 joystick_map_btn_usb[JOYSTICK_MAP_SIZE]      = { DC_BTN_Y, DC_BTN_B, DC_BTN_A, DC_BTN_X, 0, 0, 0, 0, 0, DC_BTN_START };
 	const u32 joystick_map_axis_usb[JOYSTICK_MAP_SIZE]     = { DC_AXIS_X, DC_AXIS_Y, 0, 0, 0, 0, 0, 0, 0, 0 };

core/linux-dist/main.cpp

@@ -1,17 +1,11 @@
 #include "types.h"
-#include "cfg/cfg.h"
 
 #if HOST_OS==OS_LINUX
-#include <poll.h>
-#include <termios.h>
-#include <fcntl.h>
-#include <semaphore.h>
-#include <cstdarg>
-#include <csignal>
-#include <sys/param.h>
-#include <sys/time.h>
 #include "hw/sh4/dyna/blockmanager.h"
 #include "log/LogManager.h"
+
+#include <cstdarg>
+#include <csignal>
 #include <unistd.h>
 
 #if defined(SUPPORT_DISPMANX)
@@ -35,6 +29,7 @@
 #endif
 
 #if defined(USE_JOYSTICK)
+    #include "cfg/cfg.h"
 	#include "joystick.h"
 #endif
 
@@ -149,7 +144,7 @@ void* rend_thread(void* p);
 			}
 		}
 
-		x11_window_destroy():
+		x11_window_destroy();
 
 		// finish cleaning
 		if (sig_num!=0)

core/linux-dist/x11_keyboard.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "input/keyboard_device.h"
 #include "input/gamepad_device.h"
+#include "input/keyboard_device.h"
 #include "x11.h"
 
 class X11KeyboardDevice : public KeyboardDeviceTemplate<int>

core/linux/common.cpp

@@ -1,5 +1,4 @@
 #include "types.h"
-#include "cfg/cfg.h"
 
 #if HOST_OS==OS_LINUX || HOST_OS == OS_DARWIN
 #if HOST_OS == OS_DARWIN
@@ -7,13 +6,7 @@
 	#define __USE_GNU 1
 	#include <TargetConditionals.h>
 #endif
-#include <poll.h>
-#include <termios.h>
-#include <fcntl.h>
-#include <semaphore.h>
-#include <cstdarg>
 #include <csignal>
-#include <sys/param.h>
 #include <sys/time.h>
 #if defined(__linux__) && !defined(__ANDROID__)
   #include <sys/personality.h>
@@ -134,8 +127,6 @@ void install_fault_handler(void)
 void install_fault_handler(void) {}
 #endif // !defined(TARGET_NO_EXCEPTIONS)
 
-#include <errno.h>
-
 double os_GetSeconds()
 {
 	timeval a;

core/nullDC.cpp

@@ -9,7 +9,6 @@
 #include "stdclass.h"
 #include "cfg/cfg.h"
 
-#include "types.h"
 #include "hw/maple/maple_cfg.h"
 #include "hw/sh4/sh4_mem.h"
 
@@ -27,6 +26,7 @@
 #include "log/LogManager.h"
 #include "cheats.h"
 #include "rend/CustomTexture.h"
+#include "hw/maple/maple_devs.h"
 
 void FlushCache();
 void LoadCustom();

core/oslib/audiobackend_null.cpp

@@ -1,6 +1,7 @@
+#include "audiostream.h"
+
 #include <chrono>
 #include <thread>
-#include "audiostream.h"
 
 using the_clock = std::chrono::high_resolution_clock;
 

core/oslib/audiobackend_oss.cpp

@@ -1,9 +1,9 @@
 #include "audiostream.h"
 #ifdef USE_OSS
+#include <fcntl.h>
 #include <sys/ioctl.h>
-#include <sys/fcntl.h>
-#include <unistd.h>
 #include <sys/soundcard.h>
+#include <unistd.h>
 
 static int oss_audio_fd = -1;
 

core/oslib/audiobackend_pulseaudio.cpp

@@ -1,8 +1,5 @@
 #include "audiostream.h"
 #ifdef USE_PULSEAUDIO
-#include <sys/ioctl.h>
-#include <sys/fcntl.h>
-#include <sys/unistd.h>
 
 #ifdef PULSEAUDIO_SIMPLE
 #include <pulse/simple.h>

core/oslib/audiostream.cpp

@@ -1,8 +1,8 @@
-#include <climits>
-#include <memory>
-#include "cfg/cfg.h"
-#include "oslib.h"
 #include "audiostream.h"
+#include "cfg/cfg.h"
+
+#include <algorithm>
+#include <memory>
 
 struct SoundFrame { s16 l;s16 r; };
 constexpr u32 SAMPLE_COUNT =  512;

core/oslib/oslib.h

@@ -1,7 +1,8 @@
 #pragma once
+#include "types.h"
+
 #include <algorithm>
 #include <cctype>
-#include "types.h"
 
 void os_SetWindowText(const char* text);
 double os_GetSeconds();

core/rec-x64/rec_x64.cpp

@@ -21,7 +21,6 @@
 #include "hw/sh4/sh4_mem.h"
 #include "hw/sh4/sh4_rom.h"
 #include "hw/mem/vmem32.h"
-#include "emitter/x86_emitter.h"
 #include "profiler/profiler.h"
 #include "oslib/oslib.h"
 #include "x64_regalloc.h"

core/reios/reios.cpp

@@ -22,6 +22,7 @@
 #include "iso9660.h"
 #include "font.h"
 #include "hw/aica/aica.h"
+#include "oslib/oslib.h"
 
 #include <map>
 

core/rend/CustomTexture.cpp

@@ -17,16 +17,12 @@
 	 along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "CustomTexture.h"
+#include "cfg/cfg.h"
 
 #include <algorithm>
-#include <sstream>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
-
 #include <png.h>
-#include "reios/reios.h"
-#include "cfg/cfg.h"
+#include <sstream>
 
 // TODO Move this out of gles.cpp
 u8* loadPNGData(const string& subpath, int &width, int &height);

core/rend/CustomTexture.h

@@ -18,9 +18,12 @@
  */
 #pragma once
 
-#include <string>
-#include <set>
 #include "TexCache.h"
+#include "stdclass.h"
+
+#include <set>
+#include <string>
+#include <vector>
 
 class CustomTexture {
 public:

core/rend/TexCache.cpp

@@ -1,19 +1,19 @@
-#include <algorithm>
-#include <mutex>
-#ifndef TARGET_NO_OPENMP
-#include <omp.h>
-#endif
-
 #include "TexCache.h"
-#include "hw/pvr/pvr_regs.h"
+#include "CustomTexture.h"
+#include "deps/xbrz/xbrz.h"
 #include "hw/pvr/pvr_mem.h"
 #include "hw/mem/_vmem.h"
 #include "hw/mem/vmem32.h"
 #include "hw/sh4/modules/mmu.h"
-#include "deps/xbrz/xbrz.h"
-#include <xxhash.h>
-#include "CustomTexture.h"
+
+#include <algorithm>
+#include <mutex>
 #include <png.h>
+#include <xxhash.h>
+
+#ifndef TARGET_NO_OPENMP
+#include <omp.h>
+#endif
 
 u8* vq_codebook;
 u32 palette_index;

core/rend/TexCache.h

@@ -1,22 +1,20 @@
 #pragma once
+#include "oslib/oslib.h"
+#include "hw/pvr/Renderer_if.h"
+
+#include <array>
 #include <atomic>
 #include <memory>
 #include <unordered_map>
-#include <array>
-#include "oslib/oslib.h"
-#include "hw/pvr/pvr_regs.h"
-#undef ID
-#include "hw/pvr/ta_structs.h"
-#include "hw/pvr/Renderer_if.h"
 
 extern u8* vq_codebook;
 extern u32 palette_index;
 extern u32 palette16_ram[1024];
 extern u32 palette32_ram[1024];
-extern bool pal_needs_update,fog_needs_update;
+extern bool pal_needs_update,fog_needs_update;
 extern u32 pal_hash_256[4];
 extern u32 pal_hash_16[64];
-extern bool KillTex;
+extern bool KillTex;
 
 extern u32 detwiddle[2][11][1024];
 

core/rend/gl4/abuffer.cpp

@@ -4,7 +4,6 @@
  *  Created on: May 26, 2018
  *      Author: raph
  */
-#include <cmath>
 #include "gl4.h"
 #include "rend/gles/glcache.h"
 

core/rend/gl4/gldraw.cpp

@@ -1,7 +1,5 @@
-#include <cmath>
 #include "gl4.h"
 #include "rend/gles/glcache.h"
-#include "rend/rend.h"
 
 /*
 
@@ -182,7 +180,7 @@ static void SetGPState(const PolyParam* gp)
 					bool mipmapped = gp->tcw.MipMapped != 0 && gp->tcw.ScanOrder == 0 && settings.rend.UseMipmaps;
 					glSamplerParameteri(texSamplers[i], GL_TEXTURE_MIN_FILTER, mipmapped ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR);
 					glSamplerParameteri(texSamplers[i], GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-					if (mipmapped)
+					if (mipmapped)
 						glSamplerParameterf(texSamplers[i], GL_TEXTURE_LOD_BIAS, D_Adjust_LoD_Bias[tsp.MipMapD]);
 				}
 			}

core/rend/gl4/gles.cpp

@@ -1,13 +1,5 @@
-#include <cmath>
 #include "gl4.h"
 #include "rend/gles/glcache.h"
-#include "wsi/gl_context.h"
-#include "rend/TexCache.h"
-#include "cfg/cfg.h"
-
-#include "oslib/oslib.h"
-#include "rend/rend.h"
-#include "rend/gui.h"
 #include "rend/transform_matrix.h"
 
 //Fragment and vertex shaders code

core/rend/gl4/gltex.cpp

@@ -1,5 +1,5 @@
 #include "gl4.h"
-#include "../gles/glcache.h"
+#include "rend/gles/glcache.h"
 
 GLuint gl4BindRTT(u32 addy, u32 fbw, u32 fbh, u32 channels, u32 fmt)
 {

core/rend/gles/glcache.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <map>
 #include "wsi/gl_context.h"
+#include <map>
 
 #define TEXTURE_ID_CACHE_SIZE 32
 
@@ -190,18 +190,18 @@ public:
 		_stencil_dpfail = 0xFFFFFFFFu;
 		_stencil_dppass = 0xFFFFFFFFu;
 		_stencil_mask = 0;
-		if (_texture_cache_size > 0)
-		{
-		   glDeleteTextures(_texture_cache_size, _texture_ids);
-		   _texture_cache_size = 0;
-		}
+		if (_texture_cache_size > 0)
+		{
+		   glDeleteTextures(_texture_cache_size, _texture_ids);
+		   _texture_cache_size = 0;
+		}
 	}
 
-	void DisableCache()
-	{
-		_disable_cache = true;
-		Reset();
-	}
+	void DisableCache()
+	{
+		_disable_cache = true;
+		Reset();
+	}
 	void EnableCache()
 	{
 	   _disable_cache = false;

core/rend/gles/gldraw.cpp

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

core/rend/gles/gles.cpp

@@ -1,12 +1,14 @@
-#include <cmath>
 #include "glcache.h"
 #include "gles.h"
-#include "rend/TexCache.h"
-#include "rend/gui.h"
-#include "wsi/gl_context.h"
 #include "cfg/cfg.h"
+#include "hw/pvr/ta.h"
+#include "rend/gui.h"
 #include "rend/osd.h"
+#include "rend/TexCache.h"
 #include "rend/transform_matrix.h"
+#include "wsi/gl_context.h"
+
+#include <cmath>
 
 #ifdef GLES
 #ifndef GL_RED
@@ -17,10 +19,6 @@
 #endif
 #endif
 
-#include "oslib/oslib.h"
-#include "rend/rend.h"
-#include "input/gamepad.h"
-
 float fb_scale_x, fb_scale_y; // FIXME
 
 //Fragment and vertex shaders code

core/rend/gles/gles.h

@@ -1,9 +1,10 @@
 #pragma once
-#include <unordered_map>
-#include <atomic>
-#include "rend/rend.h"
+#include "hw/pvr/ta_structs.h"
+#include "hw/pvr/ta_ctx.h"
 #include "rend/TexCache.h"
 #include "wsi/gl_context.h"
+
+#include <unordered_map>
 #include <glm/glm.hpp>
 
 #define glCheck() do { if (unlikely(settings.validate.OpenGlChecks)) { verify(glGetError()==GL_NO_ERROR); } } while(0)

core/rend/gles/gltex.cpp

@@ -1,10 +1,10 @@
-#include <algorithm>
 #include "glcache.h"
 #include "gles.h"
-#include "rend/TexCache.h"
 #include "hw/pvr/pvr_mem.h"
-#include "hw/mem/_vmem.h"
+#include "rend/TexCache.h"
 
+#include <cstdio>
+#include <cstdlib>
 #include <png.h>
 
 /*

core/rend/gui_android.h

@@ -16,5 +16,7 @@
     You should have received a copy of the GNU General Public License
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
+
 void gui_display_vjoy_commands(int screen_width, int screen_height, float scaling);
 void vjoy_start_editing();

core/rend/gui_util.h

@@ -16,6 +16,8 @@
     You should have received a copy of the GNU General Public License
     along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
+
 #include <string>
 
 #include "types.h"

core/rend/norend/norend.cpp

@@ -1,6 +1,6 @@
-
+#include "hw/pvr/ta_ctx.h"
+#include "hw/pvr/ta_structs.h"
 #include "hw/pvr/Renderer_if.h"
-#include "oslib/oslib.h"
 
 void rend_set_fb_scale(float x,float y) { }
 void rend_text_invl(vram_block* bl) { }

core/rend/osd.h

@@ -14,8 +14,10 @@
 	 You should have received a copy of the GNU General Public License
 	 along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include <vector>
+#pragma once
+
 #include "types.h"
+#include <vector>
 
 #define VJOY_VISIBLE 14
 #define OSD_TEX_W 512

core/rend/rend.h

@@ -1,3 +0,0 @@
-#pragma once
-#include "hw/pvr/ta_ctx.h"
-#include "hw/pvr/Renderer_if.h"

core/rend/sorter.cpp

@@ -14,8 +14,8 @@
 	 You should have received a copy of the GNU General Public License
 	 along with reicast.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include <algorithm>
 #include "sorter.h"
+#include <algorithm>
 
 struct IndexTrig
 {

core/rend/sorter.h

@@ -18,6 +18,8 @@
 #include "types.h"
 #include "hw/pvr/Renderer_if.h"
 
+#include <vector>
+
 //Sort based on min-z of each strip
 void SortPParams(int first, int count);
 

core/rend/transform_matrix.h

@@ -19,9 +19,10 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
+#include "hw/pvr/ta_ctx.h"
+
 #include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp>
-#include "hw/pvr/ta_ctx.h"
 
 extern float fb_scale_x, fb_scale_y;
 extern int screen_width, screen_height;

core/rend/vulkan/compiler.cpp

@@ -18,7 +18,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 <glm/glm.hpp>
 #include "compiler.h"
 #include "SPIRV/GlslangToSpv.h"
 #include "vulkan_context.h"

core/rend/vulkan/drawer.cpp

@@ -18,7 +18,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 <math.h>
 #include "drawer.h"
 #include "hw/pvr/pvr_mem.h"