diff --git a/include/iscsi-private.h b/include/iscsi-private.h
index 8ace255..dfea31c 100644
--- a/include/iscsi-private.h
+++ b/include/iscsi-private.h
@@ -25,6 +25,8 @@
 #define ssize_t SSIZE_T
 #endif
 
+#include "iscsi.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/scsi-lowlevel.h b/include/scsi-lowlevel.h
index f2a8908..f5fd037 100644
--- a/include/scsi-lowlevel.h
+++ b/include/scsi-lowlevel.h
@@ -23,6 +23,9 @@
 #define EXTERN
 #endif
 
+#include <stdint.h>
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h
index 5f79d8b..aee00ca 100644
--- a/test-tool/iscsi-support.h
+++ b/test-tool/iscsi-support.h
@@ -27,6 +27,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+#include "iscsi.h"
+#include "scsi-lowlevel.h"
+
 #ifndef discard_const
 #define discard_const(ptr) ((void *)((intptr_t)(ptr)))
 #endif
diff --git a/test-tool/iscsi-test-cu.h b/test-tool/iscsi-test-cu.h
index d88c6a7..086b949 100644
--- a/test-tool/iscsi-test-cu.h
+++ b/test-tool/iscsi-test-cu.h
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include "iscsi.h"
 #include "iscsi-support.h"
 
 /* globals between setup, tests, and teardown */