diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index f3e59d2d5..fb0b60951 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -329,6 +329,7 @@ if test x"${top_need_libs}" = xyes; then
 	qfac_include_qf_input="\$(include_qf_input)"
 	qfac_include_qf_math="\$(include_qf_math)"
 	qfac_include_qf_plugin="\$(include_qf_plugin)"
+	qfac_include_qf_progs="\$(include_qf_progs)"
 	qfac_include_qf_scene="\$(include_qf_scene)"
 	qfac_include_qf_simd="\$(include_qf_simd)"
 	qfac_include_qf_ui="\$(include_qf_ui)"
@@ -340,6 +341,7 @@ QF_SUBST(qfac_include_qf_glsl)
 QF_SUBST(qfac_include_qf_input)
 QF_SUBST(qfac_include_qf_math)
 QF_SUBST(qfac_include_qf_plugin)
+QF_SUBST(qfac_include_qf_progs)
 QF_SUBST(qfac_include_qf_scene)
 QF_SUBST(qfac_include_qf_simd)
 QF_SUBST(qfac_include_qf_ui)
diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am
index d36dd7ead..382e556e3 100644
--- a/include/QF/Makemodule.am
+++ b/include/QF/Makemodule.am
@@ -210,6 +210,7 @@ qf_glsl_includedir = $(includedir)/QF/GLSL
 qf_input_includedir = $(includedir)/QF/input
 qf_math_includedir = $(includedir)/QF/math
 qf_plugin_includedir = $(includedir)/QF/plugin
+qf_progs_includedir = $(includedir)/QF/progs
 qf_scene_includedir = $(includedir)/QF/scene
 qf_simd_includedir = $(includedir)/QF/simd
 qf_ui_includedir = $(includedir)/QF/ui
@@ -220,6 +221,7 @@ qf_glsl_include_HEADERS = @qfac_include_qf_glsl@
 qf_input_include_HEADERS = @qfac_include_qf_input@
 qf_math_include_HEADERS = @qfac_include_qf_math@
 qf_plugin_include_HEADERS = @qfac_include_qf_plugin@
+qf_progs_include_HEADERS = @qfac_include_qf_progs@
 qf_scene_include_HEADERS = @qfac_include_qf_scene@
 qf_simd_include_HEADERS = @qfac_include_qf_simd@
 qf_ui_include_HEADERS = @qfac_include_qf_ui@
@@ -232,7 +234,7 @@ ruamoko_qf_include_HEADERS = @qfac_qfcc_include_qf@
 ruamoko_qf_input_include_HEADERS = @qfac_qfcc_include_qf_input@
 ruamoko_qf_progs_include_HEADERS = @qfac_qfcc_include_qf_progs@
 
-EXTRA_HEADERS += \
+EXTRA_DIST += \
 	$(include_qf) \
 	$(include_qf_gl) \
 	$(include_qf_glsl) \
diff --git a/libs/gamecode/Makemodule.am b/libs/gamecode/Makemodule.am
index dbffb47b3..411bfb645 100644
--- a/libs/gamecode/Makemodule.am
+++ b/libs/gamecode/Makemodule.am
@@ -21,7 +21,7 @@ libs_gamecode_libQFgamecode_la_SOURCES= \
 	libs/gamecode/pr_v6p_opcode.c \
 	libs/gamecode/pr_zone.c
 
-noinst_PYTHON += $(opcodes_py)
+noinst_PYTHON += $(opcodes_py) $(convert_py) $(hops_py)
 
 opcodes_py = $(srcdir)/libs/gamecode/opcodes.py
 pr_opcode_cinc = $(top_builddir)/libs/gamecode/pr_opcode.cinc
diff --git a/libs/gamecode/test/Makemodule.am b/libs/gamecode/test/Makemodule.am
index 57793aa4f..2cfd9fbf9 100644
--- a/libs/gamecode/test/Makemodule.am
+++ b/libs/gamecode/test/Makemodule.am
@@ -35,7 +35,7 @@ TESTS += $(libs_gamecode_tests)
 
 check_PROGRAMS += $(libs_gamecode_tests)
 
-EXTRA_DIST += head.c main.c
+EXTRA_DIST += libs/gamecode/test/head.c libs/gamecode/test/main.c
 
 test_gamecode_libs= \
 	libs/gamecode/libQFgamecode.la \
diff --git a/tools/qfcc/include/Makemodule.am b/tools/qfcc/include/Makemodule.am
index f6158b5c4..6609ddfc4 100644
--- a/tools/qfcc/include/Makemodule.am
+++ b/tools/qfcc/include/Makemodule.am
@@ -11,6 +11,7 @@ EXTRA_DIST += \
 	tools/qfcc/include/dot.h \
 	tools/qfcc/include/emit.h \
 	tools/qfcc/include/expr.h \
+	tools/qfcc/include/expr_names.h \
 	tools/qfcc/include/flow.h \
 	tools/qfcc/include/function.h \
 	tools/qfcc/include/grab.h \
@@ -32,4 +33,5 @@ EXTRA_DIST += \
 	tools/qfcc/include/switch.h \
 	tools/qfcc/include/symtab.h \
 	tools/qfcc/include/type.h \
-	tools/qfcc/include/value.h
+	tools/qfcc/include/value.h \
+	tools/qfcc/include/vec_types.h