3 files changed, 29 insertions, 4 deletions
diff --git a/include/link.h b/include/link.h
index b2d4284b7..714b6bf15 100644
--- a/include/link.h
+++ b/include/link.h
@@ -306,7 +306,6 @@ void sub_8009FAC(void);
 bool8 sub_800A4D8(u8 a0);
 u8 sub_800A9D8(void);
 u8 sub_800A0C8(s32, s32);
-u16 *sub_801B058(void);
 u8 sub_800A9A8(void);
 void sub_800AD10(void);
 void sub_800AB18(void);
diff --git a/include/mevent.h b/include/mevent.h
index ce50591b1..7f12f3501 100755
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -1,8 +1,6 @@
 #ifndef GUARD_MEVENT_H
 #define GUARD_MEVENT_H
 
-#include <gba/gba.h>
-
 struct MEvent_Str_1
 {
     u16 unk_000;
@@ -33,4 +31,33 @@ struct MEventStruct_Unk1442CC
     u8 unk_60;
 };
 
+void sub_801AFD8(void);
+struct MEventBuffer_3120_Sub *sub_801B00C(void);
+struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void);
+struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void);
+struct MysteryEventStruct *sub_801B044(void);
+u16 *sub_801B058(void);
+void sub_801B06C(void);
+bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src);
+bool32 sub_801B0CC(void);
+bool32 sub_801B128(void);
+bool32 sub_801B1A4(const u8 *src);
+void sub_801B1E8(void);
+bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data);
+bool32 sub_801B27C(void);
+bool32 sub_801B308(void);
+u16 sub_801B39C(void);
+void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer);
+bool32 sub_801B3F8(void);
+bool32 sub_801B508(const u16 *data);
+void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1);
+bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1);
+u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused);
+u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused);
+bool32 sub_801B748(const struct MEventStruct_Unk1442CC *a0, const u16 *a1);
+u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command);
+u16 mevent_081445C0(u32 command);
+void sub_801B940(void);
+bool32 sub_801B94C(u16 a0);
+
 #endif //GUARD_MEVENT_H
diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h
index 0f13718e5..8376d1bc6 100644
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -13,7 +13,6 @@ extern u8 gUnknown_02022C3E;
 // Exported ROM declarations
 
 void sub_8018438(void);
-u16 mevent_081445C0(u8);
 void sub_801B990(u32, u32);
 u8 sub_8013F78(void);
 bool32 sub_802C908(u16);