diff --git a/lib/conncache.h b/lib/conncache.h
index ac5460ff4..7b7ba1205 100644
--- a/lib/conncache.h
+++ b/lib/conncache.h
@@ -29,6 +29,10 @@
  * be shared.
  */
 
+#include "timeval.h"
+
+struct connectdata;
+
 struct conncache {
   struct Curl_hash hash;
   size_t num_conn;
diff --git a/lib/multihandle.h b/lib/multihandle.h
index de4f74069..aa9ca4bcd 100644
--- a/lib/multihandle.h
+++ b/lib/multihandle.h
@@ -22,10 +22,14 @@
  *
  ***************************************************************************/
 
+#include "llist.h"
+#include "hash.h"
 #include "conncache.h"
 #include "psl.h"
 #include "socketpair.h"
 
+struct connectdata;
+
 struct Curl_message {
   struct Curl_llist_element list;
   /* the 'CURLMsg' is the part that is visible to the external user */
diff --git a/tests/server/disabled.c b/tests/server/disabled.c
index 0e862177d..6f7c10f18 100644
--- a/tests/server/disabled.c
+++ b/tests/server/disabled.c
@@ -30,6 +30,7 @@
  */
 
 #include "curl_setup.h"
+#include "multihandle.h" /* for ENABLE_WAKEUP */
 #include <stdio.h>
 
 static const char *disabled[]={
@@ -65,6 +66,9 @@ static const char *disabled[]={
 #endif
 #ifdef CURL_DISABLE_VERBOSE_STRINGS
   "verbose-strings",
+#endif
+#ifndef ENABLE_WAKEUP
+  "wakeup",
 #endif
   NULL
 };