diff --git a/libbtrfsutil/btrfsutil_internal.h b/libbtrfsutil/btrfsutil_internal.h
index 73bef04e..fbe4a6e5 100644
--- a/libbtrfsutil/btrfsutil_internal.h
+++ b/libbtrfsutil/btrfsutil_internal.h
@@ -22,6 +22,8 @@
 
 #include <asm/byteorder.h>
 #include <string.h>
+#include <errno.h>
+#include <unistd.h>
 
 #include "btrfsutil.h"
 #include "btrfs.h"
diff --git a/libbtrfsutil/filesystem.c b/libbtrfsutil/filesystem.c
index 07fa9c5f..e4c65e24 100644
--- a/libbtrfsutil/filesystem.c
+++ b/libbtrfsutil/filesystem.c
@@ -17,9 +17,9 @@
  * along with libbtrfsutil.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 
 #include "btrfsutil_internal.h"
diff --git a/libbtrfsutil/qgroup.c b/libbtrfsutil/qgroup.c
index d93d0495..c518cb63 100644
--- a/libbtrfsutil/qgroup.c
+++ b/libbtrfsutil/qgroup.c
@@ -18,9 +18,8 @@
  */
 
 #include <errno.h>
-#include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
+#include <stdint.h>
 
 #include "btrfsutil_internal.h"
 
diff --git a/libbtrfsutil/stubs.h b/libbtrfsutil/stubs.h
index b4f23895..e0023f7d 100644
--- a/libbtrfsutil/stubs.h
+++ b/libbtrfsutil/stubs.h
@@ -17,6 +17,8 @@
 
 #ifndef _LIBBTRFSUTIL_STUBS_H_
 
+#include <stddef.h>
+
 void *reallocarray(void *ptr, size_t nmemb, size_t size);
 
 #endif
diff --git a/libbtrfsutil/subvolume.c b/libbtrfsutil/subvolume.c
index deff6de7..d6efd5c1 100644
--- a/libbtrfsutil/subvolume.c
+++ b/libbtrfsutil/subvolume.c
@@ -17,16 +17,17 @@
  * along with libbtrfsutil.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sys/statfs.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <linux/magic.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/vfs.h>
-#include <linux/magic.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include "stubs.h"
 
 #include "btrfsutil_internal.h"