diff --git a/include/code_801AFA4.h b/include/code_801AFA4.h
index 355f1d016..65d959e30 100644
--- a/include/code_801AFA4.h
+++ b/include/code_801AFA4.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_CODE_801AFA4_H
 #define GUARD_CODE_801AFA4_H
 
-#include "global.h"
 #include "constants/move.h"
 #include "structs/menu.h"
 #include "pokemon.h"
@@ -26,4 +25,4 @@ bool8 sub_801AFA4(u32 index);
 u32 sub_801B00C(void);
 void sub_801B048(void);
 
-#endif // GUARD_CODE_801AFA4_H
\ No newline at end of file
+#endif // GUARD_CODE_801AFA4_H
diff --git a/include/math.h b/include/math.h
index 2c28b1222..e0e42d2f9 100644
--- a/include/math.h
+++ b/include/math.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_MATH_H
 #define GUARD_MATH_H
 
-#include "global.h"
+#include "gba/types.h"
 
 /**
  * This type represents a signed 24.8 fixed-point number, where the 24 most
diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h
index 7dd29b8cb..a22886bcb 100644
--- a/include/structs/str_dungeon.h
+++ b/include/structs/str_dungeon.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_STR_DUNGEON_H
 #define GUARD_STR_DUNGEON_H
 
-#include "global.h"
 #include "constants/monster.h"
 #include "structs/dungeon_entity.h"
 #include "file_system.h"
diff --git a/include/type_chart.h b/include/type_chart.h
index 4be0b3351..caff9f1d0 100644
--- a/include/type_chart.h
+++ b/include/type_chart.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_TYPE_CHART_H
 #define GUARD_TYPE_CHART_H
 
-#include "global.h"
 #include "constants/type.h"
 
 #define NUM_EFFECTIVENESS 4
@@ -14,4 +13,4 @@
 // [Attacking type][Defending type]
 extern const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES];
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/type_chart.c b/src/type_chart.c
index ac2071c06..ad99d2f66 100644
--- a/src/type_chart.c
+++ b/src/type_chart.c
@@ -1,3 +1,4 @@
+#include "global.h"
 #include "type_chart.h"
 
 #define IMMUNE EFFECTIVENESS_IMMUNE