isledecomp · madebr · Jul 5, 2026 · Jul 5, 2026 · Jul 5, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -76,6 +76,11 @@ option(RACERS_DECOMP_ASSERT "Assert struct size" ${MSVC_FOR_DECOMP})
 
 add_cxx_warning(parentheses)
 
+find_program(IWYU_BIN NAMES "include-what-you-use")
+if(IWYU_BIN)
+  set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "${IWYU_BIN}" -target i686-pc-windows-msvc "-Xiwyu" "--mapping_file=${PROJECT_SOURCE_DIR}/tools/iwyu.imp")
+endif()
+
 # These GOLDP-only files need the same inline expansion behavior (/Ob2) as the common/ sources.
 # This might represent another original static library or project grouping; keep the list
 # narrow until more source units show the same codegen fingerprint.

diff --git a/GolDP/include/camera/goltransform.h b/GolDP/include/camera/goltransform.h
@@ -2,6 +2,7 @@
 #define GOLTRANSFORM_H
 
 #include "compat.h"
+#include "golmath.h"
 #include "goltransformbase.h"
 #include "types.h"
 

diff --git a/GolDP/include/material/goltexturelist.h b/GolDP/include/material/goltexturelist.h
@@ -5,6 +5,7 @@
 #include "golnametable.h"
 #include "golsurfaceformat.h"
 #include "goltxtparser.h"
+#include "surface/color.h"
 
 class GolD3DRenderDevice;
 class GolTexture;

diff --git a/GolDP/include/mesh/gdbprelitvertexarray.h b/GolDP/include/mesh/gdbprelitvertexarray.h
@@ -3,6 +3,7 @@
 
 #include "compat.h"
 #include "mesh/gdbnormalvertexarray.h"
+#include "types.h"
 
 // VTABLE: GOLDP 0x10056858
 // SIZE 0x20

diff --git a/GolDP/include/surface/golattachedsurface.h b/GolDP/include/surface/golattachedsurface.h
@@ -1,7 +1,6 @@
 #ifndef GOLATTACHEDSURFACE_H
 #define GOLATTACHEDSURFACE_H
 
-#include "decomp.h"
 #include "golsurface.h"
 
 class GolRenderTarget;

diff --git a/GolDP/include/surface/goldisplaysurface.h b/GolDP/include/surface/goldisplaysurface.h
@@ -2,7 +2,9 @@
 #define GOLDISPLAYSURFACE_H
 
 #include "compat.h"
+#include "decomp.h"
 #include "golsurface.h"
+#include "types.h"
 
 class GolDrawState;
 

diff --git a/GolDP/src/camera/goltransform.cpp b/GolDP/src/camera/goltransform.cpp
@@ -1,6 +1,7 @@
 #include "camera/goltransform.h"
 
-#include "camera/golcameramatrices.h"
+#include "camera/golcameramatrices.h" // IWYU pragma: keep
+#include "decomp.h"
 
 DECOMP_SIZE_ASSERT(GolTransform, 0xd0)
 DECOMP_SIZE_ASSERT(GolCameraMatrices, 0x220)

diff --git a/GolDP/src/mesh/gdbprelitvertexarray.cpp b/GolDP/src/mesh/gdbprelitvertexarray.cpp
@@ -1,7 +1,11 @@
 #include "mesh/gdbprelitvertexarray.h"
 
+#include "decomp.h"
+#include "gdbvertexarray.h"
 #include "golmath.h"
 
+#include <stddef.h>
+
 DECOMP_SIZE_ASSERT(GdbPrelitVertexArray, 0x20)
 
 // FUNCTION: GOLDP 0x10016ad0

diff --git a/GolDP/src/surface/golattachedsurface.cpp b/GolDP/src/surface/golattachedsurface.cpp
@@ -1,5 +1,9 @@
 #include "surface/golattachedsurface.h"
 
+#include "decomp.h"
+
+#include <stddef.h>
+
 DECOMP_SIZE_ASSERT(GolAttachedSurface, 0x34)
 
 // FUNCTION: GOLDP 0x1002f360

diff --git a/GolDP/src/surface/goldisplaysurface.cpp b/GolDP/src/surface/goldisplaysurface.cpp
@@ -1,5 +1,9 @@
 #include "surface/goldisplaysurface.h"
 
+#include "golsurfaceformat.h"
+
+#include <stddef.h>
+
 DECOMP_SIZE_ASSERT(GolDisplaySurface, 0x38)
 
 // FUNCTION: GOLDP 0x1001d730

diff --git a/LEGORacers/include/app/golappeventhandler.h b/LEGORacers/include/app/golappeventhandler.h
@@ -2,7 +2,6 @@
 #define GOLAPPEVENTHANDLER_H
 
 #include "decomp.h"
-#include "types.h"
 
 // VTABLE: LEGORACERS 0x004affa4
 // SIZE 0x4

diff --git a/LEGORacers/include/audio/musicgroupstate.h b/LEGORacers/include/audio/musicgroupstate.h
@@ -1,8 +1,6 @@
 #ifndef MUSICGROUPSTATE_H
 #define MUSICGROUPSTATE_H
 
-#include "decomp.h"
-#include "gollist.h"
 #include "types.h"
 
 class MusicInstance;

diff --git a/LEGORacers/include/audio/musicinstancestate.h b/LEGORacers/include/audio/musicinstancestate.h
@@ -3,7 +3,6 @@
 
 #include "audio/musicinstance.h"
 #include "compat.h"
-#include "decomp.h"
 #include "types.h"
 
 class MusicGroup;

diff --git a/LEGORacers/include/audio/nullmusicgroup.h b/LEGORacers/include/audio/nullmusicgroup.h
@@ -2,9 +2,11 @@
 #define NULLMUSICGROUP_H
 
 #include "audio/musicgroup.h"
-#include "audio/musicinstance.h"
 #include "compat.h"
-#include "decomp.h"
+#include "gollist.h"
+#include "types.h"
+
+class MusicInstance;
 
 class SoundManager;
 

diff --git a/LEGORacers/include/audio/nullsoundgroup.h b/LEGORacers/include/audio/nullsoundgroup.h
@@ -3,15 +3,11 @@
 
 #include "audio/soundgroup.h"
 #include "compat.h"
-#include "decomp.h"
 #include "gollist.h"
+#include "types.h"
 
-class SoundInstance;
-class SoundManager;
-struct SoundVector;
 class NullSoundInstance;
 class NullStreamingSoundInstance;
-class StreamingSoundInstance;
 
 // VTABLE: LEGORACERS 0x004afd04
 // SIZE 0x28

diff --git a/LEGORacers/include/audio/nullsoundinstance.h b/LEGORacers/include/audio/nullsoundinstance.h
@@ -1,8 +1,6 @@
 #ifndef NULLSOUNDINSTANCE_H
 #define NULLSOUNDINSTANCE_H
 
-#include "compat.h"
-#include "decomp.h"
 #include "gollist.h"
 #include "types.h"
 

diff --git a/LEGORacers/include/audio/nullsoundmanager.h b/LEGORacers/include/audio/nullsoundmanager.h
@@ -1,17 +1,15 @@
 #ifndef NULLSOUNDMANAGER_H
 #define NULLSOUNDMANAGER_H
 
-#include "audio/musicgroup.h"
-#include "audio/nullmusicgroup.h"
-#include "audio/nullsoundgroup.h"
-#include "audio/soundgroup.h"
 #include "audio/soundmanager.h"
-#include "audio/soundnode.h"
 #include "compat.h"
 #include "decomp.h"
 #include "gollist.h"
 #include "types.h"
 
+class MusicGroup;
+class SoundGroup;
+
 // VTABLE: LEGORACERS 0x004afc6c
 // SIZE 0x30
 class NullSoundManager : public SoundManager {

diff --git a/LEGORacers/include/audio/nullstreamingsoundinstance.h b/LEGORacers/include/audio/nullstreamingsoundinstance.h
@@ -7,10 +7,7 @@
 #include "gollist.h"
 #include "types.h"
 
-class StreamingSoundInstance;
-
 class SoundGroup;
-struct SoundNode;
 
 // VTABLE: LEGORACERS 0x004afce4
 // SIZE 0x44

diff --git a/LEGORacers/include/audio/soundnode.h b/LEGORacers/include/audio/soundnode.h
@@ -3,7 +3,6 @@
 
 #include "audio/soundvector.h"
 #include "decomp.h"
-#include "golmath.h"
 #include "types.h"
 
 // SIZE 0x50

diff --git a/LEGORacers/include/audio/staticnullsoundinstance.h b/LEGORacers/include/audio/staticnullsoundinstance.h
@@ -1,10 +1,11 @@
 #ifndef STATICNULLSOUNDINSTANCE_H
 #define STATICNULLSOUNDINSTANCE_H
 
-#include "compat.h"
 #include "decomp.h"
 #include "types.h"
 
+#include <stddef.h>
+
 class DirectSoundGroup;
 
 // VTABLE: LEGORACERS 0x004b0be4

diff --git a/LEGORacers/include/menu/widgets/menucolorbox.h b/LEGORacers/include/menu/widgets/menucolorbox.h
@@ -4,6 +4,8 @@
 #include "compat.h"
 #include "decomp.h"
 #include "menu/widgets/menutriangle.h"
+#include "menu/widgets/menuwidget.h"
+#include "types.h"
 
 // VTABLE: LEGORACERS 0x004b20a0
 // SIZE 0xc0

diff --git a/LEGORacers/include/menu/widgets/menusceneelement.h b/LEGORacers/include/menu/widgets/menusceneelement.h
@@ -1,7 +1,6 @@
 #ifndef MENUSCENEELEMENT_H
 #define MENUSCENEELEMENT_H
 
-#include "compat.h"
 #include "decomp.h"
 #include "types.h"
 

diff --git a/LEGORacers/include/menu/widgets/menustaticwidget.h b/LEGORacers/include/menu/widgets/menustaticwidget.h
@@ -3,6 +3,7 @@
 
 #include "compat.h"
 #include "decomp.h"
+#include "input/inputeventqueue.h"
 #include "menu/widgets/menuwidget.h"
 
 // VTABLE: LEGORACERS 0x004b263c

diff --git a/LEGORacers/include/race/events/modeldistanceresource.h b/LEGORacers/include/race/events/modeldistanceresource.h
@@ -1,9 +1,12 @@
 #ifndef MODELDISTANCERESOURCE_H
 #define MODELDISTANCERESOURCE_H
 
+#include "compat.h"
 #include "race/events/raceeventresource.h"
+#include "types.h"
 
 class GolModelEntity;
+class RaceEventTable;
 
 // VTABLE: LEGORACERS 0x004b1c20
 // SIZE 0x34

diff --git a/LEGORacers/include/race/events/partanimationresource.h b/LEGORacers/include/race/events/partanimationresource.h
@@ -1,9 +1,12 @@
 #ifndef PARTANIMATIONRESOURCE_H
 #define PARTANIMATIONRESOURCE_H
 
+#include "compat.h"
 #include "race/events/raceeventresource.h"
+#include "types.h"
 
 class GolAnimatedEntity;
+class RaceEventTable;
 
 // VTABLE: LEGORACERS 0x004b1c00
 // SIZE 0x34

diff --git a/LEGORacers/include/race/events/timerresource.h b/LEGORacers/include/race/events/timerresource.h
@@ -1,7 +1,12 @@
 #ifndef TIMERRESOURCE_H
 #define TIMERRESOURCE_H
 
+#include "compat.h"
+#include "decomp.h"
 #include "race/events/raceeventresource.h"
+#include "types.h"
+
+class RaceEventTable;
 
 // VTABLE: LEGORACERS 0x004b1af0
 // SIZE 0x30

diff --git a/LEGORacers/include/race/hazards/hazard.h b/LEGORacers/include/race/hazards/hazard.h
@@ -1,6 +1,7 @@
 #ifndef HAZARD_H
 #define HAZARD_H
 
+#include "compat.h"
 #include "util/legoeventqueue.h"
 
 class GolCamera;

diff --git a/LEGORacers/include/race/powerups/beammesh.h b/LEGORacers/include/race/powerups/beammesh.h
@@ -7,6 +7,7 @@
 #include "surface/color.h"
 #include "types.h"
 
+class GdbVertexArray;
 class GolD3DRenderDevice;
 class GolExport;
 class GolMaterial;

diff --git a/LEGORacers/include/race/powerups/magnetaction.h b/LEGORacers/include/race/powerups/magnetaction.h
@@ -1,6 +1,7 @@
 #ifndef MAGNETACTION_H
 #define MAGNETACTION_H
 
+#include "golworldentity.h"
 #include "race/powerups/hazardactionbase.h"
 
 class CutsceneAnimation;

diff --git a/LEGORacers/include/race/powerups/powerupaction.h b/LEGORacers/include/race/powerups/powerupaction.h
@@ -1,10 +1,8 @@
 #ifndef POWERUPACTION_H
 #define POWERUPACTION_H
 
-#include "golmath.h"
+#include "compat.h"
 #include "race/powerups/actionsetup.h"
-#include "race/powerups/actiontarget.h"
-#include "race/raceactionsource.h"
 #include "util/legoeventqueue.h"
 
 class GolBoundedEntity;

diff --git a/LEGORacers/include/race/powerups/warpaction.h b/LEGORacers/include/race/powerups/warpaction.h
@@ -1,6 +1,7 @@
 #ifndef WARPACTION_H
 #define WARPACTION_H
 
+#include "audio/soundvector.h"
 #include "golmodelentity.h"
 #include "race/powerups/powerupaction.h"
 

diff --git a/LEGORacers/include/race/racer/carvisuals.h b/LEGORacers/include/race/racer/carvisuals.h
@@ -1,6 +1,7 @@
 #ifndef CARVISUALS_H
 #define CARVISUALS_H
 
+#include "colortransform.h"
 #include "golanimatedentity.h"
 #include "golmath.h"
 #include "golname.h"

diff --git a/LEGORacers/include/race/raceresourcemanager.h b/LEGORacers/include/race/raceresourcemanager.h
@@ -1,9 +1,6 @@
 #ifndef RACERESOURCEMANAGER_H
 #define RACERESOURCEMANAGER_H
 
-#include "decomp.h"
-#include "types.h"
-
 class SoundManager;
 class SpatialSoundInstance;
 

diff --git a/LEGORacers/include/race/racertriggerlist.h b/LEGORacers/include/race/racertriggerlist.h
@@ -3,6 +3,7 @@
 
 #include "race/triggerlist.h"
 
+class GolWorldDatabase;
 class RacerCollisionWorlds;
 class RacePowerupManager;
 class Racer;

diff --git a/LEGORacers/include/race/racesoundsource.h b/LEGORacers/include/race/racesoundsource.h
@@ -2,8 +2,8 @@
 #define RACESOUNDSOURCE_H
 
 #include "race/racer/racersoundsource.h"
+#include "types.h"
 
-class RaceSession;
 class SoundManager;
 
 // SIZE 0x14

diff --git a/LEGORacers/include/race/triggerlist.h b/LEGORacers/include/race/triggerlist.h
@@ -3,6 +3,7 @@
 
 #include "golmath.h"
 #include "goltxtparser.h"
+#include "golworldentity.h"
 #include "types.h"
 #include "util/legoeventqueue.h"
 

diff --git a/LEGORacers/include/util/legoeventqueue.h b/LEGORacers/include/util/legoeventqueue.h
@@ -1,11 +1,12 @@
 #ifndef LEGOEVENTQUEUE_H
 #define LEGOEVENTQUEUE_H
 
-#include "compat.h"
 #include "decomp.h"
-#include "golorientedentity.h"
+#include "golmath.h"
 #include "types.h"
 
+class GolOrientedEntity;
+class GolWorldEntity;
 class Racer;
 
 // VTABLE: LEGORACERS 0x004b0710

diff --git a/LEGORacers/include/util/particle.h b/LEGORacers/include/util/particle.h
@@ -1,11 +1,11 @@
 #ifndef PARTICLE_H
 #define PARTICLE_H
 
-#include "decomp.h"
-#include "golmodelentity.h"
+#include "golworldentity.h"
 #include "types.h"
 
 class GolMaterial;
+struct GolVec3;
 
 // VTABLE: LEGORACERS 0x004af8c0
 class Particle : public GolWorldEntity {