diff --git a/courses/all_course_data.h b/courses/all_course_data.h
index 1126b2cc5..87377fb33 100644
--- a/courses/all_course_data.h
+++ b/courses/all_course_data.h
@@ -1,6 +1,8 @@
 #ifndef ALL_COURSE_DATA_H
 #define ALL_COURSE_DATA_H
 
+#include "mk64.h"
+
 #include "courses/big_donut/course_data.h"
 #include "courses/block_fort/course_data.h"
 #include "courses/double_deck/course_data.h"
@@ -15,6 +17,5 @@
 #include "courses/bowsers_castle/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/include/macros.h b/include/macros.h
index d78dd7543..798ea3b27 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -99,6 +99,4 @@
  **/
 #define GET_PACKED_END(dl) (((u8 *) dl) + sizeof(dl) - sizeof(dl[0]) - 0x07000000)
 
-void gSPDisplayList(Gfx* pkt, Gfx* dl);
-
 #endif
diff --git a/include/mk64.h b/include/mk64.h
index 96628edc6..f60f8039b 100644
--- a/include/mk64.h
+++ b/include/mk64.h
@@ -3,6 +3,7 @@
 
 #include <libultraship.h>
 #include <string.h>
+#include <libultra/gbi.h>
 
 /**
  * @file mk64.h
@@ -119,7 +120,7 @@ enum SURFACE_TYPE {
 
 #define MACRO_COLOR_FLAG(r, g, b, flag) (r&~0x3) | (flag & 0x3), (g&~0x3) | ((flag>>2) & 0x3), b
 
-// libultra
+// Extra gbi commands
 void gSPSegmentLoadRes(void* value, int segNum, uintptr_t target);
 void gSPDisplayList(Gfx* pkt, Gfx* dl);
 void gSPDisplayListOffset(Gfx* pkt, Gfx* dl, int offset);