diff --git a/include/map_header_util.h b/include/map_header_util.h
index d3ee0611b8..939c148b0f 100644
--- a/include/map_header_util.h
+++ b/include/map_header_util.h
@@ -1,10 +1,12 @@
 #ifndef POKEPLATINUM_MAP_HEADER_UTIL_H
 #define POKEPLATINUM_MAP_HEADER_UTIL_H
 
+#include "generated/map_headers.h"
+
 #include "message.h"
 #include "strbuf.h"
 
 u32 MapHeader_LoadString(MessageLoader *msgLoader, u32 entryID, Strbuf *strbuf);
-void MapHeader_LoadName(int headerID, u32 heapID, Strbuf *strbuf);
+void MapHeader_LoadName(enum MapHeader headerID, u32 heapID, Strbuf *strbuf);
 
 #endif // POKEPLATINUM_MAP_HEADER_UTIL_H
diff --git a/src/map_header_util.c b/src/map_header_util.c
index 7ea4467176..3e05ef758e 100644
--- a/src/map_header_util.c
+++ b/src/map_header_util.c
@@ -1,10 +1,8 @@
 #include "map_header_util.h"
 
 #include <nitro.h>
-#include <string.h>
 
-#include "field/field_system_sub2_t.h"
-#include "text/pl_msg.naix"
+#include "generated/text_banks.h"
 
 #include "font.h"
 #include "map_header.h"
@@ -19,12 +17,12 @@ u32 MapHeader_LoadString(MessageLoader *msgLoader, u32 entryID, Strbuf *strbuf)
     return width;
 }
 
-void MapHeader_LoadName(int headerID, u32 heapID, Strbuf *strbuf)
+void MapHeader_LoadName(enum MapHeader headerID, u32 heapID, Strbuf *strbuf)
 {
     u32 mapLabelTextID;
     MessageLoader *msgLoader;
 
-    msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_location_names, heapID);
+    msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_LOCATION_NAMES, heapID);
     mapLabelTextID = MapHeader_GetMapLabelTextID(headerID);
 
     MapHeader_LoadString(msgLoader, mapLabelTextID, strbuf); // It should be MessageLoader_GetStrbuf()
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index fa1f99549d..c87036b656 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -30,8 +30,6 @@
 #include "unk_0200F174.h"
 #include "unk_02039C80.h"
 
-void MapHeader_LoadName(const int param0, const u32 param1, Strbuf *param2);
-
 typedef struct {
     int unk_00;
     int unk_04;