diff --git a/Makefile.am b/Makefile.am
index 6aa9df48..a05a223a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,7 +102,7 @@ noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
 	evrpc-internal.h strlcpy-internal.h evbuffer-internal.h \
 	bufferevent-internal.h http-internal.h event-internal.h \
 	evthread-internal.h \
-	min_heap.h log.h evsignal.h evmap.h
+	minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h
 
 include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h event-config.h
 
diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c
index f2d6a3ba..863f4e30 100644
--- a/WIN32-Code/win32.c
+++ b/WIN32-Code/win32.c
@@ -45,10 +45,10 @@
 
 #define RB_AUGMENT(x) (void)(x)
 #include "./tree.h"
-#include "log.h"
+#include "log-internal.h"
 #include "event.h"
 #include "event-internal.h"
-#include "evmap.h"
+#include "evmap-inernal.h"
 
 #define XFREE(ptr) do { if (ptr) mm_free(ptr); } while(0)
 
diff --git a/buffer.c b/buffer.c
index 09616dc9..26db9996 100644
--- a/buffer.c
+++ b/buffer.c
@@ -68,7 +68,7 @@
 #include "event2/event.h"
 #include "event2/buffer.h"
 #include "config.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 #include "evbuffer-internal.h"
 
diff --git a/bufferevent.c b/bufferevent.c
index 32e63b83..0344636d 100644
--- a/bufferevent.c
+++ b/bufferevent.c
@@ -53,7 +53,7 @@
 #include "event2/buffer.h"
 #include "event2/bufferevent_struct.h"
 #include "event2/event.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 #include "bufferevent-internal.h"
 #include "util-internal.h"
diff --git a/devpoll.c b/devpoll.c
index 3a849cd5..0b226e8c 100644
--- a/devpoll.c
+++ b/devpoll.c
@@ -49,9 +49,9 @@
 #include "event2/event.h"
 #include "event2/event_struct.h"
 #include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 struct devpollop {
 	struct pollfd *events;
diff --git a/epoll.c b/epoll.c
index 24ce52ae..db0d4d7a 100644
--- a/epoll.c
+++ b/epoll.c
@@ -49,9 +49,9 @@
 #endif
 
 #include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 struct epollop {
 	struct epoll_event *events;
diff --git a/evdns.c b/evdns.c
index 444e01c4..a62fa0b4 100644
--- a/evdns.c
+++ b/evdns.c
@@ -101,7 +101,7 @@
 
 #include "evdns.h"
 #include "evutil.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 #include "strlcpy-internal.h"
 #include "ipv6-internal.h"
diff --git a/event-internal.h b/event-internal.h
index a358d61b..f0de2ebe 100644
--- a/event-internal.h
+++ b/event-internal.h
@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 #include "config.h"
-#include "min_heap.h"
-#include "evsignal.h"
+#include "minheap-internal.h"
+#include "evsignal-internal.h"
 #include "mm-internal.h"
 
 /* map union members back */
diff --git a/event.c b/event.c
index 52210734..ed71cdb2 100644
--- a/event.c
+++ b/event.c
@@ -65,8 +65,8 @@
 #include "evthread-internal.h"
 #include "event2/thread.h"
 #include "event2/util.h"
-#include "log.h"
-#include "evmap.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 #ifdef HAVE_EVENT_PORTS
 extern const struct eventop evportops;
diff --git a/event_tagging.c b/event_tagging.c
index 4a39ea2c..cb311b8d 100644
--- a/event_tagging.c
+++ b/event_tagging.c
@@ -64,7 +64,7 @@
 #include "event2/event.h"
 #include "event2/tag.h"
 #include "event2/buffer.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 
 int evtag_decode_int(ev_uint32_t *pnumber, struct evbuffer *evbuf);
diff --git a/evmap.h b/evmap-internal.h
similarity index 99%
rename from evmap.h
rename to evmap-internal.h
index 9a238cc5..2207540c 100644
--- a/evmap.h
+++ b/evmap-internal.h
@@ -27,7 +27,7 @@
 #ifndef _EVMAP_H_
 #define _EVMAP_H_
 
-/** @file evmap.h
+/** @file evmap-internal.h
  *
  * An event_map is a utility structure to map each fd or signal to zero or
  * more events.  Functions to manipulate event_maps should only be used from
diff --git a/evmap.c b/evmap.c
index 65951493..f88c81a4 100644
--- a/evmap.c
+++ b/evmap.c
@@ -53,7 +53,7 @@
 #include <time.h>
 
 #include "event-internal.h"
-#include "evmap.h"
+#include "evmap-internal.h"
 #include "mm-internal.h"
 
 /** An entry for an evmap_io list: notes all the events that want to read or
diff --git a/evport.c b/evport.c
index 521ffbb6..e4f9bba5 100644
--- a/evport.c
+++ b/evport.c
@@ -71,9 +71,9 @@
 #endif
 
 #include "event-internal.h"
-#include "log.h"
-#include "evsignal.h"
-#include "evmap.h"
+#include "log-internal.h"
+#include "evsignal-internal.h"
+#include "evmap-internal.h"
 
 /*
  * Default value for ed_nevents, which is the maximum file descriptor number we
diff --git a/evrpc.c b/evrpc.c
index 5fd0df21..7937824c 100644
--- a/evrpc.c
+++ b/evrpc.c
@@ -63,7 +63,7 @@
 #include "event2/http_struct.h"
 #include "event2/http_compat.h"
 #include "evutil.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 
 struct evrpc_base *
diff --git a/evsignal.h b/evsignal-internal.h
similarity index 100%
rename from evsignal.h
rename to evsignal-internal.h
diff --git a/evutil.c b/evutil.c
index 2a6f7cbb..8f8f09ad 100644
--- a/evutil.c
+++ b/evutil.c
@@ -65,7 +65,7 @@
 #endif
 
 #include "event2/util.h"
-#include "log.h"
+#include "log-internal.h"
 
 #include "strlcpy-internal.h"
 #include "ipv6-internal.h"
diff --git a/http.c b/http.c
index 86844742..9c1a2ae3 100644
--- a/http.c
+++ b/http.c
@@ -91,7 +91,7 @@
 #include "event2/http_struct.h"
 #include "event2/http_compat.h"
 #include "event2/util.h"
-#include "log.h"
+#include "log-internal.h"
 #include "http-internal.h"
 #include "mm-internal.h"
 #include "util-internal.h"
diff --git a/kqueue.c b/kqueue.c
index b049dc95..4f02ce56 100644
--- a/kqueue.c
+++ b/kqueue.c
@@ -59,8 +59,8 @@
 #endif
 
 #include "event-internal.h"
-#include "log.h"
-#include "evmap.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 #define NEVENT		64
 
diff --git a/log.h b/log-internal.h
similarity index 100%
rename from log.h
rename to log-internal.h
diff --git a/log.c b/log.c
index c141dba6..efcce762 100644
--- a/log.c
+++ b/log.c
@@ -60,7 +60,7 @@
 #include "event2/event.h"
 #include "event2/util.h"
 
-#include "log.h"
+#include "log-internal.h"
 
 static void _warn_helper(int severity, const char *errstr, const char *fmt,
                          va_list ap);
diff --git a/min_heap.h b/minheap-internal.h
similarity index 100%
rename from min_heap.h
rename to minheap-internal.h
diff --git a/poll.c b/poll.c
index a5335398..e2752370 100644
--- a/poll.c
+++ b/poll.c
@@ -47,9 +47,9 @@
 #include <assert.h>
 
 #include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 struct pollop {
 	int event_count;		/* Highest number alloc */
diff --git a/select.c b/select.c
index 31c7598a..bc753237 100644
--- a/select.c
+++ b/select.c
@@ -49,9 +49,9 @@
 #include <assert.h>
 
 #include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 #ifndef howmany
 #define        howmany(x, y)   (((x)+((y)-1))/(y))
diff --git a/signal.c b/signal.c
index eaa2fff7..dc432fdd 100644
--- a/signal.c
+++ b/signal.c
@@ -61,9 +61,9 @@
 #include "event2/event_struct.h"
 #include "event-internal.h"
 #include "event2/util.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 static int evsig_add(struct event_base *, int, short, short);
 static int evsig_del(struct event_base *, int, short, short);
diff --git a/test/regress.c b/test/regress.c
index b5da2ec1..033f61e1 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -65,7 +65,7 @@
 #include "event2/util.h"
 #include "event-internal.h"
 #include "evbuffer-internal.h"
-#include "log.h"
+#include "log-internal.h"
 
 #include "regress.h"
 
diff --git a/test/regress_dns.c b/test/regress_dns.c
index 66eb8810..c36df1fc 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -62,7 +62,7 @@
 #include "event2/event.h"
 #include "event2/event_compat.h"
 #include "evdns.h"
-#include "log.h"
+#include "log-internal.h"
 
 static int dns_ok = 0;
 static int dns_err = 0;
diff --git a/test/regress_http.c b/test/regress_http.c
index b75ac64e..e693066e 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -54,7 +54,7 @@
 
 #include "event.h"
 #include "evhttp.h"
-#include "log.h"
+#include "log-internal.h"
 #include "http-internal.h"
 
 extern int pair[];
diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index acbd83b2..78ccd651 100644
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -55,7 +55,7 @@
 
 #include "event2/event.h"
 #include "evhttp.h"
-#include "log.h"
+#include "log-internal.h"
 #include "evrpc.h"
 
 #include "regress.gen.h"