diff --git a/c/bitvector-ops.c b/c/bitvector-ops.c
index 408308f..b911f39 100644
--- a/c/bitvector-ops.c
+++ b/c/bitvector-ops.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/c/builtins.c b/c/builtins.c
index 0891ae2..9e2050c 100644
--- a/c/builtins.c
+++ b/c/builtins.c
@@ -12,7 +12,7 @@
 #include <math.h>
 #include <setjmp.h>
 #include <stdarg.h>
-#include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/c/equalhash.c b/c/equalhash.c
index 3c9f813..2bfe3b0 100644
--- a/c/equalhash.c
+++ b/c/equalhash.c
@@ -1,10 +1,11 @@
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <assert.h>
 #include <limits.h>
 #include <setjmp.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "dtypes.h"
 #include "utils.h"
diff --git a/c/flmain.c b/c/flmain.c
index 7a6e05c..d8c6344 100644
--- a/c/flmain.c
+++ b/c/flmain.c
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <setjmp.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/c/fs_openbsd.c b/c/fs_openbsd.c
index 48e0d05..b87ab13 100644
--- a/c/fs_openbsd.c
+++ b/c/fs_openbsd.c
@@ -3,8 +3,12 @@
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "fs.h"
 
diff --git a/c/htable.c b/c/htable.c
index 82dceae..6449d10 100644
--- a/c/htable.c
+++ b/c/htable.c
@@ -4,6 +4,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/c/iostream.c b/c/iostream.c
index 6c0506f..88329c8 100644
--- a/c/iostream.c
+++ b/c/iostream.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <setjmp.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/c/ptrhash.c b/c/ptrhash.c
index 6c6e570..4570247 100644
--- a/c/ptrhash.c
+++ b/c/ptrhash.c
@@ -5,6 +5,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/c/string.c b/c/string.c
index 736ef17..9d83e3e 100644
--- a/c/string.c
+++ b/c/string.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/c/table.c b/c/table.c
index ea62200..1f3e82e 100644
--- a/c/table.c
+++ b/c/table.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <setjmp.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>