diff --git a/docs/progress.txt b/docs/progress.txt
index 763560233..8ab0d5e1a 100644
--- a/docs/progress.txt
+++ b/docs/progress.txt
@@ -683,7 +683,7 @@ mn_clear_handles                ----------  ----------  -
 InitialiseMovableBlock          0x0042B430  0x00000030  *
 MovableBlockControl             0x0042B460  0x0000014A  *
 MovableBlockCollision           0x0042B5B0  0x00000208  *
-TestBlockMovaable               ----------  ----------  +
+TestBlockMoveable               ----------  ----------  +
 TestBlockPush                   0x0042B7E0  0x00000142  -
 TestBlockPull                   0x0042B940  0x00000239  -
 InitialiseRollingBlock          0x0042BB90  0x00000024  *
diff --git a/src/game/moveblock.h b/src/game/moveblock.h
index 2cdc5b6f2..302194446 100644
--- a/src/game/moveblock.h
+++ b/src/game/moveblock.h
@@ -4,7 +4,13 @@
 #include <stdint.h>
 
 // clang-format off
+#define InitialiseMovableBlock  ((void          (*)(int16_t item_num))0x0042B430)
+#define MovableBlockCollision   ((void          (*)(int16_t item_num, ITEM_INFO* litem, COLL_INFO* coll))0x0042B5B0)
+#define MovableBlockControl     ((void          (*)(int16_t item_num))0x0042B460)
+#define InitialiseRollingBlock  ((void          (*)(int16_t item_num))0x0042BB90)
+#define RollingBlockControl     ((void          (*)(int16_t item_num))0x0042BBC0)
 #define AlterFloorHeight        ((void          (*)(ITEM_INFO* item, int32_t height))0x0042BCA0)
+#define DrawMovableBlock        ((void          (*)(ITEM_INFO *item))0x0042BD60)
 // clang-format on
 
 #endif
diff --git a/src/game/setup.c b/src/game/setup.c
index ad796bb53..e280a3497 100644
--- a/src/game/setup.c
+++ b/src/game/setup.c
@@ -15,6 +15,7 @@
 #include "game/lightning.h"
 #include "game/lion.h"
 #include "game/lot.h"
+#include "game/moveblock.h"
 #include "game/natla.h"
 #include "game/objects.h"
 #include "game/people.h"
diff --git a/src/game/traps.h b/src/game/traps.h
index 3847cba5d..d5d511cdb 100644
--- a/src/game/traps.h
+++ b/src/game/traps.h
@@ -6,12 +6,6 @@
 
 // clang-format off
 #define MidasCollision          ((void          (*)(int16_t item_num, ITEM_INFO* litem, COLL_INFO* coll))0x004334C0)
-#define InitialiseMovableBlock  ((void          (*)(int16_t item_num))0x0042B430)
-#define MovableBlockControl     ((void          (*)(int16_t item_num))0x0042B460)
-#define MovableBlockCollision   ((void          (*)(int16_t item_num, ITEM_INFO* litem, COLL_INFO* coll))0x0042B5B0)
-#define InitialiseRollingBlock  ((void          (*)(int16_t item_num))0x0042BB90)
-#define RollingBlockControl     ((void          (*)(int16_t item_num))0x0042BBC0)
-#define DrawMovableBlock        ((void          (*)(ITEM_INFO *item))0x0042BD60)
 #define InitialiseRollingBall   ((void          (*)(int16_t item_num))0x0043A010)
 #define RollingBallControl      ((void          (*)(int16_t item_num))0x0043A050)
 #define RollingBallCollision    ((void          (*)(int16_t item_num, ITEM_INFO* litem, COLL_INFO* coll))0x0043A2B0)