diff --git a/include/constants/followers.h b/include/constants/followers.h
new file mode 100644
index 0000000000..aef8161cf7
--- /dev/null
+++ b/include/constants/followers.h
@@ -0,0 +1,16 @@
+#ifndef GUARD_CONSTANTS_FOLLOWERS_H
+#define GUARD_CONSTANTS_FOLLOWERS_H
+
+#define FOLLOWER_HAPPY_MESSAGE_COUNT    31
+#define FOLLOWER_NEUTRAL_MESSAGE_COUNT  14
+#define FOLLOWER_SAD_MESSAGE_COUNT       3
+#define FOLLOWER_UPSET_MESSAGE_COUNT     3
+#define FOLLOWER_ANGRY_MESSAGE_COUNT     5
+#define FOLLOWER_PENSIVE_MESSAGE_COUNT  20
+#define FOLLOWER_LOVE_MESSAGE_COUNT     10
+#define FOLLOWER_SURPRISE_MESSAGE_COUNT 20
+#define FOLLOWER_CURIOUS_MESSAGE_COUNT   7
+#define FOLLOWER_MUSIC_MESSAGE_COUNT    14
+#define FOLLOWER_POISONED_MESSAGE_COUNT  1
+
+#endif //GUARD_CONSTANTS_FOLLOWERS_H
diff --git a/include/data.h b/include/data.h
index 893ac12cd1..f0efe1d0b3 100644
--- a/include/data.h
+++ b/include/data.h
@@ -5,17 +5,6 @@
 #include "constants/trainers.h"
 
 #define SPECIES_SHINY_TAG 5000
-#define N_FOLLOWER_HAPPY_MESSAGES 31
-#define N_FOLLOWER_NEUTRAL_MESSAGES 14
-#define N_FOLLOWER_SAD_MESSAGES 3
-#define N_FOLLOWER_UPSET_MESSAGES 3
-#define N_FOLLOWER_ANGRY_MESSAGES 5
-#define N_FOLLOWER_PENSIVE_MESSAGES 20
-#define N_FOLLOWER_LOVE_MESSAGES 10
-#define N_FOLLOWER_SURPRISE_MESSAGES 20
-#define N_FOLLOWER_CURIOUS_MESSAGES 7
-#define N_FOLLOWER_MUSIC_MESSAGES 14
-#define N_FOLLOWER_POISONED_MESSAGES 1
 
 #define MAX_TRAINER_ITEMS 4
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 8feee4c172..be6a63e00b 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -11,7 +11,6 @@
 #include "battle_z_move.h"
 #include "bg.h"
 #include "data.h"
-#include "event_object_movement.h"
 #include "item.h"
 #include "item_menu.h"
 #include "link.h"
diff --git a/src/follower_helper.c b/src/follower_helper.c
index 847778d860..24de61a3fd 100644
--- a/src/follower_helper.c
+++ b/src/follower_helper.c
@@ -3,6 +3,7 @@
 #include "event_scripts.h"
 #include "follower_helper.h"
 #include "constants/battle.h"
+#include "constants/followers.h"
 #include "constants/metatile_behaviors.h"
 #include "constants/pokemon.h"
 #include "constants/region_map_sections.h"
@@ -354,15 +355,15 @@ const struct FollowerMsgInfoExtended gFollowerConditionalMessages[COND_MSG_COUNT
 // Pool of "unconditional" follower messages
 const struct FollowerMessagePool gFollowerBasicMessages[FOLLOWER_EMOTION_LENGTH] =
 {
-    [FOLLOWER_EMOTION_HAPPY]    = {gFollowerHappyMessages,    EventScript_FollowerGeneric, N_FOLLOWER_HAPPY_MESSAGES},
-    [FOLLOWER_EMOTION_NEUTRAL]  = {gFollowerNeutralMessages,  EventScript_FollowerGeneric, N_FOLLOWER_NEUTRAL_MESSAGES},
-    [FOLLOWER_EMOTION_SAD]      = {gFollowerSadMessages,      EventScript_FollowerGeneric, N_FOLLOWER_SAD_MESSAGES},
-    [FOLLOWER_EMOTION_UPSET]    = {gFollowerUpsetMessages,    EventScript_FollowerGeneric, N_FOLLOWER_UPSET_MESSAGES},
-    [FOLLOWER_EMOTION_ANGRY]    = {gFollowerAngryMessages,    EventScript_FollowerGeneric, N_FOLLOWER_ANGRY_MESSAGES},
-    [FOLLOWER_EMOTION_PENSIVE]  = {gFollowerPensiveMessages,  EventScript_FollowerGeneric, N_FOLLOWER_PENSIVE_MESSAGES},
-    [FOLLOWER_EMOTION_LOVE]     = {gFollowerLoveMessages,     EventScript_FollowerGeneric, N_FOLLOWER_LOVE_MESSAGES},
-    [FOLLOWER_EMOTION_SURPRISE] = {gFollowerSurpriseMessages, EventScript_FollowerGeneric, N_FOLLOWER_SURPRISE_MESSAGES},
-    [FOLLOWER_EMOTION_CURIOUS]  = {gFollowerCuriousMessages,  EventScript_FollowerGeneric, N_FOLLOWER_CURIOUS_MESSAGES},
-    [FOLLOWER_EMOTION_MUSIC]    = {gFollowerMusicMessages,    EventScript_FollowerGeneric, N_FOLLOWER_MUSIC_MESSAGES},
-    [FOLLOWER_EMOTION_POISONED] = {gFollowerPoisonedMessages, EventScript_FollowerGeneric, N_FOLLOWER_POISONED_MESSAGES},
+    [FOLLOWER_EMOTION_HAPPY]    = {gFollowerHappyMessages,    EventScript_FollowerGeneric, FOLLOWER_HAPPY_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_NEUTRAL]  = {gFollowerNeutralMessages,  EventScript_FollowerGeneric, FOLLOWER_NEUTRAL_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_SAD]      = {gFollowerSadMessages,      EventScript_FollowerGeneric, FOLLOWER_SAD_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_UPSET]    = {gFollowerUpsetMessages,    EventScript_FollowerGeneric, FOLLOWER_UPSET_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_ANGRY]    = {gFollowerAngryMessages,    EventScript_FollowerGeneric, FOLLOWER_ANGRY_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_PENSIVE]  = {gFollowerPensiveMessages,  EventScript_FollowerGeneric, FOLLOWER_PENSIVE_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_LOVE]     = {gFollowerLoveMessages,     EventScript_FollowerGeneric, FOLLOWER_LOVE_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_SURPRISE] = {gFollowerSurpriseMessages, EventScript_FollowerGeneric, FOLLOWER_SURPRISE_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_CURIOUS]  = {gFollowerCuriousMessages,  EventScript_FollowerGeneric, FOLLOWER_CURIOUS_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_MUSIC]    = {gFollowerMusicMessages,    EventScript_FollowerGeneric, FOLLOWER_MUSIC_MESSAGE_COUNT},
+    [FOLLOWER_EMOTION_POISONED] = {gFollowerPoisonedMessages, EventScript_FollowerGeneric, FOLLOWER_POISONED_MESSAGE_COUNT},
 };