- moved the VM types into their own file and only include it where really needed.

src/scripting/zscript/ast.cpp

@@ -32,6 +32,8 @@
 */
 
 #include "dobject.h"
+#include "vmintern.h"
+#include "types.h"
 #include "sc_man.h"
 #include "memarena.h"
 #include "zcc_parser.h"

src/scripting/zscript/zcc_compile.cpp

@@ -49,6 +49,7 @@
 #include "i_system.h"
 #include "gdtoa.h"
 #include "backend/vmbuilder.h"
+#include "types.h"
 
 FSharedStringArena VMStringConstants;
 bool isActor(PContainerType *type);

src/scripting/zscript/zcc_parser.h

@@ -3,6 +3,7 @@
 
 #include "memarena.h"
 #include "sc_man.h"
+#include "types.h"
 
 struct ZCCToken
 {
@@ -193,7 +194,7 @@ struct ZCC_NamedNode : ZCC_TreeNode
 
 struct ZCC_Struct : ZCC_NamedNode
 {
-	VM_UWORD Flags;
+	uint32_t Flags;
 	ZCC_TreeNode *Body;
 	PContainerType *Type;
 	VersionInfo Version;