6 files changed, 7 insertions, 14 deletions
diff --git a/include/map_obj_80688E4.h b/include/event_object_80688E4.h
index 7132d2aa8..7132d2aa8 100644
--- a/include/map_obj_80688E4.h
+++ b/include/event_object_80688E4.h
diff --git a/include/map_obj_8097404.h b/include/event_object_8097404.h
index 84ecbf26f..84ecbf26f 100644
--- a/include/map_obj_8097404.h
+++ b/include/event_object_8097404.h
diff --git a/include/map_obj_lock.h b/include/event_object_lock.h
index 12e0eae53..12e0eae53 100644
--- a/include/map_obj_lock.h
+++ b/include/event_object_lock.h
diff --git a/include/field_map_obj.h b/include/event_object_movement.h
index e962c39e7..d89800535 100644
--- a/include/field_map_obj.h
+++ b/include/event_object_movement.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_FIELD_MAP_OBJ_H
-#define GUARD_FIELD_MAP_OBJ_H
+#ifndef GUARD_EVENT_OBJECT_MOVEMENT_H
+#define GUARD_EVENT_OBJECT_MOVEMENT_H
 
 #include "global.h"
 
@@ -96,6 +96,8 @@ u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *mapObject);
 u8 sub_8063F84(u8 direction);
 u8 GetTrainerFacingDirectionMovementType(u8 direction);
 void CameraObjectSetFollowedObjectId(u8 spriteId);
+void UnfreezeObjectEvents(void);
+void sub_8069058(u8, u8);
 
 // Exported data declarations
 
@@ -103,4 +105,4 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const struct SpritePalette gUnknown_83A5348;
 extern const struct SpriteTemplate * const gUnknown_83A0010[];
 
-#endif //GUARD_FIELD_MAP_OBJ_H
+#endif // GUARD_EVENT_OBJECT_MOVEMENT_H
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
deleted file mode 100644
index dec3639ef..000000000
--- a/include/field_map_obj_helpers.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GUARD_FIELDMAPOBJHELP_H
-#define GUARD_FIELDMAPOBJHELP_H
-
-#include "global.h"
-
-void UnfreezeObjectEvents(void);
-void sub_8069058(u8, u8);
-
-#endif
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 72970f28a..8d1097017 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_GLOBAL_FIELDMAP_H
 #define GUARD_GLOBAL_FIELDMAP_H
 
-#define NUM_FIELD_OBJECTS 16
+#define OBJECT_EVENTS_COUNT 16
 
 enum
 {
@@ -309,7 +309,7 @@ struct Camera
     s32 y;
 };
 
-extern struct ObjectEvent gObjectEvents[NUM_FIELD_OBJECTS];
+extern struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT];
 extern u8 gSelectedObjectEvent;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;