diff --git a/th02/gaiji/from_2.h b/th02/gaiji/from_2.h
index 6d42dfc9..79817284 100644
--- a/th02/gaiji/from_2.h
+++ b/th02/gaiji/from_2.h
@@ -1,6 +1,27 @@
 /// Gaiji introduced in TH02, and shared with later games
 /// -----------------------------------------------------
 
+// Enemy health / dream / power bars, with the given width in pixels.
+#define gaiji_bar(start) \
+	g_BAR_01W = start, \
+	g_BAR_02W, \
+	g_BAR_03W, \
+	g_BAR_04W, \
+	g_BAR_05W, \
+	g_BAR_06W, \
+	g_BAR_07W, \
+	g_BAR_08W, \
+	g_BAR_09W, \
+	g_BAR_10W, \
+	g_BAR_11W, \
+	g_BAR_12W, \
+	g_BAR_13W, \
+	g_BAR_14W, \
+	g_BAR_15W, \
+	g_BAR_16W
+
+#define BAR_GAIJI_MAX 16
+
 // In TH02, ZUN messed up and swapped M and N in MIKOFT.BFT for both regular
 // and bold fonts. Therefore, other code shouldn't really use the
 // straightforward solution of just adding char literals to a defined start
diff --git a/th03/gaiji/bar.h b/th03/gaiji/bar.h
deleted file mode 100644
index 190aeb6a..00000000
--- a/th03/gaiji/bar.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Enemy health / dream / power bars, with the given width in pixels.
-#define gaiji_bar(start) \
-	g_BAR_01W = start, \
-	g_BAR_02W, \
-	g_BAR_03W, \
-	g_BAR_04W, \
-	g_BAR_05W, \
-	g_BAR_06W, \
-	g_BAR_07W, \
-	g_BAR_08W, \
-	g_BAR_09W, \
-	g_BAR_10W, \
-	g_BAR_11W, \
-	g_BAR_12W, \
-	g_BAR_13W, \
-	g_BAR_14W, \
-	g_BAR_15W, \
-	g_BAR_16W
-
-#define BAR_GAIJI_MAX 16
diff --git a/th03/gaiji/gaiji.h b/th03/gaiji/gaiji.h
index 1dd038e2..14403615 100644
--- a/th03/gaiji/gaiji.h
+++ b/th03/gaiji/gaiji.h
@@ -3,7 +3,6 @@
 // Gaiji available to TH03
 
 #include "th02/gaiji/from_2.h"
-#include "th03/gaiji/bar.h"
 
 typedef enum {
 	// 1P/2P selection cursor
diff --git a/th04/gaiji/gaiji.h b/th04/gaiji/gaiji.h
index d2a2abca..dab33eb9 100644
--- a/th04/gaiji/gaiji.h
+++ b/th04/gaiji/gaiji.h
@@ -3,7 +3,6 @@
 // Gaiji available to TH04 and TH05
 
 #include "th02/gaiji/from_2.h"
-#include "th03/gaiji/bar.h"
 
 #define OVERLAY_FADE_CELS 8
 #define RETURN_KEY_CELS 4