diff --git a/.gitignore b/.gitignore
index 9515fb56..4e314e46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ src/location.hh
 src/position.hh
 src/stack.hh
 src/stamp-h1
+src/headers.mk
 /test/rules_optimization
 /test/regression_tests
 /test/unit_tests
diff --git a/build.sh b/build.sh
index 63f8a60f..4e8b5c47 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,28 @@
 
 rm -rf autom4te.cache
 rm -f aclocal.m4
+
+cd src
+rm -f haders.mk
+echo "noinst_HEADERS = \\" > headers.mk
+ls -1 \
+    actions/*.h \
+    actions/ctl/*.h \
+    actions/data/*.h \
+    actions/disruptive/*.h \
+    actions/transformations/*.h \
+    debug_log/*.h \
+    audit_log/writer/*.h \
+    collection/backend/*.h \
+    operators/*.h \
+    parser/*.h \
+    request_body_processor/*.h \
+    utils/*.h \
+    variables/*.h \
+    engine/*.h \
+    *.h | tr "\012" " " >> headers.mk
+cd ../
+
 case `uname` in Darwin*) glibtoolize --force --copy ;;
   *) libtoolize --force --copy ;; esac
 autoreconf --install
diff --git a/src/Makefile.am b/src/Makefile.am
index 79cf12aa..14c26697 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,24 +66,7 @@ libmodsecurity_includesub_collection_HEADERS = \
 libmodsecurity_includesub_actions_HEADERS = \
 	../headers/modsecurity/actions/action.h
 
-
-noinst_HEADERS = \
-	$(wildcard actions/*.h) \
-	$(wildcard actions/ctl/*.h) \
-	$(wildcard actions/data/*.h) \
-	$(wildcard actions/disruptive/*.h) \
-	$(wildcard actions/transformations/*.h) \
-	$(wildcard debug_log/*.h) \
-	$(wildcard audit_log/writer/*.h) \
-	$(wildcard collection/backend/*.h) \
-	$(wildcard operators/*.h) \
-	$(wildcard parser/*.h) \
-	$(wildcard request_body_processor/*.h) \
-	$(wildcard utils/*.h) \
-	$(wildcard variables/*.h) \
-	$(wildcard engine/*.h) \
-	$(wildcard *.h)
-
+include headers.mk
 
 ENGINES = \
 	engine/lua.cc