diff --git a/configure.ac b/configure.ac
index b3ef4fbf6f..936e916be7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,14 +274,17 @@ AC_CONFIG_FILES([\
     doc/Makefile \
     src/Makefile \
     others/Makefile \
-    test/Makefile \
-    test/benchmark/Makefile \
-    test/fuzzer/Makefile \
     examples/Makefile \
     examples/simple_example_using_c/Makefile \
     examples/multithread_c/Makefile \
     ])
 
+AM_COND_IF([TEST_UTILITIES],
+       [AC_CONFIG_FILES([test/Makefile test/benchmark/Makefile])])
+
+AM_COND_IF([AFL_FUZZER],
+       [AC_CONFIG_FILES([test/fuzzer/Makefile])])
+
 AC_CONFIG_HEADERS([src/config.h])
 
 
diff --git a/others/Makefile.am b/others/Makefile.am
index e9211f1cc5..87f510cdf7 100644
--- a/others/Makefile.am
+++ b/others/Makefile.am
@@ -4,3 +4,9 @@ libinjection_la_SOURCES = \
 	libinjection/src/libinjection_html5.c \
     libinjection/src/libinjection_sqli.c \
     libinjection/src/libinjection_xss.c
+
+noinst_HEADERS = libinjection/src/libinjection.h \
+       libinjection/src/libinjection_html5.h \
+       libinjection/src/libinjection_sqli.h \
+       libinjection/src/libinjection_sqli_data.h \
+       libinjection/src/libinjection_xss.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ffd39bf27..08190491a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,6 +50,20 @@ libmodsecurity_includesub_HEADERS = \
 	../headers/modsecurity/collection/variable.h
 
 
+noinst_HEADERS = \
+	actions/*.h \
+	actions/transformations/*.h \
+	audit_log/*.h \
+	audit_log/writer/*.h \
+	collection/backend/*.h \
+	operators/*.h \
+	parser/*.h \
+	request_body_processor/*.h \
+	utils/*.h \
+	utils/mbedtls/*.h \
+	variables/*.h \
+	variables/variations/*.h \
+	*.h
 
 
 VARIABLES = \
diff --git a/test/Makefile.am b/test/Makefile.am
index 6c5ab3b55a..a5791893a8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -20,6 +20,9 @@ MAINTAINERCLEANFILES = \
 bin_PROGRAMS =
 noinst_PROGRAMS =
 
+EXTRA_DIST = \
+	test-cases/*
+
 
 # unit_tests
 
@@ -28,6 +31,12 @@ unit_tests_SOURCES = \
         unit/unit.cc \
         unit/unit_test.cc
 
+noinst_HEADERS = \
+       common/modsecurity_test.cc \
+       common/*.h \
+       unit/*.h \
+       regression/*.h
+
 unit_tests_LDADD = \
 	$(GLOBAL_LDADD) \
 	$(top_builddir)/src/.libs/libmodsecurity.a \