From: Dave Chinner <dchinner@redhat.com>
Date: Thu, 2 Jul 2015 04:36:56 +0000 (+1000)
Subject: progs: clean up all remaining xfs*h includes
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71d5d40bc990e72081d8bf666ba28f4580b7e49f;p=xfsprogs-dev.git

progs: clean up all remaining xfs*h includes

Convert all the various ways of including xfs*.h to one standard
way across all libraries and utilities:

#include "xfs/xfs*.h"

This means we are consistently including the local
include/xfs/xfs*h header file in parts of the build.

The exception to this is the libxfs/ directory, which does not use
the "xfs/" prefix in files shared with the kernel to maintain as
much similarity to the kernel code as possible. However, libxfs/ is
the source that include/xfs points back to, so the local include
rule ensures this works just fine.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 89fba558..efc17a81 100644
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -17,11 +17,11 @@
  */
 
 #include "xfs/libxfs.h"
-#include <xfs/xfs.h>
-#include <xfs/xfs_types.h>
-#include <xfs/jdm.h>
-#include <xfs/xfs_bmap_btree.h>
-#include <xfs/xfs_attr_sf.h>
+#include "xfs/xfs.h"
+#include "xfs/xfs_types.h"
+#include "xfs/jdm.h"
+#include "xfs/xfs_bmap_btree.h"
+#include "xfs/xfs_attr_sf.h"
 
 #include <fcntl.h>
 #include <errno.h>
diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index 3ff3b5db..821a87dd 100644
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -17,7 +17,7 @@
  */
 
 #include "xfs/libxfs.h"
-#include <xfs/path.h>
+#include "xfs/path.h"
 
 static void
 usage(void)
diff --git a/include/gnukfreebsd.h b/include/gnukfreebsd.h
index 2140acd4..d3928592 100644
--- a/include/gnukfreebsd.h
+++ b/include/gnukfreebsd.h
@@ -31,7 +31,7 @@
 #include <ctype.h>
 #include <libgen.h>
 #include <paths.h>
-#include <xfs/swab.h>
+#include "xfs/swab.h"
 
 #define constpp	char * const *
 
diff --git a/include/input.h b/include/input.h
index 61b40c84..ae273add 100644
--- a/include/input.h
+++ b/include/input.h
@@ -21,7 +21,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <sys/types.h>
-#include <xfs/project.h>
+#include "xfs/project.h"
 #include <stdbool.h>
 
 extern char	**breakline(char *input, int *count);
diff --git a/include/libxfs.h b/include/libxfs.h
index 6a59cc02..1fd8bda2 100644
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -19,27 +19,27 @@
 #ifndef __LIBXFS_H__
 #define __LIBXFS_H__
 
-#include <xfs/libxfs_api_defs.h>
-#include <xfs/platform_defs.h>
+#include "xfs/libxfs_api_defs.h"
+#include "xfs/platform_defs.h"
 
-#include <xfs/list.h>
-#include <xfs/hlist.h>
-#include <xfs/cache.h>
-#include <xfs/bitops.h>
-#include <xfs/kmem.h>
-#include <xfs/radix-tree.h>
-#include <xfs/swab.h>
-#include <xfs/atomic.h>
+#include "xfs/list.h"
+#include "xfs/hlist.h"
+#include "xfs/cache.h"
+#include "xfs/bitops.h"
+#include "xfs/kmem.h"
+#include "xfs/radix-tree.h"
+#include "xfs/swab.h"
+#include "xfs/atomic.h"
 
-#include <xfs/xfs_types.h>
-#include <xfs/xfs_fs.h>
-#include <xfs/xfs_arch.h>
+#include "xfs/xfs_types.h"
+#include "xfs/xfs_fs.h"
+#include "xfs/xfs_arch.h"
 
-#include <xfs/xfs_shared.h>
-#include <xfs/xfs_format.h>
-#include <xfs/xfs_log_format.h>
-#include <xfs/xfs_quota_defs.h>
-#include <xfs/xfs_trans_resv.h>
+#include "xfs/xfs_shared.h"
+#include "xfs/xfs_format.h"
+#include "xfs/xfs_log_format.h"
+#include "xfs/xfs_quota_defs.h"
+#include "xfs/xfs_trans_resv.h"
 
 
 /* CRC stuff, buffer API dependent on it */
@@ -49,33 +49,33 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len);
 #define crc32(c,p,l)	crc32_le((c),(unsigned char const *)(p),(l))
 #define crc32c(c,p,l)	crc32c_le((c),(unsigned char const *)(p),(l))
 
-#include <xfs/xfs_cksum.h>
+#include "xfs/xfs_cksum.h"
 
 /*
  * This mirrors the kernel include for xfs_buf.h - it's implicitly included in
  * every files via a similar include in the kernel xfs_linux.h.
  */
-#include <xfs/libxfs_io.h>
-
-#include <xfs/xfs_bit.h>
-#include <xfs/xfs_sb.h>
-#include <xfs/xfs_mount.h>
-#include <xfs/xfs_da_format.h>
-#include <xfs/xfs_da_btree.h>
-#include <xfs/xfs_dir2.h>
-#include <xfs/xfs_bmap_btree.h>
-#include <xfs/xfs_alloc_btree.h>
-#include <xfs/xfs_ialloc_btree.h>
-#include <xfs/xfs_attr_sf.h>
-#include <xfs/xfs_inode_fork.h>
-#include <xfs/xfs_inode_buf.h>
-#include <xfs/xfs_inode.h>
-#include <xfs/xfs_alloc.h>
-#include <xfs/xfs_btree.h>
-#include <xfs/xfs_btree_trace.h>
-#include <xfs/xfs_bmap.h>
-#include <xfs/xfs_trace.h>
-#include <xfs/xfs_trans.h>
+#include "xfs/libxfs_io.h"
+
+#include "xfs/xfs_bit.h"
+#include "xfs/xfs_sb.h"
+#include "xfs/xfs_mount.h"
+#include "xfs/xfs_da_format.h"
+#include "xfs/xfs_da_btree.h"
+#include "xfs/xfs_dir2.h"
+#include "xfs/xfs_bmap_btree.h"
+#include "xfs/xfs_alloc_btree.h"
+#include "xfs/xfs_ialloc_btree.h"
+#include "xfs/xfs_attr_sf.h"
+#include "xfs/xfs_inode_fork.h"
+#include "xfs/xfs_inode_buf.h"
+#include "xfs/xfs_inode.h"
+#include "xfs/xfs_alloc.h"
+#include "xfs/xfs_btree.h"
+#include "xfs/xfs_btree_trace.h"
+#include "xfs/xfs_bmap.h"
+#include "xfs/xfs_trace.h"
+#include "xfs/xfs_trans.h"
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -174,11 +174,11 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
 extern int		libxfs_nproc(void);
 extern unsigned long	libxfs_physmem(void);	/* in kilobytes */
 
-#include <xfs/xfs_ialloc.h>
+#include "xfs/xfs_ialloc.h"
 
-#include <xfs/xfs_attr_leaf.h>
-#include <xfs/xfs_attr_remote.h>
-#include <xfs/xfs_trans_space.h>
+#include "xfs/xfs_attr_leaf.h"
+#include "xfs/xfs_attr_remote.h"
+#include "xfs/xfs_trans_space.h"
 
 #define XFS_INOBT_IS_FREE_DISK(rp,i)		\
 			((be64_to_cpu((rp)->ir_free) & XFS_INOBT_MASK(i)) != 0)
diff --git a/include/libxlog.h b/include/libxlog.h
index c6640a86..e2ab5add 100644
--- a/include/libxlog.h
+++ b/include/libxlog.h
@@ -44,7 +44,7 @@ struct xlog {
 	int		l_sectBBsize;   /* size of log sector in 512 byte chunks */
 };
 
-#include <xfs/xfs_log_recover.h>
+#include "xfs/xfs_log_recover.h"
 
 /*
  * macros mapping kernel code to user code
diff --git a/include/path.h b/include/path.h
index 757ba49e..c8746cb9 100644
--- a/include/path.h
+++ b/include/path.h
@@ -18,7 +18,7 @@
 #ifndef __PATH_H__
 #define __PATH_H__
 
-#include <xfs/xfs.h>
+#include "xfs/xfs.h"
 
 /*
  * XFS Filesystem Paths
diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
index ac260bcd..05a726ac 100644
--- a/include/platform_defs.h.in
+++ b/include/platform_defs.h.in
@@ -69,15 +69,15 @@ typedef __u64	__bitwise	__be64;
 typedef struct filldir		filldir_t;
 
 #if defined(__linux__)
-#include <xfs/linux.h>
+#include "xfs/linux.h"
 #elif defined(__FreeBSD__)
-#include <xfs/freebsd.h>
+#include "xfs/freebsd.h"
 #elif defined(__FreeBSD_kernel__)
-#include <xfs/gnukfreebsd.h>
+#include "xfs/gnukfreebsd.h"
 #elif defined(__APPLE__)
-#include <xfs/darwin.h>
+#include "xfs/darwin.h"
 #elif defined(__sgi__) || defined(__sgi)
-#include <xfs/irix.h>
+#include "xfs/irix.h"
 #else
 # error unknown platform... have fun porting!
 #endif
diff --git a/include/project.h b/include/project.h
index 328e013b..a458a613 100644
--- a/include/project.h
+++ b/include/project.h
@@ -18,7 +18,7 @@
 #ifndef __PROJECT_H__
 #define __PROJECT_H__
 
-#include <xfs/xfs.h>
+#include "xfs/xfs.h"
 
 extern int setprojid(const char *__name, int __fd, prid_t __id);
 extern int getprojid(const char *__name, int __fd, prid_t *__id);
diff --git a/include/xfs.h b/include/xfs.h
index e32c4a8d..0cb4fb8c 100644
--- a/include/xfs.h
+++ b/include/xfs.h
@@ -33,8 +33,8 @@
 #ifndef __XFS_H__
 #define __XFS_H__
 
-#include <xfs/platform_defs.h>
-#include <xfs/xfs_types.h>
-#include <xfs/xfs_fs.h>
+#include "xfs/platform_defs.h"
+#include "xfs/xfs_types.h"
+#include "xfs/xfs_fs.h"
 
 #endif	/* __XFS_H__ */
diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 8acff7be..303efe0e 100644
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -20,8 +20,8 @@
 #define __XFS_INODE_H__
 
 /* These match kernel side includes */
-#include <xfs/xfs_inode_buf.h>
-#include <xfs/xfs_inode_fork.h>
+#include "xfs/xfs_inode_buf.h"
+#include "xfs/xfs_inode_fork.h"
 
 struct xfs_trans;
 struct xfs_mount;
diff --git a/include/xqm.h b/include/xqm.h
index 47f58a04..0b5dfa13 100644
--- a/include/xqm.h
+++ b/include/xqm.h
@@ -18,7 +18,7 @@
 #ifndef __XQM_H__
 #define __XQM_H__
 
-#include <xfs/xfs.h>
+#include "xfs/xfs.h"
 
 /*
  * Disk quota - quotactl(2) commands for the XFS Quota Manager (XQM).
diff --git a/io/attr.c b/io/attr.c
index 9b26f31e..dfae36ed 100644
--- a/io/attr.c
+++ b/io/attr.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/bmap.c b/io/bmap.c
index a78cbb14..d96f7d40 100644
--- a/io/bmap.c
+++ b/io/bmap.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/fadvise.c b/io/fadvise.c
index a27b8f76..3b76ab9a 100644
--- a/io/fadvise.c
+++ b/io/fadvise.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/fiemap.c b/io/fiemap.c
index e76be976..363d1d9d 100644
--- a/io/fiemap.c
+++ b/io/fiemap.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
 #include <linux/fiemap.h>
 #include <linux/fs.h>
 #include "init.h"
diff --git a/io/file.c b/io/file.c
index 73b893f6..0eadcab6 100644
--- a/io/file.c
+++ b/io/file.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include <sys/mman.h>
 #include "init.h"
 #include "io.h"
diff --git a/io/freeze.c b/io/freeze.c
index 89cd303c..a12ed67e 100644
--- a/io/freeze.c
+++ b/io/freeze.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/fsync.c b/io/fsync.c
index 5ed8d25a..d9c45f1c 100644
--- a/io/fsync.c
+++ b/io/fsync.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/getrusage.c b/io/getrusage.c
index 32f2a7ee..35dc4bfe 100644
--- a/io/getrusage.c
+++ b/io/getrusage.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include <sys/time.h>
 #include <sys/resource.h>
 #include "init.h"
diff --git a/io/imap.c b/io/imap.c
index 4f3f8835..a6154676 100644
--- a/io/imap.c
+++ b/io/imap.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/init.c b/io/init.c
index 1b075189..78a49b61 100644
--- a/io/init.c
+++ b/io/init.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/inject.c b/io/inject.c
index 1e078aea..f0aaf97a 100644
--- a/io/inject.c
+++ b/io/inject.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/link.c b/io/link.c
index 9c2d1f8c..092e0d47 100644
--- a/io/link.c
+++ b/io/link.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/madvise.c b/io/madvise.c
index 87f619da..4f3f91bf 100644
--- a/io/madvise.c
+++ b/io/madvise.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include <sys/mman.h>
 #include "init.h"
 #include "io.h"
diff --git a/io/mincore.c b/io/mincore.c
index eac86996..234e0a10 100644
--- a/io/mincore.c
+++ b/io/mincore.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include <sys/mman.h>
 #include "init.h"
 #include "io.h"
diff --git a/io/mmap.c b/io/mmap.c
index 565a5417..06f678f6 100644
--- a/io/mmap.c
+++ b/io/mmap.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include <sys/mman.h>
 #include <signal.h>
 #include "init.h"
diff --git a/io/open.c b/io/open.c
index c106fa7d..795adebf 100644
--- a/io/open.c
+++ b/io/open.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/parent.c b/io/parent.c
index 0313119f..e883f652 100644
--- a/io/parent.c
+++ b/io/parent.c
@@ -16,13 +16,13 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
-#include <xfs/path.h>
-#include <xfs/parent.h>
-#include <xfs/handle.h>
-#include <xfs/jdm.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
+#include "xfs/path.h"
+#include "xfs/parent.h"
+#include "xfs/handle.h"
+#include "xfs/jdm.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/pread.c b/io/pread.c
index cff32757..280cc9d7 100644
--- a/io/pread.c
+++ b/io/pread.c
@@ -17,9 +17,9 @@
  */
 
 #include <sys/uio.h>
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include <ctype.h>
 #include "init.h"
 #include "io.h"
diff --git a/io/prealloc.c b/io/prealloc.c
index 4ab3d8cc..e458a927 100644
--- a/io/prealloc.c
+++ b/io/prealloc.c
@@ -19,9 +19,9 @@
 #if defined(HAVE_FALLOCATE)
 #include <linux/falloc.h>
 #endif
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/pwrite.c b/io/pwrite.c
index 0674c01b..69f67af9 100644
--- a/io/pwrite.c
+++ b/io/pwrite.c
@@ -17,9 +17,9 @@
  */
 
 #include <sys/uio.h>
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/readdir.c b/io/readdir.c
index 71332045..20b88987 100644
--- a/io/readdir.c
+++ b/io/readdir.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/resblks.c b/io/resblks.c
index 2e547767..197f7e8a 100644
--- a/io/resblks.c
+++ b/io/resblks.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/seek.c b/io/seek.c
index 526b7b82..9b281d5d 100644
--- a/io/seek.c
+++ b/io/seek.c
@@ -16,9 +16,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include <sys/types.h>
 #include <unistd.h>
 #include "init.h"
diff --git a/io/sendfile.c b/io/sendfile.c
index 426b75d1..22a5a4f5 100644
--- a/io/sendfile.c
+++ b/io/sendfile.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include <sys/sendfile.h>
 #include "init.h"
 #include "io.h"
diff --git a/io/shutdown.c b/io/shutdown.c
index 21e16263..2c86cf9c 100644
--- a/io/shutdown.c
+++ b/io/shutdown.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/sync.c b/io/sync.c
index 683899ba..c7bbbf1a 100644
--- a/io/sync.c
+++ b/io/sync.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/sync_file_range.c b/io/sync_file_range.c
index 35d8cc50..63663310 100644
--- a/io/sync_file_range.c
+++ b/io/sync_file_range.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/io/truncate.c b/io/truncate.c
index 49ced6f6..401d2a5f 100644
--- a/io/truncate.c
+++ b/io/truncate.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "io.h"
 
diff --git a/libhandle/handle.c b/libhandle/handle.c
index 3c1395a6..54e6f717 100644
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -17,9 +17,9 @@
  */
 
 #include <libgen.h>
-#include <xfs/xfs.h>
-#include <xfs/handle.h>
-#include <xfs/parent.h>
+#include "xfs/xfs.h"
+#include "xfs/handle.h"
+#include "xfs/parent.h"
 
 /* just pick a value we know is more than big enough */
 #define	MAXHANSIZ	64
diff --git a/libhandle/jdm.c b/libhandle/jdm.c
index 070407bc..a18dcd4c 100644
--- a/libhandle/jdm.c
+++ b/libhandle/jdm.c
@@ -16,10 +16,10 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/handle.h>
-#include <xfs/jdm.h>
-#include <xfs/parent.h>
+#include "xfs/xfs.h"
+#include "xfs/handle.h"
+#include "xfs/jdm.h"
+#include "xfs/parent.h"
 
 /* internal fshandle - typecast to a void for external use */
 #define FSHANDLE_SZ		8
diff --git a/libxcmd/command.c b/libxcmd/command.c
index ebf14134..148e58b0 100644
--- a/libxcmd/command.c
+++ b/libxcmd/command.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 
 cmdinfo_t	*cmdtab;
 int		ncmds;
diff --git a/libxcmd/help.c b/libxcmd/help.c
index 54d34d88..bcd5641a 100644
--- a/libxcmd/help.c
+++ b/libxcmd/help.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
 
 static cmdinfo_t help_cmd;
 static void help_onecmd(const char *cmd, const cmdinfo_t *ct);
diff --git a/libxcmd/input.c b/libxcmd/input.c
index c06b5b8f..83aeeb53 100644
--- a/libxcmd/input.c
+++ b/libxcmd/input.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/input.h>
+#include "xfs/xfs.h"
+#include "xfs/input.h"
 #include <ctype.h>
 #include <stdbool.h>
 
diff --git a/libxcmd/paths.c b/libxcmd/paths.c
index 443adbb4..c0b1ddb9 100644
--- a/libxcmd/paths.c
+++ b/libxcmd/paths.c
@@ -24,9 +24,9 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <xfs/path.h>
-#include <xfs/input.h>
-#include <xfs/project.h>
+#include "xfs/path.h"
+#include "xfs/input.h"
+#include "xfs/project.h"
 #include <limits.h>
 
 extern char *progname;
diff --git a/libxcmd/projects.c b/libxcmd/projects.c
index a0f5bc98..b00e4c8d 100644
--- a/libxcmd/projects.c
+++ b/libxcmd/projects.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <xfs/project.h>
+#include "xfs/project.h"
 
 #define PROJID		"/etc/projid"
 #define PROJECT_PATHS	"/etc/projects"
diff --git a/libxcmd/quit.c b/libxcmd/quit.c
index faba4d11..0921bbb7 100644
--- a/libxcmd/quit.c
+++ b/libxcmd/quit.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xfs.h>
-#include <xfs/command.h>
+#include "xfs/xfs.h"
+#include "xfs/command.h"
 
 static cmdinfo_t quit_cmd;
 
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 72fc4b3a..e0d0dc66 100644
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -58,21 +58,21 @@
 				 (ip)->d_ops, hdr, loghead)
 
 #include "libxfs_api_defs.h"
-#include <xfs/platform_defs.h>
+#include "xfs/platform_defs.h"
 
-#include <xfs/list.h>
-#include <xfs/hlist.h>
-#include <xfs/cache.h>
-#include <xfs/bitops.h>
-#include <xfs/kmem.h>
-#include <xfs/radix-tree.h>
-#include <xfs/swab.h>
-#include <xfs/atomic.h>
+#include "xfs/list.h"
+#include "xfs/hlist.h"
+#include "xfs/cache.h"
+#include "xfs/bitops.h"
+#include "xfs/kmem.h"
+#include "xfs/radix-tree.h"
+#include "xfs/swab.h"
+#include "xfs/atomic.h"
 
-#include <xfs/xfs_types.h>
-#include <xfs/xfs_arch.h>
+#include "xfs/xfs_types.h"
+#include "xfs/xfs_arch.h"
 
-#include <xfs/xfs_fs.h>
+#include "xfs/xfs_fs.h"
 
 /* CRC stuff, buffer API dependent on it */
 extern uint32_t crc32_le(uint32_t crc, unsigned char const *p, size_t len);
@@ -81,13 +81,13 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len);
 #define crc32(c,p,l)	crc32_le((c),(unsigned char const *)(p),(l))
 #define crc32c(c,p,l)	crc32c_le((c),(unsigned char const *)(p),(l))
 
-#include <xfs/xfs_cksum.h>
+#include "xfs/xfs_cksum.h"
 
 /*
  * This mirrors the kernel include for xfs_buf.h - it's implicitly included in
  * every files via a similar include in the kernel xfs_linux.h.
  */
-#include <xfs/libxfs_io.h>
+#include "libxfs_io.h"
 
 /* for all the support code that uses progname in error messages */
 extern char    *progname;
diff --git a/libxfs/radix-tree.c b/libxfs/radix-tree.c
index c4b69711..c859f286 100644
--- a/libxfs/radix-tree.c
+++ b/libxfs/radix-tree.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <xfs/platform_defs.h>
+#include "xfs/platform_defs.h"
 #include "radix-tree.h"
 
 #ifndef ARRAY_SIZE
diff --git a/quota/edit.c b/quota/edit.c
index cad3aeec..0170d51a 100644
--- a/quota/edit.c
+++ b/quota/edit.c
@@ -19,8 +19,8 @@
 #include <pwd.h>
 #include <grp.h>
 #include <ctype.h>
-#include <xfs/input.h>
-#include <xfs/command.h>
+#include "xfs/input.h"
+#include "xfs/command.h"
 #include "init.h"
 #include "quota.h"
 
diff --git a/quota/free.c b/quota/free.c
index 79b52e91..72ab5032 100644
--- a/quota/free.c
+++ b/quota/free.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/command.h>
+#include "xfs/command.h"
 #include "init.h"
 #include "quota.h"
 
diff --git a/quota/init.c b/quota/init.c
index 639e9e7f..019e2c56 100644
--- a/quota/init.c
+++ b/quota/init.c
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/path.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/path.h"
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 
 char	*progname;
diff --git a/quota/path.c b/quota/path.c
index 0c204ede..9a35332d 100644
--- a/quota/path.c
+++ b/quota/path.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "quota.h"
 
diff --git a/quota/project.c b/quota/project.c
index a2c7046d..f30c6c64 100644
--- a/quota/project.c
+++ b/quota/project.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs/command.h"
+#include "xfs/input.h"
 #include "init.h"
 #include "quota.h"
 
diff --git a/quota/quot.c b/quota/quot.c
index 96d449ea..be410263 100644
--- a/quota/quot.c
+++ b/quota/quot.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/command.h>
+#include "xfs/command.h"
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/quota/quota.c b/quota/quota.c
index 367da8ca..d2497405 100644
--- a/quota/quota.c
+++ b/quota/quota.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/command.h>
+#include "xfs/command.h"
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/quota/quota.h b/quota/quota.h
index 618bb49e..974747f5 100644
--- a/quota/quota.h
+++ b/quota/quota.h
@@ -16,9 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/xqm.h>
-#include <xfs/path.h>
-#include <xfs/project.h>
+#include "xfs/xqm.h"
+#include "xfs/path.h"
+#include "xfs/project.h"
 #include <stdbool.h>
 
 /*
diff --git a/quota/report.c b/quota/report.c
index 8e3316ed..7c3cf451 100644
--- a/quota/report.c
+++ b/quota/report.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/command.h>
+#include "xfs/command.h"
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/quota/state.c b/quota/state.c
index 42bffc01..b1827b6f 100644
--- a/quota/state.c
+++ b/quota/state.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/command.h>
+#include "xfs/command.h"
 #include "init.h"
 #include "quota.h"