Refactor cmake (#721)

* some start of refactor

* Update SetFlags.cmake

* Update SetCmakeVar.cmake

* Update SetFlags.cmake

* Fix error int-convertion

* more refactor

* clean up include and source file

* fix link of lib

* fix a warning

* fix include in src/actors

* fix include in src/debug

* fix include in src/ending

* fix include in src/engine/actors

* fix include in src/engine/cameras

* fix include in src/engine/editor

* fix include in src/engine/objects

* fix include in src/engine/tracks

* fix include in src/port/ui

* fix include in src/racing

* fix include in src/engine/vehicles

* fix include in subfolder of src/engine

* fix include in src/engine

* fix include in src/enhancements

* fix include in src

* fix switch

* invert common and findlib

* Update SetFlags.cmake

* clean up some workflow

* some splification

* Update build.sh

* Update Game.h

* add header back

* Delete test_check.cmake

* continue

* Update common.cmake

36 files changed, 99 insertions, 98 deletions

diff --git a/src/engine/objects/Bat.cpp b/src/engine/objects/Bat.cpp
index 148725bca..7dfbbaa4e 100644
--- a/src/engine/objects/Bat.cpp
+++ b/src/engine/objects/Bat.cpp
@@ -1,6 +1,6 @@
 #include "Bat.h"
-#include "World.h"
-#include "CoreMath.h"
+#include "engine/World.h"
+#include "engine/CoreMath.h"
 #include "port/interpolation/FrameInterpolation.h"
 
 extern "C" {
@@ -9,7 +9,7 @@ extern "C" {
 #include "assets/models/tracks/banshee_boardwalk/banshee_boardwalk_data.h"
 #include "assets/textures/tracks/banshee_boardwalk/banshee_boardwalk_data.h"
 #include "assets/models/common_data.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80086E70.h"
 #include "code_80057C60.h"
diff --git a/src/engine/objects/Bat.h b/src/engine/objects/Bat.h
index 67c5a0d74..4195ae4e7 100644
--- a/src/engine/objects/Bat.h
+++ b/src/engine/objects/Bat.h
@@ -5,8 +5,8 @@
 #include "Object.h"
 
 #include "engine/registry/RegisterContent.h"
-#include "World.h"
-#include "CoreMath.h"
+#include "engine/World.h"
+#include "engine/CoreMath.h"
 
 extern "C" {
 #include "macros.h"
@@ -16,7 +16,7 @@ extern "C" {
 #include "common_structs.h"
 #include "objects.h"
 #include "camera.h"
-#include "some_data.h"
+#include "assets/textures/some_data.h"
 }
 
 /**
diff --git a/src/engine/objects/BombKart.cpp b/src/engine/objects/BombKart.cpp
index 8009effef..9e7d7469e 100644
--- a/src/engine/objects/BombKart.cpp
+++ b/src/engine/objects/BombKart.cpp
@@ -10,21 +10,21 @@
 extern "C" {
 #include "macros.h"
 #include "main.h"
-#include "actors.h"
-#include "math_util.h"
+#include "racing/actors.h"
+#include "racing/math_util.h"
 #include "sounds.h"
 #include "update_objects.h"
 #include "render_player.h"
-#include "external.h"
+#include "audio/external.h"
 #include "bomb_kart.h"
-#include "collision.h"
+#include "racing/collision.h"
 #include "code_80086E70.h"
 #include "render_objects.h"
 #include "code_80057C60.h"
 #include "defines.h"
 #include "code_80005FD0.h"
 #include "math_util_2.h"
-#include "collision.h"
+#include "racing/collision.h"
 #include <assets/models/common_data.h>
 extern s8 gPlayerCount;
 }
diff --git a/src/engine/objects/BombKart.h b/src/engine/objects/BombKart.h
index b53b1c688..14962c405 100644
--- a/src/engine/objects/BombKart.h
+++ b/src/engine/objects/BombKart.h
@@ -4,7 +4,7 @@
 #include "engine/registry/RegisterContent.h"
 #include "engine/objects/Object.h"
 
-#include "World.h"
+#include "engine/World.h"
 
 extern "C" {
 #include "common_structs.h"
diff --git a/src/engine/objects/Boos.cpp b/src/engine/objects/Boos.cpp
index f41197f46..9c4ea6492 100644
--- a/src/engine/objects/Boos.cpp
+++ b/src/engine/objects/Boos.cpp
@@ -1,6 +1,6 @@
 #include "Boos.h"
-#include "World.h"
-#include "CoreMath.h"
+#include "engine/World.h"
+#include "engine/CoreMath.h"
 #include "port/interpolation/FrameInterpolation.h"
 
 extern "C" {
@@ -11,16 +11,16 @@ extern "C" {
 #include "assets/models/common_data.h"
 #include "assets/textures/boo_frames.h"
 #include "assets/textures/other_textures.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80086E70.h"
 #include "code_80057C60.h"
 #include "code_800029B0.h"
 #include "code_80005FD0.h"
 #include "menus.h"
-#include "race_logic.h"
-#include "external.h"
-#include "some_data.h"
+#include "racing/race_logic.h"
+#include "audio/external.h"
+#include "textures/some_data.h"
 }
 
 size_t OBoos::_count = 0;
diff --git a/src/engine/objects/Boos.h b/src/engine/objects/Boos.h
index faaf35ee7..e7ca06097 100644
--- a/src/engine/objects/Boos.h
+++ b/src/engine/objects/Boos.h
@@ -5,8 +5,8 @@
 #include "Object.h"
 
 #include "engine/registry/RegisterContent.h"
-#include "World.h"
-#include "CoreMath.h"
+#include "engine/World.h"
+#include "engine/CoreMath.h"
 
 extern "C" {
 #include "macros.h"
@@ -16,7 +16,7 @@ extern "C" {
 #include "common_structs.h"
 #include "objects.h"
 #include "camera.h"
-#include "some_data.h"
+#include "assets/textures/some_data.h"
 }
 
 /**
diff --git a/src/engine/objects/ChainChomp.cpp b/src/engine/objects/ChainChomp.cpp
index fcbd19cf9..ee31759f8 100644
--- a/src/engine/objects/ChainChomp.cpp
+++ b/src/engine/objects/ChainChomp.cpp
@@ -1,5 +1,5 @@
 #include "ChainChomp.h"
-#include "World.h"
+#include "engine/World.h"
 #include "port/interpolation/FrameInterpolation.h"
 
 extern "C" {
@@ -9,12 +9,12 @@ extern "C" {
 #include "assets/textures/tracks/rainbow_road/rainbow_road_data.h"
 #include "assets/other/tracks/rainbow_road/rainbow_road_data.h"
 #include "assets/models/common_data.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80086E70.h"
 #include "code_80057C60.h"
 #include "code_80005FD0.h"
-#include "external.h"
+#include "audio/external.h"
 #include "course_offsets.h"
 }
 
diff --git a/src/engine/objects/ChainChomp.h b/src/engine/objects/ChainChomp.h
index 0d76a079c..1a28b27bb 100644
--- a/src/engine/objects/ChainChomp.h
+++ b/src/engine/objects/ChainChomp.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include "Object.h"
 
-#include "World.h"
+#include "engine/World.h"
 
 extern "C" {
 #include "macros.h"
@@ -14,7 +14,7 @@ extern "C" {
 #include "common_structs.h"
 #include "objects.h"
 #include "camera.h"
-#include "some_data.h"
+#include "assets/textures/some_data.h"
 }
 
 /**
diff --git a/src/engine/objects/CheepCheep.cpp b/src/engine/objects/CheepCheep.cpp
index f81aeb795..145f1a4d5 100644
--- a/src/engine/objects/CheepCheep.cpp
+++ b/src/engine/objects/CheepCheep.cpp
@@ -7,7 +7,7 @@
 
 
 extern "C" {
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "render_objects.h"
 #include "update_objects.h"
@@ -15,7 +15,7 @@ extern "C" {
 #include "code_80086E70.h"
 #include "waypoints.h"
 #include "code_80057C60.h"
-#include "some_data.h"
+#include "textures/some_data.h"
 extern Vec3s D_800E634C[];
 extern Lights1 D_800E45C0[];
 }
diff --git a/src/engine/objects/CheepCheep.h b/src/engine/objects/CheepCheep.h
index bca65d100..55a0ed4d5 100644
--- a/src/engine/objects/CheepCheep.h
+++ b/src/engine/objects/CheepCheep.h
@@ -6,7 +6,7 @@
 #include "engine/registry/RegisterContent.h"
 #include "engine/CoreMath.h"
 
-#include "World.h"
+#include "engine/World.h"
 
 extern "C" {
 #include "macros.h"
@@ -14,7 +14,7 @@ extern "C" {
 #include "common_structs.h"
 #include "objects.h"
 #include "course_offsets.h"
-#include "some_data.h"
+#include "assets/textures/some_data.h"
 }
 
 
diff --git a/src/engine/objects/Crab.cpp b/src/engine/objects/Crab.cpp
index 7c3bc8d47..c4e057b8c 100644
--- a/src/engine/objects/Crab.cpp
+++ b/src/engine/objects/Crab.cpp
@@ -2,7 +2,7 @@
 #include <libultra/gbi.h>
 #include "Crab.h"
 #include <vector>
-#include "CoreMath.h"
+#include "engine/CoreMath.h"
 
 #include "port/Game.h"
 #include "port/interpolation/FrameInterpolation.h"
@@ -14,14 +14,14 @@ extern "C" {
 #include "camera.h"
 #include "update_objects.h"
 #include "render_objects.h"
-#include "actors.h"
+#include "racing/actors.h"
 #include "code_80057C60.h"
 #include "code_80086E70.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80005FD0.h"
-#include "some_data.h"
-#include "ceremony_and_credits.h"
+#include "textures/some_data.h"
+#include "ending/ceremony_and_credits.h"
 #include "assets/models/tracks/koopa_troopa_beach/koopa_troopa_beach_data.h"
 #include "assets/textures/tracks/koopa_troopa_beach/koopa_troopa_beach_data.h"
 #include "assets/models/common_data.h"
diff --git a/src/engine/objects/Crab.h b/src/engine/objects/Crab.h
index 425361b02..9a892bcf7 100644
--- a/src/engine/objects/Crab.h
+++ b/src/engine/objects/Crab.h
@@ -4,8 +4,8 @@
 #include <vector>
 #include "engine/registry/RegisterContent.h"
 #include "engine/objects/Object.h"
-#include "CoreMath.h"
-#include "World.h"
+#include "engine/CoreMath.h"
+#include "engine/World.h"
 
 extern "C" {
 #include "macros.h"
@@ -15,7 +15,7 @@ extern "C" {
 #include "common_structs.h"
 #include "objects.h"
 #include "course_offsets.h"
-#include "some_data.h"
+#include "assets/textures/some_data.h"
 }
 
 /**
diff --git a/src/engine/objects/Flagpole.cpp b/src/engine/objects/Flagpole.cpp
index 89d9dd825..cbb942eac 100644
--- a/src/engine/objects/Flagpole.cpp
+++ b/src/engine/objects/Flagpole.cpp
@@ -1,5 +1,5 @@
 #include "Flagpole.h"
-#include "World.h"
+#include "engine/World.h"
 #include "port/interpolation/FrameInterpolation.h"
 
 extern "C" {
@@ -8,7 +8,7 @@ extern "C" {
 #include "update_objects.h"
 #include "assets/models/tracks/yoshi_valley/yoshi_valley_data.h"
 #include "assets/models/common_data.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80086E70.h"
 #include "code_80057C60.h"
diff --git a/src/engine/objects/Flagpole.h b/src/engine/objects/Flagpole.h
index ebca915d4..49b718cdb 100644
--- a/src/engine/objects/Flagpole.h
+++ b/src/engine/objects/Flagpole.h
@@ -5,7 +5,7 @@
 #include "Object.h"
 
 #include "engine/registry/RegisterContent.h"
-#include "World.h"
+#include "engine/World.h"
 
 extern "C" {
 #include "macros.h"
@@ -15,7 +15,7 @@ extern "C" {
 #include "common_structs.h"
 #include "objects.h"
 #include "camera.h"
-#include "some_data.h"
+#include "assets/textures/some_data.h"
 }
 
 // This used to use directional_angle for rot. It now uses orientation for editor compatibility.
diff --git a/src/engine/objects/GrandPrixBalloons.cpp b/src/engine/objects/GrandPrixBalloons.cpp
index ba1c6f003..f97fc99fc 100644
--- a/src/engine/objects/GrandPrixBalloons.cpp
+++ b/src/engine/objects/GrandPrixBalloons.cpp
@@ -11,7 +11,7 @@ extern "C" {
 #include "render_objects.h"
 #include "code_80057C60.h"
 #include "code_80086E70.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "menus.h"
 }
diff --git a/src/engine/objects/Hedgehog.h b/src/engine/objects/Hedgehog.h
index 4a377ef32..cd500c746 100644
--- a/src/engine/objects/Hedgehog.h
+++ b/src/engine/objects/Hedgehog.h
@@ -15,7 +15,7 @@ extern "C" {
 #include "common_structs.h"
 #include "objects.h"
 #include "camera.h"
-#include "some_data.h"
+#include "textures/some_data.h"
 }
 
 /**
diff --git a/src/engine/objects/HotAirBalloon.cpp b/src/engine/objects/HotAirBalloon.cpp
index e080921e7..9eb8141e9 100644
--- a/src/engine/objects/HotAirBalloon.cpp
+++ b/src/engine/objects/HotAirBalloon.cpp
@@ -1,5 +1,5 @@
 #include "HotAirBalloon.h"
-#include "World.h"
+#include "engine/World.h"
 #include "port/Game.h"
 #include "port/interpolation/FrameInterpolation.h"
 
@@ -8,11 +8,11 @@ extern "C" {
 #include "update_objects.h"
 #include "assets/models/tracks/luigi_raceway/luigi_raceway_data.h"
 #include "assets/models/common_data.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80086E70.h"
 #include "code_80057C60.h"
-#include "actors.h"
+#include "racing/actors.h"
 }
 
 OHotAirBalloon::OHotAirBalloon(const SpawnParams& params) : OObject(params) {
diff --git a/src/engine/objects/HotAirBalloon.h b/src/engine/objects/HotAirBalloon.h
index dfbe3cfdb..cc4977724 100644
--- a/src/engine/objects/HotAirBalloon.h
+++ b/src/engine/objects/HotAirBalloon.h
@@ -4,7 +4,7 @@
 #include "Object.h"
 
 #include "engine/registry/RegisterContent.h"
-#include "World.h"
+#include "engine/World.h"
 
 class OHotAirBalloon : public OObject {
 public:
diff --git a/src/engine/objects/Lakitu.cpp b/src/engine/objects/Lakitu.cpp
index 121191a12..dd64e37ff 100644
--- a/src/engine/objects/Lakitu.cpp
+++ b/src/engine/objects/Lakitu.cpp
@@ -7,32 +7,33 @@
 #include "port/Game.h"
 
 extern "C" {
+#include "racing/memory.h"
 #include "macros.h"
 #include "main.h"
 #include "code_800029B0.h"
-#include "actors.h"
-#include "math_util.h"
+#include "racing/actors.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "sounds.h"
 #include "update_objects.h"
 #include "render_player.h"
-#include "external.h"
+#include "audio/external.h"
 #include "bomb_kart.h"
-#include "collision.h"
+#include "racing/collision.h"
 #include "code_80086E70.h"
 #include "render_objects.h"
 #include "code_80057C60.h"
 #include "defines.h"
 #include "code_80005FD0.h"
-#include "collision.h"
+#include "racing/collision.h"
 #include "assets/models/tracks/bowsers_castle/bowsers_castle_data.h"
-#include "ceremony_and_credits.h"
+#include "ending/ceremony_and_credits.h"
 #include "objects.h"
 #include "update_objects.h"
 #include "render_objects.h"
 #include "course_offsets.h"
 #include "data/some_data.h"
-#include "race_logic.h"
+#include "racing/race_logic.h"
 #include "effects.h"
 #include "memory.h"
 #include <assets/models/common_data.h>
diff --git a/src/engine/objects/Lakitu.h b/src/engine/objects/Lakitu.h
index 8736a5b96..8e5e57f04 100644
--- a/src/engine/objects/Lakitu.h
+++ b/src/engine/objects/Lakitu.h
@@ -3,7 +3,7 @@
 #include <libultraship.h>
 #include <vector>
 #include "Object.h"
-#include "World.h"
+#include "engine/World.h"
 
 extern "C" {
 #include "macros.h"
diff --git a/src/engine/objects/Mole.cpp b/src/engine/objects/Mole.cpp
index fe0211e1f..8478a1a39 100644
--- a/src/engine/objects/Mole.cpp
+++ b/src/engine/objects/Mole.cpp
@@ -10,18 +10,18 @@ extern "C" {
 #include "camera.h"
 #include "update_objects.h"
 #include "render_objects.h"
-#include "actors.h"
+#include "racing/actors.h"
 #include "code_80057C60.h"
 #include "code_80086E70.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80005FD0.h"
-#include "some_data.h"
-#include "ceremony_and_credits.h"
+#include "textures/some_data.h"
+#include "ending/ceremony_and_credits.h"
 #include "assets/models/tracks/moo_moo_farm/moo_moo_farm_data.h"
 #include "assets/textures/tracks/moo_moo_farm/moo_moo_farm_data.h"
 #include "sounds.h"
-#include "external.h"
+#include "audio/external.h"
 #include <assets/models/common_data.h>
 }
 
diff --git a/src/engine/objects/Mole.h b/src/engine/objects/Mole.h
index 342b77aa7..e8e00be6c 100644
--- a/src/engine/objects/Mole.h
+++ b/src/engine/objects/Mole.h
@@ -3,7 +3,7 @@
 #include <libultraship.h>
 #include <vector>
 #include "Object.h"
-#include "CoreMath.h"
+#include "engine/CoreMath.h"
 #include "MoleGroup.h"
 
 extern "C" {
@@ -14,7 +14,7 @@ extern "C" {
 #include "common_structs.h"
 #include "objects.h"
 #include "course_offsets.h"
-#include "some_data.h"
+#include "textures/some_data.h"
 }
 
 class OMoleGroup;
diff --git a/src/engine/objects/MoleGroup.cpp b/src/engine/objects/MoleGroup.cpp
index a01e55877..cc6df7e60 100644
--- a/src/engine/objects/MoleGroup.cpp
+++ b/src/engine/objects/MoleGroup.cpp
@@ -4,7 +4,7 @@
 extern "C" {
 #include "code_80057C60.h"
 #include "update_objects.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 }
 
diff --git a/src/engine/objects/MoleGroup.h b/src/engine/objects/MoleGroup.h
index 901f3c2f5..d9ef4fa53 100644
--- a/src/engine/objects/MoleGroup.h
+++ b/src/engine/objects/MoleGroup.h
@@ -2,8 +2,8 @@
 
 #include <libultraship.h>
 #include <vector>
-#include "World.h"
-#include "CoreMath.h"
+#include "engine/World.h"
+#include "engine/CoreMath.h"
 #include "Mole.h"
 
 class OMole;
diff --git a/src/engine/objects/Object.cpp b/src/engine/objects/Object.cpp
index d7f9ac616..7bfbec141 100644
--- a/src/engine/objects/Object.cpp
+++ b/src/engine/objects/Object.cpp
@@ -1,7 +1,7 @@
 #include <libultraship.h>
 #include "Object.h"
 
-#include "World.h"
+#include "engine/World.h"
 
 extern "C" {
     #include "camera.h"
diff --git a/src/engine/objects/Penguin.cpp b/src/engine/objects/Penguin.cpp
index a645b9633..994985758 100644
--- a/src/engine/objects/Penguin.cpp
+++ b/src/engine/objects/Penguin.cpp
@@ -8,23 +8,23 @@
 extern "C" {
 #include "macros.h"
 #include "main.h"
-#include "actors.h"
-#include "math_util.h"
+#include "racing/actors.h"
+#include "racing/math_util.h"
 #include "sounds.h"
 #include "update_objects.h"
 #include "render_player.h"
-#include "external.h"
+#include "audio/external.h"
 #include "bomb_kart.h"
-#include "collision.h"
+#include "racing/collision.h"
 #include "code_80086E70.h"
 #include "render_objects.h"
 #include "code_80057C60.h"
 #include "defines.h"
 #include "code_80005FD0.h"
 #include "math_util_2.h"
-#include "collision.h"
+#include "racing/collision.h"
 #include "assets/models/tracks/bowsers_castle/bowsers_castle_data.h"
-#include "ceremony_and_credits.h"
+#include "ending/ceremony_and_credits.h"
 #include "objects.h"
 #include "update_objects.h"
 #include "render_objects.h"
diff --git a/src/engine/objects/Podium.cpp b/src/engine/objects/Podium.cpp
index 621ba91ab..9f80acecb 100644
--- a/src/engine/objects/Podium.cpp
+++ b/src/engine/objects/Podium.cpp
@@ -7,11 +7,11 @@ extern "C" {
 #include "update_objects.h"
 #include "render_objects.h"
 #include "code_80057C60.h"
-#include "podium_ceremony_actors.h"
-#include "math_util.h"
+#include "ending/podium_ceremony_actors.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "assets/models/common_data.h"
-#include "some_data.h"
+#include "textures/some_data.h"
 #include "code_80091440.h"
 #include "code_80086E70.h"
 #include "code_80086E70.h"
diff --git a/src/engine/objects/Podium.h b/src/engine/objects/Podium.h
index 52cef0761..268c40215 100644
--- a/src/engine/objects/Podium.h
+++ b/src/engine/objects/Podium.h
@@ -3,7 +3,7 @@
 #include <libultraship.h>
 
 #include "engine/registry/RegisterContent.h"
-#include "World.h"
+#include "engine/World.h"
 
 
 class OPodium : public OObject {
diff --git a/src/engine/objects/Seagull.cpp b/src/engine/objects/Seagull.cpp
index 1b9d0f041..1c40b4312 100644
--- a/src/engine/objects/Seagull.cpp
+++ b/src/engine/objects/Seagull.cpp
@@ -2,7 +2,7 @@
 #include <libultra/gbi.h>
 #include "Seagull.h"
 #include <vector>
-#include "World.h"
+#include "engine/World.h"
 
 #include "port/Game.h"
 #include "port/interpolation/FrameInterpolation.h"
@@ -14,14 +14,14 @@ extern "C" {
 #include "camera.h"
 #include "update_objects.h"
 #include "render_objects.h"
-#include "actors.h"
+#include "racing/actors.h"
 #include "code_80057C60.h"
 #include "code_80086E70.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80005FD0.h"
-#include "some_data.h"
-#include "ceremony_and_credits.h"
+#include "textures/some_data.h"
+#include "ending/ceremony_and_credits.h"
 #include "assets/models/common_data.h"
 #include "course_offsets.h"
 extern SplineData D_800E6034;
diff --git a/src/engine/objects/Snowman.cpp b/src/engine/objects/Snowman.cpp
index c68088ed0..263107fa2 100644
--- a/src/engine/objects/Snowman.cpp
+++ b/src/engine/objects/Snowman.cpp
@@ -1,5 +1,5 @@
 #include "Snowman.h"
-#include "World.h"
+#include "engine/World.h"
 
 extern "C" {
 #include "render_objects.h"
@@ -7,7 +7,7 @@ extern "C" {
 #include "assets/models/tracks/frappe_snowland/frappe_snowland_data.h"
 #include "assets/textures/tracks/frappe_snowland/frappe_snowland_data.h"
 #include "assets/models/common_data.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80086E70.h"
 #include "code_80057C60.h"
diff --git a/src/engine/objects/Snowman.h b/src/engine/objects/Snowman.h
index 2aac7366a..18d767777 100644
--- a/src/engine/objects/Snowman.h
+++ b/src/engine/objects/Snowman.h
@@ -4,7 +4,7 @@
 #include "Object.h"
 
 #include "engine/registry/RegisterContent.h"
-#include "World.h"
+#include "engine/World.h"
 
 extern "C" {
 #include "common_structs.h"
diff --git a/src/engine/objects/Thwomp.cpp b/src/engine/objects/Thwomp.cpp
index b176dca70..5d97690d9 100644
--- a/src/engine/objects/Thwomp.cpp
+++ b/src/engine/objects/Thwomp.cpp
@@ -11,28 +11,28 @@
 extern "C" {
 #include "macros.h"
 #include "main.h"
-#include "actors.h"
-#include "math_util.h"
+#include "racing/actors.h"
+#include "racing/math_util.h"
 #include "sounds.h"
 #include "update_objects.h"
 #include "render_player.h"
-#include "external.h"
+#include "audio/external.h"
 #include "bomb_kart.h"
-#include "collision.h"
+#include "racing/collision.h"
 #include "code_80086E70.h"
 #include "render_objects.h"
 #include "code_80057C60.h"
 #include "defines.h"
 #include "code_80005FD0.h"
 #include "math_util_2.h"
-#include "collision.h"
+#include "racing/collision.h"
 #include "assets/models/tracks/bowsers_castle/bowsers_castle_data.h"
 #include "assets/textures/tracks/bowsers_castle/bowsers_castle_data.h"
-#include "ceremony_and_credits.h"
+#include "ending/ceremony_and_credits.h"
 #include "objects.h"
 #include "update_objects.h"
 #include "render_objects.h"
-#include "some_data.h"
+#include "textures/some_data.h"
 #include "assets/models/common_data.h"
 extern s8 gPlayerCount;
 }
diff --git a/src/engine/objects/TrashBin.cpp b/src/engine/objects/TrashBin.cpp
index 75c5390fa..ba59e62a0 100644
--- a/src/engine/objects/TrashBin.cpp
+++ b/src/engine/objects/TrashBin.cpp
@@ -1,7 +1,7 @@
 #include <libultraship.h>
 #include <libultra/gbi.h>
 #include "TrashBin.h"
-#include "World.h"
+#include "engine/World.h"
 #include "port/Game.h"
 #include "port/interpolation/FrameInterpolation.h"
 
@@ -12,7 +12,7 @@ extern "C" {
 #include "update_objects.h"
 #include "assets/models/tracks/banshee_boardwalk/banshee_boardwalk_data.h"
 #include "assets/models/common_data.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "code_80086E70.h"
 #include "code_80057C60.h"
diff --git a/src/engine/objects/TrashBin.h b/src/engine/objects/TrashBin.h
index 551f2d44e..82d3300fc 100644
--- a/src/engine/objects/TrashBin.h
+++ b/src/engine/objects/TrashBin.h
@@ -4,7 +4,7 @@
 #include "Object.h"
 
 #include "engine/registry/RegisterContent.h"
-#include "World.h"
+#include "engine/World.h"
 
 class OTrashBin : public OObject {
 public:
diff --git a/src/engine/objects/Trophy.cpp b/src/engine/objects/Trophy.cpp
index 3c6c8fc31..a3b959bf5 100644
--- a/src/engine/objects/Trophy.cpp
+++ b/src/engine/objects/Trophy.cpp
@@ -9,9 +9,9 @@ extern "C" {
 #include "update_objects.h"
 #include "code_80057C60.h"
 #include "assets/models/ceremony_data.h"
-#include "podium_ceremony_actors.h"
+#include "ending/podium_ceremony_actors.h"
 #include "engine/particles/StarEmitter.h"
-#include "math_util.h"
+#include "racing/math_util.h"
 #include "math_util_2.h"
 #include "data/some_data.h"
 #include "engine/Matrix.h"
diff --git a/src/engine/objects/Trophy.h b/src/engine/objects/Trophy.h
index a6747aedc..4bdbbf0ea 100644
--- a/src/engine/objects/Trophy.h
+++ b/src/engine/objects/Trophy.h
@@ -3,7 +3,7 @@
 #include <libultraship.h>
 #include "Object.h"
 #include "engine/registry/RegisterContent.h"
-#include "World.h"
+#include "engine/World.h"
 #include "engine/particles/StarEmitter.h"
 
 extern "C" {