From 8d9b4f5a17b7d284507837583dedccc42fda260b Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sat, 1 Dec 2018 09:44:14 +0200
Subject: [PATCH] - previous fix attempts done right

---
 src/m_cheat.cpp    | 1 -
 src/m_cheat.h      | 3 +--
 src/scriptutil.cpp | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp
index 73fc5e814..f9c0f6783 100644
--- a/src/m_cheat.cpp
+++ b/src/m_cheat.cpp
@@ -53,7 +53,6 @@
 #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 f2160b729..60950ffa9 100644
--- a/src/m_cheat.h
+++ b/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;
 
diff --git a/src/scriptutil.cpp b/src/scriptutil.cpp
index 3ba2ce451..6a9d5ab26 100644
--- a/src/scriptutil.cpp
+++ b/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;