WIP Compilation

104 files changed, 167 insertions, 169 deletions

diff --git a/courses/all_course_data.h b/courses/all_course_data.h
index bde518b5a..a3123a9a2 100644
--- a/courses/all_course_data.h
+++ b/courses/all_course_data.h
@@ -21,5 +21,6 @@
 #include "courses/royal_raceway/course_data.h"
 #include "courses/sherbet_land/course_data.h"
 #include "courses/wario_stadium/course_data.h"
+void gSPDisplayList(Gfx* pkt, Gfx* dl);
 
 #endif // ALL_COURSE_DATA_H
diff --git a/courses/banshee_boardwalk/course_data.c b/courses/banshee_boardwalk/course_data.c
index 69de3a934..642e905fd 100644
--- a/courses/banshee_boardwalk/course_data.c
+++ b/courses/banshee_boardwalk/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/banshee_boardwalk/course_data.h b/courses/banshee_boardwalk/course_data.h
index 40b4c42c6..a1f2e81fc 100644
--- a/courses/banshee_boardwalk/course_data.h
+++ b/courses/banshee_boardwalk/course_data.h
@@ -1,8 +1,8 @@
 #ifndef BANSHEE_BOARDWALK_COURSE_DATA_H
 #define BANSHEE_BOARDWALK_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/banshee_boardwalk/course_displaylists.inc.c b/courses/banshee_boardwalk/course_displaylists.inc.c
index 381f746f0..f7a5e9e54 100644
--- a/courses/banshee_boardwalk/course_displaylists.inc.c
+++ b/courses/banshee_boardwalk/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/banshee_boardwalk/course_displaylists.inc.h b/courses/banshee_boardwalk/course_displaylists.inc.h
index cd3ee45bc..5e9788400 100644
--- a/courses/banshee_boardwalk/course_displaylists.inc.h
+++ b/courses/banshee_boardwalk/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_banshee_boardwalk_packed_dl_0[];
diff --git a/courses/banshee_boardwalk/course_offsets.c b/courses/banshee_boardwalk/course_offsets.c
index 379e3f5fd..b8bde6aac 100644
--- a/courses/banshee_boardwalk/course_offsets.c
+++ b/courses/banshee_boardwalk/course_offsets.c
@@ -1,8 +1,8 @@
-#include <PR/ultratypes.h>
-#include "PR/gbi.h"
+#include <libultra/types.h>
+#include <libultra/gbi.h>
 #include "course_offsets.h"
 #include "courses/banshee_boardwalk/course_data.h"
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 
 extern u8 gTexture6447C4[];
 extern u8 gTexture676FB0[];
diff --git a/courses/big_donut/course_data.c b/courses/big_donut/course_data.c
index 4909ad5b8..1cdc9efd6 100644
--- a/courses/big_donut/course_data.c
+++ b/courses/big_donut/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/big_donut/course_data.h b/courses/big_donut/course_data.h
index bb4cf7d1f..8d1d72fa0 100644
--- a/courses/big_donut/course_data.h
+++ b/courses/big_donut/course_data.h
@@ -1,8 +1,8 @@
 #ifndef BIG_DONUT_COURSE_DATA_H
 #define BIG_DONUT_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 
 extern Gfx d_course_big_donut_dl[];
diff --git a/courses/big_donut/course_displaylists.inc.c b/courses/big_donut/course_displaylists.inc.c
index e181fa080..83d4238ac 100644
--- a/courses/big_donut/course_displaylists.inc.c
+++ b/courses/big_donut/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/big_donut/course_displaylists.inc.h b/courses/big_donut/course_displaylists.inc.h
index 4f60fae50..8fad99ddc 100644
--- a/courses/big_donut/course_displaylists.inc.h
+++ b/courses/big_donut/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_big_donut_packed_dl_0[];
diff --git a/courses/big_donut/course_offsets.c b/courses/big_donut/course_offsets.c
index af03e98cf..a432a1135 100644
--- a/courses/big_donut/course_offsets.c
+++ b/courses/big_donut/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTexture66ABA4[];
diff --git a/courses/block_fort/course_data.c b/courses/block_fort/course_data.c
index de1cda9bd..2719de11f 100644
--- a/courses/block_fort/course_data.c
+++ b/courses/block_fort/course_data.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/block_fort/course_data.h b/courses/block_fort/course_data.h
index 1cffbbdb8..aca2904f2 100644
--- a/courses/block_fort/course_data.h
+++ b/courses/block_fort/course_data.h
@@ -1,8 +1,8 @@
 #ifndef BLOCK_FORT_COURSE_DATA_H
 #define BLOCK_FORT_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 
 extern Gfx d_course_block_fort_dl[];
diff --git a/courses/block_fort/course_displaylists.inc.c b/courses/block_fort/course_displaylists.inc.c
index 762604b3d..943cc7682 100644
--- a/courses/block_fort/course_displaylists.inc.c
+++ b/courses/block_fort/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/block_fort/course_displaylists.inc.h b/courses/block_fort/course_displaylists.inc.h
index 9545e5444..299dfd774 100644
--- a/courses/block_fort/course_displaylists.inc.h
+++ b/courses/block_fort/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_block_fort_packed_dl_0[];
diff --git a/courses/block_fort/course_offsets.c b/courses/block_fort/course_offsets.c
index 0e03e0bf6..7bf6ed3fb 100644
--- a/courses/block_fort/course_offsets.c
+++ b/courses/block_fort/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTexture64286C[];
diff --git a/courses/bowsers_castle/course_data.c b/courses/bowsers_castle/course_data.c
index 55360bb7f..54a32f6c0 100644
--- a/courses/bowsers_castle/course_data.c
+++ b/courses/bowsers_castle/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/bowsers_castle/course_data.h b/courses/bowsers_castle/course_data.h
index aadfe865f..a505ffe57 100644
--- a/courses/bowsers_castle/course_data.h
+++ b/courses/bowsers_castle/course_data.h
@@ -1,8 +1,8 @@
 #ifndef BOWSERS_CASTLE_COURSE_DATA_H
 #define BOWSERS_CASTLE_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/bowsers_castle/course_displaylists.inc.c b/courses/bowsers_castle/course_displaylists.inc.c
index 7162aedff..fd11e5991 100644
--- a/courses/bowsers_castle/course_displaylists.inc.c
+++ b/courses/bowsers_castle/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/bowsers_castle/course_displaylists.inc.h b/courses/bowsers_castle/course_displaylists.inc.h
index ca15d5f90..2531513f0 100644
--- a/courses/bowsers_castle/course_displaylists.inc.h
+++ b/courses/bowsers_castle/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_bowsers_castle_packed_dl_0[];
diff --git a/courses/bowsers_castle/course_offsets.c b/courses/bowsers_castle/course_offsets.c
index 976b884fb..4cf5d1f5a 100644
--- a/courses/bowsers_castle/course_offsets.c
+++ b/courses/bowsers_castle/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/choco_mountain/course_data.c b/courses/choco_mountain/course_data.c
index 72e927c6e..938240c3d 100644
--- a/courses/choco_mountain/course_data.c
+++ b/courses/choco_mountain/course_data.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/choco_mountain/course_data.h b/courses/choco_mountain/course_data.h
index 7584ada96..38d356707 100644
--- a/courses/choco_mountain/course_data.h
+++ b/courses/choco_mountain/course_data.h
@@ -1,8 +1,8 @@
 #ifndef CHOCO_MOUNTAIN_COURSE_DATA_H
 #define CHOCO_MOUNTAIN_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/choco_mountain/course_displaylists.inc.c b/courses/choco_mountain/course_displaylists.inc.c
index acf65bcdb..7e5f18dc7 100644
--- a/courses/choco_mountain/course_displaylists.inc.c
+++ b/courses/choco_mountain/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/choco_mountain/course_displaylists.inc.h b/courses/choco_mountain/course_displaylists.inc.h
index b68ce15a8..06f0ab4c9 100644
--- a/courses/choco_mountain/course_displaylists.inc.h
+++ b/courses/choco_mountain/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_choco_mountain_packed_dl_0[];
diff --git a/courses/choco_mountain/course_offsets.c b/courses/choco_mountain/course_offsets.c
index 6ccb45107..1d7739989 100644
--- a/courses/choco_mountain/course_offsets.c
+++ b/courses/choco_mountain/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/courseTable.c b/courses/courseTable.c
index 00ee6ff72..750d18b7f 100644
--- a/courses/courseTable.c
+++ b/courses/courseTable.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 #include "courseTable.h"
 #include "all_course_model.h"
@@ -145,4 +145,3 @@ struct CourseTable gCourseTable[] = {{
         d_course_big_donut_packed, d_course_big_donut_packed_end,
         big_donut_textures, 0, 0x0000,
 }};
-
diff --git a/courses/courseTable.h b/courses/courseTable.h
index 2ab5f3ae1..9374f99f7 100644
--- a/courses/courseTable.h
+++ b/courses/courseTable.h
@@ -1,7 +1,7 @@
 #ifndef COURSE_TABLE_H
 #define COURSE_TABLE_H
 
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 
 // dlRomStart, vertexRomStart, & vertexStart, are u8* because mio0 compressed.
diff --git a/courses/dks_jungle_parkway/course_data.c b/courses/dks_jungle_parkway/course_data.c
index c1398f59e..a46d0d007 100644
--- a/courses/dks_jungle_parkway/course_data.c
+++ b/courses/dks_jungle_parkway/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/dks_jungle_parkway/course_data.h b/courses/dks_jungle_parkway/course_data.h
index 4513fcfb2..227cdbc3b 100644
--- a/courses/dks_jungle_parkway/course_data.h
+++ b/courses/dks_jungle_parkway/course_data.h
@@ -1,8 +1,8 @@
 #ifndef DKS_JUNGLE_PARKWAY_COURSE_DATA_H
 #define DKS_JUNGLE_PARKWAY_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/dks_jungle_parkway/course_displaylists.inc.c b/courses/dks_jungle_parkway/course_displaylists.inc.c
index 2b789d787..c9f1454a4 100644
--- a/courses/dks_jungle_parkway/course_displaylists.inc.c
+++ b/courses/dks_jungle_parkway/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/dks_jungle_parkway/course_displaylists.inc.h b/courses/dks_jungle_parkway/course_displaylists.inc.h
index 4b71d0414..3c950e422 100644
--- a/courses/dks_jungle_parkway/course_displaylists.inc.h
+++ b/courses/dks_jungle_parkway/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_dks_jungle_parkway_packed_dl_0[];
diff --git a/courses/dks_jungle_parkway/course_offsets.c b/courses/dks_jungle_parkway/course_offsets.c
index 3a87a03ff..8ef67c2b2 100644
--- a/courses/dks_jungle_parkway/course_offsets.c
+++ b/courses/dks_jungle_parkway/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTexture648508[];
diff --git a/courses/double_deck/course_data.c b/courses/double_deck/course_data.c
index 6a3b3294a..305d8ed2f 100644
--- a/courses/double_deck/course_data.c
+++ b/courses/double_deck/course_data.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/double_deck/course_data.h b/courses/double_deck/course_data.h
index 1c3367af9..2ab381275 100644
--- a/courses/double_deck/course_data.h
+++ b/courses/double_deck/course_data.h
@@ -1,8 +1,8 @@
 #ifndef DOUBLE_DECK_COURSE_DATA_H
 #define DOUBLE_DECK_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 
 extern Gfx d_course_double_deck_dl[];
diff --git a/courses/double_deck/course_displaylists.inc.c b/courses/double_deck/course_displaylists.inc.c
index a82236ba8..5a2d537e7 100644
--- a/courses/double_deck/course_displaylists.inc.c
+++ b/courses/double_deck/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/double_deck/course_displaylists.inc.h b/courses/double_deck/course_displaylists.inc.h
index 1e1ef481e..d6e7b6a68 100644
--- a/courses/double_deck/course_displaylists.inc.h
+++ b/courses/double_deck/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_double_deck_packed_dl_0[];
diff --git a/courses/double_deck/course_offsets.c b/courses/double_deck/course_offsets.c
index b2b826802..a6c4c5cbd 100644
--- a/courses/double_deck/course_offsets.c
+++ b/courses/double_deck/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTextureGrayCobblestone[];
diff --git a/courses/frappe_snowland/course_data.c b/courses/frappe_snowland/course_data.c
index 6e976ea92..b0a3a3a1d 100644
--- a/courses/frappe_snowland/course_data.c
+++ b/courses/frappe_snowland/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/frappe_snowland/course_data.h b/courses/frappe_snowland/course_data.h
index 0b84bc3a2..2cd4973f6 100644
--- a/courses/frappe_snowland/course_data.h
+++ b/courses/frappe_snowland/course_data.h
@@ -1,8 +1,8 @@
 #ifndef FRAPPE_SNOWLAND_COURSE_DATA_H
 #define FRAPPE_SNOWLAND_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/frappe_snowland/course_displaylists.inc.c b/courses/frappe_snowland/course_displaylists.inc.c
index 2f8c18f2e..db2643905 100644
--- a/courses/frappe_snowland/course_displaylists.inc.c
+++ b/courses/frappe_snowland/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/frappe_snowland/course_displaylists.inc.h b/courses/frappe_snowland/course_displaylists.inc.h
index 48869a152..1e43de783 100644
--- a/courses/frappe_snowland/course_displaylists.inc.h
+++ b/courses/frappe_snowland/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_frappe_snowland_packed_dl_0[];
diff --git a/courses/frappe_snowland/course_offsets.c b/courses/frappe_snowland/course_offsets.c
index d95faed23..354a26698 100644
--- a/courses/frappe_snowland/course_offsets.c
+++ b/courses/frappe_snowland/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTexture6684F8[];
diff --git a/courses/kalimari_desert/course_data.c b/courses/kalimari_desert/course_data.c
index ed591a654..d1612f608 100644
--- a/courses/kalimari_desert/course_data.c
+++ b/courses/kalimari_desert/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/kalimari_desert/course_data.h b/courses/kalimari_desert/course_data.h
index adf7e6936..6203fc4c6 100644
--- a/courses/kalimari_desert/course_data.h
+++ b/courses/kalimari_desert/course_data.h
@@ -1,8 +1,8 @@
 #ifndef KALIMARI_DESERT_COURSE_DATA_H
 #define KALIMARI_DESERT_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/kalimari_desert/course_displaylists.inc.c b/courses/kalimari_desert/course_displaylists.inc.c
index c7d76edc4..0fb406d5a 100644
--- a/courses/kalimari_desert/course_displaylists.inc.c
+++ b/courses/kalimari_desert/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/kalimari_desert/course_displaylists.inc.h b/courses/kalimari_desert/course_displaylists.inc.h
index 38f838f82..13980e073 100644
--- a/courses/kalimari_desert/course_displaylists.inc.h
+++ b/courses/kalimari_desert/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_kalimari_desert_packed_dl_0[];
diff --git a/courses/kalimari_desert/course_offsets.c b/courses/kalimari_desert/course_offsets.c
index feff3a8a0..c3394003f 100644
--- a/courses/kalimari_desert/course_offsets.c
+++ b/courses/kalimari_desert/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/koopa_troopa_beach/course_data.c b/courses/koopa_troopa_beach/course_data.c
index 880364eef..34b98dc57 100644
--- a/courses/koopa_troopa_beach/course_data.c
+++ b/courses/koopa_troopa_beach/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/koopa_troopa_beach/course_data.h b/courses/koopa_troopa_beach/course_data.h
index 0ba1be885..e6e41c3e6 100644
--- a/courses/koopa_troopa_beach/course_data.h
+++ b/courses/koopa_troopa_beach/course_data.h
@@ -1,8 +1,8 @@
 #ifndef KOOPA_TROOPA_BEACH_COURSE_DATA_H
 #define KOOPA_TROOPA_BEACH_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/koopa_troopa_beach/course_displaylists.inc.c b/courses/koopa_troopa_beach/course_displaylists.inc.c
index 27ad79b3f..498dfd2cc 100644
--- a/courses/koopa_troopa_beach/course_displaylists.inc.c
+++ b/courses/koopa_troopa_beach/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/koopa_troopa_beach/course_displaylists.inc.h b/courses/koopa_troopa_beach/course_displaylists.inc.h
index 76370a713..ba9fc9d2e 100644
--- a/courses/koopa_troopa_beach/course_displaylists.inc.h
+++ b/courses/koopa_troopa_beach/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_koopa_troopa_beach_packed_dl_0[];
diff --git a/courses/koopa_troopa_beach/course_offsets.c b/courses/koopa_troopa_beach/course_offsets.c
index 8d050bf13..a3dcd5089 100644
--- a/courses/koopa_troopa_beach/course_offsets.c
+++ b/courses/koopa_troopa_beach/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTexture643B3C[];
diff --git a/courses/luigi_raceway/course_data.c b/courses/luigi_raceway/course_data.c
index a496c7848..55e9c7b0f 100644
--- a/courses/luigi_raceway/course_data.c
+++ b/courses/luigi_raceway/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/luigi_raceway/course_data.h b/courses/luigi_raceway/course_data.h
index 1b0694238..509783277 100644
--- a/courses/luigi_raceway/course_data.h
+++ b/courses/luigi_raceway/course_data.h
@@ -1,8 +1,8 @@
 #ifndef LUIGI_RACEWAY_COURSE_DATA_H
 #define LUIGI_RACEWAY_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/luigi_raceway/course_displaylists.inc.c b/courses/luigi_raceway/course_displaylists.inc.c
index e61eae27f..ff9c78fc4 100644
--- a/courses/luigi_raceway/course_displaylists.inc.c
+++ b/courses/luigi_raceway/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/luigi_raceway/course_displaylists.inc.h b/courses/luigi_raceway/course_displaylists.inc.h
index 1ce19662d..1c92f63bc 100644
--- a/courses/luigi_raceway/course_displaylists.inc.h
+++ b/courses/luigi_raceway/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_luigi_raceway_packed_dl_0[];
diff --git a/courses/luigi_raceway/course_offsets.c b/courses/luigi_raceway/course_offsets.c
index 1cd496738..4bce40a2f 100644
--- a/courses/luigi_raceway/course_offsets.c
+++ b/courses/luigi_raceway/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/mario_raceway/course_data.c b/courses/mario_raceway/course_data.c
index 1e4901a6e..20de40b05 100644
--- a/courses/mario_raceway/course_data.c
+++ b/courses/mario_raceway/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 #include <waypoints.h>
diff --git a/courses/mario_raceway/course_data.h b/courses/mario_raceway/course_data.h
index bdc5a137d..d3a42aaa3 100644
--- a/courses/mario_raceway/course_data.h
+++ b/courses/mario_raceway/course_data.h
@@ -1,8 +1,8 @@
 #ifndef MARIO_RACEWAY_COURSE_DATA_H
 #define MARIO_RACEWAY_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/mario_raceway/course_displaylists.inc.c b/courses/mario_raceway/course_displaylists.inc.c
index 750285deb..047e35f60 100644
--- a/courses/mario_raceway/course_displaylists.inc.c
+++ b/courses/mario_raceway/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/mario_raceway/course_displaylists.inc.h b/courses/mario_raceway/course_displaylists.inc.h
index 3fa1b518f..6e06467ac 100644
--- a/courses/mario_raceway/course_displaylists.inc.h
+++ b/courses/mario_raceway/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_mario_raceway_packed_dl_0[];
diff --git a/courses/mario_raceway/course_offsets.c b/courses/mario_raceway/course_offsets.c
index 6d299ed32..9f8bc63d4 100644
--- a/courses/mario_raceway/course_offsets.c
+++ b/courses/mario_raceway/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/moo_moo_farm/course_data.c b/courses/moo_moo_farm/course_data.c
index 74936e9c5..1609f819e 100644
--- a/courses/moo_moo_farm/course_data.c
+++ b/courses/moo_moo_farm/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/moo_moo_farm/course_data.h b/courses/moo_moo_farm/course_data.h
index 8ff50ec2d..dfd23d467 100644
--- a/courses/moo_moo_farm/course_data.h
+++ b/courses/moo_moo_farm/course_data.h
@@ -1,8 +1,8 @@
 #ifndef MOO_MOO_FARM_COURSE_DATA_H
 #define MOO_MOO_FARM_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/moo_moo_farm/course_displaylists.inc.c b/courses/moo_moo_farm/course_displaylists.inc.c
index c4ae8da5d..039e9d511 100644
--- a/courses/moo_moo_farm/course_displaylists.inc.c
+++ b/courses/moo_moo_farm/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/moo_moo_farm/course_displaylists.inc.h b/courses/moo_moo_farm/course_displaylists.inc.h
index c59836400..6303285a3 100644
--- a/courses/moo_moo_farm/course_displaylists.inc.h
+++ b/courses/moo_moo_farm/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_moo_moo_farm_packed_dl_0[];
diff --git a/courses/moo_moo_farm/course_offsets.c b/courses/moo_moo_farm/course_offsets.c
index c3a1f8003..cab43fad2 100644
--- a/courses/moo_moo_farm/course_offsets.c
+++ b/courses/moo_moo_farm/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/rainbow_road/course_data.c b/courses/rainbow_road/course_data.c
index b19967c07..5e9b7c18e 100644
--- a/courses/rainbow_road/course_data.c
+++ b/courses/rainbow_road/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/rainbow_road/course_data.h b/courses/rainbow_road/course_data.h
index 4dc0a8ba5..b85f64948 100644
--- a/courses/rainbow_road/course_data.h
+++ b/courses/rainbow_road/course_data.h
@@ -1,8 +1,8 @@
 #ifndef RAINBOW_ROAD_COURSE_DATA_H
 #define RAINBOW_ROAD_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/rainbow_road/course_displaylists.inc.c b/courses/rainbow_road/course_displaylists.inc.c
index 4ffe95176..c211825c8 100644
--- a/courses/rainbow_road/course_displaylists.inc.c
+++ b/courses/rainbow_road/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/rainbow_road/course_displaylists.inc.h b/courses/rainbow_road/course_displaylists.inc.h
index e6dd89628..1ba5cc699 100644
--- a/courses/rainbow_road/course_displaylists.inc.h
+++ b/courses/rainbow_road/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_rainbow_road_packed_dl_0[];
diff --git a/courses/rainbow_road/course_offsets.c b/courses/rainbow_road/course_offsets.c
index 4bc5cb5d7..f94da6db5 100644
--- a/courses/rainbow_road/course_offsets.c
+++ b/courses/rainbow_road/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTextureStarOutline[];
diff --git a/courses/royal_raceway/course_data.c b/courses/royal_raceway/course_data.c
index 4e7e1a7b8..05a181b41 100644
--- a/courses/royal_raceway/course_data.c
+++ b/courses/royal_raceway/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/royal_raceway/course_data.h b/courses/royal_raceway/course_data.h
index 3f7325424..2ceb1380f 100644
--- a/courses/royal_raceway/course_data.h
+++ b/courses/royal_raceway/course_data.h
@@ -1,8 +1,8 @@
 #ifndef ROYAL_RACEWAY_COURSE_DATA_H
 #define ROYAL_RACEWAY_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/royal_raceway/course_displaylists.inc.c b/courses/royal_raceway/course_displaylists.inc.c
index a51c7ca58..539058ef8 100644
--- a/courses/royal_raceway/course_displaylists.inc.c
+++ b/courses/royal_raceway/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/royal_raceway/course_displaylists.inc.h b/courses/royal_raceway/course_displaylists.inc.h
index be7faeecd..9e40e2f28 100644
--- a/courses/royal_raceway/course_displaylists.inc.h
+++ b/courses/royal_raceway/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_royal_raceway_packed_dl_0[];
diff --git a/courses/royal_raceway/course_offsets.c b/courses/royal_raceway/course_offsets.c
index 8b74e33be..d4c8e11bc 100644
--- a/courses/royal_raceway/course_offsets.c
+++ b/courses/royal_raceway/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/sherbet_land/course_data.c b/courses/sherbet_land/course_data.c
index 4eb7376ee..45e61b3ba 100644
--- a/courses/sherbet_land/course_data.c
+++ b/courses/sherbet_land/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/sherbet_land/course_data.h b/courses/sherbet_land/course_data.h
index 7479a228a..6c1c6d9dc 100644
--- a/courses/sherbet_land/course_data.h
+++ b/courses/sherbet_land/course_data.h
@@ -1,8 +1,8 @@
 #ifndef SHERBET_LAND_COURSE_DATA_H
 #define SHERBET_LAND_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/sherbet_land/course_displaylists.inc.c b/courses/sherbet_land/course_displaylists.inc.c
index 6e7416e68..9ff78fd10 100644
--- a/courses/sherbet_land/course_displaylists.inc.c
+++ b/courses/sherbet_land/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/sherbet_land/course_displaylists.inc.h b/courses/sherbet_land/course_displaylists.inc.h
index c8de586c8..3c23d3f40 100644
--- a/courses/sherbet_land/course_displaylists.inc.h
+++ b/courses/sherbet_land/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_sherbet_land_packed_dl_0[];
diff --git a/courses/sherbet_land/course_offsets.c b/courses/sherbet_land/course_offsets.c
index a55981bdf..28c4ccc06 100644
--- a/courses/sherbet_land/course_offsets.c
+++ b/courses/sherbet_land/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/skyscraper/course_data.c b/courses/skyscraper/course_data.c
index 03c5e996e..b080efdc0 100644
--- a/courses/skyscraper/course_data.c
+++ b/courses/skyscraper/course_data.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/skyscraper/course_data.h b/courses/skyscraper/course_data.h
index 67570c375..e9f1b7a65 100644
--- a/courses/skyscraper/course_data.h
+++ b/courses/skyscraper/course_data.h
@@ -1,8 +1,8 @@
 #ifndef SKYSCRAPER_COURSE_DATA_H
 #define SKYSCRAPER_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 
 extern Gfx d_course_skyscraper_dl[];
diff --git a/courses/skyscraper/course_displaylists.inc.c b/courses/skyscraper/course_displaylists.inc.c
index 0294b58f2..9c0efa370 100644
--- a/courses/skyscraper/course_displaylists.inc.c
+++ b/courses/skyscraper/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/skyscraper/course_displaylists.inc.h b/courses/skyscraper/course_displaylists.inc.h
index 276d7fb37..921875183 100644
--- a/courses/skyscraper/course_displaylists.inc.h
+++ b/courses/skyscraper/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_skyscraper_packed_dl_0[];
diff --git a/courses/skyscraper/course_offsets.c b/courses/skyscraper/course_offsets.c
index a88d8a169..201cdcf46 100644
--- a/courses/skyscraper/course_offsets.c
+++ b/courses/skyscraper/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTexture6457D8[];
diff --git a/courses/staff_ghost_data.c b/courses/staff_ghost_data.c
index 87d5967d6..9483089ba 100644
--- a/courses/staff_ghost_data.c
+++ b/courses/staff_ghost_data.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 #include "common_structs.h"
 
@@ -25,4 +25,3 @@ s32 D_0F4FCAD0[] = {
     0xc8c80000, 0x00007b39, 0x6f6f6f6f, 0x6f6f6f6f,
     0x3f7b0000, 0x0000c8c8, 0xc8c8c8c8, 0xc8000000
 };
-
diff --git a/courses/toads_turnpike/course_data.c b/courses/toads_turnpike/course_data.c
index 709ddf1ac..e068d78b3 100644
--- a/courses/toads_turnpike/course_data.c
+++ b/courses/toads_turnpike/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
@@ -8432,4 +8432,3 @@ TrackSections d_course_toads_turnpike_addr[] = {
     { d_course_toads_turnpike_packed_dl_51C8, 255, 255, 0x0000 },
     { 0x00000000, 0, 0, 0x0000 },
 };
-
diff --git a/courses/toads_turnpike/course_data.h b/courses/toads_turnpike/course_data.h
index 3abb384ed..c1628ae5c 100644
--- a/courses/toads_turnpike/course_data.h
+++ b/courses/toads_turnpike/course_data.h
@@ -1,8 +1,8 @@
 #ifndef TOADS_TURNPIKE_COURSE_DATA_H
 #define TOADS_TURNPIKE_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/toads_turnpike/course_displaylists.inc.c b/courses/toads_turnpike/course_displaylists.inc.c
index 9c6705620..541d49f8c 100644
--- a/courses/toads_turnpike/course_displaylists.inc.c
+++ b/courses/toads_turnpike/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <course.h>
 
 #include "course_displaylists.inc.h"
diff --git a/courses/toads_turnpike/course_displaylists.inc.h b/courses/toads_turnpike/course_displaylists.inc.h
index a92b11c0d..54b02dff9 100644
--- a/courses/toads_turnpike/course_displaylists.inc.h
+++ b/courses/toads_turnpike/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_toads_turnpike_packed_dl_0[];
diff --git a/courses/toads_turnpike/course_offsets.c b/courses/toads_turnpike/course_offsets.c
index 4a2066ed4..42af983b5 100644
--- a/courses/toads_turnpike/course_offsets.c
+++ b/courses/toads_turnpike/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include <PR/mbi.h>
 #include <assets/common_data.h>
 #include "course_offsets.h"
diff --git a/courses/wario_stadium/course_data.c b/courses/wario_stadium/course_data.c
index 6c75f57d5..3c87af554 100644
--- a/courses/wario_stadium/course_data.c
+++ b/courses/wario_stadium/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/wario_stadium/course_data.h b/courses/wario_stadium/course_data.h
index 1fc5d7515..2c26dd3e0 100644
--- a/courses/wario_stadium/course_data.h
+++ b/courses/wario_stadium/course_data.h
@@ -1,8 +1,8 @@
 #ifndef WARIO_STADIUM_COURSE_DATA_H
 #define WARIO_STADIUM_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/wario_stadium/course_displaylists.inc.c b/courses/wario_stadium/course_displaylists.inc.c
index 1b0b71ab9..62e3a4c24 100644
--- a/courses/wario_stadium/course_displaylists.inc.c
+++ b/courses/wario_stadium/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/wario_stadium/course_displaylists.inc.h b/courses/wario_stadium/course_displaylists.inc.h
index f65532ce3..c015e6411 100644
--- a/courses/wario_stadium/course_displaylists.inc.h
+++ b/courses/wario_stadium/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_wario_stadium_packed_dl_0[];
diff --git a/courses/wario_stadium/course_offsets.c b/courses/wario_stadium/course_offsets.c
index ec01ebe9f..3d55c9e24 100644
--- a/courses/wario_stadium/course_offsets.c
+++ b/courses/wario_stadium/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 #include "course_data.h"
 
diff --git a/courses/yoshi_valley/course_data.c b/courses/yoshi_valley/course_data.c
index 2053ea389..2f9a9e339 100644
--- a/courses/yoshi_valley/course_data.c
+++ b/courses/yoshi_valley/course_data.c
@@ -1,7 +1,7 @@
 //! @todo Replace addresses with variables
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
@@ -10574,7 +10574,7 @@ u8 d_course_yoshi_valley_yoshi_flag[] = {
 
 // 0x141A0
 Lights1 d_course_yoshi_valley_unknown_light4 = gdSPDefLights1(0x37, 0x27, 0x07, 0xDF, 0x9F, 0x1F, 0x42, 0x00, 0x9D);
-Lights1 d_course_yoshi_valley_unknown_light5 = gdSPDefLights1(0x14, 0x0A, 0x00, 0x50, 0x28, 0x00, 0x42, 0x00, 0x9D); 
+Lights1 d_course_yoshi_valley_unknown_light5 = gdSPDefLights1(0x14, 0x0A, 0x00, 0x50, 0x28, 0x00, 0x42, 0x00, 0x9D);
 
 // 0x141D0
 Vtx d_course_yoshi_valley_flag_pole_model1[] = {
diff --git a/courses/yoshi_valley/course_data.h b/courses/yoshi_valley/course_data.h
index 7110a18a2..299e9ca8b 100644
--- a/courses/yoshi_valley/course_data.h
+++ b/courses/yoshi_valley/course_data.h
@@ -1,8 +1,8 @@
 #ifndef YOSHI_VALLEY_COURSE_DATA_H
 #define YOSHI_VALLEY_COURSE_DATA_H
 
-#include <ultra64.h>
-#include <PR/gbi.h>
+#include <libultraship.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <waypoints.h>
 #include <course.h>
diff --git a/courses/yoshi_valley/course_displaylists.inc.c b/courses/yoshi_valley/course_displaylists.inc.c
index c1efa0f59..510e8e110 100644
--- a/courses/yoshi_valley/course_displaylists.inc.c
+++ b/courses/yoshi_valley/course_displaylists.inc.c
@@ -1,6 +1,6 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <actor_types.h>
 #include <course.h>
 
diff --git a/courses/yoshi_valley/course_displaylists.inc.h b/courses/yoshi_valley/course_displaylists.inc.h
index 5d24cffe6..5a311a179 100644
--- a/courses/yoshi_valley/course_displaylists.inc.h
+++ b/courses/yoshi_valley/course_displaylists.inc.h
@@ -1,4 +1,4 @@
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "macros.h"
 
 extern Gfx d_course_yoshi_valley_packed_dl_0[];
diff --git a/courses/yoshi_valley/course_offsets.c b/courses/yoshi_valley/course_offsets.c
index bbdea1519..0a91bf73b 100644
--- a/courses/yoshi_valley/course_offsets.c
+++ b/courses/yoshi_valley/course_offsets.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "course_offsets.h"
 
 extern u8 gTexture66EBF0[];