diff --git a/include/rotating_gate.h b/include/rotating_gate.h
index fd86a6b04d5..3829edab4a0 100644
--- a/include/rotating_gate.h
+++ b/include/rotating_gate.h
@@ -1,9 +1,9 @@
 #ifndef GUARD_ROTATING_GATE_H
 #define GUARD_ROTATING_GATE_H
 
-void RotatingGatePuzzleCameraUpdate(s16, s16);
+void RotatingGatePuzzleCameraUpdate(s16 deltaX, s16 deltaY);
 void RotatingGate_InitPuzzleAndGraphics(void);
-u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16);
-bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8, s16, s16);
+bool32 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y);
+bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y);
 
 #endif // GUARD_ROTATING_GATE_H
diff --git a/include/sprite.h b/include/sprite.h
index 937ed42ced5..6a7b585bf38 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_SPRITE_H
 #define GUARD_SPRITE_H
 
+#define OAM_MATRIX_COUNT 32
 #define MAX_SPRITES 64
 #define SPRITE_NONE 0xFF
 #define TAG_NONE 0xFFFF
@@ -260,12 +261,12 @@ extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
 extern const struct SpriteTemplate gDummySpriteTemplate;
 
 extern u8 gReservedSpritePaletteCount;
-extern struct Sprite gSprites[];
+extern struct Sprite gSprites[MAX_SPRITES + 1];
 extern u8 gOamLimit;
 extern u16 gReservedSpriteTileCount;
 extern s16 gSpriteCoordOffsetX;
 extern s16 gSpriteCoordOffsetY;
-extern struct OamMatrix gOamMatrices[];
+extern struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT];
 extern bool8 gAffineAnimsDisabled;
 
 void ResetSpriteData(void);
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 57cb9fa7eb0..65c97845768 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -3,6 +3,7 @@
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "fieldmap.h"
+#include "rotating_gate.h"
 #include "sound.h"
 #include "sprite.h"
 #include "constants/songs.h"
@@ -939,7 +940,7 @@ void RotatingGate_InitPuzzle(void)
     }
 }
 
-void RotatingGatePuzzleCameraUpdate(u16 deltaX, u16 deltaY)
+void RotatingGatePuzzleCameraUpdate(s16 deltaX, s16 deltaY)
 {
     if (GetCurrentMapRotatingGatePuzzleType())
     {
@@ -958,7 +959,7 @@ void RotatingGate_InitPuzzleAndGraphics(void)
     }
 }
 
-bool8 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y)
+bool32 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y)
 {
     s32 i;
 
@@ -996,7 +997,7 @@ bool8 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y)
     return FALSE;
 }
 
-bool8 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y)
+bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y)
 {
     s32 i;
 
diff --git a/src/sprite.c b/src/sprite.c
index 14e9409c664..2e021f5cbff 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -5,8 +5,6 @@
 
 #define MAX_SPRITE_COPY_REQUESTS 64
 
-#define OAM_MATRIX_COUNT 32
-
 #define sAnchorX data[6]
 #define sAnchorY data[7]