6 files changed, 9 insertions, 6 deletions
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 69570d8c4..53eeadb99 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -36,6 +36,7 @@
 #include "libc64/sprintf.h"
 #include "PR/os_motor.h"
 
+#include "controller.h"
 #include "fault.h"
 #include "macros.h"
 #include "scheduler.h"
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 37d5d4cf1..fb640f0de 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1295,7 +1295,7 @@ f32 Actor_WorldDistXZToPoint(Actor* actor, Vec3f* refPoint) {
  * @param[out] offset The transformed coordinates.
  * @param[in]  point  The point to transform to actor coordinates.
  */
-void Actor_OffsetOfPointInActorCoords(Actor* actor, Vec3f* offset, Vec3f* point) {
+void Actor_WorldToActorCoords(Actor* actor, Vec3f* offset, Vec3f* point) {
     f32 cos = Math_CosS(actor->shape.rot.y);
     f32 sin = Math_SinS(actor->shape.rot.y);
     f32 diffX;
diff --git a/src/code/z_en_hy_code.c b/src/code/z_en_hy_code.c
index 9fc9ba750..28ba3734e 100644
--- a/src/code/z_en_hy_code.c
+++ b/src/code/z_en_hy_code.c
@@ -183,7 +183,7 @@ void func_800F0BB4(EnHy* enHy, PlayState* play, EnDoor* door, s16 arg3, s16 arg4
     Vec3f offset;
     f32 phi_f0;
 
-    Actor_OffsetOfPointInActorCoords(&door->knobDoor.dyna.actor, &offset, &enHy->actor.world.pos);
+    Actor_WorldToActorCoords(&door->knobDoor.dyna.actor, &offset, &enHy->actor.world.pos);
     phi_f0 = (offset.z >= 0.0f) ? 1.0f : -1.0f;
     animIndex = ((s8)phi_f0 < 0) ? 0 : 2;
     EnHy_ChangeObjectAndAnim(enHy, play, (animIndex == 0) ? arg3 : arg4);
diff --git a/src/code/z_pause.c b/src/code/z_pause.c
index a1bcf8d92..9f6f4a226 100644
--- a/src/code/z_pause.c
+++ b/src/code/z_pause.c
@@ -20,9 +20,10 @@
  */
 
 #include "z64frameadvance.h"
-#include "stdbool.h"
+
+#include "controller.h"
 #include "padutils.h"
-#include "macros.h"
+#include "stdbool.h"
 
 void FrameAdvance_Init(FrameAdvanceContext* frameAdvCtx) {
     frameAdvCtx->timer = 0;
diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c
index a7e4adfc8..1924dc87f 100644
--- a/src/code/z_sub_s.c
+++ b/src/code/z_sub_s.c
@@ -1148,12 +1148,12 @@ s32 SubS_MoveActorToPoint(Actor* actor, Vec3f* point, s16 rotStep) {
     f32 distSqBefore;
     f32 distSqAfter;
 
-    Actor_OffsetOfPointInActorCoords(actor, &offsetBefore, point);
+    Actor_WorldToActorCoords(actor, &offsetBefore, point);
     Math_SmoothStepToS(&actor->world.rot.y, SubS_GetDistSqAndOrientPoints(point, &actor->world.pos, &distSqBefore), 4,
                        rotStep, 1);
     actor->shape.rot.y = actor->world.rot.y;
     Actor_MoveWithGravity(actor);
-    Actor_OffsetOfPointInActorCoords(actor, &offsetAfter, point);
+    Actor_WorldToActorCoords(actor, &offsetAfter, point);
     SubS_GetDistSqAndOrientPoints(point, &actor->world.pos, &distSqAfter);
     return ((offsetBefore.z > 0.0f) && (offsetAfter.z <= 0.0f)) ? true : false;
 }
diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c
index af272b686..f4da13c39 100644
--- a/src/code/z_vimode.c
+++ b/src/code/z_vimode.c
@@ -3,6 +3,7 @@
 #include "stdbool.h"
 #include "PR/viint.h"
 
+#include "controller.h"
 #include "debug.h"
 #include "macros.h"
 #include "main.h"