diff --git a/src/libwhb/src/gfx.c b/src/libwhb/src/gfx.c
index ff794e0..a6d2bbf 100644
--- a/src/libwhb/src/gfx.c
+++ b/src/libwhb/src/gfx.c
@@ -1,12 +1,16 @@
 #include "gfx_heap.h"
 
+#include <gx2/clear.h>
 #include <gx2/context.h>
 #include <gx2/display.h>
 #include <gx2/event.h>
+#include <gx2/mem.h>
 #include <gx2/registers.h>
 #include <gx2/shaders.h>
+#include <gx2/state.h>
 #include <gx2/surface.h>
 #include <gx2/swap.h>
+#include <gx2/temp.h>
 #include <gx2r/mem.h>
 #include <proc_ui/procui.h>
 #include <string.h>
diff --git a/src/libwhb/src/gfx_shader.c b/src/libwhb/src/gfx_shader.c
index 225d017..9346ecf 100644
--- a/src/libwhb/src/gfx_shader.c
+++ b/src/libwhb/src/gfx_shader.c
@@ -1,6 +1,7 @@
 #include "gfx_heap.h"
 #include <gfd.h>
 #include <gx2r/buffer.h>
+#include <gx2/mem.h>
 #include <gx2/shaders.h>
 #include <latte/latte_enum_sq.h>
 #include <string.h>