diff --git a/dispatch.h b/dispatch.h
index cd51dbc0b..2bcdc91a5 100644
--- a/dispatch.h
+++ b/dispatch.h
@@ -27,6 +27,8 @@
 #ifndef DISPATCH_H
 #define DISPATCH_H
 
+#include <signal.h> /* for sig_atomic_t */
+
 #define DISPATCH_MAX	255
 
 enum {
diff --git a/ssh_api.h b/ssh_api.h
index a7e14e06e..642acd5b2 100644
--- a/ssh_api.h
+++ b/ssh_api.h
@@ -18,10 +18,11 @@
 #ifndef API_H
 #define API_H
 
-#include <sys/queue.h>
 #include <sys/types.h>
 #include <signal.h>
 
+#include "openbsd-compat/sys-queue.h"
+
 #include "cipher.h"
 #include "sshkey.h"
 #include "kex.h"