From: Stefan Fritsch <sf@apache.org>
Date: Sun, 6 Jun 2010 16:59:50 +0000 (+0000)
Subject: Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
X-Git-Tag: 2.3.6~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebb62867fb8a335f70c30e01280cc30f5c4d0597;p=thirdparty%2Fapache%2Fhttpd.git

Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/aaa/mod_access_compat.c b/modules/aaa/mod_access_compat.c
index 8b53465e6a1..3d5d535f44c 100644
--- a/modules/aaa/mod_access_compat.c
+++ b/modules/aaa/mod_access_compat.c
@@ -368,7 +368,7 @@ static void register_hooks(apr_pool_t *p)
                          AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA access_compat_module =
+AP_DECLARE_MODULE(access_compat) =
 {
     STANDARD20_MODULE_STUFF,
     create_access_compat_dir_config,   /* dir config creater */
diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
index e641119507e..9543e7e9315 100644
--- a/modules/aaa/mod_auth_basic.c
+++ b/modules/aaa/mod_auth_basic.c
@@ -292,7 +292,7 @@ static void register_hooks(apr_pool_t *p)
                         AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA auth_basic_module =
+AP_DECLARE_MODULE(auth_basic) =
 {
     STANDARD20_MODULE_STUFF,
     create_auth_basic_dir_config,  /* dir config creater */
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 7ed5ec86eff..73aeb39f194 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -2056,7 +2056,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_fixups(add_auth_info, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA auth_digest_module =
+AP_DECLARE_MODULE(auth_digest) =
 {
     STANDARD20_MODULE_STUFF,
     create_digest_dir_config,   /* dir config creater */
diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c
index a56b87f6626..d75399b9545 100644
--- a/modules/aaa/mod_auth_form.c
+++ b/modules/aaa/mod_auth_form.c
@@ -1185,7 +1185,7 @@ static void register_hooks(apr_pool_t * p)
     ap_hook_handler(authenticate_form_redirect_handler, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA auth_form_module =
+AP_DECLARE_MODULE(auth_form) =
 {
     STANDARD20_MODULE_STUFF,
     create_auth_form_dir_config, /* dir config creater */
diff --git a/modules/aaa/mod_authn_anon.c b/modules/aaa/mod_authn_anon.c
index 9bfd3152211..fc47619430b 100644
--- a/modules/aaa/mod_authn_anon.c
+++ b/modules/aaa/mod_authn_anon.c
@@ -203,7 +203,7 @@ static void register_hooks(apr_pool_t *p)
                               &authn_anon_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authn_anon_module =
+AP_DECLARE_MODULE(authn_anon) =
 {
     STANDARD20_MODULE_STUFF,
     create_authn_anon_dir_config, /* dir config creater */
diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c
index ff8a7e6d0b7..0a3658240b8 100644
--- a/modules/aaa/mod_authn_core.c
+++ b/modules/aaa/mod_authn_core.c
@@ -367,7 +367,7 @@ static void register_hooks(apr_pool_t *p)
                         AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authn_core_module =
+AP_DECLARE_MODULE(authn_core) =
 {
     STANDARD20_MODULE_STUFF,
     create_authn_core_dir_config,   /* dir config creater */
diff --git a/modules/aaa/mod_authn_dbd.c b/modules/aaa/mod_authn_dbd.c
index 1a189c51158..429d10782ab 100644
--- a/modules/aaa/mod_authn_dbd.c
+++ b/modules/aaa/mod_authn_dbd.c
@@ -273,7 +273,7 @@ static void authn_dbd_hooks(apr_pool_t *p)
                               AUTHN_PROVIDER_VERSION,
                               &authn_dbd_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
-module AP_MODULE_DECLARE_DATA authn_dbd_module =
+AP_DECLARE_MODULE(authn_dbd) =
 {
     STANDARD20_MODULE_STUFF,
     authn_dbd_cr_conf,
diff --git a/modules/aaa/mod_authn_dbm.c b/modules/aaa/mod_authn_dbm.c
index 8e7c5471c40..94c089aab51 100644
--- a/modules/aaa/mod_authn_dbm.c
+++ b/modules/aaa/mod_authn_dbm.c
@@ -194,7 +194,7 @@ static void register_hooks(apr_pool_t *p)
                               &authn_dbm_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authn_dbm_module =
+AP_DECLARE_MODULE(authn_dbm) =
 {
     STANDARD20_MODULE_STUFF,
     create_authn_dbm_dir_config, /* dir config creater */
diff --git a/modules/aaa/mod_authn_file.c b/modules/aaa/mod_authn_file.c
index 76aa2e15eec..32185f39e40 100644
--- a/modules/aaa/mod_authn_file.c
+++ b/modules/aaa/mod_authn_file.c
@@ -168,7 +168,7 @@ static void register_hooks(apr_pool_t *p)
                               &authn_file_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authn_file_module =
+AP_DECLARE_MODULE(authn_file) =
 {
     STANDARD20_MODULE_STUFF,
     create_authn_file_dir_config,    /* dir config creater */
diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 750b085981a..c0e06bffeb9 100644
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -1816,7 +1816,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_optional_fn_retrieve(ImportULDAPOptFn,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA authnz_ldap_module =
+AP_DECLARE_MODULE(authnz_ldap) =
 {
     STANDARD20_MODULE_STUFF,
     create_authnz_ldap_dir_config,   /* dir config creater */
diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index 6dbea9cf50e..3ba185744ff 100644
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -805,7 +805,7 @@ static void register_hooks(apr_pool_t *p)
                         AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_core_module =
+AP_DECLARE_MODULE(authz_core) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_core_dir_config,   /* dir config creater */
diff --git a/modules/aaa/mod_authz_dbd.c b/modules/aaa/mod_authz_dbd.c
index 42fdc0d4fcd..01e36870869 100644
--- a/modules/aaa/mod_authz_dbd.c
+++ b/modules/aaa/mod_authz_dbd.c
@@ -342,7 +342,7 @@ static void authz_dbd_hooks(apr_pool_t *p)
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_dbd_module =
+AP_DECLARE_MODULE(authz_dbd) =
 {
     STANDARD20_MODULE_STUFF,
     authz_dbd_cr_cfg,
diff --git a/modules/aaa/mod_authz_dbm.c b/modules/aaa/mod_authz_dbm.c
index 2e4eef11639..b87682c83e5 100644
--- a/modules/aaa/mod_authz_dbm.c
+++ b/modules/aaa/mod_authz_dbm.c
@@ -294,7 +294,7 @@ static void register_hooks(apr_pool_t *p)
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_dbm_module =
+AP_DECLARE_MODULE(authz_dbm) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_dbm_dir_config, /* dir config creater */
diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c
index 0631cbb1c67..b3c2635db19 100644
--- a/modules/aaa/mod_authz_groupfile.c
+++ b/modules/aaa/mod_authz_groupfile.c
@@ -288,7 +288,7 @@ static void register_hooks(apr_pool_t *p)
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_groupfile_module =
+AP_DECLARE_MODULE(authz_groupfile) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_groupfile_dir_config,/* dir config creater */
diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_authz_host.c
index a89de780bb5..b8a875b3fac 100644
--- a/modules/aaa/mod_authz_host.c
+++ b/modules/aaa/mod_authz_host.c
@@ -255,7 +255,7 @@ static void register_hooks(apr_pool_t *p)
                               &authz_all_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_host_module =
+AP_DECLARE_MODULE(authz_host) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_host_dir_config,   /* dir config creater */
diff --git a/modules/aaa/mod_authz_owner.c b/modules/aaa/mod_authz_owner.c
index 010844cfede..0ab122b856b 100644
--- a/modules/aaa/mod_authz_owner.c
+++ b/modules/aaa/mod_authz_owner.c
@@ -179,7 +179,7 @@ static void register_hooks(apr_pool_t *p)
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_owner_module =
+AP_DECLARE_MODULE(authz_owner) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                          /* dir config creater */
diff --git a/modules/aaa/mod_authz_user.c b/modules/aaa/mod_authz_user.c
index 73590ebe730..d1c76b4d7f4 100644
--- a/modules/aaa/mod_authz_user.c
+++ b/modules/aaa/mod_authz_user.c
@@ -102,7 +102,7 @@ static void register_hooks(apr_pool_t *p)
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_user_module =
+AP_DECLARE_MODULE(authz_user) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_user_dir_config, /* dir config creater */
diff --git a/modules/arch/netware/mod_netware.c b/modules/arch/netware/mod_netware.c
index aa8f4962429..138007810fa 100644
--- a/modules/arch/netware/mod_netware.c
+++ b/modules/arch/netware/mod_netware.c
@@ -191,7 +191,7 @@ AP_INIT_TAKE23("CGIMapExtension", set_extension_map, NULL, OR_FILEINFO,
 { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA netware_module = {
+AP_DECLARE_MODULE(netware) = {
    STANDARD20_MODULE_STUFF,
    create_netware_dir_config,     /* create per-dir config */
    merge_netware_dir_configs,     /* merge per-dir config */
diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c
index e294763a415..af997717fe6 100644
--- a/modules/arch/netware/mod_nw_ssl.c
+++ b/modules/arch/netware/mod_nw_ssl.c
@@ -1263,7 +1263,7 @@ static void register_hooks(apr_pool_t *p)
     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
 }
 
-module AP_MODULE_DECLARE_DATA nwssl_module =
+AP_DECLARE_MODULE(nwssl) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
diff --git a/modules/arch/unix/mod_privileges.c b/modules/arch/unix/mod_privileges.c
index bfdcc99ff2e..a04a2c598c7 100644
--- a/modules/arch/unix/mod_privileges.c
+++ b/modules/arch/unix/mod_privileges.c
@@ -577,7 +577,7 @@ static const command_rec privileges_cmds[] = {
 #endif
     {NULL}
 };
-module AP_MODULE_DECLARE_DATA privileges_module = {
+AP_DECLARE_MODULE(privileges) = {
     STANDARD20_MODULE_STUFF,
     privileges_create_dir_cfg,
     privileges_merge_dir_cfg,
diff --git a/modules/arch/unix/mod_unixd.c b/modules/arch/unix/mod_unixd.c
index c0d2b414003..50395ee19c4 100644
--- a/modules/arch/unix/mod_unixd.c
+++ b/modules/arch/unix/mod_unixd.c
@@ -357,7 +357,7 @@ static const command_rec unixd_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA unixd_module = {
+AP_DECLARE_MODULE(unixd) = {
     STANDARD20_MODULE_STUFF,
     NULL,
     NULL,
diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 13930613fe6..41604ae7864 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -1715,7 +1715,7 @@ static void isapi_hooks(apr_pool_t *cont)
     ap_hook_handler(isapi_handler, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA isapi_module = {
+AP_DECLARE_MODULE(isapi) = {
    STANDARD20_MODULE_STUFF,
    create_isapi_dir_config,     /* create per-dir config */
    merge_isapi_dir_configs,     /* merge per-dir config */
diff --git a/modules/arch/win32/mod_win32.c b/modules/arch/win32/mod_win32.c
index 394095877b4..ae0e87b252f 100644
--- a/modules/arch/win32/mod_win32.c
+++ b/modules/arch/win32/mod_win32.c
@@ -547,7 +547,7 @@ AP_INIT_TAKE1("ScriptInterpreterSource", set_interpreter_source, NULL,
 { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA win32_module = {
+AP_DECLARE_MODULE(win32) = {
    STANDARD20_MODULE_STUFF,
    create_win32_dir_config,     /* create per-dir config */
    merge_win32_dir_configs,     /* merge per-dir config */
diff --git a/modules/cache/cache_cache.c b/modules/cache/cache_cache.c
index 4fc95d73f76..3b75c3dfd3a 100644
--- a/modules/cache/cache_cache.c
+++ b/modules/cache/cache_cache.c
@@ -28,6 +28,8 @@
 #include <string.h>
 #endif
 
+APLOG_USE_MODULE(cache);
+
 struct cache_cache_t  {
     int             max_entries;
     apr_size_t      max_size;
diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index a44b9e4dcc7..606beb876ea 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -16,6 +16,8 @@
 
 #include "mod_cache.h"
 
+APLOG_USE_MODULE(cache);
+
 extern APR_OPTIONAL_FN_TYPE(ap_cache_generate_key) *cache_generate_key;
 
 extern module AP_MODULE_DECLARE_DATA cache_module;
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index fb4f0138289..df2594b5e7b 100644
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -18,6 +18,8 @@
 
 #include <ap_provider.h>
 
+APLOG_USE_MODULE(cache);
+
 /* -------------------------------------------------------------- */
 
 extern APR_OPTIONAL_FN_TYPE(ap_cache_generate_key) *cache_generate_key;
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index a57f3cf0187..beabd39ec4f 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1884,7 +1884,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_post_config(cache_post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA cache_module =
+AP_DECLARE_MODULE(cache) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                   /* create per-directory config structure */
diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index d0dd823c906..25a4a080c12 100644
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -1238,7 +1238,7 @@ static void disk_cache_register_hook(apr_pool_t *p)
                          &cache_disk_provider);
 }
 
-module AP_MODULE_DECLARE_DATA disk_cache_module = {
+AP_DECLARE_MODULE(disk_cache) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index f24a1125e5d..42f58441e1d 100644
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -402,7 +402,7 @@ static void register_hooks(apr_pool_t *p)
 
 }
 
-module AP_MODULE_DECLARE_DATA file_cache_module =
+AP_DECLARE_MODULE(file_cache) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                     /* create per-directory config structure */
diff --git a/modules/cache/mod_socache_dbm.c b/modules/cache/mod_socache_dbm.c
index 2566074a082..fc3349b93a7 100644
--- a/modules/cache/mod_socache_dbm.c
+++ b/modules/cache/mod_socache_dbm.c
@@ -530,7 +530,7 @@ static void register_hooks(apr_pool_t *p)
                          &socache_dbm);
 }
 
-module AP_MODULE_DECLARE_DATA socache_dbm_module = {
+AP_DECLARE_MODULE(socache_dbm) = {
     STANDARD20_MODULE_STUFF,
     NULL, NULL, NULL, NULL, NULL,
     register_hooks
diff --git a/modules/cache/mod_socache_dc.c b/modules/cache/mod_socache_dc.c
index 7982d69727d..06c52d7afe6 100644
--- a/modules/cache/mod_socache_dc.c
+++ b/modules/cache/mod_socache_dc.c
@@ -182,7 +182,7 @@ static void register_hooks(apr_pool_t *p)
                          &socache_dc);
 }
 
-module AP_MODULE_DECLARE_DATA socache_dc_module = {
+AP_DECLARE_MODULE(socache_dc) = {
     STANDARD20_MODULE_STUFF,
     NULL, NULL, NULL, NULL, NULL,
     register_hooks
diff --git a/modules/cache/mod_socache_memcache.c b/modules/cache/mod_socache_memcache.c
index 349a786cc2b..0d4858189cc 100644
--- a/modules/cache/mod_socache_memcache.c
+++ b/modules/cache/mod_socache_memcache.c
@@ -319,7 +319,7 @@ static void register_hooks(apr_pool_t *p)
 #endif
 }
 
-module AP_MODULE_DECLARE_DATA socache_memcache_module = {
+AP_DECLARE_MODULE(socache_memcache) = {
     STANDARD20_MODULE_STUFF,
     NULL, NULL, NULL, NULL, NULL,
     register_hooks
diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c
index 1523cbb0c12..835b6c59839 100644
--- a/modules/cache/mod_socache_shmcb.c
+++ b/modules/cache/mod_socache_shmcb.c
@@ -998,7 +998,7 @@ static void register_hooks(apr_pool_t *p)
                          &socache_shmcb);
 }
 
-module AP_MODULE_DECLARE_DATA socache_shmcb_module = {
+AP_DECLARE_MODULE(socache_shmcb) = {
     STANDARD20_MODULE_STUFF,
     NULL, NULL, NULL, NULL, NULL,
     register_hooks
diff --git a/modules/cluster/mod_heartbeat.c b/modules/cluster/mod_heartbeat.c
index 255d30ce464..45d7c6be524 100644
--- a/modules/cluster/mod_heartbeat.c
+++ b/modules/cluster/mod_heartbeat.c
@@ -217,7 +217,7 @@ static const command_rec hb_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA heartbeat_module = {
+AP_DECLARE_MODULE(heartbeat) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index 6a50dd5dc5e..1ab9c5bcdad 100644
--- a/modules/cluster/mod_heartmonitor.c
+++ b/modules/cluster/mod_heartmonitor.c
@@ -893,7 +893,7 @@ static const command_rec hm_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA heartmonitor_module = {
+AP_DECLARE_MODULE(heartmonitor) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/core/mod_so.c b/modules/core/mod_so.c
index d7bd2e71a4b..81eb2366bf8 100644
--- a/modules/core/mod_so.c
+++ b/modules/core/mod_so.c
@@ -422,7 +422,7 @@ static const command_rec so_cmds[] = {
     { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA so_module = {
+AP_DECLARE_MODULE(so) = {
    STANDARD20_MODULE_STUFF,
    NULL,                 /* create per-dir config */
    NULL,                 /* merge per-dir config */
diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c
index 02d785d9e23..136e438ac1e 100644
--- a/modules/core/mod_watchdog.c
+++ b/modules/core/mod_watchdog.c
@@ -669,7 +669,7 @@ static void wd_register_hooks(apr_pool_t *p)
 /* the static hooks into our module from the other parts of the server.     */
 /*                                                                          */
 /*--------------------------------------------------------------------------*/
-AP_MODULE_DECLARE_DATA module watchdog_module = {
+AP_DECLARE_MODULE(watchdog) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure    */
     NULL,                       /* merge per-directory config structures    */
diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index 106a9c11190..a4a266d16aa 100644
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -980,7 +980,7 @@ static void dbd_hooks(apr_pool_t *pool)
     apr_dbd_init(pool);
 }
 
-module AP_MODULE_DECLARE_DATA dbd_module = {
+AP_DECLARE_MODULE(dbd) = {
     STANDARD20_MODULE_STUFF,
     NULL,
     NULL,
diff --git a/modules/dav/fs/mod_dav_fs.c b/modules/dav/fs/mod_dav_fs.c
index dfd190b38e3..addfd7e93f2 100644
--- a/modules/dav/fs/mod_dav_fs.c
+++ b/modules/dav/fs/mod_dav_fs.c
@@ -96,7 +96,7 @@ static void register_hooks(apr_pool_t *p)
     dav_fs_register(p);
 }
 
-module AP_MODULE_DECLARE_DATA dav_fs_module =
+AP_DECLARE_MODULE(dav_fs) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                        /* dir config creater */
diff --git a/modules/dav/lock/mod_dav_lock.c b/modules/dav/lock/mod_dav_lock.c
index c57e628fc1e..56a32022ee2 100644
--- a/modules/dav/lock/mod_dav_lock.c
+++ b/modules/dav/lock/mod_dav_lock.c
@@ -92,7 +92,7 @@ static void register_hooks(apr_pool_t *p)
                          &dav_hooks_locks_generic);
 }
 
-module AP_MODULE_DECLARE_DATA dav_lock_module =
+AP_DECLARE_MODULE(dav_lock) =
 {
     STANDARD20_MODULE_STUFF,
     dav_lock_create_dir_config,     /* dir config creater */
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index f9a7c9ab5a6..f4461b984d3 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -68,6 +68,8 @@
 /* used to denote that mod_dav will be handling this request */
 #define DAV_HANDLER_NAME "dav-handler"
 
+APLOG_USE_MODULE(dav);
+
 enum {
     DAV_ENABLED_UNSET = 0,
     DAV_ENABLED_OFF,
diff --git a/modules/dav/main/util_lock.c b/modules/dav/main/util_lock.c
index ef75d9b3a0d..3dd131b221e 100644
--- a/modules/dav/main/util_lock.c
+++ b/modules/dav/main/util_lock.c
@@ -31,6 +31,7 @@
 #include "http_protocol.h"
 #include "http_core.h"
 
+APLOG_USE_MODULE(dav);
 
 /* ---------------------------------------------------------------
 **
diff --git a/modules/debugging/mod_bucketeer.c b/modules/debugging/mod_bucketeer.c
index ff6f5ebd49c..4142cbe22e5 100644
--- a/modules/debugging/mod_bucketeer.c
+++ b/modules/debugging/mod_bucketeer.c
@@ -176,7 +176,7 @@ static const command_rec bucketeer_filter_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA bucketeer_module = {
+AP_DECLARE_MODULE(bucketeer) = {
     STANDARD20_MODULE_STUFF,
     NULL,
     NULL,
diff --git a/modules/debugging/mod_dumpio.c b/modules/debugging/mod_dumpio.c
index 04ccde01b34..d8d8c2e63d9 100644
--- a/modules/debugging/mod_dumpio.c
+++ b/modules/debugging/mod_dumpio.c
@@ -266,7 +266,7 @@ static const command_rec dumpio_cmds[] = {
     { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA dumpio_module = {
+AP_DECLARE_MODULE(dumpio) = {
         STANDARD20_MODULE_STUFF,
         NULL,
         NULL,
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index bc0be70f8c6..f9628b384af 100644
--- a/modules/echo/mod_echo.c
+++ b/modules/echo/mod_echo.c
@@ -208,7 +208,7 @@ static void register_hooks(apr_pool_t *p)
                                APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA echo_module = {
+AP_DECLARE_MODULE(echo) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/examples/mod_case_filter.c b/modules/examples/mod_case_filter.c
index 023ebb2205a..6c07d37f074 100644
--- a/modules/examples/mod_case_filter.c
+++ b/modules/examples/mod_case_filter.c
@@ -127,7 +127,7 @@ static void CaseFilterRegisterHooks(apr_pool_t *p)
                               AP_FTYPE_RESOURCE);
     }
 
-module AP_MODULE_DECLARE_DATA case_filter_module =
+AP_DECLARE_MODULE(case_filter) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,
diff --git a/modules/examples/mod_case_filter_in.c b/modules/examples/mod_case_filter_in.c
index d4747940102..966d7a99968 100644
--- a/modules/examples/mod_case_filter_in.c
+++ b/modules/examples/mod_case_filter_in.c
@@ -148,7 +148,7 @@ static void CaseFilterInRegisterHooks(apr_pool_t *p)
                              AP_FTYPE_RESOURCE);
 }
 
-module AP_MODULE_DECLARE_DATA case_filter_in_module =
+AP_DECLARE_MODULE(case_filter_in) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,
diff --git a/modules/examples/mod_example_hooks.c b/modules/examples/mod_example_hooks.c
index a9709149e6c..256a6e8f4c0 100644
--- a/modules/examples/mod_example_hooks.c
+++ b/modules/examples/mod_example_hooks.c
@@ -1511,7 +1511,7 @@ static const command_rec x_cmds[] =
  * Module definition for configuration.  If a particular callback is not
  * needed, replace its routine name below with the word NULL.
  */
-module AP_MODULE_DECLARE_DATA example_hooks_module =
+AP_DECLARE_MODULE(example_hooks) =
 {
     STANDARD20_MODULE_STUFF,
     x_create_dir_config,    /* per-directory config creator */
diff --git a/modules/examples/mod_example_ipc.c b/modules/examples/mod_example_ipc.c
index d0a83cfa980..ef39cd7b61b 100644
--- a/modules/examples/mod_example_ipc.c
+++ b/modules/examples/mod_example_ipc.c
@@ -354,7 +354,7 @@ static void exipc_register_hooks(apr_pool_t *p)
 }
 
 /* Dispatch list for API hooks */
-module AP_MODULE_DECLARE_DATA example_ipc_module = {
+AP_DECLARE_MODULE(example_ipc) = {
     STANDARD20_MODULE_STUFF, 
     NULL,                  /* create per-dir    config structures */
     NULL,                  /* merge  per-dir    config structures */
diff --git a/modules/experimental/mod_noloris.c b/modules/experimental/mod_noloris.c
index dec385318e2..53adbebe1f7 100644
--- a/modules/experimental/mod_noloris.c
+++ b/modules/experimental/mod_noloris.c
@@ -226,7 +226,7 @@ static const command_rec noloris_cmds[] = {
             "Max connections in READ state to permit from an untrusted client"),
     {NULL}
 };
-module AP_MODULE_DECLARE_DATA noloris_module = {
+AP_DECLARE_MODULE(noloris) = {
     STANDARD20_MODULE_STUFF,
     NULL,
     NULL,
diff --git a/modules/filters/mod_buffer.c b/modules/filters/mod_buffer.c
index c7c471c9395..7f4ea73f84b 100644
--- a/modules/filters/mod_buffer.c
+++ b/modules/filters/mod_buffer.c
@@ -331,7 +331,7 @@ static void register_hooks(apr_pool_t *p) {
             AP_FTYPE_CONTENT_SET);
 }
 
-module AP_MODULE_DECLARE_DATA buffer_module = {
+AP_DECLARE_MODULE(buffer) = {
     STANDARD20_MODULE_STUFF,
     create_buffer_config, /* create per-directory config structure */
     merge_buffer_config, /* merge per-directory config structures */
diff --git a/modules/filters/mod_charset_lite.c b/modules/filters/mod_charset_lite.c
index ccf1074a9d5..66fccc378e0 100644
--- a/modules/filters/mod_charset_lite.c
+++ b/modules/filters/mod_charset_lite.c
@@ -1157,7 +1157,7 @@ static void charset_register_hooks(apr_pool_t *p)
                              AP_FTYPE_RESOURCE);
 }
 
-module AP_MODULE_DECLARE_DATA charset_lite_module =
+AP_DECLARE_MODULE(charset_lite) =
 {
     STANDARD20_MODULE_STUFF,
     create_charset_dir_conf,
diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 4ea0a48cc90..e40a8b0fcab 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -1388,7 +1388,7 @@ static const command_rec deflate_filter_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA deflate_module = {
+AP_DECLARE_MODULE(deflate) = {
     STANDARD20_MODULE_STUFF,
     NULL,                         /* dir config creater */
     NULL,                         /* dir merger --- default is to override */
diff --git a/modules/filters/mod_ext_filter.c b/modules/filters/mod_ext_filter.c
index aed7813f2e3..b8843467855 100644
--- a/modules/filters/mod_ext_filter.c
+++ b/modules/filters/mod_ext_filter.c
@@ -953,7 +953,7 @@ static int ef_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
     return rv;
 }
 
-module AP_MODULE_DECLARE_DATA ext_filter_module =
+AP_DECLARE_MODULE(ext_filter) =
 {
     STANDARD20_MODULE_STUFF,
     create_ef_dir_conf,
diff --git a/modules/filters/mod_filter.c b/modules/filters/mod_filter.c
index 051fa87b101..dd2c9795160 100644
--- a/modules/filters/mod_filter.c
+++ b/modules/filters/mod_filter.c
@@ -649,7 +649,7 @@ static const command_rec filter_cmds[] = {
     { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA filter_module = {
+AP_DECLARE_MODULE(filter) = {
     STANDARD20_MODULE_STUFF,
     filter_config,
     filter_merge,
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index e3234e3907d..25dcedbfb2a 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3308,7 +3308,7 @@ static void register_hooks(apr_pool_t *p)
                               AP_FTYPE_RESOURCE);
 }
 
-module AP_MODULE_DECLARE_DATA include_module =
+AP_DECLARE_MODULE(include) =
 {
     STANDARD20_MODULE_STUFF,
     create_includes_dir_config,   /* dir config creater */
diff --git a/modules/filters/mod_ratelimit.c b/modules/filters/mod_ratelimit.c
index c1789535a16..df4e6b889b2 100644
--- a/modules/filters/mod_ratelimit.c
+++ b/modules/filters/mod_ratelimit.c
@@ -302,7 +302,7 @@ static void register_hooks(apr_pool_t *p)
                               NULL, AP_FTYPE_PROTOCOL + 3);
 }
 
-module AP_MODULE_DECLARE_DATA ratelimit_module = {
+AP_DECLARE_MODULE(ratelimit) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/filters/mod_reflector.c b/modules/filters/mod_reflector.c
index e6840f35869..f8c5147fe56 100644
--- a/modules/filters/mod_reflector.c
+++ b/modules/filters/mod_reflector.c
@@ -221,7 +221,7 @@ static const command_rec reflector_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA reflector_module = {
+AP_DECLARE_MODULE(reflector) = {
     STANDARD20_MODULE_STUFF,
     create_reflector_dir_config,
     merge_reflector_dir_config,
diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index 6717cf90ef1..ccf1f8f83f9 100644
--- a/modules/filters/mod_reqtimeout.c
+++ b/modules/filters/mod_reqtimeout.c
@@ -542,7 +542,7 @@ static const command_rec reqtimeout_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA reqtimeout_module = {
+AP_DECLARE_MODULE(reqtimeout) = {
     STANDARD20_MODULE_STUFF,
     NULL,                           /* create per-dir config structures */
     NULL,                           /* merge  per-dir config structures */
diff --git a/modules/filters/mod_request.c b/modules/filters/mod_request.c
index d8110aa6f80..59bed3778b1 100644
--- a/modules/filters/mod_request.c
+++ b/modules/filters/mod_request.c
@@ -595,7 +595,7 @@ static void register_hooks(apr_pool_t *p)
     APR_REGISTER_OPTIONAL_FN(ap_request_remove_filter);
 }
 
-module AP_MODULE_DECLARE_DATA request_module = {
+AP_DECLARE_MODULE(request) = {
     STANDARD20_MODULE_STUFF,
     create_request_dir_config, /* create per-directory config structure */
     merge_request_dir_config,  /* merge per-directory config structures */
diff --git a/modules/filters/mod_sed.c b/modules/filters/mod_sed.c
index 84d5b7c302f..5252f3e3869 100644
--- a/modules/filters/mod_sed.c
+++ b/modules/filters/mod_sed.c
@@ -528,7 +528,7 @@ static void register_hooks(apr_pool_t *p)
                              AP_FTYPE_RESOURCE);
 }
 
-module AP_MODULE_DECLARE_DATA sed_module = {
+AP_DECLARE_MODULE(sed) = {
     STANDARD20_MODULE_STUFF,
     create_sed_dir_config,      /* dir config creater */
     NULL,                       /* dir merger --- default is to override */
diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index 07030403ab0..8d0c1176a6f 100644
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -587,7 +587,7 @@ static const command_rec substitute_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA substitute_module = {
+AP_DECLARE_MODULE(substitute) = {
     STANDARD20_MODULE_STUFF,
     create_substitute_dcfg,     /* dir config creater */
     merge_substitute_dcfg,      /* dir merger --- default is to override */
diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c
index a91b0bf183c..7fe634e97b2 100644
--- a/modules/generators/mod_asis.c
+++ b/modules/generators/mod_asis.c
@@ -113,7 +113,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_handler(asis_handler,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA asis_module =
+AP_DECLARE_MODULE(asis) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,              /* create per-directory config structure */
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 095b0ca81ce..bf627b01dc1 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -2318,7 +2318,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_handler(handle_autoindex,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA autoindex_module =
+AP_DECLARE_MODULE(autoindex) =
 {
     STANDARD20_MODULE_STUFF,
     create_autoindex_config,    /* dir config creater */
diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 0d000b9b44d..25901fdd166 100644
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -1266,7 +1266,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_post_config(cgi_post_config, aszPre, NULL, APR_HOOK_REALLY_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA cgi_module =
+AP_DECLARE_MODULE(cgi) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                        /* dir config creater */
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index a7cf2369ee3..443af0b11b9 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1857,7 +1857,7 @@ static void register_hook(apr_pool_t *p)
     ap_hook_handler(cgid_handler, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA cgid_module = {
+AP_DECLARE_MODULE(cgid) = {
     STANDARD20_MODULE_STUFF,
     NULL, /* dir config creater */
     NULL, /* dir merger --- default is to override */
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index 5ccfc8047eb..9687fbf6de0 100644
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -801,7 +801,7 @@ static void register_hooks(apr_pool_t * p)
     ap_hook_handler(display_info, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA info_module = {
+AP_DECLARE_MODULE(info) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
     NULL,                       /* dir merger --- default is to override */
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 7774726b324..0a44f02c923 100644
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -827,7 +827,7 @@ static void register_hooks(apr_pool_t *p)
 #endif
 }
 
-module AP_MODULE_DECLARE_DATA status_module =
+AP_DECLARE_MODULE(status) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
diff --git a/modules/generators/mod_suexec.c b/modules/generators/mod_suexec.c
index 555c30e2278..e548d71cdc7 100644
--- a/modules/generators/mod_suexec.c
+++ b/modules/generators/mod_suexec.c
@@ -125,7 +125,7 @@ static void suexec_hooks(apr_pool_t *p)
     ap_hook_post_config(suexec_post_config,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA suexec_module =
+AP_DECLARE_MODULE(suexec) =
 {
     STANDARD20_MODULE_STUFF,
     create_mconfig_for_directory,   /* create per-dir config */
diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
index 92048ab75d7..6442338eb46 100644
--- a/modules/http/byterange_filter.c
+++ b/modules/http/byterange_filter.c
@@ -54,6 +54,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(http);
+
 static int parse_byterange(char *range, apr_off_t clength,
                            apr_off_t *start, apr_off_t *end)
 {
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 8d4471eae06..66f1b111885 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -289,7 +289,7 @@ static void register_hooks(apr_pool_t *p)
     ap_method_registry_init(p);
 }
 
-module AP_MODULE_DECLARE_DATA http_module = {
+AP_DECLARE_MODULE(http) = {
     STANDARD20_MODULE_STUFF,
     NULL,              /* create per-directory config structure */
     NULL,              /* merge per-directory config structures */
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 9f979b4cd68..2fc2f40e75a 100644
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -55,6 +55,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(http);
+
 #define INVALID_CHAR -2
 
 static long get_chunk_size(char *);
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index fed255f7dba..54814a92d92 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -58,6 +58,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(http);
+
 /* New Apache routine to map status codes into array indicies
  *  e.g.  100 -> 0,  101 -> 1,  200 -> 2 ...
  * The number of status lines must equal the value of RESPONSE_CODES (httpd.h)
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 22f2066af36..d2f8ba44fe8 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -49,6 +49,8 @@
 #include <stdarg.h>
 #endif
 
+APLOG_USE_MODULE(http);
+
 /*****************************************************************
  *
  * Mainline request processing...
diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 3cde932e17a..fac4665aedd 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -1000,7 +1000,7 @@ static void register_hooks(apr_pool_t *p)
      */
 }
 
-module AP_MODULE_DECLARE_DATA mime_module = {
+AP_DECLARE_MODULE(mime) = {
     STANDARD20_MODULE_STUFF,
     create_mime_dir_config,     /* create per-directory config structure */
     merge_mime_dir_configs,     /* merge per-directory config structures */
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index b3c22a2f4f0..55647be1ce8 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -2960,7 +2960,7 @@ static void util_ldap_register_hooks(apr_pool_t *p)
     ap_hook_child_init(util_ldap_child_init, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA ldap_module = {
+AP_DECLARE_MODULE(ldap) = {
    STANDARD20_MODULE_STUFF,
    util_ldap_create_dir_config, /* create dir config */
    NULL,                        /* merge dir config */
diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c
index 09be4e2f288..adefcdcfd79 100644
--- a/modules/ldap/util_ldap_cache_mgr.c
+++ b/modules/ldap/util_ldap_cache_mgr.c
@@ -27,6 +27,8 @@
 #include "util_ldap_cache.h"
 #include <apr_strings.h>
 
+APLOG_USE_MODULE(ldap);
+
 #if APR_HAS_LDAP
 
 /* only here until strdup is gone */
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index f145d561760..17d0cad3073 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -1560,7 +1560,7 @@ static void register_hooks(apr_pool_t *p)
     APR_REGISTER_OPTIONAL_FN(ap_log_set_writer);
 }
 
-module AP_MODULE_DECLARE_DATA log_config_module =
+AP_DECLARE_MODULE(log_config) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-dir config */
diff --git a/modules/loggers/mod_log_forensic.c b/modules/loggers/mod_log_forensic.c
index f44f0b465eb..70491cdb491 100644
--- a/modules/loggers/mod_log_forensic.c
+++ b/modules/loggers/mod_log_forensic.c
@@ -277,7 +277,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_log_transaction(log_after,NULL,NULL,APR_HOOK_REALLY_LAST);
 }
 
-module AP_MODULE_DECLARE_DATA log_forensic_module =
+AP_DECLARE_MODULE(log_forensic) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-dir config */
diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
index 6de18a20b48..f58c2922d3e 100644
--- a/modules/loggers/mod_logio.c
+++ b/modules/loggers/mod_logio.c
@@ -191,7 +191,7 @@ static void register_hooks(apr_pool_t *p)
     APR_REGISTER_OPTIONAL_FN(ap_logio_get_last_bytes);
 }
 
-module AP_MODULE_DECLARE_DATA logio_module =
+AP_DECLARE_MODULE(logio) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-dir config */
diff --git a/modules/lua/lua_config.c b/modules/lua/lua_config.c
index e9080f4605a..eb72d648e26 100644
--- a/modules/lua/lua_config.c
+++ b/modules/lua/lua_config.c
@@ -18,6 +18,8 @@
 #include "lua_config.h"
 #include "lua_vmprep.h"
 
+APLOG_USE_MODULE(lua);
+
 static ap_lua_dir_cfg *check_dir_config(lua_State *L, int index)
 {
     ap_lua_dir_cfg *cfg;
diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index c978a665b6f..447de083a60 100644
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -19,6 +19,8 @@
 #include "util_script.h"
 #include "lua_apr.h"
 
+APLOG_USE_MODULE(lua);
+
 typedef char *(*req_field_string_f) (request_rec * r);
 typedef int (*req_field_int_f) (request_rec * r);
 typedef apr_table_t *(*req_field_apr_table_f) (request_rec * r);
diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c
index 2adad2efa6d..786d5298410 100644
--- a/modules/lua/lua_vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -21,6 +21,8 @@
 #include "lua_config.h"
 #include "apr_file_info.h"
 
+APLOG_USE_MODULE(lua);
+
 /* forward dec'l from this file */
 
 #if 0
diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index e40df7c3809..2c1949426c5 100644
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -1045,7 +1045,7 @@ static void lua_register_hooks(apr_pool_t *p)
                       APR_HOOK_REALLY_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA lua_module = {
+AP_DECLARE_MODULE(lua) = {
     STANDARD20_MODULE_STUFF,
     create_dir_config,          /* create per-dir    config structures */
     NULL,                       /* merge  per-dir    config structures */
diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c
index 7b072bebfb5..66ebeae64d5 100644
--- a/modules/mappers/mod_actions.c
+++ b/modules/mappers/mod_actions.c
@@ -208,7 +208,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_handler(action_handler,NULL,NULL,APR_HOOK_LAST);
 }
 
-module AP_MODULE_DECLARE_DATA actions_module =
+AP_DECLARE_MODULE(actions) =
 {
     STANDARD20_MODULE_STUFF,
     create_action_dir_config,   /* dir config creater */
diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index fdefaf54d7b..1ec14553642 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -515,7 +515,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_fixups(fixup_redir,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA alias_module =
+AP_DECLARE_MODULE(alias) =
 {
     STANDARD20_MODULE_STUFF,
     create_alias_dir_config,       /* dir config creater */
diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 6ce3945d73e..69f6cd9fb22 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -319,7 +319,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_fixups(fixup_dflt,NULL,NULL,APR_HOOK_LAST);
 }
 
-module AP_MODULE_DECLARE_DATA dir_module = {
+AP_DECLARE_MODULE(dir) = {
     STANDARD20_MODULE_STUFF,
     create_dir_config,          /* create per-directory config structure */
     merge_dir_configs,          /* merge per-directory config structures */
diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c
index 5a434f722c2..6ea44d0870b 100644
--- a/modules/mappers/mod_imagemap.c
+++ b/modules/mappers/mod_imagemap.c
@@ -881,7 +881,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_handler(imap_handler,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA imagemap_module =
+AP_DECLARE_MODULE(imagemap) =
 {
     STANDARD20_MODULE_STUFF,
     create_imap_dir_config,     /* dir config creater */
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 88819b1622a..5073968eaab 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -3221,7 +3221,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_handler(handle_map_file,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA negotiation_module =
+AP_DECLARE_MODULE(negotiation) =
 {
     STANDARD20_MODULE_STUFF,
     create_neg_dir_config,      /* dir config creator */
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 316ade60275..fd9771a9df4 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -5031,7 +5031,7 @@ static void register_hooks(apr_pool_t *p)
 }
 
     /* the main config structure */
-module AP_MODULE_DECLARE_DATA rewrite_module = {
+AP_DECLARE_MODULE(rewrite) = {
    STANDARD20_MODULE_STUFF,
    config_perdir_create,        /* create per-dir    config structures */
    config_perdir_merge,         /* merge  per-dir    config structures */
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index 78f58b07357..8288af7520f 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -519,7 +519,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_fixups(check_speling,NULL,NULL,APR_HOOK_LAST);
 }
 
-module AP_MODULE_DECLARE_DATA speling_module =
+AP_DECLARE_MODULE(speling) =
 {
     STANDARD20_MODULE_STUFF,
     create_mconfig_for_directory,  /* create per-dir config */
diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index f6e3e5dc5f2..9c2e456b7d8 100644
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -358,7 +358,7 @@ static void register_hooks(apr_pool_t *p)
 #endif
 }
 
-module AP_MODULE_DECLARE_DATA userdir_module = {
+AP_DECLARE_MODULE(userdir) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
     NULL,                       /* dir merger --- default is to override */
diff --git a/modules/mappers/mod_vhost_alias.c b/modules/mappers/mod_vhost_alias.c
index a20d0b9b076..2ea7380a149 100644
--- a/modules/mappers/mod_vhost_alias.c
+++ b/modules/mappers/mod_vhost_alias.c
@@ -444,7 +444,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_translate_name(mva_translate, aszPre, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA vhost_alias_module =
+AP_DECLARE_MODULE(vhost_alias) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
diff --git a/modules/metadata/mod_cern_meta.c b/modules/metadata/mod_cern_meta.c
index 3b57eef80b9..f80f36b47ab 100644
--- a/modules/metadata/mod_cern_meta.c
+++ b/modules/metadata/mod_cern_meta.c
@@ -359,7 +359,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_fixups(add_cern_meta_data,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA cern_meta_module =
+AP_DECLARE_MODULE(cern_meta) =
 {
     STANDARD20_MODULE_STUFF,
     create_cern_meta_dir_config, /* dir config creater */
diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c
index ef5a67799c7..8bd07327e36 100644
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -167,7 +167,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_fixups(fixup_env_module, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA env_module =
+AP_DECLARE_MODULE(env) =
 {
     STANDARD20_MODULE_STUFF,
     create_env_dir_config,      /* dir config creater */
diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index 16a4ff0b42d..ac2dfad742a 100644
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -557,7 +557,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_insert_filter(expires_insert_filter, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA expires_module =
+AP_DECLARE_MODULE(expires) =
 {
     STANDARD20_MODULE_STUFF,
     create_dir_expires_config,  /* dir config creater */
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index cbbe2d91532..8d869866a54 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -908,7 +908,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_post_read_request(ap_headers_early, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA headers_module =
+AP_DECLARE_MODULE(headers) =
 {
     STANDARD20_MODULE_STUFF,
     create_headers_dir_config,  /* dir config creater */
diff --git a/modules/metadata/mod_ident.c b/modules/metadata/mod_ident.c
index 9b9fcfca65c..bd2c54d52e1 100644
--- a/modules/metadata/mod_ident.c
+++ b/modules/metadata/mod_ident.c
@@ -332,7 +332,7 @@ static void register_hooks(apr_pool_t *p)
     APR_REGISTER_OPTIONAL_FN(ap_ident_lookup);
 }
 
-module AP_MODULE_DECLARE_DATA ident_module =
+AP_DECLARE_MODULE(ident) =
 {
     STANDARD20_MODULE_STUFF,
     create_ident_dir_config,       /* dir config creater */
diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index b29d5febf98..fde91cadff0 100644
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -2463,7 +2463,7 @@ static void register_hooks(apr_pool_t *p)
  * Apache API module interface
  */
 
-module AP_MODULE_DECLARE_DATA mime_magic_module =
+AP_DECLARE_MODULE(mime_magic) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                      /* dir config creator */
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 217448dc3eb..6d9a324f0f0 100644
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -478,7 +478,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_post_read_request(remoteip_modify_connection, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA remoteip_module = {
+AP_DECLARE_MODULE(remoteip) = {
     STANDARD20_MODULE_STUFF,
     NULL,                          /* create per-directory config structure */
     NULL,                          /* merge per-directory config structures */
diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index 7a16ca50a28..833518fb5ee 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -643,7 +643,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_post_config(setenvif_post_config, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA setenvif_module =
+AP_DECLARE_MODULE(setenvif) =
 {
     STANDARD20_MODULE_STUFF,
     create_setenvif_config_dir, /* dir config creater */
diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index a78e0206803..f828fb348c7 100644
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -356,7 +356,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_post_read_request(gen_unique_id, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA unique_id_module = {
+AP_DECLARE_MODULE(unique_id) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
     NULL,                       /* dir merger --- default is to override */
diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index 77b478d5c3f..8df944a4307 100644
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -442,7 +442,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_fixups(spot_cookie,NULL,NULL,APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA usertrack_module = {
+AP_DECLARE_MODULE(usertrack) = {
     STANDARD20_MODULE_STUFF,
     make_cookie_dir,            /* dir config creater */
     NULL,                       /* dir merger --- default is to override */
diff --git a/modules/metadata/mod_version.c b/modules/metadata/mod_version.c
index d614cae0679..d9c23399399 100644
--- a/modules/metadata/mod_version.c
+++ b/modules/metadata/mod_version.c
@@ -300,7 +300,7 @@ static const command_rec version_cmds[] = {
     { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA version_module =
+AP_DECLARE_MODULE(version) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,             /* dir config creater */
diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index eda76d183ad..485708f7fbf 100644
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -17,6 +17,8 @@
 #include "ajp_header.h"
 #include "ajp.h"
 
+APLOG_USE_MODULE(proxy_ajp);
+
 static const char *response_trans_headers[] = {
     "Content-Type",
     "Content-Language",
diff --git a/modules/proxy/ajp_link.c b/modules/proxy/ajp_link.c
index 04c8f092e92..2aeb6c9e7ef 100644
--- a/modules/proxy/ajp_link.c
+++ b/modules/proxy/ajp_link.c
@@ -16,6 +16,7 @@
 
 #include "ajp.h"
 
+APLOG_USE_MODULE(proxy_ajp);
 
 apr_status_t ajp_ilink_send(apr_socket_t *sock, ajp_msg_t *msg)
 {
diff --git a/modules/proxy/ajp_msg.c b/modules/proxy/ajp_msg.c
index f12805e338c..511b25a8573 100644
--- a/modules/proxy/ajp_msg.c
+++ b/modules/proxy/ajp_msg.c
@@ -16,6 +16,7 @@
 
 #include "ajp.h"
 
+APLOG_USE_MODULE(proxy_ajp);
 
 static char *hex_table = "0123456789ABCDEF";
 
diff --git a/modules/proxy/ajp_utils.c b/modules/proxy/ajp_utils.c
index 780aeb48560..f2eb6ba9dcd 100644
--- a/modules/proxy/ajp_utils.c
+++ b/modules/proxy/ajp_utils.c
@@ -16,6 +16,8 @@
 
 #include "ajp.h"
 
+APLOG_USE_MODULE(proxy_ajp);
+
 /*
  * Handle the CPING/CPONG
  */
diff --git a/modules/proxy/balancers/mod_lbmethod_bybusyness.c b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
index 73b878e5e59..5b4e54ee6a2 100644
--- a/modules/proxy/balancers/mod_lbmethod_bybusyness.c
+++ b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
@@ -128,7 +128,7 @@ static void register_hook(apr_pool_t *p)
     ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);
 }
 
-module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module = {
+AP_DECLARE_MODULE(lbmethod_bybusyness) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */
diff --git a/modules/proxy/balancers/mod_lbmethod_byrequests.c b/modules/proxy/balancers/mod_lbmethod_byrequests.c
index 6700e9b8c04..6c94e67fd1a 100644
--- a/modules/proxy/balancers/mod_lbmethod_byrequests.c
+++ b/modules/proxy/balancers/mod_lbmethod_byrequests.c
@@ -164,7 +164,7 @@ static void register_hook(apr_pool_t *p)
     ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0", &byrequests);
 }
 
-module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module = {
+AP_DECLARE_MODULE(lbmethod_byrequests) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */
diff --git a/modules/proxy/balancers/mod_lbmethod_bytraffic.c b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
index 32e91fe94f2..4cec05b20de 100644
--- a/modules/proxy/balancers/mod_lbmethod_bytraffic.c
+++ b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
@@ -131,7 +131,7 @@ static void register_hook(apr_pool_t *p)
     ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0", &bytraffic);
 }
 
-module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module = {
+AP_DECLARE_MODULE(lbmethod_bytraffic) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */
diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
index a1dc2ca6875..0bf1fec9dea 100644
--- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c
+++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
@@ -476,7 +476,7 @@ static const command_rec cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA lbmethod_heartbeat_module = {
+AP_DECLARE_MODULE(lbmethod_heartbeat) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/proxy/examples/mod_lbmethod_rr.c b/modules/proxy/examples/mod_lbmethod_rr.c
index 10406fda714..7888552ea4e 100644
--- a/modules/proxy/examples/mod_lbmethod_rr.c
+++ b/modules/proxy/examples/mod_lbmethod_rr.c
@@ -118,7 +118,7 @@ static void ap_proxy_rr_register_hook(apr_pool_t *p)
     ap_register_provider(p, PROXY_LBMETHOD, "roundrobin", "0", &roundrobin);
 }
 
-module AP_MODULE_DECLARE_DATA proxy_balancer_rr_module = {
+AP_DECLARE_MODULE(proxy_balancer_rr) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 59cbc3b4480..f4ba275abd5 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2367,7 +2367,7 @@ static void register_hooks(apr_pool_t *p)
 
 }
 
-module AP_MODULE_DECLARE_DATA proxy_module =
+AP_DECLARE_MODULE(proxy) =
 {
     STANDARD20_MODULE_STUFF,
     create_proxy_dir_config,    /* create per-directory config structure */
diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 0f5674cbec3..929b09c360a 100644
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -724,7 +724,7 @@ static void ap_proxy_http_register_hook(apr_pool_t *p)
     proxy_hook_canon_handler(proxy_ajp_canon, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA proxy_ajp_module = {
+AP_DECLARE_MODULE(proxy_ajp) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index f35b3b34813..2ad43601b5a 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -1018,7 +1018,7 @@ static void ap_proxy_balancer_register_hook(apr_pool_t *p)
     proxy_hook_canon_handler(proxy_balancer_canon, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA proxy_balancer_module = {
+AP_DECLARE_MODULE(proxy_balancer) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */
diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c
index 0978a1adf80..f90d6b6e673 100644
--- a/modules/proxy/mod_proxy_connect.c
+++ b/modules/proxy/mod_proxy_connect.c
@@ -522,7 +522,7 @@ static const command_rec cmds[] =
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA proxy_connect_module = {
+AP_DECLARE_MODULE(proxy_connect) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */
diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index 3de43bebd3f..d623f69a42a 100644
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -993,7 +993,7 @@ static void register_hooks(apr_pool_t *p)
     proxy_hook_canon_handler(proxy_fcgi_canon, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA proxy_fcgi_module = {
+AP_DECLARE_MODULE(proxy_fcgi) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/proxy/mod_proxy_fdpass.c b/modules/proxy/mod_proxy_fdpass.c
index 542dfb39421..f6da7073724 100644
--- a/modules/proxy/mod_proxy_fdpass.c
+++ b/modules/proxy/mod_proxy_fdpass.c
@@ -291,7 +291,7 @@ static void register_hooks(apr_pool_t *p)
     proxy_hook_canon_handler(proxy_fdpass_canon, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA proxy_fdpass_module = {
+AP_DECLARE_MODULE(proxy_fdpass) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index 10b434c3f9e..d88b7bc89fa 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -2028,7 +2028,7 @@ static const command_rec proxy_ftp_cmds[] =
 };
 
 
-module AP_MODULE_DECLARE_DATA proxy_ftp_module = {
+AP_DECLARE_MODULE(proxy_ftp) = {
     STANDARD20_MODULE_STUFF,
     create_proxy_ftp_dir_config,/* create per-directory config structure */
     merge_proxy_ftp_dir_config, /* merge per-directory config structures */
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index bad9259b65f..2bd08298216 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -2045,7 +2045,7 @@ static void ap_proxy_http_register_hook(apr_pool_t *p)
     apr_pool_cleanup_register(p, p, warn_rx_free, apr_pool_cleanup_null);
 }
 
-module AP_MODULE_DECLARE_DATA proxy_http_module = {
+AP_DECLARE_MODULE(proxy_http) = {
     STANDARD20_MODULE_STUFF,
     NULL,              /* create per-directory config structure */
     NULL,              /* merge per-directory config structures */
diff --git a/modules/proxy/mod_proxy_scgi.c b/modules/proxy/mod_proxy_scgi.c
index 1f16ae47cf4..58f5b0823b6 100644
--- a/modules/proxy/mod_proxy_scgi.c
+++ b/modules/proxy/mod_proxy_scgi.c
@@ -616,7 +616,7 @@ static void register_hooks(apr_pool_t *p)
 }
 
 
-module AP_MODULE_DECLARE_DATA proxy_scgi_module = {
+AP_DECLARE_MODULE(proxy_scgi) = {
     STANDARD20_MODULE_STUFF,
     create_scgi_config,  /* create per-directory config structure */
     merge_scgi_config,   /* merge per-directory config structures */
diff --git a/modules/proxy/mod_serf.c b/modules/proxy/mod_serf.c
index a939a0218ef..3a8696b250c 100644
--- a/modules/proxy/mod_serf.c
+++ b/modules/proxy/mod_serf.c
@@ -1147,7 +1147,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_handler(serf_handler, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA serf_module =
+AP_DECLARE_MODULE(serf) =
 {
     STANDARD20_MODULE_STUFF,
     create_dir_config,
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 6117f1f4ea5..59635f96741 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -29,6 +29,8 @@
 #define apr_socket_create apr_socket_create_ex
 #endif
 
+APLOG_USE_MODULE(proxy);
+
 /*
  * Opaque structure containing target server info when
  * using a forward proxy.
diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c
index b6a75591ea5..2c08f86096a 100644
--- a/modules/session/mod_session.c
+++ b/modules/session/mod_session.c
@@ -625,7 +625,7 @@ static void register_hooks(apr_pool_t * p)
     APR_REGISTER_OPTIONAL_FN(ap_session_save);
 }
 
-module AP_MODULE_DECLARE_DATA session_module =
+AP_DECLARE_MODULE(session) =
 {
     STANDARD20_MODULE_STUFF,
     create_session_dir_config,   /* dir config creater */
diff --git a/modules/session/mod_session_cookie.c b/modules/session/mod_session_cookie.c
index fc04e5cc6dd..1dba0083844 100644
--- a/modules/session/mod_session_cookie.c
+++ b/modules/session/mod_session_cookie.c
@@ -263,7 +263,7 @@ static void register_hooks(apr_pool_t * p)
     ap_hook_session_save(session_cookie_save, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA session_cookie_module =
+AP_DECLARE_MODULE(session_cookie) =
 {
     STANDARD20_MODULE_STUFF,
     create_session_cookie_dir_config, /* dir config creater */
diff --git a/modules/session/mod_session_crypto.c b/modules/session/mod_session_crypto.c
index e7075bc9ad0..65abf67d2fe 100644
--- a/modules/session/mod_session_crypto.c
+++ b/modules/session/mod_session_crypto.c
@@ -628,7 +628,7 @@ static void register_hooks(apr_pool_t * p)
     ap_hook_post_config(ap_session_crypto_init, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA session_crypto_module =
+AP_DECLARE_MODULE(session_crypto) =
 {
     STANDARD20_MODULE_STUFF,
     create_session_crypto_dir_config, /* dir config creater */
diff --git a/modules/session/mod_session_dbd.c b/modules/session/mod_session_dbd.c
index 83aceb87765..cfbc7ecfbac 100644
--- a/modules/session/mod_session_dbd.c
+++ b/modules/session/mod_session_dbd.c
@@ -616,7 +616,7 @@ static void register_hooks(apr_pool_t * p)
     ap_hook_monitor(session_dbd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA session_dbd_module =
+AP_DECLARE_MODULE(session_dbd) =
 {
     STANDARD20_MODULE_STUFF,
     create_session_dbd_dir_config, /* dir config creater */
diff --git a/modules/slotmem/mod_slotmem_plain.c b/modules/slotmem/mod_slotmem_plain.c
index 62eb17de327..ccd1676b7a8 100644
--- a/modules/slotmem/mod_slotmem_plain.c
+++ b/modules/slotmem/mod_slotmem_plain.c
@@ -285,7 +285,7 @@ static void ap_slotmem_plain_register_hook(apr_pool_t *p)
     ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA slotmem_plain_module = {
+AP_DECLARE_MODULE(slotmem_plain) = {
     STANDARD20_MODULE_STUFF,
     NULL,                        /* create per-directory config structure */
     NULL,                        /* merge per-directory config structures */
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 744ec0cb44c..f21bdcd94f8 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -629,7 +629,7 @@ static void ap_slotmem_shm_register_hook(apr_pool_t *p)
     ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA slotmem_shm_module = {
+AP_DECLARE_MODULE(slotmem_shm) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
diff --git a/modules/test/mod_dialup.c b/modules/test/mod_dialup.c
index a39b0024e4e..2785698d81f 100644
--- a/modules/test/mod_dialup.c
+++ b/modules/test/mod_dialup.c
@@ -296,7 +296,7 @@ static const command_rec dialup_cmds[] =
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA dialup_module =
+AP_DECLARE_MODULE(dialup) =
 {
     STANDARD20_MODULE_STUFF,
     dialup_dcfg_create,
diff --git a/modules/test/mod_optional_fn_export.c b/modules/test/mod_optional_fn_export.c
index 87d5f88d29c..358275a74de 100644
--- a/modules/test/mod_optional_fn_export.c
+++ b/modules/test/mod_optional_fn_export.c
@@ -36,7 +36,7 @@ static void ExportRegisterHooks(apr_pool_t *p)
     APR_REGISTER_OPTIONAL_FN(TestOptionalFn);
 }
 
-module AP_MODULE_DECLARE_DATA optional_fn_export_module=
+AP_DECLARE_MODULE(optional_fn_export) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,
diff --git a/modules/test/mod_optional_fn_import.c b/modules/test/mod_optional_fn_import.c
index 7e651ddb815..a01a3e74fdc 100644
--- a/modules/test/mod_optional_fn_import.c
+++ b/modules/test/mod_optional_fn_import.c
@@ -43,7 +43,7 @@ static void ImportRegisterHooks(apr_pool_t *p)
     ap_hook_optional_fn_retrieve(ImportFnRetrieve,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA optional_fn_import_module =
+AP_DECLARE_MODULE(optional_fn_import) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,
diff --git a/modules/test/mod_optional_hook_export.c b/modules/test/mod_optional_hook_export.c
index 25c34248ca5..bb61b430ad2 100644
--- a/modules/test/mod_optional_hook_export.c
+++ b/modules/test/mod_optional_hook_export.c
@@ -32,7 +32,7 @@ static void ExportRegisterHooks(apr_pool_t *p)
     ap_hook_log_transaction(ExportLogTransaction,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA optional_hook_export_module =
+AP_DECLARE_MODULE(optional_hook_export) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,
diff --git a/modules/test/mod_optional_hook_import.c b/modules/test/mod_optional_hook_import.c
index 62aaab993df..9a188527346 100644
--- a/modules/test/mod_optional_hook_import.c
+++ b/modules/test/mod_optional_hook_import.c
@@ -33,7 +33,7 @@ static void ImportRegisterHooks(apr_pool_t *p)
                      NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA optional_hook_import_module=
+AP_DECLARE_MODULE(optional_hook_import) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,
diff --git a/os/bs2000/os.c b/os/bs2000/os.c
index ab691242b49..d75ecb385fc 100644
--- a/os/bs2000/os.c
+++ b/os/bs2000/os.c
@@ -30,6 +30,8 @@
 
 #define USER_LEN 8
 
+APLOG_USE_MODULE(core);
+
 typedef enum
 {
     bs2_unknown,     /* not initialized yet. */
diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 0889672a9f0..6e2f4f90828 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -52,6 +52,7 @@
 
 unixd_config_rec ap_unixd_config;
 
+APLOG_USE_MODULE(core);
 
 AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
                                      const char *arg,
diff --git a/server/core_filters.c b/server/core_filters.c
index f2c912062a2..3c97400a728 100644
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -75,6 +75,7 @@ do { \
     } while (!APR_BRIGADE_EMPTY(b) && (e != APR_BRIGADE_SENTINEL(b))); \
 } while (0)
 
+APLOG_USE_MODULE(core);
 
 int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
                          ap_input_mode_t mode, apr_read_type_e block,
diff --git a/server/listen.c b/server/listen.c
index 0f29a856ff1..10029801ae4 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -28,6 +28,8 @@
 #include "http_log.h"
 #include "mpm_common.h"
 
+APLOG_USE_MODULE(core);
+
 AP_DECLARE_DATA ap_listen_rec *ap_listeners = NULL;
 
 static ap_listen_rec *old_listeners;
diff --git a/server/main.c b/server/main.c
index 65fac67f2dc..eee621fc529 100644
--- a/server/main.c
+++ b/server/main.c
@@ -45,6 +45,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(core);
+
 /* WARNING: Win32 binds http_main.c dynamically to the server. Please place
  *          extern functions and global data in another appropriate module.
  *
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index ed334996fbf..c7f6b0ec30a 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -2842,7 +2842,7 @@ static const command_rec event_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA mpm_event_module = {
+AP_DECLARE_MODULE(mpm_event) = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     NULL,                       /* create per-directory config structure */
diff --git a/server/mpm/event/pod.c b/server/mpm/event/pod.c
index 262bd1197bd..2c5d89723e9 100644
--- a/server/mpm/event/pod.c
+++ b/server/mpm/event/pod.c
@@ -22,6 +22,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(mpm_event);
+
 AP_DECLARE(apr_status_t) ap_event_pod_open(apr_pool_t * p, ap_event_pod_t ** pod)
 {
     apr_status_t rv;
diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c
index 4d8f22e4915..210d03a7293 100644
--- a/server/mpm/mpmt_os2/mpmt_os2.c
+++ b/server/mpm/mpmt_os2/mpmt_os2.c
@@ -626,7 +626,7 @@ AP_INIT_TAKE1("ScoreBoardFile", ignore_cmd, NULL, RSRC_CONF, \
 { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA mpm_mpmt_os2_module = {
+AP_DECLARE_MODULE(mpm_mpmt_os2) = {
     MPM20_MODULE_STUFF,
     NULL,            /* hook to run before apache parses args */
     NULL,            /* create per-directory config structure */
diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c
index 9acdad5c9e8..35663a970f0 100644
--- a/server/mpm/mpmt_os2/mpmt_os2_child.c
+++ b/server/mpm/mpmt_os2/mpmt_os2_child.c
@@ -36,6 +36,8 @@
 #include <os2.h>
 #include <process.h>
 
+APLOG_USE_MODULE(mpm_mpmt_os2);
+
 /* XXXXXX move these to header file private to this MPM */
 
 /* We don't need many processes,
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index a809372aa59..a71b6e33fee 100644
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -1360,7 +1360,7 @@ AP_INIT_TAKE1("MaxThreads", set_thread_limit, NULL, RSRC_CONF,
 { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA mpm_netware_module = {
+AP_DECLARE_MODULE(mpm_netware) = {
     MPM20_MODULE_STUFF,
     netware_rewrite_args,   /* hook to run before apache parses args */
     NULL,                   /* create per-directory config structure */
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index d0947c2df7f..307e81252fb 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1523,7 +1523,7 @@ AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND,
 { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA mpm_prefork_module = {
+AP_DECLARE_MODULE(mpm_prefork) = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     NULL,                       /* create per-directory config structure */
diff --git a/server/mpm/simple/simple_api.c b/server/mpm/simple/simple_api.c
index 1023cd6fa42..6de5226a6bf 100644
--- a/server/mpm/simple/simple_api.c
+++ b/server/mpm/simple/simple_api.c
@@ -265,7 +265,7 @@ static const command_rec simple_cmds[] = {
 
 
 
-module AP_MODULE_DECLARE_DATA mpm_simple_module = {
+AP_DECLARE_MODULE(mpm_simple) = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     NULL,                       /* create per-directory config structure */
diff --git a/server/mpm/simple/simple_children.c b/server/mpm/simple/simple_children.c
index e326784f7d4..a5215644f55 100644
--- a/server/mpm/simple/simple_children.c
+++ b/server/mpm/simple/simple_children.c
@@ -27,6 +27,8 @@
 
 #define SPAWN_CHILDREN_INTERVAL (apr_time_from_sec(5))
 
+APLOG_USE_MODULE(mpm_simple);
+
 static void simple_kill_random_child(simple_core_t * sc)
 {
     /* See comment in simple_spawn_child for why we check here. */
diff --git a/server/mpm/simple/simple_core.c b/server/mpm/simple/simple_core.c
index 7b9d99c7cd5..9e0e870f9f0 100644
--- a/server/mpm/simple/simple_core.c
+++ b/server/mpm/simple/simple_core.c
@@ -31,6 +31,8 @@ static simple_core_t *g_simple_core;
 #endif
 
 
+APLOG_USE_MODULE(mpm_simple);
+
 simple_core_t *simple_core_get()
 {
     return g_simple_core;
diff --git a/server/mpm/simple/simple_io.c b/server/mpm/simple/simple_io.c
index b1d77f30fce..4c253724f4c 100644
--- a/server/mpm/simple/simple_io.c
+++ b/server/mpm/simple/simple_io.c
@@ -27,6 +27,8 @@
 #include "scoreboard.h"
 #include "http_vhost.h"
 
+APLOG_USE_MODULE(mpm_simple);
+
 static void simple_io_timeout_cb(simple_core_t * sc, void *baton)
 {
     simple_conn_t *scon = (simple_conn_t *) baton;
diff --git a/server/mpm/simple/simple_run.c b/server/mpm/simple/simple_run.c
index 0b3246e5411..27b13d19025 100644
--- a/server/mpm/simple/simple_run.c
+++ b/server/mpm/simple/simple_run.c
@@ -35,6 +35,8 @@
 #define apr_time_from_msec(msec) ((apr_time_t)(msec) * 1000)
 #endif
 
+APLOG_USE_MODULE(mpm_simple);
+
 /**
  * Create Timers.
  */
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 5aa7c6ebeda..469855e4374 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -64,6 +64,8 @@
 #define PADDED_ADDR_SIZE (sizeof(SOCKADDR_IN)+16)
 #endif
 
+APLOG_USE_MODULE(mpm_winnt);
+
 /* Queue for managing the passing of winnt_conn_ctx_t between
  * the accept and worker threads.
  */
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 41b75d35323..e2f5e444f87 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1740,7 +1740,7 @@ static void winnt_hooks(apr_pool_t *p)
     ap_hook_mpm_get_name(winnt_get_name, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-AP_MODULE_DECLARE_DATA module mpm_winnt_module = {
+AP_DECLARE_MODULE(mpm_winnt) = {
     MPM20_MODULE_STUFF,
     winnt_rewrite_args,    /* hook to run before apache parses args */
     NULL,                  /* create per-directory config structure */
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index ea66e99d769..a4ffd0400f2 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -34,6 +34,8 @@
 #undef _WINUSER_
 #include <winuser.h>
 
+APLOG_USE_MODULE(mpm_winnt);
+
 /* Todo; clear up statics */
 static char *mpm_service_name = NULL;
 static char *mpm_display_name = NULL;
diff --git a/server/mpm/worker/pod.c b/server/mpm/worker/pod.c
index d6ebb240e46..c39930b8c82 100644
--- a/server/mpm/worker/pod.c
+++ b/server/mpm/worker/pod.c
@@ -21,6 +21,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(mpm_worker);
+
 AP_DECLARE(apr_status_t) ap_worker_pod_open(apr_pool_t *p, ap_worker_pod_t **pod)
 {
     apr_status_t rv;
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 286f6a7eac0..7af28e7cd66 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -2351,7 +2351,7 @@ AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND,
 { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA mpm_worker_module = {
+AP_DECLARE_MODULE(mpm_worker) = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     NULL,                       /* create per-directory config structure */
diff --git a/server/mpm_common.c b/server/mpm_common.c
index fee23f66de5..3f80625e195 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -56,6 +56,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(core);
+
 #if AP_ENABLE_EXCEPTION_HOOK
 APR_HOOK_STRUCT(
     APR_HOOK_LINK(fatal_exception)
diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index d2e7fbdbec2..a9cde5c0bb4 100644
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -56,6 +56,8 @@
 #endif
 
 
+APLOG_USE_MODULE(core);
+
 typedef enum {DO_NOTHING, SEND_SIGTERM, SEND_SIGKILL, GIVEUP} action_t;
 
 typedef struct extra_process_t {
diff --git a/server/protocol.c b/server/protocol.c
index 7b5c9b922de..2379d580ab0 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -57,6 +57,8 @@
 #endif
 
 
+APLOG_USE_MODULE(core);
+
 APR_HOOK_STRUCT(
     APR_HOOK_LINK(post_read_request)
     APR_HOOK_LINK(log_transaction)
diff --git a/server/request.c b/server/request.c
index 97e0803c2f2..d608cda365a 100644
--- a/server/request.c
+++ b/server/request.c
@@ -54,6 +54,8 @@
 #include <stdarg.h>
 #endif
 
+APLOG_USE_MODULE(core);
+
 APR_HOOK_STRUCT(
     APR_HOOK_LINK(translate_name)
     APR_HOOK_LINK(map_to_storage)
diff --git a/server/scoreboard.c b/server/scoreboard.c
index 6b0ee1c4f6a..2bd91143b09 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -36,6 +36,8 @@
 
 #include "scoreboard.h"
 
+APLOG_USE_MODULE(core);
+
 AP_DECLARE_DATA scoreboard *ap_scoreboard_image = NULL;
 AP_DECLARE_DATA const char *ap_scoreboard_fname = NULL;
 
diff --git a/server/util.c b/server/util.c
index e645235de54..450fb54b5c0 100644
--- a/server/util.c
+++ b/server/util.c
@@ -80,6 +80,8 @@
 #define IS_SLASH(s) (s == '/')
 #endif
 
+APLOG_USE_MODULE(core);
+
 
 /*
  * Examine a field value (such as a media-/content-type) string and return
diff --git a/server/util_cookies.c b/server/util_cookies.c
index 8f1504c7bd2..2904d07d567 100644
--- a/server/util_cookies.c
+++ b/server/util_cookies.c
@@ -21,6 +21,8 @@
 
 #define LOG_PREFIX "ap_cookie: "
 
+APLOG_USE_MODULE(core);
+
 /**
  * Write an RFC2109 compliant cookie.
  *
diff --git a/server/util_ebcdic.c b/server/util_ebcdic.c
index 78cf2739ab2..dbcdfd4693a 100644
--- a/server/util_ebcdic.c
+++ b/server/util_ebcdic.c
@@ -24,6 +24,8 @@
 #include "http_core.h"
 #include "util_ebcdic.h"
 
+APLOG_USE_MODULE(core);
+
 apr_status_t ap_init_ebcdic(apr_pool_t *pool)
 {
     apr_status_t rv;
diff --git a/server/util_expr.c b/server/util_expr.c
index 6d8329dfc9b..921b90b867f 100644
--- a/server/util_expr.c
+++ b/server/util_expr.c
@@ -27,6 +27,9 @@
 #include "http_core.h"
 
 #include "ap_expr.h"
+
+APLOG_USE_MODULE(core);
+
 #if 1
 /*
  * +-------------------------------------------------------+
diff --git a/server/util_filter.c b/server/util_filter.c
index f2e5b5d2999..1446dd53309 100644
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -44,6 +44,8 @@
  * filter names to filters
  */
 
+APLOG_USE_MODULE(core);
+
 typedef struct filter_trie_node filter_trie_node;
 
 typedef struct {
diff --git a/server/util_mutex.c b/server/util_mutex.c
index 5896bf93a8b..ad3833b14ff 100644
--- a/server/util_mutex.c
+++ b/server/util_mutex.c
@@ -41,6 +41,8 @@
 #include <unistd.h> /* getpid() */
 #endif
 
+APLOG_USE_MODULE(core);
+
 AP_DECLARE(apr_status_t) ap_parse_mutex(const char *arg, apr_pool_t *pool,
                                         apr_lockmech_e *mutexmech,
                                         const char **mutexfile)
diff --git a/server/util_script.c b/server/util_script.c
index 0a7a8a6dd57..b518f62b699 100644
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -52,6 +52,8 @@
 #define MALFORMED_MESSAGE "malformed header from script. Bad header="
 #define MALFORMED_HEADER_LENGTH_TO_SHOW 30
 
+APLOG_USE_MODULE(core);
+
 static char *http2env(apr_pool_t *a, const char *w)
 {
     char *res = (char *)apr_palloc(a, sizeof("HTTP_") + strlen(w));
diff --git a/server/util_xml.c b/server/util_xml.c
index dc88b3ddbe3..ebccee7f502 100644
--- a/server/util_xml.c
+++ b/server/util_xml.c
@@ -29,6 +29,8 @@
 #define READ_BLOCKSIZE 2048
 
 
+APLOG_USE_MODULE(core);
+
 AP_DECLARE(int) ap_xml_parse_input(request_rec * r, apr_xml_doc **pdoc)
 {
     apr_xml_parser *parser;
diff --git a/server/vhost.c b/server/vhost.c
index cc1ae929312..4b3855c8dbd 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -39,6 +39,8 @@
 #include <arpa/inet.h>
 #endif
 
+APLOG_USE_MODULE(core);
+
 /*
  * After all the definitions there's an explanation of how it's all put
  * together.