Fix includes and removed libs folder

244 files changed, 584 insertions, 584 deletions

diff --git a/configure.py b/configure.py
index 8346e05d..25ab0e93 100644
--- a/configure.py
+++ b/configure.py
@@ -282,43 +282,43 @@ config.libs = [
     EGGLib(
         "core",
         [
-            Object(NonMatching, "lib/egg/core/eggArchive.cpp"),
-            Object(NonMatching, "lib/egg/core/eggDvdFile.cpp"),
-            Object(NonMatching, "lib/egg/core/eggDvdRipper.cpp"),
-            Object(NonMatching, "lib/egg/core/eggStream.cpp"),
-            Object(NonMatching, "lib/egg/core/eggAllocator.cpp"),
-            Object(NonMatching, "lib/egg/core/eggHeap.cpp"),
-            Object(NonMatching, "lib/egg/core/eggExpHeap.cpp"),
-            Object(NonMatching, "lib/egg/core/eggFrmHeap.cpp"),
-            Object(NonMatching, "lib/egg/core/eggAssertHeap.cpp"),
-            Object(NonMatching, "lib/egg/core/eggDisposer.cpp"),
-            Object(NonMatching, "lib/egg/core/eggThread.cpp"),
-            Object(NonMatching, "lib/egg/core/eggUnk.cpp"),
-            Object(NonMatching, "lib/egg/core/eggSystem.cpp"),
-            Object(   Matching, "lib/egg/core/eggDisplay.cpp"),
-            Object(NonMatching, "lib/egg/core/eggColorFader.cpp"),
-            Object(NonMatching, "lib/egg/core/eggAsyncDisplay.cpp"), 
-            Object(NonMatching, "lib/egg/core/eggVideo.cpp"),
-            Object(NonMatching, "lib/egg/core/eggXfb.cpp"),
-            Object(NonMatching, "lib/egg/core/eggXfbManager.cpp"),
-            Object(NonMatching, "lib/egg/core/eggGraphicsFifo.cpp"), 
-            Object(NonMatching, "lib/egg/core/eggController.cpp"),
+            Object(NonMatching, "egg/core/eggArchive.cpp"),
+            Object(NonMatching, "egg/core/eggDvdFile.cpp"),
+            Object(NonMatching, "egg/core/eggDvdRipper.cpp"),
+            Object(NonMatching, "egg/core/eggStream.cpp"),
+            Object(NonMatching, "egg/core/eggAllocator.cpp"),
+            Object(NonMatching, "egg/core/eggHeap.cpp"),
+            Object(NonMatching, "egg/core/eggExpHeap.cpp"),
+            Object(NonMatching, "egg/core/eggFrmHeap.cpp"),
+            Object(NonMatching, "egg/core/eggAssertHeap.cpp"),
+            Object(NonMatching, "egg/core/eggDisposer.cpp"),
+            Object(NonMatching, "egg/core/eggThread.cpp"),
+            Object(NonMatching, "egg/core/eggUnk.cpp"),
+            Object(NonMatching, "egg/core/eggSystem.cpp"),
+            Object(   Matching, "egg/core/eggDisplay.cpp"),
+            Object(NonMatching, "egg/core/eggColorFader.cpp"),
+            Object(NonMatching, "egg/core/eggAsyncDisplay.cpp"), 
+            Object(NonMatching, "egg/core/eggVideo.cpp"),
+            Object(NonMatching, "egg/core/eggXfb.cpp"),
+            Object(NonMatching, "egg/core/eggXfbManager.cpp"),
+            Object(NonMatching, "egg/core/eggGraphicsFifo.cpp"), 
+            Object(NonMatching, "egg/core/eggController.cpp"),
         ]
     ),
     EGGLib(
         "math",
         [
-            Object(NonMatching, "lib/egg/math/eggMath.cpp"),
-            Object(NonMatching, "lib/egg/math/eggMatrix.cpp"),
-            Object(NonMatching, "lib/egg/math/eggQuat.cpp"),
-            Object(NonMatching, "lib/egg/math/eggVector.cpp"),
-            Object(NonMatching, "lib/egg/prim/eggAssert.cpp"),
+            Object(NonMatching, "egg/math/eggMath.cpp"),
+            Object(NonMatching, "egg/math/eggMatrix.cpp"),
+            Object(NonMatching, "egg/math/eggQuat.cpp"),
+            Object(NonMatching, "egg/math/eggVector.cpp"),
+            Object(NonMatching, "egg/prim/eggAssert.cpp"),
         ]
     ),
     EGGLib(
         "prim",
         [
-            Object(NonMatching, "lib/egg/prim/eggAssert.cpp"),
+            Object(NonMatching, "egg/prim/eggAssert.cpp"),
         ]
     ),
     # {
diff --git a/include/UnknownTypeBelongings.h b/include/UnknownTypeBelongings.h
index 8fc742bf..18341ba9 100644
--- a/include/UnknownTypeBelongings.h
+++ b/include/UnknownTypeBelongings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 
 // MOST LIKELY mVEC
diff --git a/include/c/c_list.h b/include/c/c_list.h
index abd6d9bd..6f00c681 100644
--- a/include/c/c_list.h
+++ b/include/c/c_list.h
@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/cLib/c_list.hpp
 
-#include <types.h>
+#include "types.h"
 
 /// @brief A doubly-linked list node. See cListMg_c.
 /// @note Unofficial name.
diff --git a/include/c/c_owner_set.h b/include/c/c_owner_set.h
index 4a80ed2b..e7446b25 100644
--- a/include/c/c_owner_set.h
+++ b/include/c/c_owner_set.h
@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/cLib/c_owner_set.hpp
 
-#include <types.h>
+#include "types.h"
 /// @file
 
 /// @brief A set node with a pointer to the owning container. See cOwnerSetMg_c.
diff --git a/include/c/c_tree.h b/include/c/c_tree.h
index 9e6dc841..ba74fbfa 100644
--- a/include/c/c_tree.h
+++ b/include/c/c_tree.h
@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/cLib/c_tree.hpp
 
-#include <types.h>
+#include "types.h"
 
 /// @brief A tree node. See cTreeMg_c.
 /// @details The tree is represented as a doubly-linked LCRS tree.
diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h
index 471ffb11..4593d186 100644
--- a/include/d/a/d_a_base.h
+++ b/include/d/a/d_a_base.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <d/d_base.h>
-#include <d/d_heap.h>
-#include <m/m_allocator.h>
-#include <UnknownTypeBelongings.h>
-// #include <m/types_m.h>
-#include <m/m_angle.h>
-#include <m/m_vec.h>
-#include <toBeSorted/room_manager.h>
+#include "d/d_base.h"
+#include "d/d_heap.h"
+#include "m/m_allocator.h"
+#include "UnknownTypeBelongings.h"
+// #include "m/types_m.h"
+#include "m/m_angle.h"
+#include "m/m_vec.h"
+#include "toBeSorted/room_manager.h"
 
 
 class dAcBase_c;
diff --git a/include/d/a/en/d_a_en_base.h b/include/d/a/en/d_a_en_base.h
index f4961976..8b2b2666 100644
--- a/include/d/a/en/d_a_en_base.h
+++ b/include/d/a/en/d_a_en_base.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <d/a/obj/d_a_obj_base.h>
+#include "d/a/obj/d_a_obj_base.h"
 
 // Ghidra: ActorEnemyBase
 //   size: 
diff --git a/include/d/a/npc/d_a_npc.h b/include/d/a/npc/d_a_npc.h
index 5c414adc..e451b534 100644
--- a/include/d/a/npc/d_a_npc.h
+++ b/include/d/a/npc/d_a_npc.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <d/a/obj/d_a_obj_base.h>
+#include "d/a/obj/d_a_obj_base.h"
 
 // This is the NPC base. Most npcs actually use dAcOrdinaryNpc, but this just is a simpler one?
 
diff --git a/include/d/a/npc/d_a_npc_ordinary.h b/include/d/a/npc/d_a_npc_ordinary.h
index 8b74bce4..fa33db09 100644
--- a/include/d/a/npc/d_a_npc_ordinary.h
+++ b/include/d/a/npc/d_a_npc_ordinary.h
@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include <d/a/npc/d_a_npc.h>
+#include "d/a/npc/d_a_npc.h"
 
 // Ghidra: AcOrdinaryNpc
 //   size:
diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h
index 5fb16a79..087f3db2 100644
--- a/include/d/a/obj/d_a_obj_base.h
+++ b/include/d/a/obj/d_a_obj_base.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <d/a/d_a_base.h>
-#include <m/types_m.h>
+#include "d/a/d_a_base.h"
+#include "m/types_m.h"
 
 // Ghidra: ActorObjectBase
 //   size: 0x330
diff --git a/include/d/a/obj/d_a_obj_item.h b/include/d/a/obj/d_a_obj_item.h
index 35942d22..41ff5625 100644
--- a/include/d/a/obj/d_a_obj_item.h
+++ b/include/d/a/obj/d_a_obj_item.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <d/a/obj/d_a_obj_base.h>
+#include "d/a/obj/d_a_obj_base.h"
 
 // Ghidra: AcItem
 //   Size: 0xd68
diff --git a/include/d/d_base.h b/include/d/d_base.h
index d8499771..405cff38 100644
--- a/include/d/d_base.h
+++ b/include/d/d_base.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <f/f_base.h>
-// #include <c/c_owner_set.h>
+#include "f/f_base.h"
+// #include "c/c_owner_set.h"
 
 // Ghidra: dBase_c
 //   size: 0x68
diff --git a/include/d/d_heap.h b/include/d/d_heap.h
index 654683f3..d71a123c 100644
--- a/include/d/d_heap.h
+++ b/include/d/d_heap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <egg/core/eggHeap.h>
+#include "egg/core/eggHeap.h"
 
 class dHeap {
     public:
diff --git a/include/lib/egg/audio/eggAudioArcPlayerMgr.h b/include/egg/audio/eggAudioArcPlayerMgr.h
index e69de29b..e69de29b 100644
--- a/include/lib/egg/audio/eggAudioArcPlayerMgr.h
+++ b/include/egg/audio/eggAudioArcPlayerMgr.h
diff --git a/include/lib/egg/audio/eggAudioHeapMgr.h b/include/egg/audio/eggAudioHeapMgr.h
index e69de29b..e69de29b 100644
--- a/include/lib/egg/audio/eggAudioHeapMgr.h
+++ b/include/egg/audio/eggAudioHeapMgr.h
diff --git a/include/lib/egg/audio/eggAudioMgr.h b/include/egg/audio/eggAudioMgr.h
index f295417d..78977a97 100644
--- a/include/lib/egg/audio/eggAudioMgr.h
+++ b/include/egg/audio/eggAudioMgr.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <egg/egg_types.h>
-#include <egg/core/eggHeap.h>
+#include "egg/egg_types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG {
     class IAudioMgr {
diff --git a/include/lib/egg/core/eggAllocator.h b/include/egg/core/eggAllocator.h
index 3db4db8b..c5c6e72c 100644
--- a/include/lib/egg/core/eggAllocator.h
+++ b/include/egg/core/eggAllocator.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/MEM.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "rvl/MEM.h"
+#include "egg/core/eggHeap.h"
 
 // /* 80495310 */ MEMInitAllocatorFor_Heap(MEMAllocator* alloc, s32 align, void* heap);
 // /* 804952f0 */ MEM_AllocFor_Heap(MEMAllocator* alloc, void* block);
diff --git a/include/lib/egg/core/eggArchive.h b/include/egg/core/eggArchive.h
index 0e5d87c5..1f1f0a1c 100644
--- a/include/lib/egg/core/eggArchive.h
+++ b/include/egg/core/eggArchive.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/ARC.h>
-#include <rvl/NAND.h>
-#include <egg/core/eggDisposer.h>
+#include "types.h"
+#include "rvl/ARC.h"
+#include "rvl/NAND.h"
+#include "egg/core/eggDisposer.h"
 
 typedef void (*FileCallbackFunc)(void*, void*, const ARCDirEntry*, const char*);
 
diff --git a/include/lib/egg/core/eggAssertHeap.h b/include/egg/core/eggAssertHeap.h
index 0ef9ebb2..1528edb1 100644
--- a/include/lib/egg/core/eggAssertHeap.h
+++ b/include/egg/core/eggAssertHeap.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG {
 
diff --git a/include/lib/egg/core/eggAsyncDisplay.h b/include/egg/core/eggAsyncDisplay.h
index 593092af..cfe11378 100644
--- a/include/lib/egg/core/eggAsyncDisplay.h
+++ b/include/egg/core/eggAsyncDisplay.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggDisplay.h>
+#include "types.h"
+#include "egg/core/eggDisplay.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggColorFader.h b/include/egg/core/eggColorFader.h
index 12abf94a..fae8a4b1 100644
--- a/include/lib/egg/core/eggColorFader.h
+++ b/include/egg/core/eggColorFader.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <nw4r/ut/Color.h>
-#include <egg/core/eggFader.h>
-#include <egg/prim/eggBitFlag.h>
+#include "types.h"
+#include "nw4r/ut/Color.h"
+#include "egg/core/eggFader.h"
+#include "egg/prim/eggBitFlag.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggController.h b/include/egg/core/eggController.h
index a6b00c14..926c1a37 100644
--- a/include/lib/egg/core/eggController.h
+++ b/include/egg/core/eggController.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
-#include <egg/math/eggMatrix.h>
-#include <egg/math/eggVector.h>
-#include <egg/prim/eggBitFlag.h>
-#include <egg/prim/eggBuffer.h>
-#include <rvl/PAD.h>
+#include "egg/math/eggMatrix.h"
+#include "egg/math/eggVector.h"
+#include "egg/prim/eggBitFlag.h"
+#include "egg/prim/eggBuffer.h"
+#include "rvl/PAD.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggDecomp.h b/include/egg/core/eggDecomp.h
index 1bca30c4..77975a41 100644
--- a/include/lib/egg/core/eggDecomp.h
+++ b/include/egg/core/eggDecomp.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/CX/cx.h>
+#include "types.h"
+#include "rvl/CX/cx.h"
 
 // NOTE: I put StreamDecomp stuff here. im unsure of the correct place
 
diff --git a/include/lib/egg/core/eggDisplay.h b/include/egg/core/eggDisplay.h
index c6ac4a23..e86db9e7 100644
--- a/include/lib/egg/core/eggDisplay.h
+++ b/include/egg/core/eggDisplay.h
@@ -1,12 +1,12 @@
 #pragma once
 
 
-#include <types.h>
-#include <rvl/VI.h>
-#include <nw4r/ut/Color.h>
-#include <egg/prim/eggBitFlag.h>
-#include <egg/core/eggSystem.h> // for BaseSystem config
-#include <egg/core/eggVideo.h>
+#include "types.h"
+#include "rvl/VI.h"
+#include "nw4r/ut/Color.h"
+#include "egg/prim/eggBitFlag.h"
+#include "egg/core/eggSystem.h" // for BaseSystem config
+#include "egg/core/eggVideo.h"
 
 
 /* 80497530 */ // void PreRetraceCallback(void);
diff --git a/include/lib/egg/core/eggDisposer.h b/include/egg/core/eggDisposer.h
index 1c9409dd..68a48176 100644
--- a/include/lib/egg/core/eggDisposer.h
+++ b/include/egg/core/eggDisposer.h
@@ -2,8 +2,8 @@
 
 // This file was adapted from https://github.com/riidefi/mkw/blob/master/source/egg/core/eggDisposer.hpp 
 
-#include <nw4r/ut/List.h>
-#include <types.h>
+#include "nw4r/ut/List.h"
+#include "types.h"
 
 namespace EGG {
 
diff --git a/include/lib/egg/core/eggDvdFile.h b/include/egg/core/eggDvdFile.h
index 12c80e46..4295f41a 100644
--- a/include/lib/egg/core/eggDvdFile.h
+++ b/include/egg/core/eggDvdFile.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/OS.h>
-#include <rvl/DVD.h>
-#include <nw4r/ut/List.h>
-#include <egg/core/eggFile.h>
+#include "types.h"
+#include "rvl/OS.h"
+#include "rvl/DVD.h"
+#include "nw4r/ut/List.h"
+#include "egg/core/eggFile.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggDvdRipper.h b/include/egg/core/eggDvdRipper.h
index 93395041..6a36ffdc 100644
--- a/include/lib/egg/core/eggDvdRipper.h
+++ b/include/egg/core/eggDvdRipper.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
-#include <egg/core/eggDvdFile.h>
-#include <egg/core/eggDecomp.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
+#include "egg/core/eggDvdFile.h"
+#include "egg/core/eggDecomp.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggExpHeap.h b/include/egg/core/eggExpHeap.h
index 06411d13..c7dcf96d 100644
--- a/include/lib/egg/core/eggExpHeap.h
+++ b/include/egg/core/eggExpHeap.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggFader.h b/include/egg/core/eggFader.h
index f8c2d1c9..581bf249 100644
--- a/include/lib/egg/core/eggFader.h
+++ b/include/egg/core/eggFader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggFile.h b/include/egg/core/eggFile.h
index 9d6f4a15..8a0a70c3 100644
--- a/include/lib/egg/core/eggFile.h
+++ b/include/egg/core/eggFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggFrmHeap.h b/include/egg/core/eggFrmHeap.h
index 33c7325f..91791dd1 100644
--- a/include/lib/egg/core/eggFrmHeap.h
+++ b/include/egg/core/eggFrmHeap.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG {
 
diff --git a/include/lib/egg/core/eggGraphicsFifo.h b/include/egg/core/eggGraphicsFifo.h
index ba5d60c1..497eaff9 100644
--- a/include/lib/egg/core/eggGraphicsFifo.h
+++ b/include/egg/core/eggGraphicsFifo.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggHeap.h b/include/egg/core/eggHeap.h
index 76261120..f9fbfa3c 100644
--- a/include/lib/egg/core/eggHeap.h
+++ b/include/egg/core/eggHeap.h
@@ -2,14 +2,14 @@
 
 // This file is ported from https://github.com/riidefi/mkw/blob/master/source/egg/core/eggHeap.hpp
 
-#include <types.h>
-#include <rvl/MEM.h>
-#include <rvl/OS.h>
-#include <egg/core/eggAllocator.h>
-#include <egg/core/eggDisposer.h>
-#include <egg/core/eggThread.h>
-#include <nw4r/ut/List.h>
-#include <egg/prim/eggBitFlag.h>
+#include "types.h"
+#include "rvl/MEM.h"
+#include "rvl/OS.h"
+#include "egg/core/eggAllocator.h"
+#include "egg/core/eggDisposer.h"
+#include "egg/core/eggThread.h"
+#include "nw4r/ut/List.h"
+#include "egg/prim/eggBitFlag.h"
 
 namespace EGG {
 
diff --git a/include/lib/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 5f1313d6..0280d8a4 100644
--- a/include/lib/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggThread.h b/include/egg/core/eggThread.h
index 1284378c..ec9dd82a 100644
--- a/include/lib/egg/core/eggThread.h
+++ b/include/egg/core/eggThread.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/OS.h>
-#include <nw4r/ut/List.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "rvl/OS.h"
+#include "nw4r/ut/List.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG {
 
diff --git a/include/lib/egg/core/eggUnk.h b/include/egg/core/eggUnk.h
index 8ee9304a..acb3ab96 100644
--- a/include/lib/egg/core/eggUnk.h
+++ b/include/egg/core/eggUnk.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/OS.h>
+#include "types.h"
+#include "rvl/OS.h"
 
 // This is seen in Animal Crossing: City Folk also. Idk where it belongs
 
diff --git a/include/lib/egg/core/eggVideo.h b/include/egg/core/eggVideo.h
index da1909db..18fca771 100644
--- a/include/lib/egg/core/eggVideo.h
+++ b/include/egg/core/eggVideo.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/GX.h>
-#include <rvl/VI.h>
-#include <egg/prim/eggBitFlag.h>
+#include "types.h"
+#include "rvl/GX.h"
+#include "rvl/VI.h"
+#include "egg/prim/eggBitFlag.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggXfb.h b/include/egg/core/eggXfb.h
index 0392e9f8..ac550678 100644
--- a/include/lib/egg/core/eggXfb.h
+++ b/include/egg/core/eggXfb.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/core/eggXfbManager.h b/include/egg/core/eggXfbManager.h
index 55f1f372..c70b6a7e 100644
--- a/include/lib/egg/core/eggXfbManager.h
+++ b/include/egg/core/eggXfbManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggXfb.h>
+#include "types.h"
+#include "egg/core/eggXfb.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/egg_types.h b/include/egg/egg_types.h
index e48fc8d6..f5fbf721 100644
--- a/include/lib/egg/egg_types.h
+++ b/include/egg/egg_types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 // Types pulled from ogws
 // May need to remove/add later
diff --git a/include/lib/egg/math/eggMath.h b/include/egg/math/eggMath.h
index 299d5b93..e0580140 100644
--- a/include/lib/egg/math/eggMath.h
+++ b/include/egg/math/eggMath.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/math/eggMatrix.h b/include/egg/math/eggMatrix.h
index 0a5c9b51..49be2360 100644
--- a/include/lib/egg/math/eggMatrix.h
+++ b/include/egg/math/eggMatrix.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <types.h>
-#include <egg/math/eggVector.h>
-#include <egg/math/eggQuat.h>
+#include "types.h"
+#include "egg/math/eggVector.h"
+#include "egg/math/eggQuat.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/math/eggQuat.h b/include/egg/math/eggQuat.h
index 08a2e570..5c8572c0 100644
--- a/include/lib/egg/math/eggQuat.h
+++ b/include/egg/math/eggQuat.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/math/eggVector.h>
+#include "types.h"
+#include "egg/math/eggVector.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/math/eggVector.h b/include/egg/math/eggVector.h
index 773ddaca..06f57b14 100644
--- a/include/lib/egg/math/eggVector.h
+++ b/include/egg/math/eggVector.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/math/eggMath.h>
+#include "types.h"
+#include "egg/math/eggMath.h"
 namespace EGG
 {
 
diff --git a/include/lib/egg/prim/eggAssert.h b/include/egg/prim/eggAssert.h
index 86a05ff5..b475f5dc 100644
--- a/include/lib/egg/prim/eggAssert.h
+++ b/include/egg/prim/eggAssert.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/prim/eggBitFlag.h b/include/egg/prim/eggBitFlag.h
index dea7972b..52d7eb61 100644
--- a/include/lib/egg/prim/eggBitFlag.h
+++ b/include/egg/prim/eggBitFlag.h
@@ -2,7 +2,7 @@
 
 // Pulled from ogws
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {
diff --git a/include/lib/egg/prim/eggBuffer.h b/include/egg/prim/eggBuffer.h
index 8a6e9246..ab536266 100644
--- a/include/lib/egg/prim/eggBuffer.h
+++ b/include/egg/prim/eggBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {
diff --git a/include/f/f_base.h b/include/f/f_base.h
index a010cecd..76be2c8b 100644
--- a/include/f/f_base.h
+++ b/include/f/f_base.h
@@ -3,13 +3,13 @@
 // This file is adapted from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_base.hpp 
 // and the Skyward Sword Ghidra database. Comments and docs can be seen above. stripped in this file for easier looking
 
-#include <types.h>
-#include <egg/core/eggFrmHeap.h>
-#include <f/f_profile.h>
-#include <f/f_base_id.h>
-#include <f/f_helper_unk.h>
-#include <f/f_manager.h>
-#include <f/f_list_mg.h>
+#include "types.h"
+#include "egg/core/eggFrmHeap.h"
+#include "f/f_profile.h"
+#include "f/f_base_id.h"
+#include "f/f_helper_unk.h"
+#include "f/f_manager.h"
+#include "f/f_list_mg.h"
 
 // Ghidra: fBase
 //   size: 0x64
diff --git a/include/f/f_helper_unk.h b/include/f/f_helper_unk.h
index 8133099f..d25f927a 100644
--- a/include/f/f_helper_unk.h
+++ b/include/f/f_helper_unk.h
@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_helper_unk.hpp
 
-#include <types.h>
+#include "types.h"
 
 /// @brief [A helper class for fBase_c with unknown purpose].
 /// @note Unofficial name.
diff --git a/include/f/f_list_mg.h b/include/f/f_list_mg.h
index 85dd7022..55529b22 100644
--- a/include/f/f_list_mg.h
+++ b/include/f/f_list_mg.h
@@ -2,11 +2,11 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_mg.hpp 
 
-#include <types.h>
-#include <f/f_profile.h>
-#include <c/c_list.h>
-#include <f/f_base_id.h>
-#include <f/f_list_nd.h>
+#include "types.h"
+#include "f/f_profile.h"
+#include "c/c_list.h"
+#include "f/f_base_id.h"
+#include "f/f_list_nd.h"
 
 class fBase_c;
 
diff --git a/include/f/f_list_mg_ptmf.h b/include/f/f_list_mg_ptmf.h
index 472f4f82..e2f197c9 100644
--- a/include/f/f_list_mg_ptmf.h
+++ b/include/f/f_list_mg_ptmf.h
@@ -2,10 +2,10 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_mg_ptmf.hpp
 
-#include <types.h>
+#include "types.h"
 
-#include <f/f_list_mg.h>
-#include <f/f_list_nd_prio.h>
+#include "f/f_list_mg.h"
+#include "f/f_list_nd_prio.h"
 
 class fBase_c;
 
diff --git a/include/f/f_list_nd.h b/include/f/f_list_nd.h
index 23f4ad14..14d5f6f4 100644
--- a/include/f/f_list_nd.h
+++ b/include/f/f_list_nd.h
@@ -2,8 +2,8 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_nd.hpp
 
-#include <types.h>
-#include <c/c_list.h>
+#include "types.h"
+#include "c/c_list.h"
 
 class fBase_c;
 
diff --git a/include/f/f_list_nd_prio.h b/include/f/f_list_nd_prio.h
index 0ccf5538..d5bc5c2f 100644
--- a/include/f/f_list_nd_prio.h
+++ b/include/f/f_list_nd_prio.h
@@ -2,9 +2,9 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_nd_prio.hpp
 
-#include <types.h>
-#include <f/f_profile.h>
-#include <f/f_list_nd.h>
+#include "types.h"
+#include "f/f_profile.h"
+#include "f/f_list_nd.h"
 
 /// @brief A list node with priority fields for an order in a list.
 /// @note Unofficial name.
diff --git a/include/f/f_manager.h b/include/f/f_manager.h
index 4b3c9e2e..8809ace4 100644
--- a/include/f/f_manager.h
+++ b/include/f/f_manager.h
@@ -2,14 +2,14 @@
 
 // this file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_manager.hpp
 
-#include <f/f_base_id.h>
-#include <f/f_list_mg_ptmf.h>
-#include <f/f_list_mg.h>
-#include <f/f_list_nd.h>
-#include <f/f_list_nd_prio.h>
-#include <f/f_tree_mg_ptmf.h>
-#include <f/f_tree_nd.h>
-#include <f/f_profile.h>
+#include "f/f_base_id.h"
+#include "f/f_list_mg_ptmf.h"
+#include "f/f_list_mg.h"
+#include "f/f_list_nd.h"
+#include "f/f_list_nd_prio.h"
+#include "f/f_tree_mg_ptmf.h"
+#include "f/f_tree_nd.h"
+#include "f/f_profile.h"
 
 #define GET_PROC_FLAG(proc) (1 << (proc - 1))
 
diff --git a/include/f/f_profile.h b/include/f/f_profile.h
index 442ac20e..8b5aaf52 100644
--- a/include/f/f_profile.h
+++ b/include/f/f_profile.h
@@ -2,7 +2,7 @@
 
 // Ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_profile.hpp
 
-#include <f/f_profile_name.h>
+#include "f/f_profile_name.h"
 
 
 /// @brief Creates a profile of a base with given values for execute and draw order.
diff --git a/include/f/f_profile_name.h b/include/f/f_profile_name.h
index 6d382a6c..5de6481b 100644
--- a/include/f/f_profile_name.h
+++ b/include/f/f_profile_name.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace fProfile {
     
diff --git a/include/f/f_tree_mg.h b/include/f/f_tree_mg.h
index dbdede5a..87ef7814 100644
--- a/include/f/f_tree_mg.h
+++ b/include/f/f_tree_mg.h
@@ -2,9 +2,9 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_mg.hpp 
 
-#include <types.h>
-#include <c/c_tree.h>
-#include <f/f_profile.h>
+#include "types.h"
+#include "c/c_tree.h"
+#include "f/f_profile.h"
 
 class fTrNdBa_c;
 
diff --git a/include/f/f_tree_mg_ptmf.h b/include/f/f_tree_mg_ptmf.h
index 15474941..ed0e0d91 100644
--- a/include/f/f_tree_mg_ptmf.h
+++ b/include/f/f_tree_mg_ptmf.h
@@ -2,9 +2,9 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_mg_ptmf.hpp
 
-#include <types.h>
-#include <c/c_tree.h>
-#include <f/f_tree_mg.h>
+#include "types.h"
+#include "c/c_tree.h"
+#include "f/f_tree_mg.h"
 
 class fBase_c;
 
diff --git a/include/f/f_tree_nd.h b/include/f/f_tree_nd.h
index 17628306..8aad0725 100644
--- a/include/f/f_tree_nd.h
+++ b/include/f/f_tree_nd.h
@@ -2,9 +2,9 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_nd.hpp
 
-#include <types.h>
-#include <c/c_tree.h>
-#include <f/f_profile.h>
+#include "types.h"
+#include "c/c_tree.h"
+#include "f/f_profile.h"
 
 class fBase_c;
 
diff --git a/include/lib/rvl/DVD.h b/include/lib/rvl/DVD.h
deleted file mode 100644
index 4c8675db..00000000
--- a/include/lib/rvl/DVD.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_DVD_H
-#define RVL_SDK_PUBLIC_DVD_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/DVD/dvd.h>
-#include <rvl/DVD/dvd_broadway.h>
-#include <rvl/DVD/dvdfatal.h>
-#include <rvl/DVD/dvdfs.h>
-#include <rvl/DVD/dvdidutils.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/lib/rvl/GX.h b/include/lib/rvl/GX.h
deleted file mode 100644
index 34d771a2..00000000
--- a/include/lib/rvl/GX.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_GX_H
-#define RVL_SDK_PUBLIC_GX_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/GX/GXAttr.h>
-#include <rvl/GX/GXBump.h>
-#include <rvl/GX/GXDisplayList.h>
-#include <rvl/GX/GXDraw.h>
-#include <rvl/GX/GXFifo.h>
-#include <rvl/GX/GXFrameBuf.h>
-#include <rvl/GX/GXGeometry.h>
-#include <rvl/GX/GXHardware.h>
-#include <rvl/GX/GXHardwareBP.h>
-#include <rvl/GX/GXHardwareCP.h>
-#include <rvl/GX/GXHardwareXF.h>
-#include <rvl/GX/GXInit.h>
-#include <rvl/GX/GXInternal.h>
-#include <rvl/GX/GXLight.h>
-#include <rvl/GX/GXMisc.h>
-#include <rvl/GX/GXPixel.h>
-#include <rvl/GX/GXTev.h>
-#include <rvl/GX/GXTexture.h>
-#include <rvl/GX/GXTransform.h>
-#include <rvl/GX/GXTypes.h>
-#include <rvl/GX/GXVert.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/lib/rvl/MEM.h b/include/lib/rvl/MEM.h
deleted file mode 100644
index d9aea4ac..00000000
--- a/include/lib/rvl/MEM.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_MEM_H
-#define RVL_SDK_PUBLIC_MEM_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/MEM/mem_heapCommon.h>
-#include <rvl/MEM/mem_allocator.h>
-#include <rvl/MEM/mem_expHeap.h>
-#include <rvl/MEM/mem_frameHeap.h>
-#include <rvl/MEM/mem_list.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/lib/rvl/OS.h b/include/lib/rvl/OS.h
deleted file mode 100644
index 7973b4d2..00000000
--- a/include/lib/rvl/OS.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_OS_H
-#define RVL_SDK_PUBLIC_OS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/OS/OS.h>
-#include <rvl/OS/OSAddress.h>
-#include <rvl/OS/OSAlarm.h>
-#include <rvl/OS/OSAlloc.h>
-#include <rvl/OS/OSArena.h>
-#include <rvl/OS/OSAudioSystem.h>
-#include <rvl/OS/OSCache.h>
-#include <rvl/OS/OSContext.h>
-#include <rvl/OS/OSError.h>
-#include <rvl/OS/OSExec.h>
-#include <rvl/OS/OSFastCast.h>
-#include <rvl/OS/OSFatal.h>
-#include <rvl/OS/OSFont.h>
-#include <rvl/OS/OSHardware.h>
-#include <rvl/OS/OSInterrupt.h>
-#include <rvl/OS/OSIpc.h>
-#include <rvl/OS/OSLink.h>
-#include <rvl/OS/OSMemory.h>
-#include <rvl/OS/OSMessage.h>
-#include <rvl/OS/OSMutex.h>
-#include <rvl/OS/OSNet.h>
-#include <rvl/OS/OSPlayRecord.h>
-#include <rvl/OS/OSReset.h>
-#include <rvl/OS/OSRtc.h>
-#include <rvl/OS/OSStateFlags.h>
-#include <rvl/OS/OSStateTM.h>
-#include <rvl/OS/OSSync.h>
-#include <rvl/OS/OSThread.h>
-#include <rvl/OS/OSTime.h>
-#include <rvl/OS/OSUtf.h>
-#include <rvl/OS/__ppc_eabi_init.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/lib/rvl/VF.h b/include/lib/rvl/VF.h
deleted file mode 100644
index d7cf9739..00000000
--- a/include/lib/rvl/VF.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_VF_H
-#define RVL_SDK_PUBLIC_VF_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/VF/pf.h>
-#include <rvl/VF/pf_clib.h>
-#include <rvl/VF/pf_code.h>
-#include <rvl/VF/pf_service.h>
-#include <rvl/VF/pf_str.h>
-#include <rvl/VF/pf_volume.h>
-#include <rvl/VF/pf_w_clib.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/libc.h b/include/libc.h
index d8f834a6..8de50d97 100644
--- a/include/libc.h
+++ b/include/libc.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 extern "C" {
 
diff --git a/include/m/m_allocator.h b/include/m/m_allocator.h
index 7d0ff95a..f8349b17 100644
--- a/include/m/m_allocator.h
+++ b/include/m/m_allocator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <egg/core/eggAllocator.h>
+#include "egg/core/eggAllocator.h"
 
 class mAllocator_c : public EGG::Allocator {
 public:
diff --git a/include/m/m_angle.h b/include/m/m_angle.h
index f808a310..72dfd5c4 100644
--- a/include/m/m_angle.h
+++ b/include/m/m_angle.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 struct mAng {
     public:
diff --git a/include/m/m_frustum.h b/include/m/m_frustum.h
index 3e7ad504..f407bfc1 100644
--- a/include/m/m_frustum.h
+++ b/include/m/m_frustum.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 class mFrustum_c {
 
diff --git a/include/m/m_heap.h b/include/m/m_heap.h
index dadb4700..58446999 100644
--- a/include/m/m_heap.h
+++ b/include/m/m_heap.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <egg/core/eggHeap.h>
-#include <egg/core/eggFrmHeap.h>
-// #include <egg/core/eggExpHeap.h>
-// #include <egg/core/eggAssertHeap.h>
+#include "egg/core/eggHeap.h"
+#include "egg/core/eggFrmHeap.h"
+// #include "egg/core/eggExpHeap.h"
+// #include "egg/core/eggAssertHeap.h"
 
 namespace EGG {
     class ExpHeap;
diff --git a/include/m/m_mtx.h b/include/m/m_mtx.h
index ee45f465..c7eee925 100644
--- a/include/m/m_mtx.h
+++ b/include/m/m_mtx.h
@@ -2,9 +2,9 @@
 
 // NOTE:: Comments about functions pulled from NSMBW
 
-#include <types.h>
-#include <m/m_angle.h>
-#include <nw4r/nw4r_types.h>
+#include "types.h"
+#include "m/m_angle.h"
+#include "nw4r/nw4r_types.h"
 
 class mMtx_c
 {
diff --git a/include/m/m_vec.h b/include/m/m_vec.h
index 01f4d9fd..6f016e58 100644
--- a/include/m/m_vec.h
+++ b/include/m/m_vec.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/MTX.h>
-#include <nw4r/math/vec.h>
+#include "types.h"
+#include "rvl/MTX.h"
+#include "nw4r/math/vec.h"
 
 class mVec3_c {
     public:
diff --git a/include/m/types_m.h b/include/m/types_m.h
index 596c6b79..4dc6d4e2 100644
--- a/include/m/types_m.h
+++ b/include/m/types_m.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 
 class mFaderBase_c;
diff --git a/include/lib/nw4r/db/db_directPrint.h b/include/nw4r/db/db_directPrint.h
index b0f56a37..8667dcb8 100644
--- a/include/lib/nw4r/db/db_directPrint.h
+++ b/include/nw4r/db/db_directPrint.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace nw4r
 {
diff --git a/include/lib/nw4r/g3d/g3d_rescommon.h b/include/nw4r/g3d/g3d_rescommon.h
index e69de29b..e69de29b 100644
--- a/include/lib/nw4r/g3d/g3d_rescommon.h
+++ b/include/nw4r/g3d/g3d_rescommon.h
diff --git a/include/lib/nw4r/g3d/g3d_resfile.h b/include/nw4r/g3d/g3d_resfile.h
index 7a04a1ab..3f44eb0b 100644
--- a/include/lib/nw4r/g3d/g3d_resfile.h
+++ b/include/nw4r/g3d/g3d_resfile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace nw4r {
     namespace g3d {
diff --git a/include/lib/nw4r/math/vec.h b/include/nw4r/math/vec.h
index f7a56eb7..7645dc18 100644
--- a/include/lib/nw4r/math/vec.h
+++ b/include/nw4r/math/vec.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nw4r/nw4r_types.h>
+#include "nw4r/nw4r_types.h"
 
 namespace nw4r
 {
diff --git a/include/lib/nw4r/nw4r_types.h b/include/nw4r/nw4r_types.h
index aab87ea2..9dcd1846 100644
--- a/include/lib/nw4r/nw4r_types.h
+++ b/include/nw4r/nw4r_types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace nw4r
 {
diff --git a/include/lib/nw4r/snd/snd_SoundSystem.h b/include/nw4r/snd/snd_SoundSystem.h
index 429736cd..0dd206f2 100644
--- a/include/lib/nw4r/snd/snd_SoundSystem.h
+++ b/include/nw4r/snd/snd_SoundSystem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nw4r/nw4r_types.h>
+#include "nw4r/nw4r_types.h"
 
 namespace nw4r
 {
diff --git a/include/lib/nw4r/ut/Color.h b/include/nw4r/ut/Color.h
index b542e26b..91c2a2c6 100644
--- a/include/lib/nw4r/ut/Color.h
+++ b/include/nw4r/ut/Color.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/GX.h>
+#include "types.h"
+#include "rvl/GX.h"
 
 namespace nw4r
 {
diff --git a/include/lib/nw4r/ut/List.h b/include/nw4r/ut/List.h
index a1d76383..f8dd23b2 100644
--- a/include/lib/nw4r/ut/List.h
+++ b/include/nw4r/ut/List.h
@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/riidefi/mkw/blob/master/source/nw4r/ut/utList.hpp
 
-#include <types.h>
+#include "types.h"
 
 // TODO: Doc file boundaries
 
diff --git a/include/lib/rvl/AI.h b/include/rvl/AI.h
index 8884d79f..afbf8cec 100644
--- a/include/lib/rvl/AI.h
+++ b/include/rvl/AI.h
@@ -4,8 +4,8 @@
 extern "C" {
 #endif
 
-#include <rvl/AI/ai.h>
-#include <rvl/AI/ai_hardware.h>
+#include "rvl/AI/ai.h"
+#include "rvl/AI/ai_hardware.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/AI/ai.h b/include/rvl/AI/ai.h
index f358bd85..5f331674 100644
--- a/include/lib/rvl/AI/ai.h
+++ b/include/rvl/AI/ai.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_AI_H
 #define RVL_SDK_AI_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/AI/ai_hardware.h b/include/rvl/AI/ai_hardware.h
index 9496ccd1..f0b70415 100644
--- a/include/lib/rvl/AI/ai_hardware.h
+++ b/include/rvl/AI/ai_hardware.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_AI_HARDWARE_H
 #define RVL_SDK_AI_HARDWARE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/ARC.h b/include/rvl/ARC.h
index adbfbeff..c74dee7b 100644
--- a/include/lib/rvl/ARC.h
+++ b/include/rvl/ARC.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/ARC/arc.h>
+#include "rvl/ARC/arc.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/ARC/arc.h b/include/rvl/ARC/arc.h
index 4b3faf91..c9ff7795 100644
--- a/include/lib/rvl/ARC/arc.h
+++ b/include/rvl/ARC/arc.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef RVL_SDK_ARC_H
 #define RVL_SDK_ARC_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/BASE.h b/include/rvl/BASE.h
index 85947d3f..617e7491 100644
--- a/include/lib/rvl/BASE.h
+++ b/include/rvl/BASE.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/BASE/PPCArch.h>
+#include "rvl/BASE/PPCArch.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/BASE/PPCArch.h b/include/rvl/BASE/PPCArch.h
index d9c7ad09..5cce44a6 100644
--- a/include/lib/rvl/BASE/PPCArch.h
+++ b/include/rvl/BASE/PPCArch.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_PPC_ARCH_H
 #define RVL_SDK_PPC_ARCH_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/CARD.h b/include/rvl/CARD.h
index 53f117f5..2139bf5d 100644
--- a/include/lib/rvl/CARD.h
+++ b/include/rvl/CARD.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/CARD/CARD.h>
+#include "rvl/CARD/CARD.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/CARD/CARD.h b/include/rvl/CARD/CARD.h
index 11c680ef..27fe804d 100644
--- a/include/lib/rvl/CARD/CARD.h
+++ b/include/rvl/CARD/CARD.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_CARD_H
 #define RVL_SDK_CARD_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/CNT.h b/include/rvl/CNT.h
index ea4997dd..10c8be9e 100644
--- a/include/lib/rvl/CNT.h
+++ b/include/rvl/CNT.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/CNT/cnt.h>
+#include "rvl/CNT/cnt.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/CNT/cnt.h b/include/rvl/CNT/cnt.h
index ddc5105a..2ab09fa7 100644
--- a/include/lib/rvl/CNT/cnt.h
+++ b/include/rvl/CNT/cnt.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_CNT_H
 #define RVL_SDK_CNT_H
-#include <rvl/ARC.h>
-#include <rvl/types.h>
+#include "rvl/ARC.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/CX/cx.h b/include/rvl/CX/cx.h
index 9441238a..2f3fdae9 100644
--- a/include/lib/rvl/CX/cx.h
+++ b/include/rvl/CX/cx.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 // .text: [0x803cee90, 0x803d0b20]
 
diff --git a/include/lib/rvl/DB.h b/include/rvl/DB.h
index 8a8e2218..3ed28968 100644
--- a/include/lib/rvl/DB.h
+++ b/include/rvl/DB.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/DB/db.h>
+#include "rvl/DB/db.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/DB/db.h b/include/rvl/DB/db.h
index a2286655..7e4ab69d 100644
--- a/include/lib/rvl/DB/db.h
+++ b/include/rvl/DB/db.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DB_H
 #define RVL_SDK_DB_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/DSP.h b/include/rvl/DSP.h
index 4ef32281..a1ad55fb 100644
--- a/include/lib/rvl/DSP.h
+++ b/include/rvl/DSP.h
@@ -4,10 +4,10 @@
 extern "C" {
 #endif
 
-#include <rvl/DSP/dsp.h>
-#include <rvl/DSP/dsp_debug.h>
-#include <rvl/DSP/dsp_hardware.h>
-#include <rvl/DSP/dsp_task.h>
+#include "rvl/DSP/dsp.h"
+#include "rvl/DSP/dsp_debug.h"
+#include "rvl/DSP/dsp_hardware.h"
+#include "rvl/DSP/dsp_task.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/DSP/dsp.h b/include/rvl/DSP/dsp.h
index a210b39c..d0caf527 100644
--- a/include/lib/rvl/DSP/dsp.h
+++ b/include/rvl/DSP/dsp.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DSP_H
 #define RVL_SDK_DSP_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/DSP/dsp_debug.h b/include/rvl/DSP/dsp_debug.h
index ee5fd721..a1259d06 100644
--- a/include/lib/rvl/DSP/dsp_debug.h
+++ b/include/rvl/DSP/dsp_debug.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DSP_DEBUG_H
 #define RVL_SDK_DSP_DEBUG_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/DSP/dsp_hardware.h b/include/rvl/DSP/dsp_hardware.h
index eb0ef8fb..51fdbe54 100644
--- a/include/lib/rvl/DSP/dsp_hardware.h
+++ b/include/rvl/DSP/dsp_hardware.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DSP_HARDWARE_H
 #define RVL_SDK_DSP_HARDWARE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/DSP/dsp_task.h b/include/rvl/DSP/dsp_task.h
index 409ab067..c56ad6d2 100644
--- a/include/lib/rvl/DSP/dsp_task.h
+++ b/include/rvl/DSP/dsp_task.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DSP_TASK_H
 #define RVL_SDK_DSP_TASK_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/rvl/DVD.h b/include/rvl/DVD.h
new file mode 100644
index 00000000..00b87a44
--- /dev/null
+++ b/include/rvl/DVD.h
@@ -0,0 +1,16 @@
+#ifndef RVL_SDK_PUBLIC_DVD_H
+#define RVL_SDK_PUBLIC_DVD_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "rvl/DVD/dvd.h"
+#include "rvl/DVD/dvd_broadway.h"
+#include "rvl/DVD/dvdfatal.h"
+#include "rvl/DVD/dvdfs.h"
+#include "rvl/DVD/dvdidutils.h"
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/include/lib/rvl/DVD/dvd.h b/include/rvl/DVD/dvd.h
index c292ef79..ac91ac08 100644
--- a/include/lib/rvl/DVD/dvd.h
+++ b/include/rvl/DVD/dvd.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DVD_H
 #define RVL_SDK_DVD_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/DVD/dvd_broadway.h b/include/rvl/DVD/dvd_broadway.h
index 0b4d2809..2946ef4d 100644
--- a/include/lib/rvl/DVD/dvd_broadway.h
+++ b/include/rvl/DVD/dvd_broadway.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DVD_BROADWAY_H
 #define RVL_SDK_DVD_BROADWAY_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/DVD/dvdfatal.h b/include/rvl/DVD/dvdfatal.h
index b956c0fe..cfc501f4 100644
--- a/include/lib/rvl/DVD/dvdfatal.h
+++ b/include/rvl/DVD/dvdfatal.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DVD_FATAL_H
 #define RVL_SDK_DVD_FATAL_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/DVD/dvdfs.h b/include/rvl/DVD/dvdfs.h
index a66e6ae6..4cf52d1a 100644
--- a/include/lib/rvl/DVD/dvdfs.h
+++ b/include/rvl/DVD/dvdfs.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DVD_FS_H
 #define RVL_SDK_DVD_FS_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/DVD/dvdidutils.h b/include/rvl/DVD/dvdidutils.h
index d6ed343c..e2852eeb 100644
--- a/include/lib/rvl/DVD/dvdidutils.h
+++ b/include/rvl/DVD/dvdidutils.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DVD_ID_UTILS_H
 #define RVL_SDK_DVD_ID_UTILS_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/ESP.h b/include/rvl/ESP.h
index 517b2c48..b2120efb 100644
--- a/include/lib/rvl/ESP.h
+++ b/include/rvl/ESP.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/ESP/esp.h>
+#include "rvl/ESP/esp.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/ESP/esp.h b/include/rvl/ESP/esp.h
index 86665580..a36ff9c5 100644
--- a/include/lib/rvl/ESP/esp.h
+++ b/include/rvl/ESP/esp.h
@@ -1,8 +1,8 @@
 #ifndef RVL_SDK_ESP_H
 #define RVL_SDK_ESP_H
-#include <rvl/ARC.h>
-#include <rvl/IPC.h>
-#include <rvl/types.h>
+#include "rvl/ARC.h"
+#include "rvl/IPC.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/EXI.h b/include/rvl/EXI.h
index b7654931..ba1e63ab 100644
--- a/include/lib/rvl/EXI.h
+++ b/include/rvl/EXI.h
@@ -4,10 +4,10 @@
 extern "C" {
 #endif
 
-#include <rvl/EXI/EXIBios.h>
-#include <rvl/EXI/EXICommon.h>
-#include <rvl/EXI/EXIHardware.h>
-#include <rvl/EXI/EXIUart.h>
+#include "rvl/EXI/EXIBios.h"
+#include "rvl/EXI/EXICommon.h"
+#include "rvl/EXI/EXIHardware.h"
+#include "rvl/EXI/EXIUart.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/EXI/EXIBios.h b/include/rvl/EXI/EXIBios.h
index bd57f813..d13fb52c 100644
--- a/include/lib/rvl/EXI/EXIBios.h
+++ b/include/rvl/EXI/EXIBios.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_EXI_BIOS_H
 #define RVL_SDK_EXI_BIOS_H
-#include <rvl/EXI/EXICommon.h>
-#include <rvl/types.h>
+#include "rvl/EXI/EXICommon.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/EXI/EXICommon.h b/include/rvl/EXI/EXICommon.h
index e6358493..dbad73d6 100644
--- a/include/lib/rvl/EXI/EXICommon.h
+++ b/include/rvl/EXI/EXICommon.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_EXI_COMMON_H
 #define RVL_SDK_EXI_COMMON_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/EXI/EXIHardware.h b/include/rvl/EXI/EXIHardware.h
index 8fb16b51..defbc980 100644
--- a/include/lib/rvl/EXI/EXIHardware.h
+++ b/include/rvl/EXI/EXIHardware.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_EXI_HARDWARE_H
 #define RVL_SDK_EXI_HARDWARE_H
-#include <rvl/EXI/EXICommon.h>
-#include <rvl/types.h>
+#include "rvl/EXI/EXICommon.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/EXI/EXIUart.h b/include/rvl/EXI/EXIUart.h
index 880208b5..0a4a5c2e 100644
--- a/include/lib/rvl/EXI/EXIUart.h
+++ b/include/rvl/EXI/EXIUart.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_EXI_UART_H
 #define RVL_SDK_EXI_UART_H
-#include <rvl/EXI/EXIBios.h>
-#include <rvl/types.h>
+#include "rvl/EXI/EXIBios.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/FS.h b/include/rvl/FS.h
index 749efc7f..55653683 100644
--- a/include/lib/rvl/FS.h
+++ b/include/rvl/FS.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/FS/fs.h>
+#include "rvl/FS/fs.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/FS/fs.h b/include/rvl/FS/fs.h
index 0bc25bd3..8ed45994 100644
--- a/include/lib/rvl/FS/fs.h
+++ b/include/rvl/FS/fs.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_FS_H
 #define RVL_SDK_FS_H
-#include <rvl/IPC.h>
-#include <rvl/types.h>
+#include "rvl/IPC.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/rvl/GX.h b/include/rvl/GX.h
new file mode 100644
index 00000000..e559a598
--- /dev/null
+++ b/include/rvl/GX.h
@@ -0,0 +1,32 @@
+#ifndef RVL_SDK_PUBLIC_GX_H
+#define RVL_SDK_PUBLIC_GX_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "rvl/GX/GXAttr.h"
+#include "rvl/GX/GXBump.h"
+#include "rvl/GX/GXDisplayList.h"
+#include "rvl/GX/GXDraw.h"
+#include "rvl/GX/GXFifo.h"
+#include "rvl/GX/GXFrameBuf.h"
+#include "rvl/GX/GXGeometry.h"
+#include "rvl/GX/GXHardware.h"
+#include "rvl/GX/GXHardwareBP.h"
+#include "rvl/GX/GXHardwareCP.h"
+#include "rvl/GX/GXHardwareXF.h"
+#include "rvl/GX/GXInit.h"
+#include "rvl/GX/GXInternal.h"
+#include "rvl/GX/GXLight.h"
+#include "rvl/GX/GXMisc.h"
+#include "rvl/GX/GXPixel.h"
+#include "rvl/GX/GXTev.h"
+#include "rvl/GX/GXTexture.h"
+#include "rvl/GX/GXTransform.h"
+#include "rvl/GX/GXTypes.h"
+#include "rvl/GX/GXVert.h"
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/include/lib/rvl/GX/GXAttr.h b/include/rvl/GX/GXAttr.h
index 24dd1eef..0f696ddb 100644
--- a/include/lib/rvl/GX/GXAttr.h
+++ b/include/rvl/GX/GXAttr.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_ATTR_H
 #define RVL_SDK_GX_ATTR_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXBump.h b/include/rvl/GX/GXBump.h
index 5c3d8e82..5bb453c4 100644
--- a/include/lib/rvl/GX/GXBump.h
+++ b/include/rvl/GX/GXBump.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_BUMP_H
 #define RVL_SDK_GX_BUMP_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXDisplayList.h b/include/rvl/GX/GXDisplayList.h
index a9fab0d5..6c669aab 100644
--- a/include/lib/rvl/GX/GXDisplayList.h
+++ b/include/rvl/GX/GXDisplayList.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_DISPLAY_LIST_H
 #define RVL_SDK_GX_DISPLAY_LIST_H
-#include <rvl/GX/GXHardware.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXHardware.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXDraw.h b/include/rvl/GX/GXDraw.h
index 1e9ea343..89a1c841 100644
--- a/include/lib/rvl/GX/GXDraw.h
+++ b/include/rvl/GX/GXDraw.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_GX_DRAW_H
 #define RVL_SDK_GX_DRAW_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXFifo.h b/include/rvl/GX/GXFifo.h
index 389f11a4..bb89fbc1 100644
--- a/include/lib/rvl/GX/GXFifo.h
+++ b/include/rvl/GX/GXFifo.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_FIFO_H
 #define RVL_SDK_GX_FIFO_H
-#include <rvl/GX/GXInternal.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXInternal.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXFrameBuf.h b/include/rvl/GX/GXFrameBuf.h
index 764a2a90..86479c58 100644
--- a/include/lib/rvl/GX/GXFrameBuf.h
+++ b/include/rvl/GX/GXFrameBuf.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_GX_FRAMEBUF_H
 #define RVL_SDK_GX_FRAMEBUF_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXGeometry.h b/include/rvl/GX/GXGeometry.h
index 88b75df2..567ab9e7 100644
--- a/include/lib/rvl/GX/GXGeometry.h
+++ b/include/rvl/GX/GXGeometry.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_GEOMETRY_H
 #define RVL_SDK_GX_GEOMETRY_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXHardware.h b/include/rvl/GX/GXHardware.h
index 53e12360..6e771a30 100644
--- a/include/lib/rvl/GX/GXHardware.h
+++ b/include/rvl/GX/GXHardware.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_HARDWARE_H
 #define RVL_SDK_GX_HARDWARE_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXHardwareBP.h b/include/rvl/GX/GXHardwareBP.h
index 6b776d07..7de55079 100644
--- a/include/lib/rvl/GX/GXHardwareBP.h
+++ b/include/rvl/GX/GXHardwareBP.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_HARDWARE_BP_H
 #define RVL_SDK_GX_HARDWARE_BP_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXHardwareCP.h b/include/rvl/GX/GXHardwareCP.h
index 9a0f993c..28d196a1 100644
--- a/include/lib/rvl/GX/GXHardwareCP.h
+++ b/include/rvl/GX/GXHardwareCP.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_HARDWARE_CP_H
 #define RVL_SDK_GX_HARDWARE_CP_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXHardwareXF.h b/include/rvl/GX/GXHardwareXF.h
index ca5506ce..8ec281af 100644
--- a/include/lib/rvl/GX/GXHardwareXF.h
+++ b/include/rvl/GX/GXHardwareXF.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_HARDWARE_XF_H
 #define RVL_SDK_GX_HARDWARE_XF_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXInit.h b/include/rvl/GX/GXInit.h
index 04aaa377..d5d7af6e 100644
--- a/include/lib/rvl/GX/GXInit.h
+++ b/include/rvl/GX/GXInit.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_GX_INIT_H
 #define RVL_SDK_GX_INIT_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXInternal.h b/include/rvl/GX/GXInternal.h
index ed66a59a..05958f55 100644
--- a/include/lib/rvl/GX/GXInternal.h
+++ b/include/rvl/GX/GXInternal.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_INTERNAL_H
 #define RVL_SDK_GX_INTERNAL_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXLight.h b/include/rvl/GX/GXLight.h
index 71ca208c..888bfcf6 100644
--- a/include/lib/rvl/GX/GXLight.h
+++ b/include/rvl/GX/GXLight.h
@@ -1,8 +1,8 @@
 #ifndef RVL_SDK_GX_LIGHT_H
 #define RVL_SDK_GX_LIGHT_H
-#include <rvl/GX/GXInternal.h>
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXInternal.h"
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXMisc.h b/include/rvl/GX/GXMisc.h
index 0429d138..bddd3906 100644
--- a/include/lib/rvl/GX/GXMisc.h
+++ b/include/rvl/GX/GXMisc.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_GX_MISC_H
 #define RVL_SDK_GX_MISC_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXPixel.h b/include/rvl/GX/GXPixel.h
index 8e031ac5..48867356 100644
--- a/include/lib/rvl/GX/GXPixel.h
+++ b/include/rvl/GX/GXPixel.h
@@ -1,8 +1,8 @@
 #ifndef RVL_SDK_GX_PIXEL_H
 #define RVL_SDK_GX_PIXEL_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/MTX.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/MTX.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXTev.h b/include/rvl/GX/GXTev.h
index 62b0d503..6112db6e 100644
--- a/include/lib/rvl/GX/GXTev.h
+++ b/include/rvl/GX/GXTev.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_TEV_H
 #define RVL_SDK_GX_TEV_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXTexture.h b/include/rvl/GX/GXTexture.h
index 6efe35bc..a096c618 100644
--- a/include/lib/rvl/GX/GXTexture.h
+++ b/include/rvl/GX/GXTexture.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_TEXTURE_H
 #define RVL_SDK_GX_TEXTURE_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXTransform.h b/include/rvl/GX/GXTransform.h
index 5163fdf6..7922d2eb 100644
--- a/include/lib/rvl/GX/GXTransform.h
+++ b/include/rvl/GX/GXTransform.h
@@ -1,8 +1,8 @@
 #ifndef RVL_SDK_GX_TRANSFORM_H
 #define RVL_SDK_GX_TRANSFORM_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/MTX.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/MTX.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXTypes.h b/include/rvl/GX/GXTypes.h
index 23988977..353e3296 100644
--- a/include/lib/rvl/GX/GXTypes.h
+++ b/include/rvl/GX/GXTypes.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_GX_TYPES_H
 #define RVL_SDK_GX_TYPES_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/GX/GXVert.h b/include/rvl/GX/GXVert.h
index 9e8a9a3d..58ecdca5 100644
--- a/include/lib/rvl/GX/GXVert.h
+++ b/include/rvl/GX/GXVert.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_GX_VERT_H
 #define RVL_SDK_GX_VERT_H
-#include <rvl/GX/GXHardware.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXHardware.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/IPC.h b/include/rvl/IPC.h
index 15dccaaf..6bba8fbd 100644
--- a/include/lib/rvl/IPC.h
+++ b/include/rvl/IPC.h
@@ -4,10 +4,10 @@
 extern "C" {
 #endif
 
-#include <rvl/IPC/ipcMain.h>
-#include <rvl/IPC/ipcProfile.h>
-#include <rvl/IPC/ipcclt.h>
-#include <rvl/IPC/memory.h>
+#include "rvl/IPC/ipcMain.h"
+#include "rvl/IPC/ipcProfile.h"
+#include "rvl/IPC/ipcclt.h"
+#include "rvl/IPC/memory.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/IPC/ipcMain.h b/include/rvl/IPC/ipcMain.h
index 4cb69e38..7cc48771 100644
--- a/include/lib/rvl/IPC/ipcMain.h
+++ b/include/rvl/IPC/ipcMain.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_IPC_MAIN_H
 #define RVL_SDK_IPC_MAIN_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/IPC/ipcProfile.h b/include/rvl/IPC/ipcProfile.h
index 35e445fc..dc2ec0b7 100644
--- a/include/lib/rvl/IPC/ipcProfile.h
+++ b/include/rvl/IPC/ipcProfile.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_IPC_PROFILE_H
 #define RVL_SDK_IPC_PROFILE_H
-#include <rvl/IPC/ipcclt.h>
-#include <rvl/types.h>
+#include "rvl/IPC/ipcclt.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/IPC/ipcclt.h b/include/rvl/IPC/ipcclt.h
index 5f28054b..97ad9765 100644
--- a/include/lib/rvl/IPC/ipcclt.h
+++ b/include/rvl/IPC/ipcclt.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_IPC_CLT_H
 #define RVL_SDK_IPC_CLT_H
-#include <rvl/OS.h>
-#include <rvl/types.h>
+#include "rvl/OS.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/IPC/memory.h b/include/rvl/IPC/memory.h
index c8328836..5a44ff19 100644
--- a/include/lib/rvl/IPC/memory.h
+++ b/include/rvl/IPC/memory.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_IPC_MEMORY_H
 #define RVL_SDK_IPC_MEMORY_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/rvl/MEM.h b/include/rvl/MEM.h
new file mode 100644
index 00000000..70cefb3d
--- /dev/null
+++ b/include/rvl/MEM.h
@@ -0,0 +1,16 @@
+#ifndef RVL_SDK_PUBLIC_MEM_H
+#define RVL_SDK_PUBLIC_MEM_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "rvl/MEM/mem_heapCommon.h"
+#include "rvl/MEM/mem_allocator.h"
+#include "rvl/MEM/mem_expHeap.h"
+#include "rvl/MEM/mem_frameHeap.h"
+#include "rvl/MEM/mem_list.h"
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/include/lib/rvl/MEM/mem_allocator.h b/include/rvl/MEM/mem_allocator.h
index b535029e..8972c983 100644
--- a/include/lib/rvl/MEM/mem_allocator.h
+++ b/include/rvl/MEM/mem_allocator.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_MEM_ALLOCATOR_H
 #define RVL_SDK_MEM_ALLOCATOR_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MEM/mem_expHeap.h b/include/rvl/MEM/mem_expHeap.h
index 749bda3a..5dc06462 100644
--- a/include/lib/rvl/MEM/mem_expHeap.h
+++ b/include/rvl/MEM/mem_expHeap.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_MEM_EXP_HEAP_H
 #define RVL_SDK_MEM_EXP_HEAP_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MEM/mem_frameHeap.h b/include/rvl/MEM/mem_frameHeap.h
index b8ac75c2..91f725a8 100644
--- a/include/lib/rvl/MEM/mem_frameHeap.h
+++ b/include/rvl/MEM/mem_frameHeap.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_MEM_FRAME_HEAP_H
 #define RVL_SDK_MEM_FRAME_HEAP_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MEM/mem_heapCommon.h b/include/rvl/MEM/mem_heapCommon.h
index ad64d4cb..ed6e8566 100644
--- a/include/lib/rvl/MEM/mem_heapCommon.h
+++ b/include/rvl/MEM/mem_heapCommon.h
@@ -1,9 +1,9 @@
 #ifndef RVL_SDK_MEM_HEAP_COMMON_H
 #define RVL_SDK_MEM_HEAP_COMMON_H
-#include <rvl/MEM/mem_list.h>
-#include <rvl/OS.h>
-#include <rvl/types.h>
-// #include <string.h>
+#include "rvl/MEM/mem_list.h"
+#include "rvl/OS.h"
+#include "rvl/types.h"
+// #include "string.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MEM/mem_list.h b/include/rvl/MEM/mem_list.h
index 006cb783..ad7fbbd0 100644
--- a/include/lib/rvl/MEM/mem_list.h
+++ b/include/rvl/MEM/mem_list.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_MEM_LIST_H
 #define RVL_SDK_MEM_LIST_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MTX.h b/include/rvl/MTX.h
index fd6061d7..8300c482 100644
--- a/include/lib/rvl/MTX.h
+++ b/include/rvl/MTX.h
@@ -4,11 +4,11 @@
 extern "C" {
 #endif
 
-#include <rvl/MTX/mtx.h>
-#include <rvl/MTX/mtx44.h>
-#include <rvl/MTX/mtxvec.h>
-#include <rvl/MTX/quat.h>
-#include <rvl/MTX/vec.h>
+#include "rvl/MTX/mtx.h"
+#include "rvl/MTX/mtx44.h"
+#include "rvl/MTX/mtxvec.h"
+#include "rvl/MTX/quat.h"
+#include "rvl/MTX/vec.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/MTX/mtx.h b/include/rvl/MTX/mtx.h
index a353afbd..0d7f7eca 100644
--- a/include/lib/rvl/MTX/mtx.h
+++ b/include/rvl/MTX/mtx.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_MTX_MTX_H
 #define RVL_SDK_MTX_MTX_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MTX/mtx44.h b/include/rvl/MTX/mtx44.h
index 546803ed..e5dfd040 100644
--- a/include/lib/rvl/MTX/mtx44.h
+++ b/include/rvl/MTX/mtx44.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_MTX_MTX44_H
 #define RVL_SDK_MTX_MTX44_H
-#include <rvl/MTX/mtx.h>
-#include <rvl/types.h>
+#include "rvl/MTX/mtx.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MTX/mtxvec.h b/include/rvl/MTX/mtxvec.h
index 6f71ef56..b1650c51 100644
--- a/include/lib/rvl/MTX/mtxvec.h
+++ b/include/rvl/MTX/mtxvec.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_MTX_MTXVEC_H
 #define RVL_SDK_MTX_MTXVEC_H
-#include <rvl/MTX/mtx.h>
-#include <rvl/types.h>
+#include "rvl/MTX/mtx.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MTX/quat.h b/include/rvl/MTX/quat.h
index 2510952a..662a9acc 100644
--- a/include/lib/rvl/MTX/quat.h
+++ b/include/rvl/MTX/quat.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_MTX_QUAT_H
 #define RVL_SDK_MTX_QUAT_H
-#include <rvl/MTX/mtx.h>
-#include <rvl/types.h>
+#include "rvl/MTX/mtx.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/MTX/vec.h b/include/rvl/MTX/vec.h
index 65ba706c..3f362386 100644
--- a/include/lib/rvl/MTX/vec.h
+++ b/include/rvl/MTX/vec.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_MTX_VEC_H
 #define RVL_SDK_MTX_VEC_H
-#include <rvl/MTX/mtx.h>
-#include <rvl/types.h>
+#include "rvl/MTX/mtx.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NAND.h b/include/rvl/NAND.h
index f599e621..10795a52 100644
--- a/include/lib/rvl/NAND.h
+++ b/include/rvl/NAND.h
@@ -4,10 +4,10 @@
 extern "C" {
 #endif
 
-#include <rvl/NAND/NANDCheck.h>
-#include <rvl/NAND/NANDCore.h>
-#include <rvl/NAND/NANDOpenClose.h>
-#include <rvl/NAND/nand.h>
+#include "rvl/NAND/NANDCheck.h"
+#include "rvl/NAND/NANDCore.h"
+#include "rvl/NAND/NANDOpenClose.h"
+#include "rvl/NAND/nand.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/NAND/NANDCheck.h b/include/rvl/NAND/NANDCheck.h
index eb935666..50969817 100644
--- a/include/lib/rvl/NAND/NANDCheck.h
+++ b/include/rvl/NAND/NANDCheck.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_NAND_CHECK_H
 #define RVL_SDK_NAND_CHECK_H
-#include <rvl/NAND/nand.h>
-#include <rvl/types.h>
+#include "rvl/NAND/nand.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NAND/NANDCore.h b/include/rvl/NAND/NANDCore.h
index e0a60abc..59cafe7e 100644
--- a/include/lib/rvl/NAND/NANDCore.h
+++ b/include/rvl/NAND/NANDCore.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_NAND_CORE_H
 #define RVL_SDK_NAND_CORE_H
-#include <rvl/NAND/nand.h>
-#include <rvl/types.h>
+#include "rvl/NAND/nand.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NAND/NANDOpenClose.h b/include/rvl/NAND/NANDOpenClose.h
index b2837e97..baf5dc5a 100644
--- a/include/lib/rvl/NAND/NANDOpenClose.h
+++ b/include/rvl/NAND/NANDOpenClose.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_NAND_OPEN_CLOSE_H
 #define RVL_SDK_NAND_OPEN_CLOSE_H
-#include <rvl/NAND/nand.h>
-#include <rvl/types.h>
+#include "rvl/NAND/nand.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NAND/nand.h b/include/rvl/NAND/nand.h
index a5ca48c5..c59d30c0 100644
--- a/include/lib/rvl/NAND/nand.h
+++ b/include/rvl/NAND/nand.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_NAND_H
 #define RVL_SDK_NAND_H
-#include <rvl/FS.h>
-#include <rvl/types.h>
+#include "rvl/FS.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NWC24.h b/include/rvl/NWC24.h
index d4150bf1..6b2e0ba6 100644
--- a/include/lib/rvl/NWC24.h
+++ b/include/rvl/NWC24.h
@@ -4,9 +4,9 @@
 extern "C" {
 #endif
 
-#include <rvl/NWC24/NWC24Schedule.h>
-#include <rvl/NWC24/NWC24System.h>
-#include <rvl/NWC24/NWC24Time.h>
+#include "rvl/NWC24/NWC24Schedule.h"
+#include "rvl/NWC24/NWC24System.h"
+#include "rvl/NWC24/NWC24Time.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/NWC24/NWC24Schedule.h b/include/rvl/NWC24/NWC24Schedule.h
index 2b5f31d7..18b70ffb 100644
--- a/include/lib/rvl/NWC24/NWC24Schedule.h
+++ b/include/rvl/NWC24/NWC24Schedule.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_NWC24_SCHEDULE_H
 #define RVL_SDK_NWC24_SCHEDULE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NWC24/NWC24System.h b/include/rvl/NWC24/NWC24System.h
index bf40a161..0e4b9a5f 100644
--- a/include/lib/rvl/NWC24/NWC24System.h
+++ b/include/rvl/NWC24/NWC24System.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_NWC24_SYSTEM_H
 #define RVL_SDK_NWC24_SYSTEM_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NWC24/NWC24Time.h b/include/rvl/NWC24/NWC24Time.h
index 990fe2d9..0b30b9b2 100644
--- a/include/lib/rvl/NWC24/NWC24Time.h
+++ b/include/rvl/NWC24/NWC24Time.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_NWC24_TIME_H
 #define RVL_SDK_NWC24_TIME_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NdevExi2AD.h b/include/rvl/NdevExi2AD.h
index 7a0478d4..b7303ca5 100644
--- a/include/lib/rvl/NdevExi2AD.h
+++ b/include/rvl/NdevExi2AD.h
@@ -4,9 +4,9 @@
 extern "C" {
 #endif
 
-#include <rvl/NdevExi2AD/DebuggerDriver.h>
-#include <rvl/NdevExi2AD/ODEMU.h>
-#include <rvl/NdevExi2AD/exi2.h>
+#include "rvl/NdevExi2AD/DebuggerDriver.h"
+#include "rvl/NdevExi2AD/ODEMU.h"
+#include "rvl/NdevExi2AD/exi2.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/NdevExi2AD/DebuggerDriver.h b/include/rvl/NdevExi2AD/DebuggerDriver.h
index d969b3fd..38892315 100644
--- a/include/lib/rvl/NdevExi2AD/DebuggerDriver.h
+++ b/include/rvl/NdevExi2AD/DebuggerDriver.h
@@ -1,8 +1,8 @@
 #ifndef RVL_SDK_NDEV_EXI2_AD_DEBUGGER_DRIVER_H
 #define RVL_SDK_NDEV_EXI2_AD_DEBUGGER_DRIVER_H
-#include <rvl/NdevExi2AD/exi2.h>
-#include <rvl/OS.h>
-#include <rvl/types.h>
+#include "rvl/NdevExi2AD/exi2.h"
+#include "rvl/OS.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NdevExi2AD/ODEMU.h b/include/rvl/NdevExi2AD/ODEMU.h
index f577ecbd..1f77ab31 100644
--- a/include/lib/rvl/NdevExi2AD/ODEMU.h
+++ b/include/rvl/NdevExi2AD/ODEMU.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_NDEV_EXI2_AD_ODEMU_H
 #define RVL_SDK_NDEV_EXI2_AD_ODEMU_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/NdevExi2AD/exi2.h b/include/rvl/NdevExi2AD/exi2.h
index 73d4e39e..64eed826 100644
--- a/include/lib/rvl/NdevExi2AD/exi2.h
+++ b/include/rvl/NdevExi2AD/exi2.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_NDEV_EXI2_AD_EXI2_H
 #define RVL_SDK_NDEV_EXI2_AD_EXI2_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/rvl/OS.h b/include/rvl/OS.h
new file mode 100644
index 00000000..e2bdbce0
--- /dev/null
+++ b/include/rvl/OS.h
@@ -0,0 +1,42 @@
+#ifndef RVL_SDK_PUBLIC_OS_H
+#define RVL_SDK_PUBLIC_OS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "rvl/OS/OS.h"
+#include "rvl/OS/OSAddress.h"
+#include "rvl/OS/OSAlarm.h"
+#include "rvl/OS/OSAlloc.h"
+#include "rvl/OS/OSArena.h"
+#include "rvl/OS/OSAudioSystem.h"
+#include "rvl/OS/OSCache.h"
+#include "rvl/OS/OSContext.h"
+#include "rvl/OS/OSError.h"
+#include "rvl/OS/OSExec.h"
+#include "rvl/OS/OSFastCast.h"
+#include "rvl/OS/OSFatal.h"
+#include "rvl/OS/OSFont.h"
+#include "rvl/OS/OSHardware.h"
+#include "rvl/OS/OSInterrupt.h"
+#include "rvl/OS/OSIpc.h"
+#include "rvl/OS/OSLink.h"
+#include "rvl/OS/OSMemory.h"
+#include "rvl/OS/OSMessage.h"
+#include "rvl/OS/OSMutex.h"
+#include "rvl/OS/OSNet.h"
+#include "rvl/OS/OSPlayRecord.h"
+#include "rvl/OS/OSReset.h"
+#include "rvl/OS/OSRtc.h"
+#include "rvl/OS/OSStateFlags.h"
+#include "rvl/OS/OSStateTM.h"
+#include "rvl/OS/OSSync.h"
+#include "rvl/OS/OSThread.h"
+#include "rvl/OS/OSTime.h"
+#include "rvl/OS/OSUtf.h"
+#include "rvl/OS/__ppc_eabi_init.h"
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/include/lib/rvl/OS/OS.h b/include/rvl/OS/OS.h
index 6e104789..29666cd2 100644
--- a/include/lib/rvl/OS/OS.h
+++ b/include/rvl/OS/OS.h
@@ -1,8 +1,8 @@
 #ifndef RVL_SDK_OS_H
 #define RVL_SDK_OS_H
-#include <rvl/OS/OSContext.h>
-#include <rvl/OS/OSExec.h>
-#include <rvl/types.h>
+#include "rvl/OS/OSContext.h"
+#include "rvl/OS/OSExec.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSAddress.h b/include/rvl/OS/OSAddress.h
index 95a9f650..742bbf8a 100644
--- a/include/lib/rvl/OS/OSAddress.h
+++ b/include/rvl/OS/OSAddress.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_ADDRESS_H
 #define RVL_SDK_OS_ADDRESS_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSAlarm.h b/include/rvl/OS/OSAlarm.h
index 8dd1dfc3..13c675f9 100644
--- a/include/lib/rvl/OS/OSAlarm.h
+++ b/include/rvl/OS/OSAlarm.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_ALARM_H
 #define RVL_SDK_OS_ALARM_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSAlloc.h b/include/rvl/OS/OSAlloc.h
index 3693aa5e..c5c5cbf2 100644
--- a/include/lib/rvl/OS/OSAlloc.h
+++ b/include/rvl/OS/OSAlloc.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_ALLOC_H
 #define RVL_SDK_OS_ALLOC_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSArena.h b/include/rvl/OS/OSArena.h
index 402f9f2a..ebf2b6bc 100644
--- a/include/lib/rvl/OS/OSArena.h
+++ b/include/rvl/OS/OSArena.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_ARENA_H
 #define RVL_SDK_OS_ARENA_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSAudioSystem.h b/include/rvl/OS/OSAudioSystem.h
index 0b013dd2..a5c811bb 100644
--- a/include/lib/rvl/OS/OSAudioSystem.h
+++ b/include/rvl/OS/OSAudioSystem.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_AUDIOSYSTEM_H
 #define RVL_SDK_OS_AUDIOSYSTEM_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSCache.h b/include/rvl/OS/OSCache.h
index e1a3311e..a35ca89c 100644
--- a/include/lib/rvl/OS/OSCache.h
+++ b/include/rvl/OS/OSCache.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_CACHE_H
 #define RVL_SDK_OS_CACHE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSContext.h b/include/rvl/OS/OSContext.h
index 4b6bf40a..8893a169 100644
--- a/include/lib/rvl/OS/OSContext.h
+++ b/include/rvl/OS/OSContext.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_CONTEXT_H
 #define RVL_SDK_OS_CONTEXT_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSError.h b/include/rvl/OS/OSError.h
index fd4ab02c..36f696a1 100644
--- a/include/lib/rvl/OS/OSError.h
+++ b/include/rvl/OS/OSError.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_ERROR_H
 #define RVL_SDK_OS_ERROR_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSExec.h b/include/rvl/OS/OSExec.h
index c63a4d34..3fb1c972 100644
--- a/include/lib/rvl/OS/OSExec.h
+++ b/include/rvl/OS/OSExec.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_EXEC_H
 #define RVL_SDK_OS_EXEC_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSFastCast.h b/include/rvl/OS/OSFastCast.h
index 302d6eed..d75f1e7d 100644
--- a/include/lib/rvl/OS/OSFastCast.h
+++ b/include/rvl/OS/OSFastCast.h
@@ -1,6 +1,6 @@
 // #ifndef RVL_SDK_OS_FAST_CAST_H
 // #define RVL_SDK_OS_FAST_CAST_H
-// #include <rvl/types.h>
+// #include "rvl/types.h"
 // #ifdef __cplusplus
 // extern "C" {
 // #endif
diff --git a/include/lib/rvl/OS/OSFatal.h b/include/rvl/OS/OSFatal.h
index cab6136b..7ed7ebf8 100644
--- a/include/lib/rvl/OS/OSFatal.h
+++ b/include/rvl/OS/OSFatal.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_OS_FATAL_H
 #define RVL_SDK_OS_FATAL_H
-#include <rvl/GX/GXTypes.h>
-#include <rvl/types.h>
+#include "rvl/GX/GXTypes.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSFont.h b/include/rvl/OS/OSFont.h
index 9c37ba4b..4b791d79 100644
--- a/include/lib/rvl/OS/OSFont.h
+++ b/include/rvl/OS/OSFont.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_FONT_H
 #define RVL_SDK_OS_FONT_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSHardware.h b/include/rvl/OS/OSHardware.h
index 6927091d..119a7190 100644
--- a/include/lib/rvl/OS/OSHardware.h
+++ b/include/rvl/OS/OSHardware.h
@@ -1,8 +1,8 @@
 #ifndef RVL_SDK_OS_HARDWARE_H
 #define RVL_SDK_OS_HARDWARE_H
-#include <rvl/OS/OSAddress.h>
-#include <rvl/OS/OSThread.h>
-#include <rvl/types.h>
+#include "rvl/OS/OSAddress.h"
+#include "rvl/OS/OSThread.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSInterrupt.h b/include/rvl/OS/OSInterrupt.h
index 69ec528c..dcd852f2 100644
--- a/include/lib/rvl/OS/OSInterrupt.h
+++ b/include/rvl/OS/OSInterrupt.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_INTERRUPT_H
 #define RVL_SDK_OS_INTERRUPT_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSIpc.h b/include/rvl/OS/OSIpc.h
index cfc453f2..24c03871 100644
--- a/include/lib/rvl/OS/OSIpc.h
+++ b/include/rvl/OS/OSIpc.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_IPC_H
 #define RVL_SDK_OS_IPC_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSLink.h b/include/rvl/OS/OSLink.h
index 0c13945e..749574d2 100644
--- a/include/lib/rvl/OS/OSLink.h
+++ b/include/rvl/OS/OSLink.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_LINK_H
 #define RVL_SDK_OS_LINK_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSMemory.h b/include/rvl/OS/OSMemory.h
index f3502b9c..5f8de442 100644
--- a/include/lib/rvl/OS/OSMemory.h
+++ b/include/rvl/OS/OSMemory.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_MEMORY_H
 #define RVL_SDK_OS_MEMORY_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSMessage.h b/include/rvl/OS/OSMessage.h
index 6bf42e8e..ab1e9352 100644
--- a/include/lib/rvl/OS/OSMessage.h
+++ b/include/rvl/OS/OSMessage.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_OS_MESSAGE_H
 #define RVL_SDK_OS_MESSAGE_H
-#include <rvl/OS/OSThread.h>
-#include <rvl/types.h>
+#include "rvl/OS/OSThread.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSMutex.h b/include/rvl/OS/OSMutex.h
index 84c9f77c..7dde7c49 100644
--- a/include/lib/rvl/OS/OSMutex.h
+++ b/include/rvl/OS/OSMutex.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_OS_MUTEX_H
 #define RVL_SDK_OS_MUTEX_H
-#include <rvl/OS/OSThread.h>
-#include <rvl/types.h>
+#include "rvl/OS/OSThread.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSNet.h b/include/rvl/OS/OSNet.h
index 0965b29f..0f248549 100644
--- a/include/lib/rvl/OS/OSNet.h
+++ b/include/rvl/OS/OSNet.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_NET_H
 #define RVL_SDK_OS_NET_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSPlayRecord.h b/include/rvl/OS/OSPlayRecord.h
index 383a9b5a..c1a26623 100644
--- a/include/lib/rvl/OS/OSPlayRecord.h
+++ b/include/rvl/OS/OSPlayRecord.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_PLAY_RECORD_H
 #define RVL_SDK_OS_PLAY_RECORD_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSReset.h b/include/rvl/OS/OSReset.h
index b0829e35..32c9da4b 100644
--- a/include/lib/rvl/OS/OSReset.h
+++ b/include/rvl/OS/OSReset.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_RESET_H
 #define RVL_SDK_OS_RESET_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSRtc.h b/include/rvl/OS/OSRtc.h
index 80ce4326..57b3678b 100644
--- a/include/lib/rvl/OS/OSRtc.h
+++ b/include/rvl/OS/OSRtc.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_RTC_H
 #define RVL_SDK_OS_RTC_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSStateFlags.h b/include/rvl/OS/OSStateFlags.h
index a5117f4b..5d1b28fc 100644
--- a/include/lib/rvl/OS/OSStateFlags.h
+++ b/include/rvl/OS/OSStateFlags.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_STATE_FLAGS_H
 #define RVL_SDK_OS_STATE_FLAGS_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSStateTM.h b/include/rvl/OS/OSStateTM.h
index 7fae68d6..4f6255b2 100644
--- a/include/lib/rvl/OS/OSStateTM.h
+++ b/include/rvl/OS/OSStateTM.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_STATETM_H
 #define RVL_SDK_OS_STATETM_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSSync.h b/include/rvl/OS/OSSync.h
index 369dd9b7..457ceaca 100644
--- a/include/lib/rvl/OS/OSSync.h
+++ b/include/rvl/OS/OSSync.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_SYNC_H
 #define RVL_SDK_OS_SYNC_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSThread.h b/include/rvl/OS/OSThread.h
index 43eade3f..ceeb941b 100644
--- a/include/lib/rvl/OS/OSThread.h
+++ b/include/rvl/OS/OSThread.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_OS_THREAD_H
 #define RVL_SDK_OS_THREAD_H
-#include <rvl/OS/OSContext.h>
-#include <rvl/types.h>
+#include "rvl/OS/OSContext.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSTime.h b/include/rvl/OS/OSTime.h
index a7762bb9..3bd44f85 100644
--- a/include/lib/rvl/OS/OSTime.h
+++ b/include/rvl/OS/OSTime.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_OS_TIME_H
 #define RVL_SDK_OS_TIME_H
-#include <rvl/OS/OSHardware.h>
-#include <rvl/types.h>
+#include "rvl/OS/OSHardware.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/OSUtf.h b/include/rvl/OS/OSUtf.h
index 5564451d..670e56ec 100644
--- a/include/lib/rvl/OS/OSUtf.h
+++ b/include/rvl/OS/OSUtf.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_UTF_H
 #define RVL_SDK_OS_UTF_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/OS/__ppc_eabi_init.h b/include/rvl/OS/__ppc_eabi_init.h
index 71ddd7a7..b09255e8 100644
--- a/include/lib/rvl/OS/__ppc_eabi_init.h
+++ b/include/rvl/OS/__ppc_eabi_init.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_OS_PPC_EABI_INIT_H
 #define RVL_SDK_OS_PPC_EABI_INIT_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/PAD.h b/include/rvl/PAD.h
index 2940df16..bc503e7e 100644
--- a/include/lib/rvl/PAD.h
+++ b/include/rvl/PAD.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/PAD/Pad.h>
+#include "rvl/PAD/Pad.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/PAD/Pad.h b/include/rvl/PAD/Pad.h
index 6163fd04..6811a931 100644
--- a/include/lib/rvl/PAD/Pad.h
+++ b/include/rvl/PAD/Pad.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_PAD_H
 #define RVL_SDK_PAD_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/SC.h b/include/rvl/SC.h
index 244f4f30..a72b29b4 100644
--- a/include/lib/rvl/SC.h
+++ b/include/rvl/SC.h
@@ -4,9 +4,9 @@
 extern "C" {
 #endif
 
-#include <rvl/SC/scapi.h>
-#include <rvl/SC/scapi_prdinfo.h>
-#include <rvl/SC/scsystem.h>
+#include "rvl/SC/scapi.h"
+#include "rvl/SC/scapi_prdinfo.h"
+#include "rvl/SC/scsystem.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/SC/scapi.h b/include/rvl/SC/scapi.h
index 5a50a988..3f60136c 100644
--- a/include/lib/rvl/SC/scapi.h
+++ b/include/rvl/SC/scapi.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_SC_SCAPI_H
 #define RVL_SDK_SC_SCAPI_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/SC/scapi_prdinfo.h b/include/rvl/SC/scapi_prdinfo.h
index 068b298b..f193da71 100644
--- a/include/lib/rvl/SC/scapi_prdinfo.h
+++ b/include/rvl/SC/scapi_prdinfo.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_SC_SCAPI_PRDINFO_H
 #define RVL_SDK_SC_SCAPI_PRDINFO_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/SC/scsystem.h b/include/rvl/SC/scsystem.h
index 43cc19a4..13c95dde 100644
--- a/include/lib/rvl/SC/scsystem.h
+++ b/include/rvl/SC/scsystem.h
@@ -1,9 +1,9 @@
 #ifndef RVL_SDK_SC_SCSYSTEM_H
 #define RVL_SDK_SC_SCSYSTEM_H
-#include <rvl/FS.h>
-#include <rvl/NAND.h>
-#include <rvl/OS.h>
-#include <rvl/types.h>
+#include "rvl/FS.h"
+#include "rvl/NAND.h"
+#include "rvl/OS.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/SI.h b/include/rvl/SI.h
index a1114ba0..91f3c017 100644
--- a/include/lib/rvl/SI.h
+++ b/include/rvl/SI.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/SI/SIBios.h>
+#include "rvl/SI/SIBios.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/SI/SIBios.h b/include/rvl/SI/SIBios.h
index bcf36c2d..863994bc 100644
--- a/include/lib/rvl/SI/SIBios.h
+++ b/include/rvl/SI/SIBios.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_SI_SIBIOS_H
 #define RVL_SDK_SI_SIBIOS_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/TPL.h b/include/rvl/TPL.h
index 6f176cb4..f5d29af4 100644
--- a/include/lib/rvl/TPL.h
+++ b/include/rvl/TPL.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/TPL/TPL.h>
+#include "rvl/TPL/TPL.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/TPL/TPL.h b/include/rvl/TPL/TPL.h
index b5b544bb..9615a3d0 100644
--- a/include/lib/rvl/TPL/TPL.h
+++ b/include/rvl/TPL/TPL.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_TPL_H
 #define RVL_SDK_TPL_H
-#include <rvl/GX.h>
-#include <rvl/types.h>
+#include "rvl/GX.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/USB.h b/include/rvl/USB.h
index 5eeafb87..c10eef2b 100644
--- a/include/lib/rvl/USB.h
+++ b/include/rvl/USB.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/USB/usb.h>
+#include "rvl/USB/usb.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/USB/usb.h b/include/rvl/USB/usb.h
index 73eeff0a..7292aef5 100644
--- a/include/lib/rvl/USB/usb.h
+++ b/include/rvl/USB/usb.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_USB_H
 #define RVL_SDK_USB_H
-#include <rvl/IPC.h>
-#include <rvl/types.h>
+#include "rvl/IPC.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/rvl/VF.h b/include/rvl/VF.h
new file mode 100644
index 00000000..83ce233d
--- /dev/null
+++ b/include/rvl/VF.h
@@ -0,0 +1,18 @@
+#ifndef RVL_SDK_PUBLIC_VF_H
+#define RVL_SDK_PUBLIC_VF_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "rvl/VF/pf.h"
+#include "rvl/VF/pf_clib.h"
+#include "rvl/VF/pf_code.h"
+#include "rvl/VF/pf_service.h"
+#include "rvl/VF/pf_str.h"
+#include "rvl/VF/pf_volume.h"
+#include "rvl/VF/pf_w_clib.h"
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/include/lib/rvl/VF/pf.h b/include/rvl/VF/pf.h
index d21867bc..fefee35d 100644
--- a/include/lib/rvl/VF/pf.h
+++ b/include/rvl/VF/pf.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_VF_PF_H
 #define RVL_SDK_VF_PF_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VF/pf_clib.h b/include/rvl/VF/pf_clib.h
index d84bddb8..bd49c29a 100644
--- a/include/lib/rvl/VF/pf_clib.h
+++ b/include/rvl/VF/pf_clib.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_VF_PF_CLIB_H
 #define RVL_SDK_VF_PF_CLIB_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VF/pf_code.h b/include/rvl/VF/pf_code.h
index 347f2fc9..f11606e6 100644
--- a/include/lib/rvl/VF/pf_code.h
+++ b/include/rvl/VF/pf_code.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_VF_PF_CODE_H
 #define RVL_SDK_VF_PF_CODE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VF/pf_service.h b/include/rvl/VF/pf_service.h
index 635404f4..6dcd6ac9 100644
--- a/include/lib/rvl/VF/pf_service.h
+++ b/include/rvl/VF/pf_service.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_VF_PF_SERVICE_H
 #define RVL_SDK_VF_PF_SERVICE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VF/pf_str.h b/include/rvl/VF/pf_str.h
index 9d72b83b..c92b2194 100644
--- a/include/lib/rvl/VF/pf_str.h
+++ b/include/rvl/VF/pf_str.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_VF_PF_STRING_H
 #define RVL_SDK_VF_PF_STRING_H
-#include <rvl/VF/pf.h>
-#include <rvl/types.h>
+#include "rvl/VF/pf.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VF/pf_volume.h b/include/rvl/VF/pf_volume.h
index 1ed938a6..93c9e944 100644
--- a/include/lib/rvl/VF/pf_volume.h
+++ b/include/rvl/VF/pf_volume.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_VF_PF_VOLUME_H
 #define RVL_SDK_VF_PF_VOLUME_H
-#include <rvl/VF/pf_code.h>
-#include <rvl/types.h>
+#include "rvl/VF/pf_code.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VF/pf_w_clib.h b/include/rvl/VF/pf_w_clib.h
index d6ed54b2..3e1d0ea4 100644
--- a/include/lib/rvl/VF/pf_w_clib.h
+++ b/include/rvl/VF/pf_w_clib.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_VF_PF_W_CLIB_H
 #define RVL_SDK_VF_PF_W_CLIB_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VI.h b/include/rvl/VI.h
index be8f16c5..c9c5b0b6 100644
--- a/include/lib/rvl/VI.h
+++ b/include/rvl/VI.h
@@ -4,9 +4,9 @@
 extern "C" {
 #endif
 
-#include <rvl/VI/vi.h>
-#include <rvl/VI/vi3in1.h>
-#include <rvl/VI/vihardware.h>
+#include "rvl/VI/vi.h"
+#include "rvl/VI/vi3in1.h"
+#include "rvl/VI/vihardware.h"
 
 #ifdef __cplusplus
 }
diff --git a/include/lib/rvl/VI/vi.h b/include/rvl/VI/vi.h
index 87c593ac..b875d2dc 100644
--- a/include/lib/rvl/VI/vi.h
+++ b/include/rvl/VI/vi.h
@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_VI_H
 #define RVL_SDK_VI_H
-#include <rvl/GX.h>
-#include <rvl/types.h>
+#include "rvl/GX.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VI/vi3in1.h b/include/rvl/VI/vi3in1.h
index 20ed63db..348c60ce 100644
--- a/include/lib/rvl/VI/vi3in1.h
+++ b/include/rvl/VI/vi3in1.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_VI_VI3IN1_H
 #define RVL_SDK_VI_VI3IN1_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/VI/vihardware.h b/include/rvl/VI/vihardware.h
index 8843f846..bb132102 100644
--- a/include/lib/rvl/VI/vihardware.h
+++ b/include/rvl/VI/vihardware.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_VI_HARDWARE_H
 #define RVL_SDK_VI_HARDWARE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/lib/rvl/macros.h b/include/rvl/macros.h
index ea564007..ea564007 100644
--- a/include/lib/rvl/macros.h
+++ b/include/rvl/macros.h
diff --git a/include/lib/rvl/types.h b/include/rvl/types.h
index 2b214a51..4e5a45ce 100644
--- a/include/lib/rvl/types.h
+++ b/include/rvl/types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rvl/macros.h>
+#include "rvl/macros.h"
 typedef int BOOL;
 enum { FALSE, TRUE };
 typedef int UNKWORD;
@@ -10,11 +10,11 @@ typedef void UNKTYPE;
 #define TYPES_H
 
 // #ifdef __cplusplus
-// #include <cstdarg>
-// #include <cstddef>
+// #include "cstdarg>
+// #include "cstddef>
 // #else
-// #include <stdarg.h>
-// #include <stddef.h>
+// #include "stdarg.h"
+// #include "stddef.h"
 // #endif
 
 
diff --git a/include/sound_mgrs/sound_audio_manager.h b/include/sound_mgrs/sound_audio_manager.h
index b2f5b49c..571c6fa5 100644
--- a/include/sound_mgrs/sound_audio_manager.h
+++ b/include/sound_mgrs/sound_audio_manager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/audio/eggAudioMgr.h>
+#include "types.h"
+#include "egg/audio/eggAudioMgr.h"
 
 
 // Size: 0x6d0
diff --git a/include/toBeSorted/arc_manager.h b/include/toBeSorted/arc_manager.h
index 63dc2cea..bd1e39b1 100644
--- a/include/toBeSorted/arc_manager.h
+++ b/include/toBeSorted/arc_manager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 // Ghidra: ArcManagerEntry
 //   size: 0x40
diff --git a/include/toBeSorted/bitwise_flag_helper.h b/include/toBeSorted/bitwise_flag_helper.h
index fa917cec..2cad936a 100644
--- a/include/toBeSorted/bitwise_flag_helper.h
+++ b/include/toBeSorted/bitwise_flag_helper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 class BitwiseFlagHelper {
     public:
diff --git a/include/toBeSorted/file_manager.h b/include/toBeSorted/file_manager.h
index 3dec323c..b2e3cbf3 100644
--- a/include/toBeSorted/file_manager.h
+++ b/include/toBeSorted/file_manager.h
@@ -1,4 +1,4 @@
-#include <types.h>
+#include "types.h"
 
 // stub
 struct FileManager {
diff --git a/include/toBeSorted/flag_space.h b/include/toBeSorted/flag_space.h
index 12ea3603..a5f45ecc 100644
--- a/include/toBeSorted/flag_space.h
+++ b/include/toBeSorted/flag_space.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 struct BaseFlagSpace {
     u16 *mpFlags;
diff --git a/include/toBeSorted/room_manager.h b/include/toBeSorted/room_manager.h
index 15c7a2ff..3b3ba024 100644
--- a/include/toBeSorted/room_manager.h
+++ b/include/toBeSorted/room_manager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <d/d_base.h>
+#include "types.h"
+#include "d/d_base.h"
 
 #define MAX_ROOM_NUMBER 64
 
diff --git a/include/toBeSorted/save_file.h b/include/toBeSorted/save_file.h
index 991b6be7..c9da8bcb 100644
--- a/include/toBeSorted/save_file.h
+++ b/include/toBeSorted/save_file.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <UnknownTypeBelongings.h>
+#include "types.h"
+#include "UnknownTypeBelongings.h"
 
 
 // Ghidra: SaveFile
diff --git a/include/types.h b/include/types.h
index a215e494..d3f48c9a 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "lib/rvl/macros.h"
+#include "rvl/macros.h"
 
 #ifndef TYPES_H
 #define TYPES_H
diff --git a/src/d/a/d_a_base.cpp b/src/d/a/d_a_base.cpp
index 8cc26cd4..61dbfefd 100644
--- a/src/d/a/d_a_base.cpp
+++ b/src/d/a/d_a_base.cpp
@@ -1,4 +1,4 @@
-#include <d/a/d_a_base.h>
+#include "d/a/d_a_base.h"
 
 // RoomManager* RoomManager::m_Instance;
 
diff --git a/src/d/a/obj/d_a_obj_base.cpp b/src/d/a/obj/d_a_obj_base.cpp
index 9f418b3b..ac66e142 100644
--- a/src/d/a/obj/d_a_obj_base.cpp
+++ b/src/d/a/obj/d_a_obj_base.cpp
@@ -1 +1 @@
-#include <d/a/obj/d_a_obj_base.h>
+#include "d/a/obj/d_a_obj_base.h"
diff --git a/src/d/d_base.cpp b/src/d/d_base.cpp
index 6532708b..0ae747e4 100644
--- a/src/d/d_base.cpp
+++ b/src/d/d_base.cpp
@@ -1,4 +1,4 @@
-#include <d/d_base.h>
+#include "d/d_base.h"
 
 // .sbss
 /* 805750c0 */ u32 dBase_c::s_ExecuteControlFlags;
diff --git a/src/lib/egg/core/eggController.cpp b/src/egg/core/eggController.cpp
index a936f1fa..645eca40 100644
--- a/src/lib/egg/core/eggController.cpp
+++ b/src/egg/core/eggController.cpp
@@ -1,4 +1,4 @@
-#include <egg/core/eggController.h>
+#include "egg/core/eggController.h"
 
 
 namespace EGG
diff --git a/src/lib/egg/core/eggDisplay.cpp b/src/egg/core/eggDisplay.cpp
index e31ae8da..16031605 100644
--- a/src/lib/egg/core/eggDisplay.cpp
+++ b/src/egg/core/eggDisplay.cpp
@@ -1,8 +1,8 @@
-#include <egg/core/eggDisplay.h>
-#include <nw4r/db/db_directPrint.h>
-#include <egg/core/eggXfbManager.h>
-#include <rvl/GX.h>
-#include <rvl/OS/OSHardware.h>
+#include "egg/core/eggDisplay.h"
+#include "nw4r/db/db_directPrint.h"
+#include "egg/core/eggXfbManager.h"
+#include "rvl/GX.h"
+#include "rvl/OS/OSHardware.h"
 
 extern "C" {
     void PreRetraceCallback(u32 retraceCount) {
diff --git a/src/f/f_base.cpp b/src/f/f_base.cpp
index 47ef17d3..ae5ec7e7 100644
--- a/src/f/f_base.cpp
+++ b/src/f/f_base.cpp
@@ -1,4 +1,4 @@
-#include <f/f_base.h>
+#include "f/f_base.h"
 
 /*
 .text File Range:
diff --git a/src/toBeSorted/bitwise_flag_helper.cpp b/src/toBeSorted/bitwise_flag_helper.cpp
index 1cd8d979..d4e42131 100644
--- a/src/toBeSorted/bitwise_flag_helper.cpp
+++ b/src/toBeSorted/bitwise_flag_helper.cpp
@@ -1,5 +1,5 @@
-#include <types.h>
-#include <toBeSorted/bitwise_flag_helper.h>
+#include "types.h"
+#include "toBeSorted/bitwise_flag_helper.h"
 
 bool BitwiseFlagHelper::checkFlag(u16 slot, u16 shift, const u16 *pData, u16 flagCount) {
     return (pData[slot] >> shift) & 1;
diff --git a/src/toBeSorted/flag_space.cpp b/src/toBeSorted/flag_space.cpp
index 8ec2810e..11f43709 100644
--- a/src/toBeSorted/flag_space.cpp
+++ b/src/toBeSorted/flag_space.cpp
@@ -1,7 +1,7 @@
-#include <libc.h>
-#include <types.h>
-#include <toBeSorted/file_manager.h>
-#include <toBeSorted/flag_space.h>
+#include "libc.h"
+#include "types.h"
+#include "toBeSorted/file_manager.h"
+#include "toBeSorted/flag_space.h"
 
 u16* FlagSpace::getFlagPtrChecked() {
     filemanagerCheck();
diff --git a/src/toBeSorted/room_manager.cpp b/src/toBeSorted/room_manager.cpp
index 1adf5c3a..fe904bf2 100644
--- a/src/toBeSorted/room_manager.cpp
+++ b/src/toBeSorted/room_manager.cpp
@@ -1,3 +1,3 @@
-#include <toBeSorted/room_manager.h>
+#include "toBeSorted/room_manager.h"
 
 RoomManager* RoomManager::m_Instance;
\ No newline at end of file
diff --git a/src/toBeSorted/save_file.cpp b/src/toBeSorted/save_file.cpp
index 8cdc6fe5..c876ccd5 100644
--- a/src/toBeSorted/save_file.cpp
+++ b/src/toBeSorted/save_file.cpp
@@ -1,5 +1,5 @@
-#include <toBeSorted/save_file.h>
-#include <MSL_C/string.h>
+#include "toBeSorted/save_file.h"
+#include "MSL_C/string.h"
 
 // 0x800099b0   getStoryFlags0__8SaveFileFv
 u16* SaveFile::getStoryFlags0() { 
diff --git a/src/toBeSorted/sceneflag_manager.cpp b/src/toBeSorted/sceneflag_manager.cpp
index bf4dff92..eeab1156 100644
--- a/src/toBeSorted/sceneflag_manager.cpp
+++ b/src/toBeSorted/sceneflag_manager.cpp
@@ -1,10 +1,10 @@
-#include <types.h>
-#include <libc.h>
+#include "types.h"
+#include "libc.h"
 
-#include <rvl/macros.h>
-#include <toBeSorted/flag_space.h>
-#include <toBeSorted/file_manager.h>
-#include <toBeSorted/bitwise_flag_helper.h>
+#include "rvl/macros.h"
+#include "toBeSorted/flag_space.h"
+#include "toBeSorted/file_manager.h"
+#include "toBeSorted/bitwise_flag_helper.h"
 
 class SceneflagManager {
     public:
diff --git a/src/toBeSorted/unk_flag_stuff.cpp b/src/toBeSorted/unk_flag_stuff.cpp
index e755a7a5..f5a3f1af 100644
--- a/src/toBeSorted/unk_flag_stuff.cpp
+++ b/src/toBeSorted/unk_flag_stuff.cpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <toBeSorted/unk_flag_stuff.h>
+#include "toBeSorted/unk_flag_stuff.h"
 
 u16 UnkFlagStuff::calculateMask(s32 shift) {
     return (2 << (shift & 0xF)) - 1;