diff --git a/native/advertise/mod_advertise.h b/native/advertise/mod_advertise.h
index 9afae26f..2bf215d1 100644
--- a/native/advertise/mod_advertise.h
+++ b/native/advertise/mod_advertise.h
@@ -18,38 +18,17 @@
 
 #define CORE_PRIVATE
 
-#include "apr_hooks.h"
-#include "apr.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_buckets.h"
 #include "apr_md5.h"
-#include "apr_network_io.h"
-#include "apr_pools.h"
 #include "apr_strings.h"
-#include "apr_uri.h"
-#include "apr_date.h"
 #include "apr_uuid.h"
-#include "apr_version.h"
-#include "apr_atomic.h"
 
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
 #include "http_protocol.h"
-#include "http_request.h"
-#include "http_vhost.h"
-#include "http_main.h"
 #include "http_log.h"
-#include "http_connection.h"
-#include "util_filter.h"
-#include "util_ebcdic.h"
 #include "util_time.h"
 #include "ap_provider.h"
-#include "ap_mpm.h"
 
 #if APR_HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff --git a/native/balancers/mod_lbmethod_cluster.c b/native/balancers/mod_lbmethod_cluster.c
index b0c0bd3a..3e3b6257 100644
--- a/native/balancers/mod_lbmethod_cluster.c
+++ b/native/balancers/mod_lbmethod_cluster.c
@@ -3,23 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "mod_proxy.h"
 #include "mod_watchdog.h"
-#include "scoreboard.h"
-#include "ap_mpm.h"
-#include "apr_version.h"
-#include "ap_hooks.h"
-
-#include "ap_slotmem.h"
-
-#include "node.h"
-#include "host.h"
-#include "context.h"
-#include "balancer.h"
-
 #include "common.h"
 
-#include "mod_proxy_cluster.h"
 
 #define LB_CLUSTER_WATHCHDOG_NAME ("_lb_cluster_")
 static ap_watchdog_t *watchdog;
diff --git a/native/common/common.c b/native/common/common.c
index 14c1cf15..8d2c0d5d 100644
--- a/native/common/common.c
+++ b/native/common/common.c
@@ -5,24 +5,6 @@
 
 #include "common.h"
 
-#include "httpd.h"
-#include "http_config.h"
-#include "http_log.h"
-#include "http_main.h"
-#include "http_request.h"
-#include "mod_proxy.h"
-
-#include "ap_slotmem.h"
-
-#include "domain.h"
-#include "node.h"
-#include "host.h"
-#include "context.h"
-#include "balancer.h"
-
-#include "mod_proxy_cluster.h"
-
-
 proxy_vhost_table *read_vhost_table(apr_pool_t *pool, struct host_storage_method *host_storage, int for_cache)
 {
     proxy_vhost_table *vhost_table = apr_palloc(pool, sizeof(proxy_vhost_table));
diff --git a/native/include/common.h b/native/include/common.h
index c21123b2..a4cedb13 100644
--- a/native/include/common.h
+++ b/native/include/common.h
@@ -7,15 +7,7 @@
  * Common routines
  */
 
-#include "mod_proxy.h"
 
-#include "ap_slotmem.h"
-
-#include "domain.h"
-#include "node.h"
-#include "host.h"
-#include "node.h"
-#include "context.h"
 #include "mod_proxy_cluster.h"
 
 
diff --git a/native/include/mod_proxy_cluster.h b/native/include/mod_proxy_cluster.h
index cc38a456..fdf197dc 100644
--- a/native/include/mod_proxy_cluster.h
+++ b/native/include/mod_proxy_cluster.h
@@ -17,6 +17,9 @@
  */
 
 #include "balancer.h"
+#include "node.h"
+#include "context.h"
+#include "host.h"
 
 #define MOD_CLUSTER_EXPOSED_VERSION "mod_cluster/2.0.0.Alpha1-SNAPSHOT"
 
diff --git a/native/include/node.h b/native/include/node.h
index f57b4520..5bcee8e0 100644
--- a/native/include/node.h
+++ b/native/include/node.h
@@ -25,8 +25,6 @@ typedef struct mem mem_t;
 
 #include "mod_clustersize.h"
 
-#include "ap_mmn.h"
-
 /**
  * Configuration of the node received from jboss cluster
  */
diff --git a/native/mod_manager/balancer.c b/native/mod_manager/balancer.c
index fa2a4762..5336d04c 100644
--- a/native/mod_manager/balancer.c
+++ b/native/mod_manager/balancer.c
@@ -13,15 +13,6 @@
  * @{
  */
 
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_pools.h"
-#include "apr_time.h"
-
-#include "ap_slotmem.h"
-#include "balancer.h"
-
-#include "common.h"
 
 #include "mod_manager.h"
 
diff --git a/native/mod_manager/context.c b/native/mod_manager/context.c
index be24a59e..d5ffbbdf 100644
--- a/native/mod_manager/context.c
+++ b/native/mod_manager/context.c
@@ -13,18 +13,8 @@
  * @{
  */
 
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_pools.h"
-#include "apr_time.h"
-
-#include "ap_slotmem.h"
-#include "context.h"
-
 #include "mod_manager.h"
 
-#include "common.h"
-
 
 static mem_t *create_attach_mem_context(char *string, unsigned *num, int type, int create, apr_pool_t *p,
                                         slotmem_storage_method *storage)
diff --git a/native/mod_manager/domain.c b/native/mod_manager/domain.c
index 27fd976a..e3f54ba6 100644
--- a/native/mod_manager/domain.c
+++ b/native/mod_manager/domain.c
@@ -12,17 +12,8 @@
  * @{
  */
 
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_pools.h"
-#include "apr_time.h"
-
-#include "ap_slotmem.h"
-#include "domain.h"
-
-#include "common.h"
-
 #include "mod_manager.h"
+#include "domain.h"
 
 static mem_t *create_attach_mem_domain(char *string, unsigned *num, int type, int create, apr_pool_t *p,
                                        slotmem_storage_method *storage)
diff --git a/native/mod_manager/host.c b/native/mod_manager/host.c
index e3e3b053..c5657b9c 100644
--- a/native/mod_manager/host.c
+++ b/native/mod_manager/host.c
@@ -13,16 +13,9 @@
  * @{
  */
 
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_pools.h"
-#include "apr_time.h"
-
-#include "ap_slotmem.h"
+#include "mod_manager.h"
 #include "host.h"
 
-#include "mod_manager.h"
-#include "common.h"
 
 static mem_t *create_attach_mem_host(char *string, unsigned *num, int type, int create, apr_pool_t *p,
                                      slotmem_storage_method *storage)
diff --git a/native/mod_manager/mod_manager.c b/native/mod_manager/mod_manager.c
index 392dc367..a8f99d71 100644
--- a/native/mod_manager/mod_manager.c
+++ b/native/mod_manager/mod_manager.c
@@ -7,34 +7,17 @@
  * @author Jean-Frederic Clere
  */
 
-#include "apr_strings.h"
+#include "domain.h"
+#include "common.h"
+
 #include "apr_lib.h"
 #include "apr_uuid.h"
 
 #define CORE_PRIVATE
 #include "httpd.h"
-#include "http_config.h"
-#include "http_log.h"
-#include "http_main.h"
-#include "http_request.h"
-#include "http_protocol.h"
-#include "http_core.h"
 #include "scoreboard.h"
-#include "mod_proxy.h"
-#include "ap_mpm.h"
-
-#include "ap_slotmem.h"
-
-#include "node.h"
-#include "host.h"
-#include "context.h"
-#include "balancer.h"
 #include "sessionid.h"
-#include "domain.h"
-
-#include "common.h"
 
-#include "mod_proxy_cluster.h"
 
 #define DEFMAXCONTEXT          100
 #define DEFMAXNODE             20
diff --git a/native/mod_manager/mod_manager.h b/native/mod_manager/mod_manager.h
index 3a0a4d33..2e698649 100644
--- a/native/mod_manager/mod_manager.h
+++ b/native/mod_manager/mod_manager.h
@@ -13,6 +13,8 @@
  * @{
  */
 
+#include "common.h"
+
 struct mem
 {
     ap_slotmem_instance_t *slotmem;
diff --git a/native/mod_manager/node.c b/native/mod_manager/node.c
index c6586eed..561ba09d 100644
--- a/native/mod_manager/node.c
+++ b/native/mod_manager/node.c
@@ -13,21 +13,9 @@
  * @{
  */
 
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_pools.h"
-#include "apr_time.h"
-
-/* for debug */
-#include "httpd.h"
-#include "http_main.h"
-
-#include "ap_slotmem.h"
-#include "node.h"
-
 #include "mod_manager.h"
+#include "node.h"
 
-#include "common.h"
 
 static mem_t *create_attach_mem_node(char *string, unsigned *num, int type, int create, apr_pool_t *p,
                                      slotmem_storage_method *storage)
diff --git a/native/mod_manager/sessionid.c b/native/mod_manager/sessionid.c
index ab6085fe..16a82cc0 100644
--- a/native/mod_manager/sessionid.c
+++ b/native/mod_manager/sessionid.c
@@ -13,17 +13,9 @@
  * @{
  */
 
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_pools.h"
-#include "apr_time.h"
-
-#include "ap_slotmem.h"
+#include "mod_manager.h"
 #include "sessionid.h"
 
-#include "common.h"
-
-#include "mod_manager.h"
 
 static mem_t *create_attach_mem_sessionid(char *string, unsigned *num, int type, int create, apr_pool_t *p,
                                           slotmem_storage_method *storage)
diff --git a/native/mod_proxy_cluster/mod_proxy_cluster.c b/native/mod_proxy_cluster/mod_proxy_cluster.c
index 428b0ca9..e9566929 100644
--- a/native/mod_proxy_cluster/mod_proxy_cluster.c
+++ b/native/mod_proxy_cluster/mod_proxy_cluster.c
@@ -7,31 +7,15 @@
  * @author Jean-Frederic Clere
  */
 
-#include "httpd.h"
-#include "http_config.h"
-#include "http_log.h"
-#include "http_main.h"
-#include "http_request.h"
-#include "http_protocol.h"
-#include "http_core.h"
-#include "scoreboard.h"
-#include "ap_mpm.h"
+#include "mod_proxy_cluster.h"
+
 #include "mpm_common.h"
-#include "mod_proxy.h"
 #include "mod_watchdog.h"
 
-#include "ap_slotmem.h"
-
-#include "node.h"
-#include "host.h"
-#include "context.h"
-#include "balancer.h"
 #include "sessionid.h"
 #include "domain.h"
-
 #include "common.h"
 
-#include "mod_proxy_cluster.h"
 
 #if APR_HAVE_UNISTD_H
 /* for getpid() */