diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index d301da8303..2fae89bc4c 100644
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -29,7 +29,6 @@
 
 #include "mpm_unix.h"
 
-#include "apr.h"
 #include "apr_thread_proc.h"
 #include "apr_signal.h"
 #include "apr_strings.h"
@@ -41,12 +40,12 @@
 #include "apr_atomic.h"
 #include "apr_errno.h"
 
+#include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
 #include "http_main.h"
 #include "mpm_common.h"
-#include "ap_mpm.h"
 #include "ap_listen.h"
 #include "scoreboard.h"
 #include "util_mutex.h"
diff --git a/server/mpm_unix.h b/server/mpm_unix.h
index 826256ef06..45e0ab1f86 100644
--- a/server/mpm_unix.h
+++ b/server/mpm_unix.h
@@ -28,7 +28,10 @@
 
 #ifndef WIN32
 
-#include "httpd.h"
+#include <apr.h>
+#include <apr_ring.h>
+#include <apr_pools.h>
+#include <apr_network_io.h>
 #include <apr_thread_mutex.h>
 #include <apr_thread_cond.h>