diff --git a/common/send-stream.h b/common/send-stream.h
index 39901f86..2de51eac 100644
--- a/common/send-stream.h
+++ b/common/send-stream.h
@@ -19,20 +19,7 @@
 #ifndef __BTRFS_SEND_STREAM_H__
 #define __BTRFS_SEND_STREAM_H__
 
-/*
- * NOTE: this file is public API, any incompatible change has to update
- * library version
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
-#else
-#include <btrfs/kerncompat.h>
-#endif /* BTRFS_FLAT_INCLUDES */
 
 struct btrfs_send_ops {
 	int (*subvol)(const char *path, const u8 *uuid, u64 ctransid,
@@ -73,8 +60,4 @@ int btrfs_read_and_process_send_stream(int fd,
 				       int honor_end_cmd,
 				       u64 max_errors);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/common/send-utils.h b/common/send-utils.h
index dd67b3fe..06c249e0 100644
--- a/common/send-utils.h
+++ b/common/send-utils.h
@@ -19,19 +19,9 @@
 #ifndef __BTRFS_SEND_UTILS_H__
 #define __BTRFS_SEND_UTILS_H__
 
-#if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-lib/rbtree.h"
-#else
-#include <btrfs/kerncompat.h>
-#include <btrfs/ctree.h>
-#include <btrfs/rbtree.h>
-#endif /* BTRFS_FLAT_INCLUDES */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /*
  * Compatibility code for kernels < 3.12; the UUID tree is not available there
@@ -107,8 +97,4 @@ int btrfs_subvolid_resolve(int fd, char *path, size_t path_len, u64 subvol_id);
 int path_cat_out(char *out, const char *p1, const char *p2);
 int path_cat3_out(char *out, const char *p1, const char *p2, const char *p3);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/libbtrfs/send-stream.c b/libbtrfs/send-stream.c
index d07748ce..2c056a7e 100644
--- a/libbtrfs/send-stream.c
+++ b/libbtrfs/send-stream.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include "kernel-shared/send.h"
-#include "common/send-stream.h"
+#include "libbtrfs/send-stream.h"
 #include "crypto/crc32c.h"
 #include "common/utils.h"
 
diff --git a/libbtrfs/send-utils.c b/libbtrfs/send-utils.c
index a4f824e8..709c6215 100644
--- a/libbtrfs/send-utils.c
+++ b/libbtrfs/send-utils.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include "kernel-shared/ctree.h"
-#include "common/send-utils.h"
+#include "libbtrfs/send-utils.h"
 #include "common/messages.h"
 #include "common/utils.h"
 #include "ioctl.h"