diff --git a/src/npc/anju.c b/src/npc/anju.c
index fa66f537..89131839 100644
--- a/src/npc/anju.c
+++ b/src/npc/anju.c
@@ -1,6 +1,12 @@
+/**
+ * @file anju.c
+ * @ingroup NPCs
+ *
+ * @brief Anju NPC
+ */
 #include "entity.h"
-#include "player.h"
 #include "npc.h"
+#include "player.h"
 
 void Anju(Entity* this) {
     switch (this->action) {
diff --git a/src/npc/beedle.c b/src/npc/beedle.c
index 16ed2ec2..3fcc4f99 100644
--- a/src/npc/beedle.c
+++ b/src/npc/beedle.c
@@ -1,12 +1,17 @@
-#include "global.h"
+/**
+ * @file beedle.c
+ * @ingroup NPCs
+ *
+ * @brief Beedle NPC
+ */
 #include "entity.h"
+#include "functions.h"
+#include "game.h"
+#include "item.h"
 #include "message.h"
+#include "npc.h"
 #include "room.h"
 #include "script.h"
-#include "npc.h"
-#include "game.h"
-#include "functions.h"
-#include "item.h"
 
 typedef struct {
     Rect customHitbox;
diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c
index 1497f185..33cc3f80 100644
--- a/src/npc/bigGoron.c
+++ b/src/npc/bigGoron.c
@@ -1,8 +1,14 @@
-#include "npc.h"
+/**
+ * @file bigGoron.c
+ * @ingroup NPCs
+ *
+ * @brief BigGoron NPC
+ */
 #include "functions.h"
-#include "screen.h"
 #include "hitbox.h"
 #include "item.h"
+#include "npc.h"
+#include "screen.h"
 
 static const u16 goronSounds[] = {
     SFX_VO_GORON1,
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 2133d809..67ca0d19 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -1,15 +1,20 @@
-#include "global.h"
+/**
+ * @file bladeBrothers.c
+ * @ingroup NPCs
+ *
+ * @brief Blade Brothers NPC
+ */
 #include "entity.h"
 #include "flags.h"
-#include "player.h"
-#include "room.h"
-#include "message.h"
-#include "save.h"
-#include "script.h"
-#include "npc.h"
 #include "functions.h"
 #include "game.h"
 #include "item.h"
+#include "message.h"
+#include "npc.h"
+#include "player.h"
+#include "room.h"
+#include "save.h"
+#include "script.h"
 
 void sub_08068A1C(Entity*);
 void sub_08068A4C(Entity*);
diff --git a/src/npc/brocco.c b/src/npc/brocco.c
index e02ca622..27992b36 100644
--- a/src/npc/brocco.c
+++ b/src/npc/brocco.c
@@ -1,7 +1,13 @@
+/**
+ * @file brocco.c
+ * @ingroup NPCs
+ *
+ * @brief Brocco NPC
+ */
 #include "entity.h"
 #include "message.h"
-#include "save.h"
 #include "npc.h"
+#include "save.h"
 
 void sub_08063544(Entity*);
 void sub_0806362C(Entity*);
diff --git a/src/npc/carlov.c b/src/npc/carlov.c
index ec97c9ba..72947ccb 100644
--- a/src/npc/carlov.c
+++ b/src/npc/carlov.c
@@ -1,7 +1,13 @@
-#include "sound.h"
+/**
+ * @file carlov.c
+ * @ingroup NPCs
+ *
+ * @brief Carlov NPC
+ */
 #include "entity.h"
-#include "room.h"
 #include "npc.h"
+#include "room.h"
+#include "sound.h"
 
 void Carlov(Entity* this) {
     if (this->action == 0) {
diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c
index f54795e0..f712dd48 100644
--- a/src/npc/carpenter.c
+++ b/src/npc/carpenter.c
@@ -1,8 +1,13 @@
-#include "global.h"
+/**
+ * @file carpenter.c
+ * @ingroup NPCs
+ *
+ * @brief Carpenter NPC
+ */
 #include "entity.h"
-#include "player.h"
-#include "npc.h"
 #include "item.h"
+#include "npc.h"
+#include "player.h"
 
 static const SpriteLoadData gUnk_08110CA8[] = {
     { 0x51, 0x3f, 0x4 }, { 0x1451, 0x3f, 0x4 }, { 0x4001, 0x3f, 0x4 }, { 0, 0, 0 },
diff --git a/src/npc/castleMaid.c b/src/npc/castleMaid.c
index c17db2f8..400d680e 100644
--- a/src/npc/castleMaid.c
+++ b/src/npc/castleMaid.c
@@ -1,12 +1,18 @@
+/**
+ * @file castleMaid.c
+ * @ingroup NPCs
+ *
+ * @brief Castle Maid NPC
+ */
 #define NENT_DEPRECATED
 #include "entity.h"
-#include "script.h"
-#include "save.h"
 #include "flags.h"
+#include "functions.h"
+#include "manager.h"
 #include "message.h"
 #include "npc.h"
-#include "manager.h"
-#include "functions.h"
+#include "save.h"
+#include "script.h"
 
 typedef struct {
     Entity base;
diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c
index c0557905..a14d847c 100644
--- a/src/npc/castorWildsStatue.c
+++ b/src/npc/castorWildsStatue.c
@@ -1,10 +1,16 @@
-#include "sound.h"
-#include "entity.h"
-#include "script.h"
-#include "functions.h"
-#include "flags.h"
+/**
+ * @file castorWildsStatue.c
+ * @ingroup NPCs
+ *
+ * @brief Castor Wilds Statue NPC
+ */
 #include "effects.h"
+#include "entity.h"
+#include "flags.h"
+#include "functions.h"
 #include "npc.h"
+#include "script.h"
+#include "sound.h"
 
 static const Hitbox gUnk_08110E94;
 
diff --git a/src/npc/cat.c b/src/npc/cat.c
index 33586cb9..2212a039 100644
--- a/src/npc/cat.c
+++ b/src/npc/cat.c
@@ -1,10 +1,15 @@
-#include "global.h"
+/**
+ * @file cat.c
+ * @ingroup NPCs
+ *
+ * @brief Cat NPC
+ */
+#include "enemy.h"
 #include "entity.h"
 #include "functions.h"
-#include "save.h"
 #include "message.h"
 #include "npc.h"
-#include "enemy.h"
+#include "save.h"
 
 static const Hitbox gUnk_08110EF0 = { 0, -1, { 5, 3, 3, 5 }, 5, 4 };
 
diff --git a/src/npc/clothesRack.c b/src/npc/clothesRack.c
index 883999f8..9d9f24a2 100644
--- a/src/npc/clothesRack.c
+++ b/src/npc/clothesRack.c
@@ -1,3 +1,9 @@
+/**
+ * @file clothesRack.c
+ * @ingroup NPCs
+ *
+ * @brief Clothes Rack NPC
+ */
 #include "npc.h"
 
 void sub_0806DD90(Entity*);
diff --git a/src/npc/cow.c b/src/npc/cow.c
index e74ed30a..7f2dbc73 100644
--- a/src/npc/cow.c
+++ b/src/npc/cow.c
@@ -1,9 +1,14 @@
-#include "global.h"
-#include "sound.h"
+/**
+ * @file cow.c
+ * @ingroup NPCs
+ *
+ * @brief Cow NPC
+ */
 #include "entity.h"
-#include "player.h"
-#include "npc.h"
 #include "functions.h"
+#include "npc.h"
+#include "player.h"
+#include "sound.h"
 
 void sub_0806920C(Entity* ent);
 void sub_0806924C(Entity* ent);
diff --git a/src/npc/cucco.c b/src/npc/cucco.c
index 28709607..50973797 100644
--- a/src/npc/cucco.c
+++ b/src/npc/cucco.c
@@ -1,6 +1,12 @@
-#include "npc.h"
+/**
+ * @file cucco.c
+ * @ingroup NPCs
+ *
+ * @brief Cucco NPC
+ */
 #include "functions.h"
 #include "kinstone.h"
+#include "npc.h"
 
 void (*const Cucco_Actions[])(Entity*);
 const u16 Cucco_Sounds[];
diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c
index 75ccdce3..c920bb7e 100644
--- a/src/npc/cuccoChick.c
+++ b/src/npc/cuccoChick.c
@@ -1,5 +1,11 @@
-#include "npc.h"
+/**
+ * @file cuccoChick.c
+ * @ingroup NPCs
+ *
+ * @brief Cucco Chick NPC
+ */
 #include "functions.h"
+#include "npc.h"
 
 void CuccoChick_Init(Entity*);
 void sub_0806E764(Entity*);
@@ -91,7 +97,7 @@ void sub_0806E838(Entity* this) {
 }
 
 void sub_0806E884(Entity* this) {
-    MessageNoOverlap(TEXT_INDEX(TEXT_MINISH, 0Xb6), this);
+    MessageNoOverlap(TEXT_INDEX(TEXT_MINISH, 0xB6), this);
 }
 
 void CuccoChick_Fusion(Entity* this) {
diff --git a/src/npc/dampe.c b/src/npc/dampe.c
index fad25893..b811826b 100644
--- a/src/npc/dampe.c
+++ b/src/npc/dampe.c
@@ -1,11 +1,16 @@
-#include "global.h"
+/**
+ * @file dampe.c
+ * @ingroup NPCs
+ *
+ * @brief Dampe NPC
+ */
 #include "entity.h"
-#include "player.h"
-#include "room.h"
 #include "flags.h"
+#include "item.h"
 #include "message.h"
 #include "npc.h"
-#include "item.h"
+#include "player.h"
+#include "room.h"
 
 void Dampe(Entity* this) {
     switch (this->action) {
diff --git a/src/npc/din.c b/src/npc/din.c
index c5608c7e..4e10dcd1 100644
--- a/src/npc/din.c
+++ b/src/npc/din.c
@@ -1,7 +1,12 @@
-#include "global.h"
+/**
+ * @file din.c
+ * @ingroup NPCs
+ *
+ * @brief Din NPC
+ */
 #include "entity.h"
-#include "npc.h"
 #include "kinstone.h"
+#include "npc.h"
 
 void Din(Entity* this) {
     switch (this->action) {
diff --git a/src/npc/dog.c b/src/npc/dog.c
index 10427419..927b9a27 100644
--- a/src/npc/dog.c
+++ b/src/npc/dog.c
@@ -1,8 +1,14 @@
-#include "entity.h"
+/**
+ * @file dog.c
+ * @ingroup NPCs
+ *
+ * @brief Dog NPC
+ */
 #include "collision.h"
+#include "entity.h"
 #include "functions.h"
-#include "npc.h"
 #include "item.h"
+#include "npc.h"
 
 void sub_08069FE8(Entity*);
 bool32 sub_08069EF0(Entity*);
diff --git a/src/npc/drLeft.c b/src/npc/drLeft.c
index aef5ecc4..4bfccdcd 100644
--- a/src/npc/drLeft.c
+++ b/src/npc/drLeft.c
@@ -1,6 +1,12 @@
-#include "npc.h"
+/**
+ * @file drLeft.c
+ * @ingroup NPCs
+ *
+ * @brief Dr Left NPC
+ */
 #include "functions.h"
 #include "item.h"
+#include "npc.h"
 
 void sub_0806BFD8(Entity* this);
 
diff --git a/src/npc/emma.c b/src/npc/emma.c
index 0f0f1c36..d5b55c2e 100644
--- a/src/npc/emma.c
+++ b/src/npc/emma.c
@@ -1,3 +1,9 @@
+/**
+ * @file emma.c
+ * @ingroup NPCs
+ *
+ * @brief Emma NPC
+ */
 #include "entity.h"
 #include "functions.h"
 #include "screenTransitions.h"
diff --git a/src/npc/epona.c b/src/npc/epona.c
index b06a7777..55975fa6 100644
--- a/src/npc/epona.c
+++ b/src/npc/epona.c
@@ -1,9 +1,14 @@
-#include "global.h"
-#include "sound.h"
+/**
+ * @file epona.c
+ * @ingroup NPCs
+ *
+ * @brief Epona NPC
+ */
 #include "entity.h"
+#include "functions.h"
 #include "message.h"
 #include "npc.h"
-#include "functions.h"
+#include "sound.h"
 
 void sub_08065A64(Entity* this);
 void sub_08065AA4(Entity*);
diff --git a/src/npc/ezlo.c b/src/npc/ezlo.c
index 307ec550..472aeb57 100644
--- a/src/npc/ezlo.c
+++ b/src/npc/ezlo.c
@@ -1,3 +1,9 @@
+/**
+ * @file ezlo.c
+ * @ingroup NPCs
+ *
+ * @brief Ezlo NPC
+ */
 #include "npc.h"
 
 const u8 gUnk_08114134[];
diff --git a/src/npc/farmers.c b/src/npc/farmers.c
index d2c4e2fc..d58e8ace 100644
--- a/src/npc/farmers.c
+++ b/src/npc/farmers.c
@@ -1,7 +1,13 @@
+/**
+ * @file farmers.c
+ * @ingroup NPCs
+ *
+ * @brief Farmers NPC
+ */
 #include "entity.h"
-#include "script.h"
 #include "functions.h"
 #include "npc.h"
+#include "script.h"
 
 static const SpriteLoadData gUnk_08113140[] = {
     { 0xf7, 0x48, 0x4 }, { 0x40f7, 0x48, 0x4 }, { 0, 0, 0 }, { 0xf8, 0x49, 0x4 }, { 0x40f8, 0x49, 0x4 }, { 0, 0, 0 },
diff --git a/src/npc/farore.c b/src/npc/farore.c
index c802bf6f..3556e9df 100644
--- a/src/npc/farore.c
+++ b/src/npc/farore.c
@@ -1,4 +1,9 @@
-#include "global.h"
+/**
+ * @file farore.c
+ * @ingroup NPCs
+ *
+ * @brief Farore NPC
+ */
 #include "entity.h"
 #include "npc.h"
 #include "kinstone.h"
diff --git a/src/npc/festari.c b/src/npc/festari.c
index f9e0cb57..4a3c8b84 100644
--- a/src/npc/festari.c
+++ b/src/npc/festari.c
@@ -1,4 +1,9 @@
-#include "global.h"
+/**
+ * @file festari.c
+ * @ingroup NPCs
+ *
+ * @brief Festari NPC
+ */
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c
index b002d976..6ca6d7cf 100644
--- a/src/npc/forestMinish.c
+++ b/src/npc/forestMinish.c
@@ -1,3 +1,9 @@
+/**
+ * @file forestMinish.c
+ * @ingroup NPCs
+ *
+ * @brief Forest Minish NPC
+ */
 #include "functions.h"
 #include "item.h"
 #include "kinstone.h"
diff --git a/src/npc/fusionMenuNPC.c b/src/npc/fusionMenuNPC.c
index 01f5c111..63fd2143 100644
--- a/src/npc/fusionMenuNPC.c
+++ b/src/npc/fusionMenuNPC.c
@@ -1,4 +1,11 @@
-#include "global.h"
+/**
+ * @file fusionMenuNPC.c
+ * @ingroup NPCs
+ *
+ * @brief Fusion Menu NPC
+ *
+ * Representation for the NPCs in the fusion menu.
+ */
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/gentari.c b/src/npc/gentari.c
index d2d36028..dd81b120 100644
--- a/src/npc/gentari.c
+++ b/src/npc/gentari.c
@@ -1,4 +1,9 @@
-#include "global.h"
+/**
+ * @file gentari.c
+ * @ingroup NPCs
+ *
+ * @brief Gentari NPC
+ */
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c
index 2fe80a97..2834a8d3 100644
--- a/src/npc/ghostBrothers.c
+++ b/src/npc/ghostBrothers.c
@@ -1,9 +1,15 @@
+/**
+ * @file ghostBrothers.c
+ * @ingroup NPCs
+ *
+ * @brief Ghost Brothers NPC
+ */
 #include "entity.h"
 #include "functions.h"
-#include "save.h"
-#include "screen.h"
 #include "message.h"
 #include "npc.h"
+#include "save.h"
+#include "screen.h"
 
 extern u32 gSpriteAnimations_GhostBrothers[];
 
diff --git a/src/npc/gina.c b/src/npc/gina.c
index 0095f7b3..17d59e9f 100644
--- a/src/npc/gina.c
+++ b/src/npc/gina.c
@@ -1,7 +1,12 @@
-#include "global.h"
+/**
+ * @file gina.c
+ * @ingroup NPCs
+ *
+ * @brief Gina NPC
+ */
 #include "entity.h"
-#include "player.h"
 #include "npc.h"
+#include "player.h"
 
 void Gina(Entity* this) {
     switch (this->action) {
diff --git a/src/npc/gorman.c b/src/npc/gorman.c
index abec9aae..12474876 100644
--- a/src/npc/gorman.c
+++ b/src/npc/gorman.c
@@ -1,3 +1,9 @@
+/**
+ * @file gorman.c
+ * @ingroup NPCs
+ *
+ * @brief Gorman NPC
+ */
 #include "functions.h"
 #include "npc.h"
 
diff --git a/src/npc/goron.c b/src/npc/goron.c
index ce2fb731..e3afeb94 100644
--- a/src/npc/goron.c
+++ b/src/npc/goron.c
@@ -1,3 +1,9 @@
+/**
+ * @file goron.c
+ * @ingroup NPCs
+ *
+ * @brief Goron NPC
+ */
 #include "effects.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/npc/goronMerchant.c b/src/npc/goronMerchant.c
index a26eb4b1..78e7d726 100644
--- a/src/npc/goronMerchant.c
+++ b/src/npc/goronMerchant.c
@@ -1,11 +1,16 @@
-#include "global.h"
+/**
+ * @file goronMerchant.c
+ * @ingroup NPCs
+ *
+ * @brief Goron Merchant NPC
+ */
 #include "entity.h"
-#include "functions.h"
-#include "message.h"
 #include "flags.h"
-#include "save.h"
-#include "npc.h"
+#include "functions.h"
 #include "item.h"
+#include "message.h"
+#include "npc.h"
+#include "save.h"
 
 static u32 GoronMerchant_GetSalePrice(Entity*);
 
diff --git a/src/npc/gregal.c b/src/npc/gregal.c
index 8a279a06..88b069ce 100644
--- a/src/npc/gregal.c
+++ b/src/npc/gregal.c
@@ -1,7 +1,13 @@
+/**
+ * @file gregal.c
+ * @ingroup NPCs
+ *
+ * @brief Gregal NPC
+ */
 #include "entity.h"
-#include "script.h"
 #include "functions.h"
 #include "npc.h"
+#include "script.h"
 
 static const u32 gUnk_08113D84[] = {
     0x100c0200,
diff --git a/src/npc/guard.c b/src/npc/guard.c
index 834c2f1b..7f9c12ed 100644
--- a/src/npc/guard.c
+++ b/src/npc/guard.c
@@ -1,13 +1,18 @@
-#include "global.h"
+/**
+ * @file guard.c
+ * @ingroup NPCs
+ *
+ * @brief Guard NPC
+ */
 #include "entity.h"
-#include "player.h"
 #include "flags.h"
+#include "functions.h"
 #include "message.h"
+#include "npc.h"
+#include "player.h"
+#include "projectile.h"
 #include "room.h"
 #include "script.h"
-#include "functions.h"
-#include "npc.h"
-#include "projectile.h"
 
 typedef struct {
     u32 unk;
diff --git a/src/npc/guardWithSpear.c b/src/npc/guardWithSpear.c
index f74b97ce..7938af80 100644
--- a/src/npc/guardWithSpear.c
+++ b/src/npc/guardWithSpear.c
@@ -1,11 +1,17 @@
+/**
+ * @file guardWithSpear.c
+ * @ingroup NPCs
+ *
+ * @brief Guard with Spear NPC
+ */
 #define NENT_DEPRECATED
 #include "entity.h"
-#include "script.h"
-#include "player.h"
-#include "npc.h"
 #include "functions.h"
-#include "object.h"
 #include "item.h"
+#include "npc.h"
+#include "object.h"
+#include "player.h"
+#include "script.h"
 
 typedef struct {
     Entity base;
diff --git a/src/npc/hurdyGurdyMan.c b/src/npc/hurdyGurdyMan.c
index 1c45bbf3..cd130edb 100644
--- a/src/npc/hurdyGurdyMan.c
+++ b/src/npc/hurdyGurdyMan.c
@@ -1,7 +1,13 @@
+/**
+ * @file hurdyGurdyMan.c
+ * @ingroup NPCs
+ *
+ * @brief Hurdy Gurdy Man NPC
+ */
 #include "entity.h"
 #include "functions.h"
-#include "save.h"
 #include "npc.h"
+#include "save.h"
 
 static const SpriteLoadData gUnk_081144F0[] = { { 0x163, 0x59, 0x4 }, { 0x4163, 0x59, 0x4 }, { 0, 0, 0 } };
 
diff --git a/src/npc/kid.c b/src/npc/kid.c
index 685d7da8..6c039e1d 100644
--- a/src/npc/kid.c
+++ b/src/npc/kid.c
@@ -1,3 +1,9 @@
+/**
+ * @file kid.c
+ * @ingroup NPCs
+ *
+ * @brief Kid NPC
+ */
 #include "functions.h"
 #include "message.h"
 #include "npc.h"
diff --git a/src/npc/kingDaltus.c b/src/npc/kingDaltus.c
index 3bdf60a2..763c2636 100644
--- a/src/npc/kingDaltus.c
+++ b/src/npc/kingDaltus.c
@@ -1,8 +1,14 @@
+/**
+ * @file kingDaltus.c
+ * @ingroup NPCs
+ *
+ * @brief King Daltus NPC
+ */
 #include "entity.h"
-#include "script.h"
 #include "functions.h"
-#include "npc.h"
 #include "item.h"
+#include "npc.h"
+#include "script.h"
 
 void sub_08066654(Entity*);
 void sub_08066688(Entity*);
diff --git a/src/npc/kingGustaf.c b/src/npc/kingGustaf.c
index c09d7de0..e775e5d3 100644
--- a/src/npc/kingGustaf.c
+++ b/src/npc/kingGustaf.c
@@ -1,4 +1,9 @@
-#include "global.h"
+/**
+ * @file kingGustaf.c
+ * @ingroup NPCs
+ *
+ * @brief King Gustaf NPC
+ */
 #include "entity.h"
 #include "functions.h"
 #include "screen.h"
diff --git a/src/npc/librari.c b/src/npc/librari.c
index e725b669..80da08d1 100644
--- a/src/npc/librari.c
+++ b/src/npc/librari.c
@@ -1,7 +1,12 @@
-#include "global.h"
+/**
+ * @file librari.c
+ * @ingroup NPCs
+ *
+ * @brief Librari NPC
+ */
 #include "entity.h"
-#include "npc.h"
 #include "item.h"
+#include "npc.h"
 
 void Librari(Entity* this) {
     switch (this->action) {
diff --git a/src/npc/librarians.c b/src/npc/librarians.c
index 1a58777d..c9a7166f 100644
--- a/src/npc/librarians.c
+++ b/src/npc/librarians.c
@@ -1,10 +1,16 @@
+/**
+ * @file librarians.c
+ * @ingroup NPCs
+ *
+ * @brief Librarians NPC
+ */
 #include "entity.h"
-#include "script.h"
-#include "functions.h"
 #include "flags.h"
-#include "message.h"
-#include "sound.h"
+#include "functions.h"
 #include "item.h"
+#include "message.h"
+#include "script.h"
+#include "sound.h"
 
 extern void sub_08095BE0(Entity*, u32);
 
diff --git a/src/npc/mailbox.c b/src/npc/mailbox.c
index 5c92eefc..f22b3e35 100644
--- a/src/npc/mailbox.c
+++ b/src/npc/mailbox.c
@@ -1,7 +1,12 @@
-#include "global.h"
+/**
+ * @file mailbox.c
+ * @ingroup NPCs
+ *
+ * @brief Mailbox NPC
+ */
+#include "effects.h"
 #include "entity.h"
 #include "message.h"
-#include "effects.h"
 #include "npc.h"
 
 void sub_08063280(Entity*);
diff --git a/src/npc/malon.c b/src/npc/malon.c
index 1ab967c0..e4585583 100644
--- a/src/npc/malon.c
+++ b/src/npc/malon.c
@@ -1,7 +1,12 @@
-#include "global.h"
+/**
+ * @file malon.c
+ * @ingroup NPCs
+ *
+ * @brief Malon NPC
+ */
 #include "entity.h"
-#include "script.h"
 #include "npc.h"
+#include "script.h"
 
 void sub_08065864(Entity* this);
 void sub_08065880(Entity* this);
diff --git a/src/npc/mama.c b/src/npc/mama.c
index 0e2b7620..8ca75d77 100644
--- a/src/npc/mama.c
+++ b/src/npc/mama.c
@@ -1,7 +1,13 @@
+/**
+ * @file mama.c
+ * @ingroup NPCs
+ *
+ * @brief Mama NPC
+ */
 #include "entity.h"
-#include "script.h"
-#include "save.h"
 #include "npc.h"
+#include "save.h"
+#include "script.h"
 
 static const SpriteLoadData gUnk_08113754[] = {
     { 0x101, 0x4e, 0x4 },
diff --git a/src/npc/marcy.c b/src/npc/marcy.c
index 57f979dd..588f45aa 100644
--- a/src/npc/marcy.c
+++ b/src/npc/marcy.c
@@ -1,8 +1,14 @@
+/**
+ * @file marcy.c
+ * @ingroup NPCs
+ *
+ * @brief Marcy NPC
+ */
 #include "entity.h"
-#include "functions.h"
 #include "flags.h"
-#include "message.h"
+#include "functions.h"
 #include "item.h"
+#include "message.h"
 
 void Marcy(Entity* this) {
     if (this->action == 0) {
diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c
index e5e5cad3..4729e96b 100644
--- a/src/npc/mayorHagen.c
+++ b/src/npc/mayorHagen.c
@@ -1,9 +1,14 @@
-#include "global.h"
+/**
+ * @file mayorHagen.c
+ * @ingroup NPCs
+ *
+ * @brief Mayor Hagen NPC
+ */
 #include "entity.h"
-#include "player.h"
 #include "flags.h"
-#include "npc.h"
 #include "item.h"
+#include "npc.h"
+#include "player.h"
 
 void MayorHagen(Entity* this) {
     u32 v;
diff --git a/src/npc/melari.c b/src/npc/melari.c
index 59760a78..01ad6242 100644
--- a/src/npc/melari.c
+++ b/src/npc/melari.c
@@ -1,5 +1,11 @@
-#include "npc.h"
+/**
+ * @file melari.c
+ * @ingroup NPCs
+ *
+ * @brief Melari NPC
+ */
 #include "item.h"
+#include "npc.h"
 
 void sub_08068780(Entity*);
 void sub_08068708(Entity*);
diff --git a/src/npc/milkCart.c b/src/npc/milkCart.c
index 5736b5b6..4c581a1e 100644
--- a/src/npc/milkCart.c
+++ b/src/npc/milkCart.c
@@ -1,3 +1,9 @@
+/**
+ * @file milkCart.c
+ * @ingroup NPCs
+ *
+ * @brief Milk Cart NPC
+ */
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/minishEzlo.c b/src/npc/minishEzlo.c
index 921452de..39a4c028 100644
--- a/src/npc/minishEzlo.c
+++ b/src/npc/minishEzlo.c
@@ -1,8 +1,14 @@
+/**
+ * @file minishEzlo.c
+ * @ingroup NPCs
+ *
+ * @brief Minish Ezlo NPC
+ */
 #define NENT_DEPRECATED
 #include "entity.h"
-#include "sound.h"
-#include "script.h"
 #include "npc.h"
+#include "script.h"
+#include "sound.h"
 
 typedef struct {
     Entity base;
diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c
index fe5806c1..3bce1938 100644
--- a/src/npc/ministerPotho.c
+++ b/src/npc/ministerPotho.c
@@ -1,8 +1,14 @@
+/**
+ * @file ministerPotho.c
+ * @ingroup NPCs
+ *
+ * @brief Minister Potho NPC
+ */
 #include "entity.h"
 #include "flags.h"
+#include "item.h"
 #include "message.h"
 #include "npc.h"
-#include "item.h"
 
 void sub_08066864(Entity*);
 void sub_080667E4(Entity*);
diff --git a/src/npc/moblinLady.c b/src/npc/moblinLady.c
index 7aa448f1..b32800a4 100644
--- a/src/npc/moblinLady.c
+++ b/src/npc/moblinLady.c
@@ -1,3 +1,9 @@
+/**
+ * @file moblinLady.c
+ * @ingroup NPCs
+ *
+ * @brief Moblin Lady NPC
+ */
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c
index 44739b9d..e9fe9be5 100644
--- a/src/npc/mountainMinish.c
+++ b/src/npc/mountainMinish.c
@@ -1,10 +1,16 @@
+/**
+ * @file mountainMinish.c
+ * @ingroup NPCs
+ *
+ * @brief Mountain Minish NPC
+ */
 #include "entity.h"
-#include "script.h"
-#include "functions.h"
-#include "message.h"
 #include "flags.h"
-#include "npc.h"
+#include "functions.h"
 #include "item.h"
+#include "message.h"
+#include "npc.h"
+#include "script.h"
 
 const u8 gUnk_08111284[][0x20] = {
     { 0x8, 0x1,  0x9, 0x1,  0xa, 0x1,  0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x83, 0xf, 0x80,
diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c
index a93b7258..1fe39df8 100644
--- a/src/npc/mutoh.c
+++ b/src/npc/mutoh.c
@@ -1,10 +1,16 @@
-#include "global.h"
+
+/**
+ * @file mutoh.c
+ * @ingroup NPCs
+ *
+ * @brief Mutoh NPC
+ */
 #include "entity.h"
-#include "player.h"
 #include "flags.h"
+#include "item.h"
 #include "message.h"
 #include "npc.h"
-#include "item.h"
+#include "player.h"
 
 static const SpriteLoadData gUnk_08110C00[] = {
     { 0x51, 0x3e, 0x4 },
diff --git a/src/npc/nayru.c b/src/npc/nayru.c
index b9ea0df4..42b47ea6 100644
--- a/src/npc/nayru.c
+++ b/src/npc/nayru.c
@@ -1,7 +1,12 @@
-#include "global.h"
+/**
+ * @file nayru.c
+ * @ingroup NPCs
+ *
+ * @brief Nayru NPC
+ */
 #include "entity.h"
-#include "npc.h"
 #include "kinstone.h"
+#include "npc.h"
 
 void Nayru(Entity* this) {
     switch (this->action) {
diff --git a/src/npc/npc23.c b/src/npc/npc23.c
index a07b14b1..14c28601 100644
--- a/src/npc/npc23.c
+++ b/src/npc/npc23.c
@@ -1,9 +1,15 @@
+/**
+ * @file npc23.c
+ * @ingroup NPCs
+ *
+ * @brief NPC 23
+ */
 #include "entity.h"
-#include "player.h"
-#include "structures.h"
 #include "functions.h"
 #include "message.h"
 #include "npc.h"
+#include "player.h"
+#include "structures.h"
 
 bool32 sub_0806650C(Entity*);
 
diff --git a/src/npc/npc26.c b/src/npc/npc26.c
index fddbf460..cad4d6e3 100644
--- a/src/npc/npc26.c
+++ b/src/npc/npc26.c
@@ -1,4 +1,9 @@
-#include "global.h"
+/**
+ * @file npc26.c
+ * @ingroup NPCs
+ *
+ * @brief NPC 26
+ */
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c
index cdfd7abe..797c560f 100644
--- a/src/npc/npc4E.c
+++ b/src/npc/npc4E.c
@@ -1,3 +1,9 @@
+/**
+ * @file npc4E.c
+ * @ingroup NPCs
+ *
+ * @brief NPC 4E
+ */
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/npc4F.c b/src/npc/npc4F.c
index 69cee66d..3f9450a3 100644
--- a/src/npc/npc4F.c
+++ b/src/npc/npc4F.c
@@ -1,3 +1,9 @@
+/**
+ * @file npc4F.c
+ * @ingroup NPCs
+ *
+ * @brief NPC 4F
+ */
 #include "npc.h"
 
 void NPC4F(Entity* this) {
diff --git a/src/npc/npc5.c b/src/npc/npc5.c
index f8e6707e..fc7e0c98 100644
--- a/src/npc/npc5.c
+++ b/src/npc/npc5.c
@@ -1,8 +1,14 @@
+/**
+ * @file npc5.c
+ * @ingroup NPCs
+ *
+ * @brief NPC 5
+ */
+#include "collision.h"
 #include "functions.h"
+#include "hitbox.h"
 #include "message.h"
 #include "npc.h"
-#include "hitbox.h"
-#include "collision.h"
 
 typedef struct {
     u8 unk_0;  // u8
diff --git a/src/npc/npc58.c b/src/npc/npc58.c
index 0409dc4f..78534d2b 100644
--- a/src/npc/npc58.c
+++ b/src/npc/npc58.c
@@ -1,3 +1,9 @@
+/**
+ * @file npc58.c
+ * @ingroup NPCs
+ *
+ * @brief NPC 58
+ */
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/npc9.c b/src/npc/npc9.c
index a8361648..70fa20bf 100644
--- a/src/npc/npc9.c
+++ b/src/npc/npc9.c
@@ -1,4 +1,9 @@
-#include "global.h"
+/**
+ * @file npc9.c
+ * @ingroup NPCs
+ *
+ * @brief NPC 9
+ */
 #include "entity.h"
 #include "message.h"
 #include "npc.h"
diff --git a/src/npc/percy.c b/src/npc/percy.c
index 145bbea7..b190c478 100644
--- a/src/npc/percy.c
+++ b/src/npc/percy.c
@@ -1,9 +1,14 @@
-#include "global.h"
+/**
+ * @file percy.c
+ * @ingroup NPCs
+ *
+ * @brief Percy NPC
+ */
 #include "entity.h"
-#include "npc.h"
 #include "functions.h"
-#include "kinstone.h"
 #include "item.h"
+#include "kinstone.h"
+#include "npc.h"
 
 static const SpriteLoadData gUnk_08112E1C[] = {
     { 0x30f6, 0x47, 0x4 },
diff --git a/src/npc/phonograph.c b/src/npc/phonograph.c
index 071f5b6e..1edaf270 100644
--- a/src/npc/phonograph.c
+++ b/src/npc/phonograph.c
@@ -1,11 +1,17 @@
-#include "entity.h"
-#include "script.h"
-#include "functions.h"
-#include "fileselect.h"
-#include "screen.h"
+/**
+ * @file phonograph.c
+ * @ingroup NPCs
+ *
+ * @brief Phonograph NPC
+ */
 #include "common.h"
+#include "entity.h"
+#include "fileselect.h"
 #include "flags.h"
+#include "functions.h"
 #include "message.h"
+#include "screen.h"
+#include "script.h"
 
 #ifdef EU
 void sub_0806EABC(Entity* this);
diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c
index 80ebfc0a..a68b3792 100644
--- a/src/npc/picolyteBottle.c
+++ b/src/npc/picolyteBottle.c
@@ -1,3 +1,9 @@
+/**
+ * @file picolyteBottle.c
+ * @ingroup NPCs
+ *
+ * @brief Picolyte Bottle NPC
+ */
 #define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
diff --git a/src/npc/pina.c b/src/npc/pina.c
index f11cbdd9..f7be3dd9 100644
--- a/src/npc/pina.c
+++ b/src/npc/pina.c
@@ -1,9 +1,15 @@
+/**
+ * @file pina.c
+ * @ingroup NPCs
+ *
+ * @brief Pina NPC
+ */
 #include "entity.h"
 #include "functions.h"
 #include "message.h"
-#include "save.h"
 #include "npc.h"
 #include "object.h"
+#include "save.h"
 
 void sub_08063B68(Entity* this);
 void sub_08063A80(Entity* this);
diff --git a/src/npc/pita.c b/src/npc/pita.c
index 8414accc..91584449 100644
--- a/src/npc/pita.c
+++ b/src/npc/pita.c
@@ -1,21 +1,23 @@
-#include "npc.h"
+/**
+ * @file pita.c
+ * @ingroup NPCs
+ *
+ * @brief Pita NPC
+ */
 #include "item.h"
+#include "npc.h"
 
 void Pita(Entity* this) {
     static const Hitbox gUnk_0810C428 = {
+        0,
+        2,
+        { 0, 0, 0, 0 },
 #if EU
-        0,
-        2,
-        { 0, 0, 0, 0 },
         6,
-        18,
 #else
-        0,
-        2,
-        { 0, 0, 0, 0 },
         10,
-        18,
 #endif
+        18,
     };
     if (this->action == 0) {
         this->action++;
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 9e7ce529..1cf65669 100644
--- a/src/npc/postman.c
+++ b/src/npc/postman.c
@@ -1,8 +1,13 @@
-#include "global.h"
-#include "sound.h"
+/**
+ * @file postman.c
+ * @ingroup NPCs
+ *
+ * @brief Postman NPC
+ */
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
+#include "sound.h"
 #include "structures.h"
 
 extern void sub_08060528(Entity*);
diff --git a/src/npc/rem.c b/src/npc/rem.c
index 01db2ab1..4d2f34ce 100644
--- a/src/npc/rem.c
+++ b/src/npc/rem.c
@@ -1,6 +1,12 @@
+/**
+ * @file rem.c
+ * @ingroup NPCs
+ *
+ * @brief Rem NPC
+ */
 #include "functions.h"
-#include "npc.h"
 #include "item.h"
+#include "npc.h"
 
 extern void sub_0806A8C8(Entity*);
 
diff --git a/src/npc/simon.c b/src/npc/simon.c
index 647eae41..81f779e3 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -1,3 +1,9 @@
+/**
+ * @file simon.c
+ * @ingroup NPCs
+ *
+ * @brief Simon NPC
+ */
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/sittingPerson.c b/src/npc/sittingPerson.c
index c5f63d07..6377776a 100644
--- a/src/npc/sittingPerson.c
+++ b/src/npc/sittingPerson.c
@@ -1,3 +1,9 @@
+/**
+ * @file sittingPerson.c
+ * @ingroup NPCs
+ *
+ * @brief Sitting Person NPC
+ */
 #include "npc.h"
 #include "functions.h"
 
diff --git a/src/npc/smallTownMinish.c b/src/npc/smallTownMinish.c
index 5bbe8040..d3ed3edb 100644
--- a/src/npc/smallTownMinish.c
+++ b/src/npc/smallTownMinish.c
@@ -1,11 +1,16 @@
-#include "global.h"
+/**
+ * @file smallTownMinish.c
+ * @ingroup NPCs
+ *
+ * @brief Small Town Minish NPC
+ */
 #include "entity.h"
-#include "player.h"
-#include "script.h"
-#include "save.h"
-#include "npc.h"
 #include "functions.h"
 #include "item.h"
+#include "npc.h"
+#include "player.h"
+#include "save.h"
+#include "script.h"
 
 void SmallTownMinish(Entity* this) {
     static const Hitbox gUnk_081142FC = { -2, 1, { 0, 0, 0, 0 }, 6, 6 };
diff --git a/src/npc/smith.c b/src/npc/smith.c
index bc5df016..047703fd 100644
--- a/src/npc/smith.c
+++ b/src/npc/smith.c
@@ -1,5 +1,11 @@
-#include "npc.h"
+/**
+ * @file smith.c
+ * @ingroup NPCs
+ *
+ * @brief Smith NPC
+ */
 #include "functions.h"
+#include "npc.h"
 
 static const SpriteLoadData gUnk_08110354[] = {
     { 0x4d, 0x38, 0x4 },
diff --git a/src/npc/stamp.c b/src/npc/stamp.c
index 0ac805ec..10450320 100644
--- a/src/npc/stamp.c
+++ b/src/npc/stamp.c
@@ -1,10 +1,15 @@
-#include "global.h"
-#include "entity.h"
-#include "message.h"
-#include "functions.h"
+/**
+ * @file stamp.c
+ * @ingroup NPCs
+ *
+ * @brief Stamp NPC
+ */
 #include "effects.h"
-#include "npc.h"
+#include "entity.h"
+#include "functions.h"
 #include "kinstone.h"
+#include "message.h"
+#include "npc.h"
 
 void sub_08062CA4(Entity*);
 void sub_08062BD4(Entity*);
diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c
index fa1e1305..e4a4d5bf 100644
--- a/src/npc/stockwell.c
+++ b/src/npc/stockwell.c
@@ -1,12 +1,18 @@
+/**
+ * @file stockwell.c
+ * @ingroup NPCs
+ *
+ * @brief Stockwell NPC
+ */
 #include "entity.h"
-#include "script.h"
-#include "room.h"
-#include "message.h"
 #include "functions.h"
+#include "game.h"
+#include "item.h"
+#include "message.h"
 #include "npc.h"
 #include "object.h"
-#include "item.h"
-#include "game.h"
+#include "room.h"
+#include "script.h"
 
 #ifndef EU
 static const Rect gUnk_0810FDA0 = { 0, 8, 10, 16 };
diff --git a/src/npc/sturgeon.c b/src/npc/sturgeon.c
index 05416de9..c4553bb5 100644
--- a/src/npc/sturgeon.c
+++ b/src/npc/sturgeon.c
@@ -1,8 +1,14 @@
+/**
+ * @file sturgeon.c
+ * @ingroup NPCs
+ *
+ * @brief Sturgeon NPC
+ */
 #include "entity.h"
 #include "functions.h"
+#include "item.h"
 #include "npc.h"
 #include "object.h"
-#include "item.h"
 
 const SpriteLoadData gUnk_0810FA38[] = {
     { 59, 140, 0 },
diff --git a/src/npc/syrup.c b/src/npc/syrup.c
index 1668d4f7..6e0f348e 100644
--- a/src/npc/syrup.c
+++ b/src/npc/syrup.c
@@ -1,5 +1,11 @@
-#include "npc.h"
+/**
+ * @file syrup.c
+ * @ingroup NPCs
+ *
+ * @brief Syrup NPC
+ */
 #include "functions.h"
+#include "npc.h"
 #include "object.h"
 
 static const SpriteLoadData gUnk_081121B4[] = {
diff --git a/src/npc/talon.c b/src/npc/talon.c
index dc86ba85..843b0bf5 100644
--- a/src/npc/talon.c
+++ b/src/npc/talon.c
@@ -1,6 +1,12 @@
-#include "npc.h"
+/**
+ * @file talon.c
+ * @ingroup NPCs
+ *
+ * @brief Talon NPC
+ */
 #include "functions.h"
 #include "item.h"
+#include "npc.h"
 
 static const SpriteLoadData gUnk_0810FEB0[] = {
     { 0x4b, 0x8b, 0 },
diff --git a/src/npc/teachers.c b/src/npc/teachers.c
index 05e0d3f6..8e9bc495 100644
--- a/src/npc/teachers.c
+++ b/src/npc/teachers.c
@@ -1,9 +1,14 @@
-#include "global.h"
+/**
+ * @file teachers.c
+ * @ingroup NPCs
+ *
+ * @brief Teachers NPC
+ */
 #include "entity.h"
+#include "npc.h"
 #include "player.h"
 #include "save.h"
 #include "script.h"
-#include "npc.h"
 
 static const SpriteLoadData gUnk_08113910[] = {
     { 0x103, 0x4f, 0x4 }, { 0x2103, 0x4f, 0x4 }, { 0, 0, 0 },           { 0, 0, 0 },
diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c
index 1d5cfabf..5f64fad7 100644
--- a/src/npc/tingleSiblings.c
+++ b/src/npc/tingleSiblings.c
@@ -1,9 +1,14 @@
-#include "global.h"
+/**
+ * @file tingleSiblings.c
+ * @ingroup NPCs
+ *
+ * @brief Tingle Siblings NPC
+ */
 #include "entity.h"
-#include "npc.h"
 #include "functions.h"
 #include "item.h"
 #include "kinstone.h"
+#include "npc.h"
 
 extern void sub_08064DE4(Entity*);
 extern void sub_08064D78(Entity*);
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index 721c800f..669e7198 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -1,8 +1,13 @@
-#include "global.h"
+/**
+ * @file townMinish.c
+ * @ingroup NPCs
+ *
+ * @brief Town Minish NPC
+ */
 #include "entity.h"
-#include "npc.h"
 #include "functions.h"
 #include "item.h"
+#include "npc.h"
 
 extern u32 sub_080B1AC8(u32, u32, u32);
 void sub_0806ACC4(Entity*);
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index adb973cb..4394ceb7 100644
--- a/src/npc/townsperson.c
+++ b/src/npc/townsperson.c
@@ -1,6 +1,12 @@
-#include "npc.h"
+/**
+ * @file townsperson.c
+ * @ingroup NPCs
+ *
+ * @brief Townsperson NPC
+ */
 #include "functions.h"
 #include "item.h"
+#include "npc.h"
 
 typedef struct {
     u8 frame1;
diff --git a/src/npc/vaati.c b/src/npc/vaati.c
index e9197a55..f088598e 100644
--- a/src/npc/vaati.c
+++ b/src/npc/vaati.c
@@ -1,8 +1,13 @@
-#include "global.h"
+/**
+ * @file vaati.c
+ * @ingroup NPCs
+ *
+ * @brief Vaati NPC
+ */
 #include "entity.h"
+#include "functions.h"
 #include "script.h"
 #include "sound.h"
-#include "functions.h"
 
 extern void sub_08095CB0(Entity*);
 extern void CreateRepeatedSoundManager(Entity*);
diff --git a/src/npc/vaatiReborn.c b/src/npc/vaatiReborn.c
index f2837926..82c349be 100644
--- a/src/npc/vaatiReborn.c
+++ b/src/npc/vaatiReborn.c
@@ -1,6 +1,11 @@
-#include "global.h"
-#include "npc.h"
+/**
+ * @file vaatiReborn.c
+ * @ingroup NPCs
+ *
+ * @brief Vaati Reborn NPC
+ */
 #include "functions.h"
+#include "npc.h"
 
 void VaatiRebornAction0(Entity* this);
 void VaatiRebornAction1(Entity* this);
diff --git a/src/npc/wheaton.c b/src/npc/wheaton.c
index daa98a6f..7edfc52b 100644
--- a/src/npc/wheaton.c
+++ b/src/npc/wheaton.c
@@ -1,3 +1,9 @@
+/**
+ * @file wheaton.c
+ * @ingroup NPCs
+ *
+ * @brief Wheaton NPC
+ */
 #include "npc.h"
 
 void Wheaton(Entity* this) {
diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c
index aa5c9c86..a7b29d2f 100644
--- a/src/npc/windTribespeople.c
+++ b/src/npc/windTribespeople.c
@@ -1,7 +1,12 @@
-#include "global.h"
-#include "sound.h"
+/**
+ * @file windTribespeople.c
+ * @ingroup NPCs
+ *
+ * @brief Wind Tribespeople NPC
+ */
 #include "entity.h"
 #include "npc.h"
+#include "sound.h"
 
 void sub_0806C798(Entity*);
 void sub_0806C7D4(Entity*);
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index 64898ef7..e790ddda 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -1,9 +1,14 @@
-#include "global.h"
-#include "sound.h"
+/**
+ * @file zelda.c
+ * @ingroup NPCs
+ *
+ * @brief Zelda NPC
+ */
 #include "entity.h"
-#include "functions.h"
 #include "flags.h"
+#include "functions.h"
 #include "npc.h"
+#include "sound.h"
 
 void ZeldaFollower_Hide(Entity*, Entity*);
 void ZeldaFollower_Show(Entity*, Entity*);
diff --git a/src/npc/zeldaFollower.c b/src/npc/zeldaFollower.c
index 2402823d..5b5bad35 100644
--- a/src/npc/zeldaFollower.c
+++ b/src/npc/zeldaFollower.c
@@ -1,3 +1,9 @@
+/**
+ * @file zeldaFollower.c
+ * @ingroup NPCs
+ *
+ * @brief Zelda Follower NPC
+ */
 #include "common.h"
 #include "entity.h"
 #include "functions.h"