diff --git a/include/functions.h b/include/functions.h
index e6be13bc..7f5b9cc1 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -9,6 +9,7 @@
 #include "player.h"
 #include "structures.h"
 #include "room.h"
+#include "script.h"
 
 // Identified - to be sorted into header files
 extern u32 Random(void);
@@ -43,7 +44,6 @@ extern void UpdateAnimationVariableFrames(Entity*, u32);
 extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
 extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
 extern u32 LoadFixedGFX(Entity*, u32);
-extern void ExecuteScriptCommandSet();
 extern void _DmaFill32(u32, void*, u32);
 extern Entity* CreateItemEntity(u32, u32, u32);
 void _DmaCopy(const void* src, void* dst, u32 size);
diff --git a/src/npc/festari.c b/src/npc/festari.c
index 67637ec3..0c5c74f8 100644
--- a/src/npc/festari.c
+++ b/src/npc/festari.c
@@ -8,7 +8,6 @@ extern u32 sub_0801E99C(Entity*);
 extern void sub_08078784(Entity*, u32);
 extern void sub_0807DD50(Entity*);
 extern void sub_0806F118(Entity*);
-extern void ExecuteScriptCommandSet(Entity*, void*);
 extern void sub_0805FF2C(Entity*, void*);
 
 extern void (*const gUnk_08109BBC[])(Entity*);
diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c
index cdee3afe..170f6e33 100644
--- a/src/object/houseDoorExterior.c
+++ b/src/object/houseDoorExterior.c
@@ -116,7 +116,7 @@ static void sub_0808681C(Entity* this) {
     }
 
     if (this->flags & 0x2) {
-        ExecuteScriptCommandSet(this, *(u32**)&this->cutsceneBeh);
+        ExecuteScriptCommandSet(this, *(ScriptExecutionContext **)&this->cutsceneBeh);
         sub_080868EC(this, *(void**)&this->cutsceneBeh);
     }
 }
@@ -128,7 +128,7 @@ void sub_080868B0(Entity* this) {
         this->boundingBox = &gUnk_081206AC;
         this->actionDelay = 8;
     }
-    ExecuteScriptCommandSet(this, *(u32**)&this->cutsceneBeh);
+    ExecuteScriptCommandSet(this, *(ScriptExecutionContext **)&this->cutsceneBeh);
     sub_080868EC(this, *(void**)&this->cutsceneBeh);
 }