Tidy includes, drop PC STATIC_ASSERTs, and more macro usage

libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp

@@ -8,7 +8,10 @@
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "tracy/Tracy.hpp"
+
+#if TARGET_PC
+#include <tracy/Tracy.hpp>
+#endif
 
 void J3DDrawBuffer::calcZRatio() {
     mZRatio = (mZFar - mZNear) / (f32)mEntryTableSize;

libs/JSystem/src/J3DGraphBase/J3DGD.cpp

@@ -6,7 +6,10 @@
 
 #include "JSystem/J3DGraphBase/J3DGD.h"
 #include "JSystem/J3DGraphBase/J3DFifo.h"
-#include <dusk/logging.h>
+
+#if TARGET_PC
+#include "dusk/logging.h"
+#endif
 
 void J3DGDSetGenMode(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds,
                      GXCullMode cm) {

libs/JSystem/src/J3DGraphBase/J3DPacket.cpp

@@ -1,15 +1,18 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
-#include <cstring>
-#include <os.h>
+#include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"
 #include "JSystem/JKernel/JKRHeap.h"
+#include <os.h>
+#include <cstring>
 #include "global.h"
-#include "tracy/Tracy.hpp"
+
+#if TARGET_PC
+#include <tracy/Tracy.hpp>
+#endif
 
 J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) {
     mMaxSize = ALIGN_NEXT(maxSize, 0x20);

libs/JSystem/src/J3DGraphBase/J3DShape.cpp

@@ -1,15 +1,17 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphBase/J3DShape.h"
-
-#include <dolphin/gd.h>
-#include <gd.h>
-#include <gx.h>
-#include "JSystem/J3DGraphBase/J3DFifo.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
+#include "JSystem/J3DGraphBase/J3DFifo.h"
+#include <gd.h>
+
+#if TARGET_PC
 #include "JSystem/JKernel/JKRHeap.h"
-#include "tracy/Tracy.hpp"
+
+#include <dolphin/gx.h>
+#include <tracy/Tracy.hpp>
+#endif
 
 void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList const*, bool);
 void J3DFifoLoadPosMtxImm(Mtx, u32);

libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp

@@ -6,11 +6,14 @@
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
+
+#if TARGET_PC
 #include "dusk/frame_interpolation.h"
+#endif
 
 DUSK_GAME_DATA u16 J3DShapeMtx::sMtxLoadCache[10];
 
-#ifdef TARGET_PC
+#if TARGET_PC
 static void J3DFrameInterpConcat(MtxP lhs, MtxP rhs, Mtx out) {
     if (!dusk::frame_interp::lookup_concat_replacement(lhs, rhs, out)) {
         MTXConcat(lhs, rhs, out);

libs/JSystem/src/J3DGraphBase/J3DSys.cpp

@@ -1,15 +1,16 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
-#include "JSystem/J3DGraphBase/J3DFifo.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
-#include "helpers/gx_helper.h"
+#include "JSystem/J3DGraphBase/J3DFifo.h"
 #include "global.h"
-#include "tracy/Tracy.hpp"
 
 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
+#include "helpers/gx_helper.h"
+
+#include <tracy/Tracy.hpp>
 #endif
 
 DUSK_GAME_DATA J3DSys j3dSys;

libs/JSystem/src/JAudio2/JASAiCtrl.cpp

@@ -18,7 +18,9 @@
 #include <os.h>
 #include <stdint.h>
 
-#include "tracy/Tracy.hpp"
+#if TARGET_PC
+#include <tracy/Tracy.hpp>
+#endif
 
 DUSK_GAME_DATA s16* JASDriver::sDmaDacBuffer[3];
 

libs/JSystem/src/JFramework/JFWDisplay.cpp

@@ -12,17 +12,18 @@
 #include "global.h"
 #include <stdint.h>
 
-#ifdef TARGET_PC
+#if TARGET_PC
 #include "dusk/dusk.h"
 #include "dusk/frame_interpolation.h"
 #include "dusk/logging.h"
 #include "dusk/settings.h"
 #include "dusk/time.h"
-#include "f_op/f_op_overlap_mng.h"
 #include "helpers/gx_helper.h"
 
-#include "SDL3/SDL_timer.h"
-#include "tracy/Tracy.hpp"
+#include "f_op/f_op_overlap_mng.h"
+
+#include <SDL3/SDL_timer.h>
+#include <tracy/Tracy.hpp>
 
 #include <chrono>
 #endif

libs/JSystem/src/JParticle/JPABaseShape.cpp

@@ -11,8 +11,9 @@
 
 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
+
+#include <tracy/Tracy.hpp>
 #endif
-#include "tracy/Tracy.hpp"
 
 #if TARGET_PC
 #define JPA_DRAW_CTX_PARAM , ParticleDrawCtx* ctx

libs/JSystem/src/JParticle/JPAEmitterManager.cpp

@@ -8,7 +8,9 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include <gx.h>
 
+#if TARGET_PC
 #include "tracy/Tracy.hpp"
+#endif
 
 JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHeap, u8 i_gidMax,
                                      u8 i_ridMax) {

libs/JSystem/src/JParticle/JPAResource.cpp

@@ -1,10 +1,6 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAResource.h"
-
-#include <cstring>
-
-#include <gx.h>
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JParticle/JPABaseShape.h"
 #include "JSystem/JParticle/JPAChildShape.h"
@@ -15,12 +11,14 @@
 #include "JSystem/JParticle/JPAKeyBlock.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
+#include <gx.h>
 #include "global.h"
-#include "tracy/Tracy.hpp"
 
 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
 
+#include <tracy/Tracy.hpp>
+
 #define JPA_DRAW_CTX_ARG , &ctx
 #else
 #define JPA_DRAW_CTX_ARG