diff --git a/test/regress_dns.c b/test/regress_dns.c
index 88547160..756ac165 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -60,10 +60,13 @@
 
 #include "event2/event.h"
 #include "event2/event_compat.h"
+#include "event2/event_struct.h"
 #include <event2/util.h>
 #include <event2/listener.h>
 #include <event2/bufferevent.h>
-#include "evdns.h"
+#include "event2/dns.h"
+#include "event2/dns_compat.h"
+#include "event2/dns_struct.h"
 #include "log-internal.h"
 #include "regress.h"
 #include "regress_testutils.h"
diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index 14585b4a..9362e493 100644
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -54,11 +54,17 @@
 #include <errno.h>
 #include <assert.h>
 
+#include "event2/buffer.h"
 #include "event2/event.h"
-#include "evhttp.h"
-#include "log-internal.h"
+#include "event2/event_compat.h"
+#include "event2/http.h"
+#include "event2/http_compat.h"
+#include "event2/http_struct.h"
+#include "event2/rpc.h"
 #include "event2/rpc.h"
 #include "event2/rpc_struct.h"
+#include "event2/tag.h"
+#include "log-internal.h"
 
 #include "regress.gen.h"
 
diff --git a/test/regress_testutils.c b/test/regress_testutils.c
index 319178f6..334c41b9 100644
--- a/test/regress_testutils.c
+++ b/test/regress_testutils.c
@@ -57,12 +57,13 @@
 #include <string.h>
 #include <errno.h>
 
+#include "event2/dns.h"
+#include "event2/dns_struct.h"
 #include "event2/event.h"
 #include "event2/event_compat.h"
 #include <event2/util.h>
 #include <event2/listener.h>
 #include <event2/bufferevent.h>
-#include "evdns.h"
 #include "log-internal.h"
 #include "regress.h"
 #include "regress_testutils.h"