14 files changed, 27 insertions, 3 deletions
diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 91060622ab..aa097ded3a 100644
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -65,4 +65,6 @@ APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
   fi
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/arch/unix/config5.m4 b/modules/arch/unix/config5.m4
index e4831b49e5..1815b6198b 100644
--- a/modules/arch/unix/config5.m4
+++ b/modules/arch/unix/config5.m4
@@ -18,5 +18,7 @@ APACHE_MODULE(privileges, Per-virtualhost Unix UserIDs and enhanced security for
   fi
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
 
diff --git a/modules/core/config.m4 b/modules/core/config.m4
index 84e71060ec..fe1aae78c6 100644
--- a/modules/core/config.m4
+++ b/modules/core/config.m4
@@ -61,4 +61,6 @@ APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
     fi
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/database/config.m4 b/modules/database/config.m4
index ab2f941587..809270be20 100644
--- a/modules/database/config.m4
+++ b/modules/database/config.m4
@@ -3,4 +3,6 @@ APACHE_MODPATH_INIT(database)
 
 APACHE_MODULE(dbd, Apache DBD Framework, , , most)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/dav/main/config5.m4 b/modules/dav/main/config5.m4
index fa2eee4762..59c077ebbc 100644
--- a/modules/dav/main/config5.m4
+++ b/modules/dav/main/config5.m4
@@ -14,9 +14,8 @@ APACHE_MODULE(dav, WebDAV protocol handling, $dav_objects, , $dav_enable)
 
 if test "$dav_enable" != "no" -o "$enable_dav" != "no"; then
   apache_need_expat=yes
-
-  APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 fi
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 
 APACHE_MODPATH_FINISH
diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 110bedb1a4..fa296efd41 100644
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -76,4 +76,6 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
   fi
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/generators/config5.m4 b/modules/generators/config5.m4
index 51a9ee77fd..117facf312 100644
--- a/modules/generators/config5.m4
+++ b/modules/generators/config5.m4
@@ -61,4 +61,6 @@ else
     APACHE_MODULE(cgid, CGI scripts, , , no)
 fi
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/ldap/config.m4 b/modules/ldap/config.m4
index 2f0bbf9e39..f962dda2d7 100644
--- a/modules/ldap/config.m4
+++ b/modules/ldap/config.m4
@@ -13,4 +13,6 @@ APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects,
   AC_SUBST(MOD_LDAP_LDADD)
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4
index 2d1d142b0c..23ee15eee2 100644
--- a/modules/loggers/config.m4
+++ b/modules/loggers/config.m4
@@ -14,4 +14,6 @@ fi
 
 APACHE_MODULE(logio, input and output logging, , , most)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/lua/config.m4 b/modules/lua/config.m4
index 78f17ea3aa..6010980938 100644
--- a/modules/lua/config.m4
+++ b/modules/lua/config.m4
@@ -125,4 +125,6 @@ APACHE_MODULE(lua, Apache Lua Framework, $lua_objects, , no, [
   MOD_LUA_LDADD="$LUA_LIBS"
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 8766a89082..ad8b75cbfa 100644
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -14,4 +14,6 @@ APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , yes
 APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes)
 APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index cd3ba0cca1..f382dde8ed 100644
--- a/modules/proxy/config.m4
+++ b/modules/proxy/config.m4
@@ -92,6 +92,7 @@ APACHE_MODULE(serf, [Reverse proxy module using Serf], , , no, [
     CHECK_SERF
 ])
 
-APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/../generators])
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
 
diff --git a/modules/session/config.m4 b/modules/session/config.m4
index 4721831a22..75d6a5f4c5 100644
--- a/modules/session/config.m4
+++ b/modules/session/config.m4
@@ -30,5 +30,7 @@ APACHE_MODULE(session_crypto, session crypto module, , , no, [
 APACHE_MODULE(session_dbd, session dbd module, , , $session_mods_enable)
 dnl APACHE_MODULE(session_ldap, session ldap module, , , $session_mods_enable)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
 
diff --git a/modules/test/config.m4 b/modules/test/config.m4
index 9c150f488f..94cc604b87 100644
--- a/modules/test/config.m4
+++ b/modules/test/config.m4
@@ -8,4 +8,6 @@ APACHE_MODULE(optional_fn_export, example optional function exporter, , , no)
 
 APACHE_MODULE(dialup, rate limits static files to dialup modem speeds, , , no)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH