diff --git a/buffer_iocp.c b/buffer_iocp.c
index bae08434e0..7da74431b8 100644
--- a/buffer_iocp.c
+++ b/buffer_iocp.c
@@ -32,7 +32,6 @@
 */
 
 #include "event2/buffer.h"
-#include "event2/buffer_compat.h"
 #include "event2/util.h"
 #include "event2/thread.h"
 #include "event-config.h"
diff --git a/bufferevent.c b/bufferevent.c
index 21a5e87d72..980d1468dd 100644
--- a/bufferevent.c
+++ b/bufferevent.c
@@ -51,7 +51,6 @@
 #include "event2/util.h"
 #include "event2/bufferevent.h"
 #include "event2/buffer.h"
-#include "event2/buffer_compat.h"
 #include "event2/bufferevent_struct.h"
 #include "event2/bufferevent_compat.h"
 #include "event2/event.h"
diff --git a/bufferevent_async.c b/bufferevent_async.c
index 50cf448b9e..2889ce9507 100644
--- a/bufferevent_async.c
+++ b/bufferevent_async.c
@@ -51,9 +51,7 @@
 #include "event2/util.h"
 #include "event2/bufferevent.h"
 #include "event2/buffer.h"
-#include "event2/buffer_compat.h"
 #include "event2/bufferevent_struct.h"
-#include "event2/bufferevent_compat.h"
 #include "event2/event.h"
 #include "log-internal.h"
 #include "mm-internal.h"
diff --git a/bufferevent_filter.c b/bufferevent_filter.c
index 9a45faf0ec..fa7c1f5473 100644
--- a/bufferevent_filter.c
+++ b/bufferevent_filter.c
@@ -52,9 +52,7 @@
 #include "event2/util.h"
 #include "event2/bufferevent.h"
 #include "event2/buffer.h"
-#include "event2/buffer_compat.h"
 #include "event2/bufferevent_struct.h"
-#include "event2/bufferevent_compat.h"
 #include "event2/event.h"
 #include "log-internal.h"
 #include "mm-internal.h"
diff --git a/bufferevent_sock.c b/bufferevent_sock.c
index 78ea1c1713..877c912c19 100644
--- a/bufferevent_sock.c
+++ b/bufferevent_sock.c
@@ -55,7 +55,6 @@
 #include "event2/util.h"
 #include "event2/bufferevent.h"
 #include "event2/buffer.h"
-#include "event2/buffer_compat.h"
 #include "event2/bufferevent_struct.h"
 #include "event2/bufferevent_compat.h"
 #include "event2/event.h"
diff --git a/http.c b/http.c
index 1e2c57875d..496e495bba 100644
--- a/http.c
+++ b/http.c
@@ -1193,9 +1193,12 @@ evhttp_connection_cb(struct bufferevent *bufev, void *arg)
 	if (evcon->timeout == -1)
 		bufferevent_settimeout(evcon->bufev,
 		    HTTP_READ_TIMEOUT, HTTP_WRITE_TIMEOUT);
-	else
-		bufferevent_settimeout(evcon->bufev,
-		    evcon->timeout, evcon->timeout);
+	else {
+		struct timeval tv;
+		tv.tv_sec = evcon->timeout;
+		tv.tv_usec = 0;
+		bufferevent_set_timeouts(evcon->bufev, &tv, &tv);
+	}
 
 	/* try to start requests that have queued up on this connection */
 	evhttp_request_dispatch(evcon);