update from dtk-template - clangd :) (#66)

* update from dtk-template and start work towards using clangd

* include <a> -> "a"

* Update build.yml

* remove/add non-trivial class in union warning

65 files changed, 181 insertions, 157 deletions

diff --git a/src/egg/audio/eggAudioArcPlayerMgr.cpp b/src/egg/audio/eggAudioArcPlayerMgr.cpp
index 176ac9db..7413b618 100644
--- a/src/egg/audio/eggAudioArcPlayerMgr.cpp
+++ b/src/egg/audio/eggAudioArcPlayerMgr.cpp
@@ -1,7 +1,7 @@
-#include <egg/audio/eggAudioArcPlayerMgr.h>
-#include <egg/audio/eggAudioMgr.h>
-#include <nw4r/snd/snd_SoundPlayer.h>
-#include <rvl/OS/OSCache.h>
+#include "egg/audio/eggAudioArcPlayerMgr.h"
+
+// #include "egg/audio/eggAudioMgr.h"
+#include "nw4r/snd/snd_SoundPlayer.h"
 
 namespace EGG {
 
@@ -30,7 +30,7 @@ UNKTYPE *ArcPlayer::openArchive(const char *name, snd::SoundHeap *heap, SARC_STO
 
         case STORAGE_NAND: ret = openNandArchive(name, heap); break;
 
-        default: break;
+        default:           break;
     }
 
     return ret;
diff --git a/src/egg/audio/eggAudioHeapMgr.cpp b/src/egg/audio/eggAudioHeapMgr.cpp
index 5ca7c5d7..28e93e63 100644
--- a/src/egg/audio/eggAudioHeapMgr.cpp
+++ b/src/egg/audio/eggAudioHeapMgr.cpp
@@ -1,4 +1,4 @@
-#include <egg/audio/eggAudioHeapMgr.h>
+#include "egg/audio/eggAudioHeapMgr.h"
 
 namespace EGG {
 
diff --git a/src/egg/audio/eggAudioMgr.cpp b/src/egg/audio/eggAudioMgr.cpp
index ab330146..9c98a801 100644
--- a/src/egg/audio/eggAudioMgr.cpp
+++ b/src/egg/audio/eggAudioMgr.cpp
@@ -1,7 +1,8 @@
-#include <egg/audio/eggAudioMgr.h>
-#include <nw4r/snd/snd_SoundSystem.h>
-#include <rvl/AI.h>
-#include <rvl/AX.h>
+#include "egg/audio/eggAudioMgr.h"
+
+#include "nw4r/snd/snd_SoundSystem.h"
+#include "rvl/AI.h" // IWYU pragma: export
+#include "rvl/AX.h" // IWYU pragma: export
 
 namespace EGG {
 
@@ -51,7 +52,7 @@ void SimpleAudioMgr::initialize(EGG::IAudioMgr::Arg *arg) {
         param.dvdThreadPriority = arg->dvdThreadPriority;
         param.dvdThreadStackSize = arg->dvdThreadStackSize;
         u32 size = nw4r::snd::SoundSystem::GetRequiredMemSize(param);
-        void *ptr = SoundHeapMgr::getSoundHeap()->Alloc(size, nullptr, (void*)'SYST');
+        void *ptr = SoundHeapMgr::getSoundHeap()->Alloc(size, nullptr, (void *)'SYST');
         nw4r::snd::SoundSystem::InitSoundSystem(param, ptr, size);
     }
     ArcPlayer::setSteamBlocks(arg->blocks);
diff --git a/src/egg/audio/eggAudioRmtSpeakerMgr.cpp b/src/egg/audio/eggAudioRmtSpeakerMgr.cpp
index 08695c8e..af752d30 100644
--- a/src/egg/audio/eggAudioRmtSpeakerMgr.cpp
+++ b/src/egg/audio/eggAudioRmtSpeakerMgr.cpp
@@ -1,6 +1,7 @@
-#include <egg/audio/eggAudioRmtSpeakerMgr.h>
-#include <nw4r/snd/snd_SoundSystem.h>
-#include <rvl/OS.h>
+#include "egg/audio/eggAudioRmtSpeakerMgr.h"
+
+#include "nw4r/snd/snd_SoundSystem.h"
+#include "rvl/OS.h" // IWYU pragma: export
 
 namespace EGG {
 
diff --git a/src/egg/audio/eggAudioSystem.cpp b/src/egg/audio/eggAudioSystem.cpp
index 50d8634d..8687eb62 100644
--- a/src/egg/audio/eggAudioSystem.cpp
+++ b/src/egg/audio/eggAudioSystem.cpp
@@ -1,5 +1,7 @@
-#include <egg/audio/eggAudioSystem.h>
-#include <nw4r/snd/snd_SoundSystem.h>
+#include "egg/audio/eggAudioSystem.h"
+
+#include "nw4r/snd/snd_SoundSystem.h"
+
 
 namespace EGG {
 
diff --git a/src/egg/audio/eggAudioUtility.cpp b/src/egg/audio/eggAudioUtility.cpp
index 95c2b0b9..5bbace2c 100644
--- a/src/egg/audio/eggAudioUtility.cpp
+++ b/src/egg/audio/eggAudioUtility.cpp
@@ -1,7 +1,9 @@
-#include <egg/audio/eggAudioRmtSpeakerMgr.h>
-#include <egg/audio/eggAudioUtility.h>
-#include <nw4r/snd/snd_SoundPlayer.h>
-#include <nw4r/snd/snd_SoundSystem.h>
+#include "egg/audio/eggAudioUtility.h"
+
+#include "egg/audio/eggAudioRmtSpeakerMgr.h"
+#include "nw4r/snd/snd_SoundPlayer.h"
+#include "nw4r/snd/snd_SoundSystem.h"
+
 
 namespace EGG {
 
diff --git a/src/egg/core/eggAllocator.cpp b/src/egg/core/eggAllocator.cpp
index c89e5755..d12d57a8 100644
--- a/src/egg/core/eggAllocator.cpp
+++ b/src/egg/core/eggAllocator.cpp
@@ -1,5 +1,7 @@
-#include <egg/core/eggAllocator.h>
-#include <egg/core/eggHeap.h>
+#include "egg/core/eggAllocator.h"
+
+#include "egg/core/eggHeap.h"
+
 
 /* 804952d0 */ static void *MEM_AllocFor_Heap(MEMAllocator *alloc, u32 size) {
     return static_cast<EGG::Heap *>(static_cast<EGG::Allocator *>(alloc)->heap)->alloc(size, alloc->heapParam1);
diff --git a/src/egg/core/eggArchive.cpp b/src/egg/core/eggArchive.cpp
index 374356a1..9bde5af2 100644
--- a/src/egg/core/eggArchive.cpp
+++ b/src/egg/core/eggArchive.cpp
@@ -1,6 +1,8 @@
-#include <egg/core/eggArchive.h>
-#include <egg/core/eggHeap.h>
-#include <string.h>
+#include "egg/core/eggArchive.h"
+
+#include "egg/core/eggHeap.h"
+#include "string.h"
+
 
 namespace EGG {
 
diff --git a/src/egg/core/eggAssertHeap.cpp b/src/egg/core/eggAssertHeap.cpp
index a3e49c9e..83afa194 100644
--- a/src/egg/core/eggAssertHeap.cpp
+++ b/src/egg/core/eggAssertHeap.cpp
@@ -1,4 +1,4 @@
-#include <egg/core/eggAssertHeap.h>
+#include "egg/core/eggAssertHeap.h"
 
 namespace EGG {
 
diff --git a/src/egg/core/eggAsyncDisplay.cpp b/src/egg/core/eggAsyncDisplay.cpp
index d04156a6..f8cbe935 100644
--- a/src/egg/core/eggAsyncDisplay.cpp
+++ b/src/egg/core/eggAsyncDisplay.cpp
@@ -1,8 +1,8 @@
-#include <egg/core/eggAsyncDisplay.h>
-#include <egg/core/eggXfbManager.h>
-#include <egg/math/eggMatrix.h>
-#include <rvl/GX/GXHardware.h>
-#include <rvl/GX/GXTexture.h>
+#include "egg/core/eggAsyncDisplay.h"
+
+#include "egg/core/eggXfbManager.h"
+#include "egg/math/eggMatrix.h"
+#include "rvl/GX/GXTexture.h"
 
 // TODO: Find the proper place for this symbol? - Ghidra has it literally unused
 extern "C" static EGG::Display *spSelector;
@@ -10,7 +10,7 @@ extern "C" static EGG::Display *spSelector;
 namespace {
 static GXTexObj clear_z_tobj;
 // clang-format off
-u8 clear_z_TX[64] ALIGN(32) = {
+u8 clear_z_TX[64] ALIGN_DECL(32) = {
     0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF,
     0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF,
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
diff --git a/src/egg/core/eggColorFader.cpp b/src/egg/core/eggColorFader.cpp
index 69185240..a11eed1a 100644
--- a/src/egg/core/eggColorFader.cpp
+++ b/src/egg/core/eggColorFader.cpp
@@ -1,6 +1,5 @@
-#include <egg/core/eggColorFader.h>
-#include <rvl/GX/GXHardware.h>
-#include <rvl/GX/GXTexture.h>
+
+#include "egg/core/eggColorFader.h"
 
 /* 80497930 */
 EGG::ColorFader::ColorFader(
diff --git a/src/egg/core/eggController.cpp b/src/egg/core/eggController.cpp
index 3a8242d8..b73a02a4 100644
--- a/src/egg/core/eggController.cpp
+++ b/src/egg/core/eggController.cpp
@@ -1,12 +1,13 @@
 
 #include "egg/core/eggController.h"
 
-#include "MSL_C/string.h"
 #include "egg/core/eggAllocator.h"
 #include "egg/core/eggExpHeap.h"
 #include "egg/core/eggSystem.h"
 #include "egg/math/eggMath.h"
-#include "rvl/VI.h"
+#include "rvl/VI.h" // IWYU pragma: export
+#include "string.h"
+
 
 EGG::NullController null_controller;
 namespace EGG {
diff --git a/src/egg/core/eggDisplay.cpp b/src/egg/core/eggDisplay.cpp
index 6a5a75a7..b9684803 100644
--- a/src/egg/core/eggDisplay.cpp
+++ b/src/egg/core/eggDisplay.cpp
@@ -2,9 +2,8 @@
 
 #include "egg/core/eggXfbManager.h"
 #include "nw4r/db/db_directPrint.h"
-#include "rvl/GX.h"
-#include "rvl/OS/OSHardware.h"
-
+#include "rvl/GX.h" // IWYU pragma: export
+#include "rvl/OS.h" // IWYU pragma: export
 
 extern "C" {
 void PreRetraceCallback(u32 retraceCount) {
diff --git a/src/egg/core/eggDisposer.cpp b/src/egg/core/eggDisposer.cpp
index ae6cba5f..eed5aa83 100644
--- a/src/egg/core/eggDisposer.cpp
+++ b/src/egg/core/eggDisposer.cpp
@@ -1,5 +1,7 @@
-#include <egg/core/eggDisposer.h>
-#include <egg/core/eggHeap.h>
+#include "egg/core/eggDisposer.h"
+
+#include "egg/core/eggHeap.h"
+
 
 namespace EGG {
 
diff --git a/src/egg/core/eggDvdFile.cpp b/src/egg/core/eggDvdFile.cpp
index d067fdce..2f92ab08 100644
--- a/src/egg/core/eggDvdFile.cpp
+++ b/src/egg/core/eggDvdFile.cpp
@@ -1,4 +1,4 @@
-#include <egg/core/eggDvdFile.h>
+#include "egg/core/eggDvdFile.h"
 
 namespace EGG {
 
diff --git a/src/egg/core/eggDvdRipper.cpp b/src/egg/core/eggDvdRipper.cpp
index 217df265..718613e8 100644
--- a/src/egg/core/eggDvdRipper.cpp
+++ b/src/egg/core/eggDvdRipper.cpp
@@ -1,5 +1,6 @@
-#include <egg/core/eggDvdRipper.h>
-#include <rvl/VI.h>
+#include "egg/core/eggDvdRipper.h"
+
+#include "rvl/VI.h" // IWYU pragma: export
 
 namespace EGG {
 
diff --git a/src/egg/core/eggExpHeap.cpp b/src/egg/core/eggExpHeap.cpp
index 96bf38f1..13296e54 100644
--- a/src/egg/core/eggExpHeap.cpp
+++ b/src/egg/core/eggExpHeap.cpp
@@ -1,4 +1,4 @@
-#include <egg/core/eggExpHeap.h>
+#include "egg/core/eggExpHeap.h"
 
 namespace EGG {
 
diff --git a/src/egg/core/eggFrmHeap.cpp b/src/egg/core/eggFrmHeap.cpp
index ad2931d1..ae3cdd2a 100644
--- a/src/egg/core/eggFrmHeap.cpp
+++ b/src/egg/core/eggFrmHeap.cpp
@@ -1,4 +1,4 @@
-#include <egg/core/eggFrmHeap.h>
+#include "egg/core/eggFrmHeap.h"
 
 namespace EGG {
 
diff --git a/src/egg/core/eggGraphicsFifo.cpp b/src/egg/core/eggGraphicsFifo.cpp
index 1ea1455f..7716e3c6 100644
--- a/src/egg/core/eggGraphicsFifo.cpp
+++ b/src/egg/core/eggGraphicsFifo.cpp
@@ -1,6 +1,7 @@
-#include <egg/core/eggGraphicsFifo.h>
-#include <egg/core/eggHeap.h>
-#include <rvl/GX.h>
+#include "egg/core/eggGraphicsFifo.h"
+
+#include "egg/core/eggHeap.h"
+#include "rvl/GX.h" // IWYU pragma: export
 
 extern "C" void GXGetGPStatus(GXBool *overhi, GXBool *underlow, GXBool *readIdle, GXBool *cmdIdle, GXBool *brkpt);
 
diff --git a/src/egg/core/eggHeap.cpp b/src/egg/core/eggHeap.cpp
index a6ebc139..37522dba 100644
--- a/src/egg/core/eggHeap.cpp
+++ b/src/egg/core/eggHeap.cpp
@@ -1,6 +1,8 @@
-#include <egg/core/eggAllocator.h>
-#include <egg/core/eggHeap.h>
-#include <nw4r/ut/ut_list.h>
+#include "egg/core/eggHeap.h"
+
+#include "egg/core/eggAllocator.h"
+#include "nw4r/ut/ut_list.h"
+
 
 namespace EGG {
 
diff --git a/src/egg/core/eggStreamDecomp.cpp b/src/egg/core/eggStreamDecomp.cpp
index 1a9e2e5b..ff9983b2 100644
--- a/src/egg/core/eggStreamDecomp.cpp
+++ b/src/egg/core/eggStreamDecomp.cpp
@@ -1,4 +1,4 @@
-#include <egg/core/eggStreamDecomp.h>
+#include "egg/core/eggStreamDecomp.h"
 
 namespace EGG {
 
diff --git a/src/egg/core/eggThread.cpp b/src/egg/core/eggThread.cpp
index 0179359a..1390bd51 100644
--- a/src/egg/core/eggThread.cpp
+++ b/src/egg/core/eggThread.cpp
@@ -1,4 +1,4 @@
-#include <egg/core/eggThread.h>
+#include "egg/core/eggThread.h"
 
 namespace EGG {
 
diff --git a/src/egg/core/eggVideo.cpp b/src/egg/core/eggVideo.cpp
index e84f4fec..4f1982c7 100644
--- a/src/egg/core/eggVideo.cpp
+++ b/src/egg/core/eggVideo.cpp
@@ -1,7 +1,8 @@
-#include <egg/core/eggVideo.h>
-#include <rvl/OS/OSHardware.h>
-#include <rvl/OS/OSTime.h>
-#include <rvl/SC/scapi.h>
+#include "egg/core/eggVideo.h"
+
+#include "rvl/OS/OSHardware.h"
+#include "rvl/OS/OSTime.h"
+#include "rvl/SC/scapi.h"
 
 namespace {
 
diff --git a/src/egg/core/eggXfb.cpp b/src/egg/core/eggXfb.cpp
index 0ea620e4..81b65b5d 100644
--- a/src/egg/core/eggXfb.cpp
+++ b/src/egg/core/eggXfb.cpp
@@ -1,6 +1,8 @@
-#include <egg/core/eggSystem.h>
-#include <egg/core/eggVideo.h>
-#include <egg/core/eggXfb.h>
+#include "egg/core/eggXfb.h"
+
+#include "egg/core/eggSystem.h"
+#include "egg/core/eggVideo.h"
+
 
 namespace EGG {
 
diff --git a/src/egg/core/eggXfbManager.cpp b/src/egg/core/eggXfbManager.cpp
index 46ab8d2a..532f0e64 100644
--- a/src/egg/core/eggXfbManager.cpp
+++ b/src/egg/core/eggXfbManager.cpp
@@ -1,8 +1,10 @@
-#include <common.h>
-#include <egg/core/eggXfb.h>
-#include <egg/core/eggXfbManager.h>
-#include <nw4r/db/db_directPrint.h>
-#include <rvl/VI/vi.h>
+#include "egg/core/eggXfbManager.h"
+
+#include "common.h"
+#include "egg/core/eggXfb.h"
+#include "nw4r/db/db_directPrint.h"
+#include "rvl/VI.h" // IWYU pragma: export
+
 
 namespace EGG {
 
diff --git a/src/egg/gfx/eggCamera.cpp b/src/egg/gfx/eggCamera.cpp
index 980fa65d..ad0889b8 100644
--- a/src/egg/gfx/eggCamera.cpp
+++ b/src/egg/gfx/eggCamera.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggCamera.h>
+#include "egg/gfx/eggCamera.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggCapTexture.cpp b/src/egg/gfx/eggCapTexture.cpp
index 6a0d6b29..d2779ce3 100644
--- a/src/egg/gfx/eggCapTexture.cpp
+++ b/src/egg/gfx/eggCapTexture.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggCapTexture.h>
+#include "egg/gfx/eggCapTexture.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggCpuTexture.cpp b/src/egg/gfx/eggCpuTexture.cpp
index 1d91d1d0..674d190b 100644
--- a/src/egg/gfx/eggCpuTexture.cpp
+++ b/src/egg/gfx/eggCpuTexture.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggCpuTexture.h>
+#include "egg/gfx/eggCpuTexture.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggDrawGX.cpp b/src/egg/gfx/eggDrawGX.cpp
index 123b5372..8f7b8d2a 100644
--- a/src/egg/gfx/eggDrawGX.cpp
+++ b/src/egg/gfx/eggDrawGX.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggDrawGX.h>
+#include "egg/gfx/eggDrawGX.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggDrawPathBase.cpp b/src/egg/gfx/eggDrawPathBase.cpp
index bbb5a2c0..e59be480 100644
--- a/src/egg/gfx/eggDrawPathBase.cpp
+++ b/src/egg/gfx/eggDrawPathBase.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggDrawPathBase.h>
+#include "egg/gfx/eggDrawPathBase.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggDrawPathDOF.cpp b/src/egg/gfx/eggDrawPathDOF.cpp
index ff43fac9..8f611cde 100644
--- a/src/egg/gfx/eggDrawPathDOF.cpp
+++ b/src/egg/gfx/eggDrawPathDOF.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggDrawPathDOF.h>
+#include "egg/gfx/eggDrawPathDOF.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggDrawPathUnk1.cpp b/src/egg/gfx/eggDrawPathUnk1.cpp
index 5c81e59c..2a89d9da 100644
--- a/src/egg/gfx/eggDrawPathUnk1.cpp
+++ b/src/egg/gfx/eggDrawPathUnk1.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggDrawPathUnk1.h>
+#include "egg/gfx/eggDrawPathUnk1.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggDrawPathUnk2.cpp b/src/egg/gfx/eggDrawPathUnk2.cpp
index a903174e..eb4f9c5d 100644
--- a/src/egg/gfx/eggDrawPathUnk2.cpp
+++ b/src/egg/gfx/eggDrawPathUnk2.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggDrawPathUnk2.h>
+#include "egg/gfx/eggDrawPathUnk2.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggFog.cpp b/src/egg/gfx/eggFog.cpp
index 2da4345a..71bf0b8c 100644
--- a/src/egg/gfx/eggFog.cpp
+++ b/src/egg/gfx/eggFog.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggFog.h>
+#include "egg/gfx/eggFog.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggFrustum.cpp b/src/egg/gfx/eggFrustum.cpp
index 5c2946fc..c060e519 100644
--- a/src/egg/gfx/eggFrustum.cpp
+++ b/src/egg/gfx/eggFrustum.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggFrustum.h>
+#include "egg/gfx/eggFrustum.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggG3DUtility.cpp b/src/egg/gfx/eggG3DUtility.cpp
index 0ba51e9e..b8da6920 100644
--- a/src/egg/gfx/eggG3DUtility.cpp
+++ b/src/egg/gfx/eggG3DUtility.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggG3DUtility.h>
+#include "egg/gfx/eggG3DUtility.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggGXUtility.cpp b/src/egg/gfx/eggGXUtility.cpp
index 68b6893f..43963b51 100644
--- a/src/egg/gfx/eggGXUtility.cpp
+++ b/src/egg/gfx/eggGXUtility.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggGXUtility.h>
+#include "egg/gfx/eggGXUtility.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggGfxEngine.cpp b/src/egg/gfx/eggGfxEngine.cpp
index 98c394b2..7a2da6a7 100644
--- a/src/egg/gfx/eggGfxEngine.cpp
+++ b/src/egg/gfx/eggGfxEngine.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggGfxEngine.h>
+#include "egg/gfx/eggGfxEngine.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggGlobalDrawState.cpp b/src/egg/gfx/eggGlobalDrawState.cpp
index 085467aa..aed5311a 100644
--- a/src/egg/gfx/eggGlobalDrawState.cpp
+++ b/src/egg/gfx/eggGlobalDrawState.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggGlobalDrawState.h>
+#include "egg/gfx/eggGlobalDrawState.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggIScnProc.cpp b/src/egg/gfx/eggIScnProc.cpp
index 60b81f8e..6b86ce5b 100644
--- a/src/egg/gfx/eggIScnProc.cpp
+++ b/src/egg/gfx/eggIScnProc.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggIScnProc.h>
+#include "egg/gfx/eggIScnProc.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggLight.cpp b/src/egg/gfx/eggLight.cpp
index 7e7867df..c842a6ec 100644
--- a/src/egg/gfx/eggLight.cpp
+++ b/src/egg/gfx/eggLight.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggLight.h>
+#include "egg/gfx/eggLight.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggLightTexture.cpp b/src/egg/gfx/eggLightTexture.cpp
index fb016069..174c6584 100644
--- a/src/egg/gfx/eggLightTexture.cpp
+++ b/src/egg/gfx/eggLightTexture.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggLightTexture.h>
+#include "egg/gfx/eggLightTexture.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggLightTextureMgr.cpp b/src/egg/gfx/eggLightTextureMgr.cpp
index 1d4f43c0..6d8d0928 100644
--- a/src/egg/gfx/eggLightTextureMgr.cpp
+++ b/src/egg/gfx/eggLightTextureMgr.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggLightTextureMgr.h>
+#include "egg/gfx/eggLightTextureMgr.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggModelEx.cpp b/src/egg/gfx/eggModelEx.cpp
index 9f213d6d..4fdaae07 100644
--- a/src/egg/gfx/eggModelEx.cpp
+++ b/src/egg/gfx/eggModelEx.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggModelEx.h>
+#include "egg/gfx/eggModelEx.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggPalette.cpp b/src/egg/gfx/eggPalette.cpp
index 490c1e9a..425ecb04 100644
--- a/src/egg/gfx/eggPalette.cpp
+++ b/src/egg/gfx/eggPalette.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggPalette.h>
+#include "egg/gfx/eggPalette.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggPostEffectBase.cpp b/src/egg/gfx/eggPostEffectBase.cpp
index c26fc8e1..d1110185 100644
--- a/src/egg/gfx/eggPostEffectBase.cpp
+++ b/src/egg/gfx/eggPostEffectBase.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggPostEffectBase.h>
+#include "egg/gfx/eggPostEffectBase.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggPostEffectBlur.cpp b/src/egg/gfx/eggPostEffectBlur.cpp
index a2094497..d988b7bb 100644
--- a/src/egg/gfx/eggPostEffectBlur.cpp
+++ b/src/egg/gfx/eggPostEffectBlur.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggPostEffectBlur.h>
+#include "egg/gfx/eggPostEffectBlur.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggPostEffectMask.cpp b/src/egg/gfx/eggPostEffectMask.cpp
index edd8e1fc..64833345 100644
--- a/src/egg/gfx/eggPostEffectMask.cpp
+++ b/src/egg/gfx/eggPostEffectMask.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggPostEffectMask.h>
+#include "egg/gfx/eggPostEffectMask.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggPostEffectMaskDOF.cpp b/src/egg/gfx/eggPostEffectMaskDOF.cpp
index 67e87a23..9bd54d28 100644
--- a/src/egg/gfx/eggPostEffectMaskDOF.cpp
+++ b/src/egg/gfx/eggPostEffectMaskDOF.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggPostEffectMaskDOF.h>
+#include "egg/gfx/eggPostEffectMaskDOF.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggPostEffectSimple.cpp b/src/egg/gfx/eggPostEffectSimple.cpp
index b336e626..468e8539 100644
--- a/src/egg/gfx/eggPostEffectSimple.cpp
+++ b/src/egg/gfx/eggPostEffectSimple.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggPostEffectSimple.h>
+#include "egg/gfx/eggPostEffectSimple.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggPostEffectUnk1.cpp b/src/egg/gfx/eggPostEffectUnk1.cpp
index 395447bb..f85768e6 100644
--- a/src/egg/gfx/eggPostEffectUnk1.cpp
+++ b/src/egg/gfx/eggPostEffectUnk1.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggPostEffectUnk1.h>
+#include "egg/gfx/eggPostEffectUnk1.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggPostEffectUnk2.cpp b/src/egg/gfx/eggPostEffectUnk2.cpp
index 49c853fe..d44f65cc 100644
--- a/src/egg/gfx/eggPostEffectUnk2.cpp
+++ b/src/egg/gfx/eggPostEffectUnk2.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggPostEffectUnk2.h>
+#include "egg/gfx/eggPostEffectUnk2.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggScreen.cpp b/src/egg/gfx/eggScreen.cpp
index aec1ceb2..66b80c4e 100644
--- a/src/egg/gfx/eggScreen.cpp
+++ b/src/egg/gfx/eggScreen.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggScreen.h>
+#include "egg/gfx/eggScreen.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggScreenEffectBase.cpp b/src/egg/gfx/eggScreenEffectBase.cpp
index ba916c5d..6e8a1f55 100644
--- a/src/egg/gfx/eggScreenEffectBase.cpp
+++ b/src/egg/gfx/eggScreenEffectBase.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggScreenEffectBase.h>
+#include "egg/gfx/eggScreenEffectBase.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggScreenEffectBlur.cpp b/src/egg/gfx/eggScreenEffectBlur.cpp
index 1617c385..65a45952 100644
--- a/src/egg/gfx/eggScreenEffectBlur.cpp
+++ b/src/egg/gfx/eggScreenEffectBlur.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggScreenEffectBlur.h>
+#include "egg/gfx/eggScreenEffectBlur.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggStateEfb.cpp b/src/egg/gfx/eggStateEfb.cpp
index d26203ba..25f2dbbb 100644
--- a/src/egg/gfx/eggStateEfb.cpp
+++ b/src/egg/gfx/eggStateEfb.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggStateEfb.h>
+#include "egg/gfx/eggStateEfb.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggStateGX.cpp b/src/egg/gfx/eggStateGX.cpp
index 848ef301..baf181f0 100644
--- a/src/egg/gfx/eggStateGX.cpp
+++ b/src/egg/gfx/eggStateGX.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggStateGX.h>
+#include "egg/gfx/eggStateGX.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggTexture.cpp b/src/egg/gfx/eggTexture.cpp
index 32c3707a..0e673cef 100644
--- a/src/egg/gfx/eggTexture.cpp
+++ b/src/egg/gfx/eggTexture.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggTexture.h>
+#include "egg/gfx/eggTexture.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggTextureBuffer.cpp b/src/egg/gfx/eggTextureBuffer.cpp
index 9c7d9568..ed1b41e1 100644
--- a/src/egg/gfx/eggTextureBuffer.cpp
+++ b/src/egg/gfx/eggTextureBuffer.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggTextureBuffer.h>
+#include "egg/gfx/eggTextureBuffer.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/gfx/eggUnk1.cpp b/src/egg/gfx/eggUnk1.cpp
index a5a63d35..a5be01ae 100644
--- a/src/egg/gfx/eggUnk1.cpp
+++ b/src/egg/gfx/eggUnk1.cpp
@@ -1,3 +1,3 @@
-#include <egg/gfx/eggUnk1.h>
+#include "egg/gfx/eggUnk1.h"
 
 namespace EGG {} // namespace EGG
diff --git a/src/egg/math/eggMatrix.cpp b/src/egg/math/eggMatrix.cpp
index 9fef71b7..dd171848 100644
--- a/src/egg/math/eggMatrix.cpp
+++ b/src/egg/math/eggMatrix.cpp
@@ -1,6 +1,7 @@
-#include <egg/math/eggMatrix.h>
-#include <rvl/GX.h>
-#include <rvl/MTX.h>
+#include "egg/math/eggMatrix.h"
+
+#include "rvl/GX.h"  // IWYU pragma: export
+#include "rvl/MTX.h" // IWYU pragma: export
 
 namespace EGG {
 
@@ -295,32 +296,31 @@ void Matrix34f::toQuat(Quatf &q) const {
     }
 
     switch (tempMax) {
-    case 0:
-        q.w = Math<f32>::sqrt(temp0);
-        q.x = (0.25f / q.w) * (m[2][1] - m[1][2]);
-        q.y = (0.25f / q.w) * (m[0][2] - m[2][0]);
-        q.z = (0.25f / q.w) * (m[1][0] - m[0][1]);
-        break;
-    case 1:
-        q.x = Math<f32>::sqrt(temp1);
-        q.w = (0.25f / q.x) * (m[2][1] - m[1][2]);
-        q.y = (0.25f / q.x) * (m[0][1] + m[1][0]);
-        q.z = (0.25f / q.x) * (m[0][2] + m[2][0]);
-        break;
-    case 2:
-        q.y = Math<f32>::sqrt(temp2);
-        q.w = (0.25f / q.y) * (m[0][2] - m[2][0]);
-        q.z = (0.25f / q.y) * (m[1][2] + m[2][1]);
-        q.x = (0.25f / q.y) * (m[1][0] + m[0][1]);
-        break;
-    case 3:
-        q.z = Math<f32>::sqrt(temp3);
-        q.w = (0.25f / q.z) * (m[1][0] - m[0][1]);
-        q.x = (0.25f / q.z) * (m[2][0] + m[0][2]);
-        q.y = (0.25f / q.z) * (m[2][1] + m[1][2]);
-        break;
-    default:
-        break;
+        case 0:
+            q.w = Math<f32>::sqrt(temp0);
+            q.x = (0.25f / q.w) * (m[2][1] - m[1][2]);
+            q.y = (0.25f / q.w) * (m[0][2] - m[2][0]);
+            q.z = (0.25f / q.w) * (m[1][0] - m[0][1]);
+            break;
+        case 1:
+            q.x = Math<f32>::sqrt(temp1);
+            q.w = (0.25f / q.x) * (m[2][1] - m[1][2]);
+            q.y = (0.25f / q.x) * (m[0][1] + m[1][0]);
+            q.z = (0.25f / q.x) * (m[0][2] + m[2][0]);
+            break;
+        case 2:
+            q.y = Math<f32>::sqrt(temp2);
+            q.w = (0.25f / q.y) * (m[0][2] - m[2][0]);
+            q.z = (0.25f / q.y) * (m[1][2] + m[2][1]);
+            q.x = (0.25f / q.y) * (m[1][0] + m[0][1]);
+            break;
+        case 3:
+            q.z = Math<f32>::sqrt(temp3);
+            q.w = (0.25f / q.z) * (m[1][0] - m[0][1]);
+            q.x = (0.25f / q.z) * (m[2][0] + m[0][2]);
+            q.y = (0.25f / q.z) * (m[2][1] + m[1][2]);
+            break;
+        default: break;
     }
 
     if (q.w < 0.0f) {
diff --git a/src/egg/math/eggQuat.cpp b/src/egg/math/eggQuat.cpp
index 77eb58fc..0a735a78 100644
--- a/src/egg/math/eggQuat.cpp
+++ b/src/egg/math/eggQuat.cpp
@@ -1,4 +1,4 @@
-#include <egg/math/eggQuat.h>
+#include "egg/math/eggQuat.h"
 
 namespace EGG {
 
diff --git a/src/egg/math/eggVector.cpp b/src/egg/math/eggVector.cpp
index 7b480314..7eb2e4df 100644
--- a/src/egg/math/eggVector.cpp
+++ b/src/egg/math/eggVector.cpp
@@ -1,4 +1,4 @@
-#include <egg/math/eggVector.h>
+#include "egg/math/eggVector.h"
 
 namespace EGG {
 
diff --git a/src/egg/prim/eggAssert.cpp b/src/egg/prim/eggAssert.cpp
index 146012af..64239a9b 100644
--- a/src/egg/prim/eggAssert.cpp
+++ b/src/egg/prim/eggAssert.cpp
@@ -1,11 +1,14 @@
-#include <egg/core/eggSystem.h>
-#include <egg/core/eggXfbManager.h>
-#include <egg/prim/eggAssert.h>
-#include <nw4r/db/db_directPrint.h>
-#include <nw4r/db/db_mapFile.h>
-#include <rvl/OS.h>
-#include <rvl/VI.h>
-#include <MSL_C/string.h>
+#include "egg/prim/eggAssert.h"
+
+#include "__va_arg.h"
+#include "egg/core/eggSystem.h"
+#include "egg/core/eggXfbManager.h"
+#include "nw4r/db/db_directPrint.h"
+#include "nw4r/db/db_mapFile.h"
+#include "rvl/OS.h" // IWYU pragma: export
+#include "rvl/VI.h" // IWYU pragma: export
+#include "string.h"
+
 
 namespace EGG {
 
@@ -54,7 +57,7 @@ bool sAssertOccurred;
 /* 80674c60 */ char buf[260];
 
 /* 8049c100 */ const char *getMapSymbol(void *arg) {
-    bool success = nw4r::db::MapFile_QuerySymbol((u32)arg, (u8*)buf, sizeof(buf));
+    bool success = nw4r::db::MapFile_QuerySymbol((u32)arg, (u8 *)buf, sizeof(buf));
     return success ? buf : nullptr;
 }
 
@@ -93,7 +96,7 @@ bool sAssertOccurred;
     system_report("\n");
     u32 *stackp = (u32 *)OSGetStackPointer();
     if (sPtrOverride != 0) {
-        stackp = (u32*)((u32*)sPtrOverride)[1];
+        stackp = (u32 *)((u32 *)sPtrOverride)[1];
     }
     u32 *stack = stackp;
 
@@ -108,7 +111,7 @@ bool sAssertOccurred;
         } else {
             system_report("%d: %p\n", num, stack[1]);
         }
-        stack = (u32*)stack[0];
+        stack = (u32 *)stack[0];
         if (isOutsideMEM1((u32)stack)) {
             break;
         }
@@ -153,14 +156,14 @@ bool sAssertOccurred;
                 if (isOutsideMEM1((u32)stack)) {
                     break;
                 }
-                const char *sym = getMapSymbol((void*)stack[1]);
+                const char *sym = getMapSymbol((void *)stack[1]);
                 if (sym != nullptr) {
                     nw4r::db::DirectPrint_Printf(2, line, "%d:%s\n", counter, sym);
                 } else {
-                    nw4r::db::DirectPrint_Printf(2, line, "LR Save[%d]:%p\n", counter, (void*)stack[1]);
+                    nw4r::db::DirectPrint_Printf(2, line, "LR Save[%d]:%p\n", counter, (void *)stack[1]);
                 }
                 nw4r::db::DirectPrint_StoreCache();
-                stack = (u32*)*stack;
+                stack = (u32 *)*stack;
                 if (isOutsideMEM1((u32)stack)) {
                     break;
                 }
diff --git a/src/egg/util/eggException.cpp b/src/egg/util/eggException.cpp
index 2b4ea036..6bf4e2e7 100644
--- a/src/egg/util/eggException.cpp
+++ b/src/egg/util/eggException.cpp
@@ -1,13 +1,14 @@
-#include <egg/core/eggController.h>
-#include <egg/core/eggHeap.h>
-#include <egg/core/eggSystem.h>
-#include <egg/core/eggVideo.h>
-#include <egg/util/eggException.h>
-#include <nw4r/db/db_directPrint.h>
-#include <nw4r/db/db_exception.h>
-#include <nw4r/db/db_mapFile.h>
-#include <rvl/KPAD.h>
-#include <rvl/OS.h>
+#include "egg/util/eggException.h"
+
+#include "egg/core/eggController.h"
+#include "egg/core/eggHeap.h"
+#include "egg/core/eggSystem.h"
+#include "egg/core/eggVideo.h"
+#include "nw4r/db/db_directPrint.h"
+#include "nw4r/db/db_exception.h"
+#include "nw4r/db/db_mapFile.h"
+#include "rvl/KPAD.h" // IWYU pragma: export
+#include "rvl/OS.h"   // IWYU pragma: export
 
 namespace EGG {