diff --git a/include/functions.h b/include/functions.h
index 58eac1e9..fc849174 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1,10 +1,8 @@
 #ifndef _FUNCTIONS_H_
 #define _FUNCTIONS_H_
 
-#include "types.h"
+#include "dolphin.h"
 #include "common_structs.h"
-#include "dolphin/mtx.h"
-#include "dolphin/gx/GXStruct.h"
 
 void Hu3DLayerHookSet(short layer, void (*func)(short layer));
 void Hu3D2Dto3D(Vec*, s32, Vec*);
diff --git a/include/variables.h b/include/variables.h
index af46f34a..00a33d6b 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -1,10 +1,8 @@
 #ifndef _VARIABLES_H
 #define _VARIABLES_H
 
-#include "types.h"
+#include "dolphin.h"
 #include "common_structs.h"
-#include "dolphin/os.h"
-#include "dolphin/gx/GXStruct.h"
 
 #define M_PI 3.141592653589793