diff --git a/src/scripting/decorate/olddecorations.cpp b/src/scripting/decorate/olddecorations.cpp
index 4bcb2c36c..75e49dbaa 100644
--- a/src/scripting/decorate/olddecorations.cpp
+++ b/src/scripting/decorate/olddecorations.cpp
@@ -48,7 +48,7 @@
 #include "decallib.h"
 #include "i_system.h"
 #include "thingdef.h"
-#include "codegeneration/thingdef_exp.h"
+#include "codegeneration/codegen.h"
 #include "r_data/r_translate.h"
 
 // TYPES -------------------------------------------------------------------
diff --git a/src/scripting/decorate/thingdef_exp.cpp b/src/scripting/decorate/thingdef_exp.cpp
index 2f52fb260..5dc909cd0 100644
--- a/src/scripting/decorate/thingdef_exp.cpp
+++ b/src/scripting/decorate/thingdef_exp.cpp
@@ -48,7 +48,7 @@
 #include "thingdef.h"
 #include "p_lnspec.h"
 #include "doomstat.h"
-#include "codegeneration/thingdef_exp.h"
+#include "codegeneration/codegen.h"
 
 FRandom pr_exrandom ("EX_Random");
 
diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp
index f567d91e0..e48d4d856 100644
--- a/src/scripting/decorate/thingdef_parse.cpp
+++ b/src/scripting/decorate/thingdef_parse.cpp
@@ -49,7 +49,7 @@
 #include "v_palette.h"
 #include "doomerrors.h"
 #include "i_system.h"
-#include "codegeneration/thingdef_exp.h"
+#include "codegeneration/codegen.h"
 #include "w_wad.h"
 #include "v_video.h"
 #include "version.h"
diff --git a/src/scripting/decorate/thingdef_states.cpp b/src/scripting/decorate/thingdef_states.cpp
index 143144aa5..f2dda5548 100644
--- a/src/scripting/decorate/thingdef_states.cpp
+++ b/src/scripting/decorate/thingdef_states.cpp
@@ -54,7 +54,7 @@
 #include "s_sound.h"
 #include "i_system.h"
 #include "colormatcher.h"
-#include "codegeneration/thingdef_exp.h"
+#include "codegeneration/codegen.h"
 #include "version.h"
 #include "templates.h"
 #include "vmbuilder.h"
diff --git a/src/scripting/thingdef.cpp b/src/scripting/thingdef.cpp
index 1a761b8c2..1ed0ea910 100644
--- a/src/scripting/thingdef.cpp
+++ b/src/scripting/thingdef.cpp
@@ -61,7 +61,7 @@
 #include "p_conversation.h"
 #include "v_text.h"
 #include "thingdef.h"
-#include "codegeneration/thingdef_exp.h"
+#include "codegeneration/codegen.h"
 #include "a_sharedglobal.h"
 #include "vmbuilder.h"
 #include "stats.h"
diff --git a/src/scripting/vm/vmbuilder.cpp b/src/scripting/vm/vmbuilder.cpp
index f111c4529..4351723f8 100644
--- a/src/scripting/vm/vmbuilder.cpp
+++ b/src/scripting/vm/vmbuilder.cpp
@@ -32,7 +32,7 @@
 */
 
 #include "vmbuilder.h"
-#include "codegeneration/thingdef_exp.h"
+#include "codegeneration/codegen.h"
 #include "info.h"
 #include "m_argv.h"
 #include "thingdef.h"
diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp
index d034c51cc..2016659fa 100644
--- a/src/scripting/zscript/zcc_compile.cpp
+++ b/src/scripting/zscript/zcc_compile.cpp
@@ -47,7 +47,7 @@
 #include "p_lnspec.h"
 #include "i_system.h"
 #include "gdtoa.h"
-#include "codegeneration/thingdef_exp.h"
+#include "codegeneration/codegen.h"
 #include "vmbuilder.h"
 
 #define DEFINING_CONST ((PSymbolConst *)(void *)1)
@@ -2290,6 +2290,7 @@ FxExpression *ZCCCompiler::ConvertNode(ZCC_TreeNode *ast)
 	case AST_ExprFuncCall:
 	{
 		auto fcall = static_cast<ZCC_ExprFuncCall *>(ast);
+		//return ConvertFunctionCall(fcall);
 		assert(fcall->Function->NodeType == AST_ExprID);	// of course this cannot remain. Right now nothing more complex can come along but later this will have to be decomposed into 'self' and the actual function name.
 		auto fname = static_cast<ZCC_ExprID *>(fcall->Function)->Identifier;
 		return new FxFunctionCall(nullptr, fname, ConvertNodeList(fcall->Parameters), *ast);