diff --git a/include/dolphin/gf/GFGeometry.h b/include/dolphin/gf/GFGeometry.h
new file mode 100644
index 000000000..32d68cace
--- /dev/null
+++ b/include/dolphin/gf/GFGeometry.h
@@ -0,0 +1,11 @@
+#ifndef GFGEOMETRY_H
+#define GFGEOMETRY_H
+
+#include "dolphin/gx/GXAttr.h"
+
+void GFSetVtxDescv(GXVtxDescList*);
+void GFSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList*);
+void GFSetArray(GXAttr, void*, u8);
+void GFSetCullMode(GXCullMode);
+
+#endif /* GFGEOMETRY_H */
diff --git a/include/dolphin/gf/GFLight.h b/include/dolphin/gf/GFLight.h
new file mode 100644
index 000000000..b674630de
--- /dev/null
+++ b/include/dolphin/gf/GFLight.h
@@ -0,0 +1,9 @@
+#ifndef GFLIGHT_H
+#define GFLIGHT_H
+
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
+
+void GFSetChanMatColor(GXChannelID, GXColor);
+
+#endif /* GFLIGHT_H */
diff --git a/include/dolphin/gf/GFPixel.h b/include/dolphin/gf/GFPixel.h
new file mode 100644
index 000000000..662a76b43
--- /dev/null
+++ b/include/dolphin/gf/GFPixel.h
@@ -0,0 +1,10 @@
+#ifndef GFPIXEL_H
+#define GFPIXEL_H
+
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
+
+void GFSetFog(GXFogType type, f32 startZ, f32 endZ, f32 nearZ, f32 farZ, GXColor color);
+void GFSetBlendModeEtc(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp, u8, u8, u8);
+
+#endif /* GFPIXEL_H */
diff --git a/include/dolphin/gf/GFTev.h b/include/dolphin/gf/GFTev.h
new file mode 100644
index 000000000..e16ad9b81
--- /dev/null
+++ b/include/dolphin/gf/GFTev.h
@@ -0,0 +1,11 @@
+#ifndef GFTEV_H
+#define GFTEV_H
+
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
+
+void GFSetTevColor(GXTevRegID, GXColor);
+void GFSetTevColorS10(GXTevRegID, GXColorS10);
+void GFSetAlphaCompare(GXCompare, u8, GXAlphaOp, GXCompare, u8);
+
+#endif /* GFTEV_H */
diff --git a/include/dolphin/gf/GFTransform.h b/include/dolphin/gf/GFTransform.h
new file mode 100644
index 000000000..00ec78cb4
--- /dev/null
+++ b/include/dolphin/gf/GFTransform.h
@@ -0,0 +1,11 @@
+#ifndef GFTRANSFORM_H
+#define GFTRANSFORM_H
+
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/mtx/mtx.h"
+
+void GFLoadPosMtxImm(MtxP, GXPosNrmMtx);
+void GFLoadNrmMtxImm(MtxP, GXPosNrmMtx);
+void GFSetCurrentMtx(u32, u32, u32, u32, u32, u32, u32, u32, u32);
+
+#endif /* GFTRANSFORM_H */
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 7cffa80a3..1f40606d4 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -6,6 +6,10 @@
 #include "d/d_drawlist.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo_rain.h"
+#include "dolphin/gf/GFGeometry.h"
+#include "dolphin/gf/GFLight.h"
+#include "dolphin/gf/GFPixel.h"
+#include "dolphin/gf/GFTransform.h"
 #include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_mtx.h"
@@ -472,14 +476,6 @@ void dDlst_alphaModelData_c::set(u8 type, Mtx mtx, u8 alpha) {
     mAlpha = alpha;
 }
 
-extern void GFLoadPosMtxImm(MtxP, GXPosNrmMtx);
-extern void GFSetCurrentMtx(u32, u32, u32, u32, u32, u32, u32, u32, u32);
-extern void GFSetChanMatColor(GXChannelID, GXColor);
-extern void GFSetVtxDescv(GXVtxDescList*);
-extern void GFSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList*);
-extern void GFSetBlendModeEtc(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp, u8, u8, u8);
-extern void GFSetArray(GXAttr, void*, u8);
-
 char l_backRevZMat[0x41] ALIGN_DECL(32) = {};
 char l_frontZMat[0x3c] ALIGN_DECL(32) = {};
 char l_frontNoZSubMat[0x2a] ALIGN_DECL(32) = {};
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 3afd13493..f65afde0e 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -12,6 +12,7 @@
 #include "d/d_procname.h"
 #include "d/d_s_play.h"
 #include "d/d_stage.h"
+#include "dolphin/gf/GFPixel.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_kankyo.h"
@@ -3151,8 +3152,6 @@ void dKy_GxFog_tevstr_set(dKy_tevstr_c* pTevStr) {
     GxXFog_set();
 }
 
-extern void GFSetFog(GXFogType type, f32 startZ, f32 endZ, f32 nearZ, f32 farZ, GXColor color);
-
 /* 80196C5C-80196D04       .text dKy_GfFog_tevstr_set__FP12dKy_tevstr_c */
 void dKy_GfFog_tevstr_set(dKy_tevstr_c* pTevStr) {
     f32 near = 1.0f;
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index a7082aa8f..51e087642 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -14,6 +14,7 @@
 #include "SSystem/SComponent/c_m3d.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
+#include "dolphin/gf/GFPixel.h"
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_printf.h"
 
@@ -1431,8 +1432,6 @@ void mDoExt_McaMorf2::stopZelAnime() {
     /* Nonmatching */
 }
 
-extern void GFSetBlendModeEtc(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp, u8, u8, u8);
-
 /* 8001427C-800142B8       .text draw__24mDoExt_offCupOnAupPacketFv */
 void mDoExt_offCupOnAupPacket::draw() {
     GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 0, 1, 1);