- previous fix attempts done right

# Conflicts:
#	src/m_cheat.cpp

src/m_cheat.cpp

@@ -65,7 +65,6 @@
 #include "vm.h"
 #include "events.h"
 #include "p_acs.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

src/m_cheat.h

@@ -1,13 +1,12 @@
 #ifndef __M_CHEAT_H__
 #define __M_CHEAT_H__
 
-#include "zstring.h"
-
 //
 // CHEAT SEQUENCE PACKAGE
 //
 
 // [RH] Functions that actually perform the cheating
+class FString;
 class player_t;
 class PClassActor;
 

src/scriptutil.cpp

@@ -29,7 +29,7 @@
 #include "vm.h"
 #include "scriptutil.h"
 #include "p_acs.h"
-#include "actor.h"
+#include "actorinlines.h"
 
 
 static TArray<VMValue> parameters;