diff --git a/include/z64horse.h b/include/horse.h
similarity index 90%
rename from include/z64horse.h
rename to include/horse.h
index d58de4b6d4..0df858fbeb 100644
--- a/include/z64horse.h
+++ b/include/horse.h
@@ -1,5 +1,5 @@
-#ifndef Z64HORSE_H
-#define Z64HORSE_H
+#ifndef HORSE_H
+#define HORSE_H
 
 #include "ultra64.h"
 #include "z64math.h"
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index fda3f845f9..4c8594fa38 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -23,7 +23,7 @@
 #include "audio.h"
 #include "effect.h"
 #include "z64light.h"
-#include "z64horse.h"
+#include "horse.h"
 #include "z64play.h"
 #include "z64save.h"
 #include "z64skin_matrix.h"
diff --git a/src/code/z_horse.c b/src/code/z_horse.c
index d61af32e7e..764eb46143 100644
--- a/src/code/z_horse.c
+++ b/src/code/z_horse.c
@@ -4,7 +4,7 @@
 #include "printf.h"
 #include "regs.h"
 #include "translation.h"
-#include "z64horse.h"
+#include "horse.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 8aa4edcf0f..50f392e229 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -19,7 +19,7 @@
 #include "versions.h"
 #include "audio.h"
 #include "z64lifemeter.h"
-#include "z64horse.h"
+#include "horse.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 089043cad6..fa1d02a518 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -16,7 +16,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "face_reaction.h"
-#include "z64horse.h"
+#include "horse.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
index 37482c8996..4a96e040c3 100644
--- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
@@ -15,7 +15,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64horse.h"
+#include "horse.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
index 17faa872f1..ee75e3d740 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
@@ -25,7 +25,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "effect.h"
-#include "z64horse.h"
+#include "horse.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
index b854e6b68f..47b3b0b243 100644
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
@@ -17,7 +17,7 @@
 #include "sys_math3d.h"
 #include "z_lib.h"
 #include "actor.h"
-#include "z64horse.h"
+#include "horse.h"
 #include "z64player.h"
 #include "z64play.h"
 #include "z64save.h"