diff --git a/src/rendering/vulkan/system/vk_device.cpp b/src/rendering/vulkan/system/vk_device.cpp
index c3d775b8c..8fc6e8949 100644
--- a/src/rendering/vulkan/system/vk_device.cpp
+++ b/src/rendering/vulkan/system/vk_device.cpp
@@ -41,7 +41,7 @@
 #include "i_system.h"
 #include "version.h"
 #include "engineerrors.h"
-#include "gamedata/fonts/v_text.h"
+#include "v_text.h"
 
 bool I_GetVulkanPlatformExtensions(unsigned int *count, const char **names);
 bool I_CreateVulkanSurface(VkInstance instance, VkSurfaceKHR *surface);
diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp
index 0dc60bc3c..f5b0e93c1 100644
--- a/src/scripting/thingdef_data.cpp
+++ b/src/scripting/thingdef_data.cpp
@@ -757,6 +757,8 @@ void InitThingdef()
 		qsort(&properties[0], properties.Size(), sizeof(properties[0]), propcmp);
 	}
 
+	InitImports();
+
 	// Add the constructor and destructor to FCheckPosition.
 	auto fcp = NewStruct("FCheckPosition", nullptr);
 	fcp->mConstructor = *FindFunction(fcp, "_Constructor")->VMPointer;
@@ -774,8 +776,6 @@ void InitThingdef()
 	auto fltd = NewStruct("FLineTraceData", nullptr);
 	fltd->Size = sizeof(FLineTraceData);
 	fltd->Align = alignof(FLineTraceData);
-
-	InitImports();
 }
 
 void SynthesizeFlagFields()