diff --git a/include/common_structs.h b/include/common_structs.h
index 7d7f06a7..38dbec4f 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -2,9 +2,7 @@
 #define _COMMON_STRUCTS_H
 
 #include "types.h"
-#include "dolphin/dvd.h"
-#include "dolphin/mtx/GeoTypes.h"
-#include "dolphin/gx/GXEnum.h"
+#include "dolphin.h"
 
 typedef struct player_config {
     s16 character;
diff --git a/include/functions.h b/include/functions.h
index fc849174..dd1db21e 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -11,11 +11,7 @@ void Hu3DBGColorSet(u8, u8, u8);
 void Hu3DCameraCreate(s16);
 void Hu3DCameraPerspectiveSet(s16, f32, f32, f32, f32);
 void Hu3DCameraViewportSet(s16, f32, f32, f32, f32, f32, f32);
-void fn_80044920(s16);
-void fn_80045F74(s16, s32);
-s32 fn_800578E4(void);
 void HuAudFadeOut(int arg0);
-void fn_80035A0C(void);
 
 void WipeCreate(char dir, char type, short duration);
 u8 WipeStatGet(void);
@@ -36,7 +32,9 @@ void HuWinAllKill(void);
 void HuWinMesSet(s16, s32);
 void HuWinKill(s16);
 void HuWinPriSet(s16, s32);
+void HuWinHomeClear(s16);
 void HuWinMesPalSet(s16, s32, s32, s32, s32);
+void HuWinMesSet(s16, s32);
 void HuWinMesSpeedSet(s16, s32);
 void HuWinMesMaxSizeGet(s32, f32*, ...);
 s16 HuWinCreate(float x, float y, s16 w, s16 h, s16 frame);
@@ -59,6 +57,8 @@ void BoardMessCreate(s16, s32, s32);
 void BoardMessKill(void);
 void BoardMessWait(void);
 
+s32 HuTHPFrameGet(void);
+
 s32 rand8(void);
 
 void fn_8005D8E8(void);