diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp
index f9c0f6783a..73fc5e8145 100644
--- a/src/m_cheat.cpp
+++ b/src/m_cheat.cpp
@@ -53,6 +53,7 @@
 #include "a_morph.h"
 #include "g_levellocals.h"
 #include "vm.h"
+#include "zstring.h"
 
 // [RH] Actually handle the cheat. The cheat code in st_stuff.c now just
 // writes some bytes to the network data stream, and the network code
diff --git a/src/m_cheat.h b/src/m_cheat.h
index a6bb5ab687..f2160b7294 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -1,6 +1,8 @@
 #ifndef __M_CHEAT_H__
 #define __M_CHEAT_H__
 
+#include "zstring.h"
+
 //
 // CHEAT SEQUENCE PACKAGE
 //
diff --git a/src/posix/cocoa/i_system.mm b/src/posix/cocoa/i_system.mm
index 8ceaaf3599..870d4b8bbb 100644
--- a/src/posix/cocoa/i_system.mm
+++ b/src/posix/cocoa/i_system.mm
@@ -141,10 +141,7 @@ static void I_FatalError(const char* const error, va_list ap)
 
 		char errortext[MAX_ERRORTEXT];
 		int index;
-		va_list argptr;
-		va_start(argptr, error);
 		index = vsnprintf(errortext, MAX_ERRORTEXT, error, ap);
-		va_end(argptr);
 
 		extern void Mac_I_FatalError(const char*);
 		Mac_I_FatalError(errortext);
diff --git a/src/scriptutil.cpp b/src/scriptutil.cpp
index f5d88087bc..3ba2ce4513 100644
--- a/src/scriptutil.cpp
+++ b/src/scriptutil.cpp
@@ -29,6 +29,7 @@
 #include "vm.h"
 #include "scriptutil.h"
 #include "p_acs.h"
+#include "actor.h"
 
 
 static TArray<VMValue> parameters;