diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 1fb6f3d9b..5564ea8af 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -326,6 +326,7 @@ if test x"${top_need_libs}" = xyes; then
 	qfac_include_qf_plugin="\$(include_qf_plugin)"
 	qfac_include_qf_scene="\$(include_qf_scene)"
 	qfac_include_qf_simd="\$(include_qf_simd)"
+	qfac_include_qf_ui="\$(include_qf_ui)"
 	qfac_include_qf_vulkan="\$(include_qf_vulkan)"
 fi
 QF_SUBST(qfac_include_qf)
@@ -335,6 +336,7 @@ QF_SUBST(qfac_include_qf_math)
 QF_SUBST(qfac_include_qf_plugin)
 QF_SUBST(qfac_include_qf_scene)
 QF_SUBST(qfac_include_qf_simd)
+QF_SUBST(qfac_include_qf_ui)
 QF_SUBST(qfac_include_qf_vulkan)
 
 progs_gz=
diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am
index af3c99982..8008d89c2 100644
--- a/include/QF/Makemodule.am
+++ b/include/QF/Makemodule.am
@@ -48,6 +48,7 @@ include_qf = \
 	include/QF/pr_obj.h \
 	include/QF/pr_type.h \
 	include/QF/progs.h \
+	include/QF/pvsfile.h \
 	include/QF/qargs.h \
 	include/QF/qdefs.h \
 	include/QF/qendian.h \
@@ -67,6 +68,7 @@ include_qf = \
 	include/QF/sound.h \
 	include/QF/spritegn.h \
 	include/QF/sys.h \
+	include/QF/sys_developer.h \
 	include/QF/teamplay.h \
 	include/QF/tga.h \
 	include/QF/va.h \
@@ -189,6 +191,7 @@ qf_math_includedir = $(includedir)/QF/math
 qf_plugin_includedir = $(includedir)/QF/plugin
 qf_scene_includedir = $(includedir)/QF/scene
 qf_simd_includedir = $(includedir)/QF/simd
+qf_ui_includedir = $(includedir)/QF/ui
 qf_vulkan_includedir = $(includedir)/QF/Vulkan
 qf_include_HEADERS = @qfac_include_qf@
 qf_gl_include_HEADERS = @qfac_include_qf_gl@
@@ -197,6 +200,7 @@ qf_math_include_HEADERS = @qfac_include_qf_math@
 qf_plugin_include_HEADERS = @qfac_include_qf_plugin@
 qf_scene_include_HEADERS = @qfac_include_qf_scene@
 qf_simd_include_HEADERS = @qfac_include_qf_simd@
+qf_ui_include_HEADERS = @qfac_include_qf_ui@
 qf_vulkan_include_HEADERS = @qfac_include_qf_vulkan@
 
 ruamoko_qf_includedir = $(ruamoko_includedir)/QF
@@ -210,5 +214,6 @@ EXTRA_HEADERS += \
 	$(include_qf_plugin) \
 	$(include_qf_scene) \
 	$(include_qf_simd) \
+	$(include_qf_ui) \
 	$(include_qf_vulkan) \
 	$(qfcc_include_qf)
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 37b0f5a72..9fc6fced0 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -424,7 +424,7 @@ CLEANFILES += \
 	libs/video/renderer/vulkan/*.plc \
 	libs/video/renderer/vulkan/shader/*.spv \
 	libs/video/renderer/vulkan/shader/*.spvc \
-	libs/video/renderer/vulkan/vkgen.sym \
+	vkgen.sym \
 	$(vkparse_src)
 
 BUILT_SOURCES += $(shader_gen)
@@ -442,7 +442,7 @@ EXTRA_DIST += \
 	libs/video/renderer/vulkan/shader/alias.vert \
 	libs/video/renderer/vulkan/shader/alias_depth.vert \
 	libs/video/renderer/vulkan/shader/alias_gbuf.frag \
-	libs/video/renderer/vulkan/shader/alias_shadow.frag \
+	libs/video/renderer/vulkan/shader/alias_shadow.vert \
 	libs/video/renderer/vulkan/shader/bsp_depth.vert \
 	libs/video/renderer/vulkan/shader/bsp_gbuf.frag \
 	libs/video/renderer/vulkan/shader/bsp_gbuf.geom \