diff -ru httpd-logging-plain/modules/dav/lock/locks.c httpd-logging/modules/dav/lock/locks.c
--- httpd-logging-plain/modules/dav/lock/locks.c	2010-04-12 14:00:11.674331542 -0400
+++ httpd-logging/modules/dav/lock/locks.c	2010-04-12 13:58:38.112887242 -0400
@@ -27,6 +27,7 @@
 #include "apr_want.h"
 
 #include "httpd.h"
+#define AP_MODULE_VAR dav_lock_module
 #include "http_log.h"
 
 #include "mod_dav.h"
@@ -196,6 +197,8 @@
     dav_locktoken token;
 } dav_lock_combined;
 
+extern module AP_MODULE_DECLARE_DATA dav_lock_module;
+
 /*
  * This must be forward-declared so the open_lockdb function can use it.
  */
diff -ru httpd-logging-plain/modules/examples/mod_example_hooks.c httpd-logging/modules/examples/mod_example_hooks.c
--- httpd-logging-plain/modules/examples/mod_example_hooks.c	2010-04-12 14:00:49.707607183 -0400
+++ httpd-logging/modules/examples/mod_example_hooks.c	2010-04-12 13:47:42.333596961 -0400
@@ -492,7 +492,8 @@
      */
 
 #ifdef EXAMPLE_LOG_EACH
-    ap_log_perror(file, line, APLOG_NOTICE, 0, p, "%s", note);
+    ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_NOTICE, 0, p, "%s",
+                  note);
 #endif
 }
 
diff -ru httpd-logging-plain/modules/examples/mod_example_ipc.c httpd-logging/modules/examples/mod_example_ipc.c
--- httpd-logging-plain/modules/examples/mod_example_ipc.c	2010-04-12 14:00:49.708007770 -0400
+++ httpd-logging/modules/examples/mod_example_ipc.c	2010-04-12 13:48:19.732660299 -0400
@@ -74,6 +74,8 @@
 /* Number of microseconds the handler sits on the lock once acquired. */
 #define SLEEPYTIME 1000
 
+module AP_MODULE_DECLARE_DATA example_ipc_module;
+
 apr_shm_t *exipc_shm; /* Pointer to shared memory block */
 char *shmfilename; /* Shared memory file name, used on some systems */
 apr_global_mutex_t *exipc_mutex; /* Lock around shared memory segment access */
diff -ru httpd-logging-plain/modules/filters/mod_reflector.c httpd-logging/modules/filters/mod_reflector.c
--- httpd-logging-plain/modules/filters/mod_reflector.c	2010-04-12 14:00:10.926387698 -0400
+++ httpd-logging/modules/filters/mod_reflector.c	2010-04-12 13:49:12.387628090 -0400
@@ -17,6 +17,7 @@
 #include "apr_tables.h"
 
 #include "httpd.h"
+#define AP_MODULE_VAR reflector_module
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
diff -ru httpd-logging-plain/modules/generators/mod_cgid.c httpd-logging/modules/generators/mod_cgid.c
--- httpd-logging-plain/modules/generators/mod_cgid.c	2010-04-12 14:00:49.716394043 -0400
+++ httpd-logging/modules/generators/mod_cgid.c	2010-04-12 13:56:09.440524330 -0400
@@ -395,7 +395,7 @@
     if (stat != APR_SUCCESS) {
         return stat;
     }
-    r->server->loglevel = req->loglevel;
+    r->server->log.level = req->loglevel;
     if (req->req_type == GETPID_REQ) {
         /* no more data sent for this request */
         return APR_SUCCESS;
@@ -504,7 +504,7 @@
     req.argv0_len = strlen(argv0);
     req.uri_len = strlen(r->uri);
     req.args_len = r->args ? strlen(r->args) : 0;
-    req.loglevel = r->server->loglevel;
+    req.loglevel = r->server->log.level;
 
     /* Write the request header */
     if (req.args_len) {
diff -ru httpd-logging-plain/modules/test/mod_optional_fn_export.c httpd-logging/modules/test/mod_optional_fn_export.c
--- httpd-logging-plain/modules/test/mod_optional_fn_export.c	2010-04-12 14:00:49.759402041 -0400
+++ httpd-logging/modules/test/mod_optional_fn_export.c	2010-04-12 13:53:17.350769919 -0400
@@ -20,6 +20,8 @@
 #include "http_log.h"
 #include "mod_optional_fn_export.h"
 
+module AP_MODULE_DECLARE_DATA optional_fn_export_module;
+
 /* The alert will note a strange mirror-image style resemblance to
  * mod_optional_hook_import.c. Yes, I _did_ mean import. Think about it.
  */
diff -ru httpd-logging-plain/modules/test/mod_optional_hook_import.c httpd-logging/modules/test/mod_optional_hook_import.c
--- httpd-logging-plain/modules/test/mod_optional_hook_import.c	2010-04-12 14:00:49.759635375 -0400
+++ httpd-logging/modules/test/mod_optional_hook_import.c	2010-04-12 13:52:34.311609482 -0400
@@ -20,6 +20,8 @@
 #include "http_log.h"
 #include "mod_optional_hook_export.h"
 
+module AP_MODULE_DECLARE_DATA optional_hook_import_module;
+
 static int ImportOptionalHookTestHook(const char *szStr)
 {
     ap_log_error(APLOG_MARK,APLOG_ERR,OK,NULL,"Optional hook test said: %s",
diff -ru httpd-logging-plain/server/mpm/event/event.c httpd-logging/server/mpm/event/event.c
--- httpd-logging-plain/server/mpm/event/event.c	2010-04-12 14:00:49.766727602 -0400
+++ httpd-logging/server/mpm/event/event.c	2010-04-12 13:39:52.529250302 -0400
@@ -148,6 +148,8 @@
 #define apr_time_from_msec(x) (x * 1000)
 #endif
 
+module AP_MODULE_DECLARE_DATA mpm_event_module;
+
 /*
  * Actual definitions of config globals
  */
diff -ru httpd-logging-plain/server/mpm/event/pod.c httpd-logging/server/mpm/event/pod.c
--- httpd-logging-plain/server/mpm/event/pod.c	2010-04-12 14:00:04.781709499 -0400
+++ httpd-logging/server/mpm/event/pod.c	2010-04-12 13:44:12.489450036 -0400
@@ -22,6 +22,8 @@
 #include <unistd.h>
 #endif
 
+module AP_MODULE_DECLARE_DATA mpm_event_module;
+
 AP_DECLARE(apr_status_t) ap_event_pod_open(apr_pool_t * p, ap_event_pod_t ** pod)
 {
     apr_status_t rv;
diff -ru httpd-logging-plain/server/mpm/event/pod.h httpd-logging/server/mpm/event/pod.h
--- httpd-logging-plain/server/mpm/event/pod.h	2010-04-12 14:00:04.784975350 -0400
+++ httpd-logging/server/mpm/event/pod.h	2010-04-12 13:43:36.338075277 -0400
@@ -28,6 +28,7 @@
 #include "apr_want.h"
 
 #include "httpd.h"
+#define AP_MODULE_VAR mpm_event_module
 #include "http_config.h"
 #include "http_log.h"
 #include "http_main.h"
diff -ru httpd-logging-plain/server/mpm/worker/pod.h httpd-logging/server/mpm/worker/pod.h
--- httpd-logging-plain/server/mpm/worker/pod.h	2010-04-12 14:00:05.045536180 -0400
+++ httpd-logging/server/mpm/worker/pod.h	2010-04-12 13:45:16.896069049 -0400
@@ -28,6 +28,7 @@
 #include "apr_want.h"
 
 #include "httpd.h"
+#define AP_MODULE_VAR mpm_worker_module
 #include "http_config.h"
 #include "http_log.h"
 #include "http_main.h"