diff --git a/libbtrfs/send-stream.c b/libbtrfs/send-stream.c
index b29b5b70..1f15621b 100644
--- a/libbtrfs/send-stream.c
+++ b/libbtrfs/send-stream.c
@@ -16,9 +16,15 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 #include <unistd.h>
 #include "libbtrfs/send.h"
 #include "libbtrfs/send-stream.h"
+#include "libbtrfs/ctree.h"
 #include "crypto/crc32c.h"
 
 struct btrfs_send_stream {
diff --git a/libbtrfs/send-utils.c b/libbtrfs/send-utils.c
index 4824243e..9f7054b2 100644
--- a/libbtrfs/send-utils.c
+++ b/libbtrfs/send-utils.c
@@ -16,12 +16,15 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
 #include <limits.h>
 #include <errno.h>
-
+#include "kernel-lib/rbtree.h"
 #include "libbtrfs/ctree.h"
 #include "libbtrfs/send-utils.h"
 #include "ioctl.h"
diff --git a/libbtrfs/send-utils.h b/libbtrfs/send-utils.h
index 7dbbf65b..5a43af7b 100644
--- a/libbtrfs/send-utils.h
+++ b/libbtrfs/send-utils.h
@@ -21,12 +21,14 @@
 
 #if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
+#include <stddef.h>
 #include "libbtrfs/ctree.h"
-#include "kernel-lib/rbtree.h"
+#include "kernel-lib/rbtree_types.h"
 #else
 #include <btrfs/kerncompat.h>
+#include <stddef.h>
 #include <btrfs/ctree.h>
-#include <btrfs/rbtree.h>
+#include <btrfs/rbtree_types.h>
 #endif /* BTRFS_FLAT_INCLUDES */
 
 #ifdef __cplusplus