diff --git a/th01/main/boss/b05.cpp b/th01/main/boss/b05.cpp
index d05d502f..1b7c7002 100644
--- a/th01/main/boss/b05.cpp
+++ b/th01/main/boss/b05.cpp
@@ -22,6 +22,7 @@ extern "C" {
 }
 #include "th01/formats/grp.h"
 #include "th01/formats/pf.hpp"
+#include "th01/sprites/pellet.h"
 #include "th01/main/particle.hpp"
 #include "th01/main/playfld.hpp"
 #include "th01/main/vars.hpp"
diff --git a/th01/main/boss/b20m.cpp b/th01/main/boss/b20m.cpp
index ed4fd8e7..19d6dd39 100644
--- a/th01/main/boss/b20m.cpp
+++ b/th01/main/boss/b20m.cpp
@@ -40,6 +40,7 @@ extern "C" {
 #include "th01/main/playfld.hpp"
 #include "th01/formats/stagedat.hpp"
 #include "th01/sprites/leaf.hpp"
+#include "th01/sprites/pellet.h"
 #include "th01/sprites/shape8x8.hpp"
 #include "th01/main/entity.hpp"
 #include "th01/main/spawnray.hpp"
diff --git a/th01/main/bullet/pellet.cpp b/th01/main/bullet/pellet.cpp
index dbdb1afa..68e5cd4c 100644
--- a/th01/main/bullet/pellet.cpp
+++ b/th01/main/bullet/pellet.cpp
@@ -1,3 +1,5 @@
+#include "th01/main/bullet/pellet.hpp"
+
 /// Constants
 /// ---------
 // Can't declare these as `static const` variables, because that would break
diff --git a/th01/main/player/player.cpp b/th01/main/player/player.cpp
index d84e2f41..831fea33 100644
--- a/th01/main/player/player.cpp
+++ b/th01/main/player/player.cpp
@@ -1,3 +1,4 @@
+#include "th01/resident.hpp"
 extern "C" {
 #include "th01/hardware/frmdelay.h"
 }
@@ -6,11 +7,11 @@ extern "C" {
 extern "C" {
 #include "th01/snd/mdrv2.h"
 }
+#include "th01/formats/pf.hpp"
+#include "th01/sprites/pellet.h"
 #include "th01/main/vars.hpp"
 #include "th01/main/player/bomb.hpp"
 #include "th01/math/dir.hpp"
-#include "th01/formats/pf.hpp"
-#include "th01/resident.hpp"
 #include "th01/math/subpixel.hpp"
 #include "th01/main/hud/hud.hpp"
 #include "th01/main/player/anim.hpp"
diff --git a/th01/main/player/shot.cpp b/th01/main/player/shot.cpp
index 9eaf4e89..9f8a0b71 100644
--- a/th01/main/player/shot.cpp
+++ b/th01/main/player/shot.cpp
@@ -1,3 +1,6 @@
+#include "th01/math/overlap.hpp"
+#include "th01/sprites/pellet.h"
+
 bool16 unused_boss_stage_flag = false;
 
 static const pixel_t SHOT_SPRITE_MARGIN = 2;
diff --git a/th01/main/player/shot.hpp b/th01/main/player/shot.hpp
index 46aeab9d..be913ced 100644
--- a/th01/main/player/shot.hpp
+++ b/th01/main/player/shot.hpp
@@ -1,6 +1,3 @@
-#include "th01/sprites/pellet.h"
-#include "th01/math/overlap.hpp"
-
 static const int SHOT_COUNT = 8;
 static const pixel_t SHOT_W = 16;
 static const pixel_t SHOT_H = 16;
diff --git a/th01/main_38.cpp b/th01/main_38.cpp
index 92d8f7d7..d4e6b51c 100644
--- a/th01/main_38.cpp
+++ b/th01/main_38.cpp
@@ -24,8 +24,8 @@ extern "C" {
 #include "th01/main/playfld.hpp"
 #include "th01/main/player/player.hpp"
 #include "th01/main/player/shot.hpp"
-#include "th01/main/bullet/pellet.hpp"
 #include "th01/main/bullet/pellet_c.hpp"
 #include "th01/main/player/orb.hpp"
+
 #include "th01/main/player/shot.cpp"
 #include "th01/main/bullet/pellet.cpp"