diff --git a/th01/main/bomb.hpp b/th01/main/bomb.hpp
deleted file mode 100644
index d8a7ca25..00000000
--- a/th01/main/bomb.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// Current frame within the BOMB_DOUBLETAP_WINDOW. A bomb is fired if both
-// shot and strike keys are double-tapped before this variable reaches that
-// window.
-extern int bomb_doubletap_frames;
-
-#define BOMB_DOUBLETAP_WINDOW 20
diff --git a/th01/main/player/bomb.hpp b/th01/main/player/bomb.hpp
index 143e1a3d..2ed83ecf 100644
--- a/th01/main/player/bomb.hpp
+++ b/th01/main/player/bomb.hpp
@@ -1,6 +1,13 @@
+#define BOMB_DOUBLETAP_WINDOW 20
+
+// Current frame within the BOMB_DOUBLETAP_WINDOW. A bomb is fired if both
+// shot and strike keys are double-tapped before this variable reaches that
+// window.
+extern int bomb_doubletap_frames;
+
 // Indicates whether a bomb is active and dealing damage to everything on
 // screen.
-bool bomb_damaging;
+extern bool bomb_damaging;
 
 // Renders the given [frame] of the bomb animation, and applies any
 // frame-specific game state modifications. Returns false if the animation is
diff --git a/th01/main_01.cpp b/th01/main_01.cpp
index 3564957d..e7946551 100644
--- a/th01/main_01.cpp
+++ b/th01/main_01.cpp
@@ -16,8 +16,8 @@ extern "C" {
 #include "twobyte.h"
 #include "th01/hardware/frmdelay.h"
 #include "th01/hardware/input.hpp"
-#include "th01/main/bomb.hpp"
 #include "th01/main/debug.hpp"
+#include "th01/main/player/bomb.hpp"
 
 extern const char esc_cls[];