diff --git a/evrpc.c b/evrpc.c
index ce080b85..25e7bf78 100644
--- a/evrpc.c
+++ b/evrpc.c
@@ -53,6 +53,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include "util-internal.h"
 #include "event2/event.h"
 #include "event2/event_struct.h"
 #include "evrpc.h"
diff --git a/evthread_win32.c b/evthread_win32.c
index 7b64df50..caf7ac3e 100644
--- a/evthread_win32.c
+++ b/evthread_win32.c
@@ -37,6 +37,8 @@
 struct event_base;
 #include <event2/thread.h>
 
+#include "mm-internal.h"
+
 static void *
 evthread_win32_lock_create(void)
 {
diff --git a/http.c b/http.c
index 905c1cc9..5a8063db 100644
--- a/http.c
+++ b/http.c
@@ -92,9 +92,9 @@
 #include "event2/http_compat.h"
 #include "event2/util.h"
 #include "log-internal.h"
+#include "util-internal.h"
 #include "http-internal.h"
 #include "mm-internal.h"
-#include "util-internal.h"
 
 #ifdef WIN32
 #define strcasecmp _stricmp
diff --git a/test/regress.c b/test/regress.c
index c511be0c..0308f61a 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -1249,7 +1249,7 @@ test_evbuffer_reference(void)
 {
 	struct evbuffer *src = evbuffer_new();
 	struct evbuffer *dst = evbuffer_new();
-	void *tmp;
+	char *tmp;
 	const char *data = "this is what we add as read-only memory.";
 
 	setup_test("Testing evbuffer_add_reference: ");
diff --git a/test/regress_http.c b/test/regress_http.c
index 478a0d2e..892295ae 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -55,6 +55,7 @@
 #include "event.h"
 #include "evhttp.h"
 #include "log-internal.h"
+#include "util-internal.h"
 #include "http-internal.h"
 
 extern int pair[];
diff --git a/util-internal.h b/util-internal.h
index 30aa99ea..13b98e0e 100644
--- a/util-internal.h
+++ b/util-internal.h
@@ -70,6 +70,10 @@ extern "C" {
 
 #endif
 
+#ifdef _EVENT_socklen_t
+#define socklen_t _EVENT_socklen_t
+#endif
+
 #ifdef __cplusplus
 }
 #endif