From: Nathan Scott <nathans@sgi.com>
Date: Tue, 29 Apr 2003 01:52:34 +0000 (+0000)
Subject: Fix includes to not be relative to paths provided by -I directives, for
X-Git-Tag: XFS-1_3_0pre1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d7e80eebeef0d123500137d5e6b0ca020f9d385;p=thirdparty%2Fxfsprogs-dev.git

Fix includes to not be relative to paths provided by -I directives, for
the xfsprogs and xfsdump builds.  At this stage still provide these gcc
options in the build but later that can be removed too now that headers
are clean.
---

diff --git a/db/addr.c b/db/addr.c
index cab213a63..8f8957ca3 100644
--- a/db/addr.c
+++ b/db/addr.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "addr.h"
 #include "command.h"
 #include "type.h"
diff --git a/db/agf.c b/db/agf.c
index cbbe97248..def6beaca 100644
--- a/db/agf.c
+++ b/db/agf.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "agf.h"
 #include "command.h"
 #include "type.h"
diff --git a/db/agfl.c b/db/agfl.c
index 819d1f01f..4bc9c5894 100644
--- a/db/agfl.c
+++ b/db/agfl.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "agfl.h"
 #include "command.h"
 #include "type.h"
diff --git a/db/agi.c b/db/agi.c
index 0b7c24b90..5fbcafbeb 100644
--- a/db/agi.c
+++ b/db/agi.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "agi.h"
 #include "command.h"
 #include "type.h"
diff --git a/db/attr.c b/db/attr.c
index 9d512f947..f9d76e202 100644
--- a/db/attr.c
+++ b/db/attr.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"
diff --git a/db/attrshort.c b/db/attrshort.c
index bdbed1a67..93778f735 100644
--- a/db/attrshort.c
+++ b/db/attrshort.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/bit.c b/db/bit.c
index 3791d7e81..57b408d5d 100644
--- a/db/bit.c
+++ b/db/bit.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 
 #undef setbit	/* defined in param.h on Linux */
diff --git a/db/block.c b/db/block.c
index 2f3dec553..ff3e69371 100644
--- a/db/block.c
+++ b/db/block.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "block.h"
 #include "bmap.h"
 #include "command.h"
diff --git a/db/bmap.c b/db/bmap.c
index 6b686f364..b9a3e38e2 100644
--- a/db/bmap.c
+++ b/db/bmap.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
 #include "bmap.h"
diff --git a/db/bmapbt.c b/db/bmapbt.c
index 1dba5575a..4c72133fc 100644
--- a/db/bmapbt.c
+++ b/db/bmapbt.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/bmroot.c b/db/bmroot.c
index 4f99d189b..efe52eced 100644
--- a/db/bmroot.c
+++ b/db/bmroot.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/bnobt.c b/db/bnobt.c
index b53c51db7..fa99dc970 100644
--- a/db/bnobt.c
+++ b/db/bnobt.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/check.c b/db/check.c
index fd4186331..e13a68bff 100644
--- a/db/check.c
+++ b/db/check.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <math.h>
 #include <sys/time.h>
 #include "bmap.h"
diff --git a/db/cntbt.c b/db/cntbt.c
index b241daf4a..a790ef648 100644
--- a/db/cntbt.c
+++ b/db/cntbt.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/command.c b/db/command.c
index c23fd04bf..0571101e4 100644
--- a/db/command.c
+++ b/db/command.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "addr.h"
 #include "agf.h"
 #include "agfl.h"
diff --git a/db/convert.c b/db/convert.c
index 357777fac..0fdaae6eb 100644
--- a/db/convert.c
+++ b/db/convert.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "convert.h"
 #include "output.h"
diff --git a/db/dbread.c b/db/dbread.c
index d1ddeb9b2..411667b42 100644
--- a/db/dbread.c
+++ b/db/dbread.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bmap.h"
 #include "dbread.h"
 #include "io.h"
diff --git a/db/debug.c b/db/debug.c
index 6d1867a08..0c1937b47 100644
--- a/db/debug.c
+++ b/db/debug.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "debug.h"
 #include "output.h"
diff --git a/db/dir.c b/db/dir.c
index 23458b611..5c2512aef 100644
--- a/db/dir.c
+++ b/db/dir.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"
diff --git a/db/dir2.c b/db/dir2.c
index 8c48e54a5..5f6e512bd 100644
--- a/db/dir2.c
+++ b/db/dir2.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"
diff --git a/db/dir2sf.c b/db/dir2sf.c
index cd0a2c9ed..b9953dae8 100644
--- a/db/dir2sf.c
+++ b/db/dir2sf.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/dirshort.c b/db/dirshort.c
index 041a35070..404a6ec0f 100644
--- a/db/dirshort.c
+++ b/db/dirshort.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/dquot.c b/db/dquot.c
index 774068028..6795d0a60 100644
--- a/db/dquot.c
+++ b/db/dquot.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 #include "bmap.h"
 #include "command.h"
diff --git a/db/echo.c b/db/echo.c
index d939114ce..43002e8ee 100644
--- a/db/echo.c
+++ b/db/echo.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "echo.h"
 #include "output.h"
diff --git a/db/faddr.c b/db/faddr.c
index 61a310cc2..ad829ff55 100644
--- a/db/faddr.c
+++ b/db/faddr.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "inode.h"
diff --git a/db/field.c b/db/field.c
index fd56668d4..e8491766c 100644
--- a/db/field.c
+++ b/db/field.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/flist.c b/db/flist.c
index e566097f6..2e5cced08 100644
--- a/db/flist.c
+++ b/db/flist.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/fprint.c b/db/fprint.c
index e5bf2e7cd..e92ac33d4 100644
--- a/db/fprint.c
+++ b/db/fprint.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include <time.h>
 #include "type.h"
diff --git a/db/frag.c b/db/frag.c
index d0b3a8c0b..1c61bd9bf 100644
--- a/db/frag.c
+++ b/db/frag.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/time.h>
 #include "bmap.h"
 #include "command.h"
diff --git a/db/freesp.c b/db/freesp.c
index bdbcc4e5f..d8c10ff9d 100644
--- a/db/freesp.c
+++ b/db/freesp.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "freesp.h"
 #include "io.h"
diff --git a/db/hash.c b/db/hash.c
index 8174652c5..f58aea410 100644
--- a/db/hash.c
+++ b/db/hash.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "addr.h"
 #include "command.h"
 #include "type.h"
diff --git a/db/help.c b/db/help.c
index 0f0aa22cc..8dfcb6e19 100644
--- a/db/help.c
+++ b/db/help.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "help.h"
 #include "output.h"
diff --git a/db/init.c b/db/init.c
index 4a684362c..520fc653a 100644
--- a/db/init.c
+++ b/db/init.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <signal.h>
 #include "command.h"
 #include "init.h"
diff --git a/db/inobt.c b/db/inobt.c
index e170c3fcb..861f3557d 100644
--- a/db/inobt.c
+++ b/db/inobt.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
diff --git a/db/inode.c b/db/inode.c
index 844b833ce..fa1e4ec5e 100644
--- a/db/inode.c
+++ b/db/inode.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
 #include "faddr.h"
diff --git a/db/input.c b/db/input.c
index 3d828d924..a3b1f70f5 100644
--- a/db/input.c
+++ b/db/input.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <signal.h>
 #include "command.h"
 #include "input.h"
diff --git a/db/io.c b/db/io.c
index 53ab56961..7bd4dae1e 100644
--- a/db/io.c
+++ b/db/io.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
 #include "faddr.h"
diff --git a/db/malloc.c b/db/malloc.c
index 9811c2147..708b05982 100644
--- a/db/malloc.c
+++ b/db/malloc.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "init.h"
 #include "malloc.h"
 #include "output.h"
diff --git a/db/output.c b/db/output.c
index d8e5510e0..0298e8048 100644
--- a/db/output.c
+++ b/db/output.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <stdarg.h>
 #include "command.h"
 #include "output.h"
diff --git a/db/print.c b/db/print.c
index b30b2957e..fe87999f3 100644
--- a/db/print.c
+++ b/db/print.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
 #include "faddr.h"
diff --git a/db/quit.c b/db/quit.c
index 5dbeb7299..4207f4baf 100644
--- a/db/quit.c
+++ b/db/quit.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "quit.h"
 
diff --git a/db/sb.c b/db/sb.c
index 26739839c..5259b2155 100644
--- a/db/sb.c
+++ b/db/sb.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <libxlog.h>
+#include <xfs/libxfs.h>
+#include <xfs/libxlog.h>
 #include "command.h"
 #include "type.h"
 #include "faddr.h"
diff --git a/db/sig.c b/db/sig.c
index 7c17f1957..f73c26675 100644
--- a/db/sig.c
+++ b/db/sig.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <signal.h>
 #include "sig.h"
 
diff --git a/db/strvec.c b/db/strvec.c
index a85eaf56c..107698a09 100644
--- a/db/strvec.c
+++ b/db/strvec.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "strvec.h"
 #include "output.h"
 #include "malloc.h"
diff --git a/db/text.c b/db/text.c
index 777120020..d5c570d11 100644
--- a/db/text.c
+++ b/db/text.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include "block.h"
 #include "bmap.h"
diff --git a/db/type.c b/db/type.c
index f774c3b47..5b30fb30b 100644
--- a/db/type.c
+++ b/db/type.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "agf.h"
 #include "agfl.h"
 #include "agi.h"
diff --git a/db/write.c b/db/write.c
index 37675dc94..f4acb730f 100644
--- a/db/write.c
+++ b/db/write.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include <time.h>
 #include "bit.h"
diff --git a/freeze/xfs_freeze.c b/freeze/xfs_freeze.c
index a4403b341..63973fa96 100644
--- a/freeze/xfs_freeze.c
+++ b/freeze/xfs_freeze.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 char	*progname;
 
diff --git a/growfs/explore.c b/growfs/explore.c
index 530d250f8..ba6e4f72b 100644
--- a/growfs/explore.c
+++ b/growfs/explore.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <mntent.h>
 
 extern char	*fname;		/* mount point name */
diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index c579e8111..ed96e8555 100644
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "explore.h"
 
 /*
diff --git a/imap/xfs_imap.c b/imap/xfs_imap.c
index f23db6c59..7e193bd86 100644
--- a/imap/xfs_imap.c
+++ b/imap/xfs_imap.c
@@ -34,7 +34,7 @@
  * Inode map display utility for XFS.
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 int main(int argc, char **argv)
 {
diff --git a/include/Makefile b/include/Makefile
index 839475bf5..2d0033400 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -48,11 +48,12 @@ LHFILES = xfs_acl.h xfs_cap.h xfs_mac.h
 DKHFILES = volume.h fstyp.h dvh.h
 LSRCFILES = platform_defs.h.in builddefs.in buildmacros buildrules \
 	$(LHFILES) $(DKHFILES)
-LDIRT = xfs
+LDIRT = xfs disk
 
 default install :
-	rm -f xfs
+	rm -f xfs disk
 	$(LN_S) . xfs
+	$(LN_S) . disk
 
 include $(BUILDRULES)
 
diff --git a/io/bmap.c b/io/bmap.c
index 6d2671d33..d66683779 100644
--- a/io/bmap.c
+++ b/io/bmap.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 
diff --git a/io/command.c b/io/command.c
index 7b798365f..f5e60839d 100644
--- a/io/command.c
+++ b/io/command.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 
 cmdinfo_t	*cmdtab;
diff --git a/io/fsync.c b/io/fsync.c
index 2dfd1f77f..c4d35acc0 100644
--- a/io/fsync.c
+++ b/io/fsync.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 
diff --git a/io/help.c b/io/help.c
index caaa7f160..692c70536 100644
--- a/io/help.c
+++ b/io/help.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 
 static cmdinfo_t help_cmd;
diff --git a/io/init.c b/io/init.c
index 16e6b0f46..076d44bbb 100644
--- a/io/init.c
+++ b/io/init.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "input.h"
 #include "command.h"
 
diff --git a/io/input.c b/io/input.c
index c6263285b..5a2a2cc06 100644
--- a/io/input.c
+++ b/io/input.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "input.h"
 #include "init.h"
 
diff --git a/io/open.c b/io/open.c
index 4997b3a73..49caec41a 100644
--- a/io/open.c
+++ b/io/open.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 
diff --git a/io/pread.c b/io/pread.c
index 1859046de..31cd5437a 100644
--- a/io/pread.c
+++ b/io/pread.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include "command.h"
 #include "input.h"
diff --git a/io/prealloc.c b/io/prealloc.c
index c92838752..c806cefa3 100644
--- a/io/prealloc.c
+++ b/io/prealloc.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 
diff --git a/io/pwrite.c b/io/pwrite.c
index 528ceaa3a..e1fef4b1b 100644
--- a/io/pwrite.c
+++ b/io/pwrite.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "input.h"
 #include "init.h"
diff --git a/io/quit.c b/io/quit.c
index a72ed944e..67942b542 100644
--- a/io/quit.c
+++ b/io/quit.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 
 static cmdinfo_t quit_cmd;
diff --git a/io/resblks.c b/io/resblks.c
index 5774fc73a..38361787d 100644
--- a/io/resblks.c
+++ b/io/resblks.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 
diff --git a/io/truncate.c b/io/truncate.c
index be420dde7..49d54d1e9 100644
--- a/io/truncate.c
+++ b/io/truncate.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 
diff --git a/libdisk/drivers.h b/libdisk/drivers.h
index ad8634c6e..cd729cb2e 100644
--- a/libdisk/drivers.h
+++ b/libdisk/drivers.h
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/stat.h>
 #include <volume.h>
 
diff --git a/libdisk/evms.c b/libdisk/evms.c
index 3153e7a69..62f937379 100644
--- a/libdisk/evms.c
+++ b/libdisk/evms.c
@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/sysmacros.h>
-#include <volume.h>
+#include <disk/volume.h>
 #include "evms.h"
 
 int
diff --git a/libdisk/pttype.c b/libdisk/pttype.c
index 265d6b6cc..f5cf858f5 100644
--- a/libdisk/pttype.c
+++ b/libdisk/pttype.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <dvh.h>
+#include <disk/dvh.h>
 #include "pttype.h"
 
 #define blksize 512
diff --git a/libdisk/xvm.c b/libdisk/xvm.c
index dc4612ff5..05c44a77d 100644
--- a/libdisk/xvm.c
+++ b/libdisk/xvm.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <volume.h>
+#include <disk/volume.h>
 #include "xvm.h"
 
 int
diff --git a/libhandle/handle.c b/libhandle/handle.c
index 07fb296e8..4433dc768 100644
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -31,12 +31,12 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 /* attributes.h (purposefully) unavailable to xfsprogs, make do */
 struct attrlist_cursor { __u32 opaque[4]; };
 
-#include <handle.h>
+#include <xfs/handle.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 91ea76a8b..c93a3988d 100644
--- a/libhandle/jdm.c
+++ b/libhandle/jdm.c
@@ -31,13 +31,13 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 /* attributes.h (purposefully) unavailable to xfsprogs, make do */
 struct attrlist_cursor { __u32 opaque[4]; };
 
-#include <handle.h>
-#include <jdm.h>
+#include <xfs/handle.h>
+#include <xfs/jdm.h>
 
 /* internal fshandle - typecast to a void for external use */
 #define FSHANDLE_SZ		8
diff --git a/libxfs/darwin.c b/libxfs/darwin.c
index 87586b4b0..d7a8daede 100644
--- a/libxfs/darwin.c
+++ b/libxfs/darwin.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/ioctl.h>
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 extern char *progname;
 
diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index a9075a079..b48b48e67 100644
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -32,7 +32,7 @@
  */
 
 #define ustat __kernel_ustat
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/ioctl.h>
diff --git a/libxfs/init.c b/libxfs/init.c
index adc02b5cb..6176948f5 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/stat.h>
 #include "init.h"
 
diff --git a/libxfs/irix.c b/libxfs/irix.c
index 03af0556a..d6782cc3e 100644
--- a/libxfs/irix.c
+++ b/libxfs/irix.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 extern char *progname;
 extern __int64_t findsize(char *);
diff --git a/libxfs/linux.c b/libxfs/linux.c
index 38f0da317..fd3be4705 100644
--- a/libxfs/linux.c
+++ b/libxfs/linux.c
@@ -31,7 +31,7 @@
  */
 
 #define ustat __kernel_ustat
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <mntent.h>
 #include <sys/stat.h>
 #undef ustat
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 14ade5de7..614f10b75 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -30,9 +30,9 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <xfs_log.h>
-#include <xfs_log_priv.h>
+#include <xfs/libxfs.h>
+#include <xfs/xfs_log.h>
+#include <xfs/xfs_log_priv.h>
 
 #define BBTOOFF64(bbs)	(((xfs_off_t)(bbs)) << BBSHIFT)
 #define BDSTRAT_SIZE	(256 * 1024)
diff --git a/libxfs/xfs.h b/libxfs/xfs.h
index 0c0272a18..52c768e4e 100644
--- a/libxfs/xfs.h
+++ b/libxfs/xfs.h
@@ -56,10 +56,7 @@
  *         specifically there to support the user level build.
  */
 
-#include <libxfs.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
+#include <xfs/libxfs.h>
 
 /*
  * Map XFS kernel routine names to libxfs.h names
diff --git a/libxlog/util.c b/libxlog/util.c
index a00829a0e..4aebea634 100644
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 
 int print_exit;
 int print_record_header;
diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index 0d1f85e34..a43a99404 100644
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 
 /*
  * This routine finds (to an approximation) the first block in the physical
diff --git a/logprint/logprint.h b/logprint/logprint.h
index c141ac569..0c971699c 100644
--- a/logprint/logprint.h
+++ b/logprint/logprint.h
@@ -32,7 +32,7 @@
 #ifndef LOGPRINT_H
 #define LOGPRINT_H
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 
 /* command line flags */
 extern int	print_data;
diff --git a/mkfile/xfs_mkfile.c b/mkfile/xfs_mkfile.c
index c536e94c9..a2d758975 100644
--- a/mkfile/xfs_mkfile.c
+++ b/mkfile/xfs_mkfile.c
@@ -34,7 +34,7 @@
  * Make file utility for xfs.
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 
 #define	MAXBUFFERSIZE	(256 * 1024)
diff --git a/mkfs/fstyp.c b/mkfs/fstyp.c
index 038cfed5d..3354073be 100644
--- a/mkfs/fstyp.c
+++ b/mkfs/fstyp.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <fstyp.h>
+#include <xfs/libxfs.h>
+#include <disk/fstyp.h>
 
 /*
  * fstyp allows the user to determine the filesystem identifier of
diff --git a/mkfs/maxtrres.c b/mkfs/maxtrres.c
index a16c81fcb..db916bf81 100644
--- a/mkfs/maxtrres.c
+++ b/mkfs/maxtrres.c
@@ -40,7 +40,7 @@
  * and minimum log sizes.
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "xfs_mkfs.h"
 
 xfs_trans_reservations_t tr_count = {
diff --git a/mkfs/proto.c b/mkfs/proto.c
index 773d1a9ef..0339e94c5 100644
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/stat.h>
 #include "xfs_mkfs.h"
 
diff --git a/mkfs/trtab.c b/mkfs/trtab.c
index c9395e46e..746e28cc0 100644
--- a/mkfs/trtab.c
+++ b/mkfs/trtab.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "xfs_mkfs.h"
 #include "maxtrres.h"
 
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 55b84779f..3bdf1d728 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -30,10 +30,9 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <fstyp.h>
-#include <stdio.h>
-#include <volume.h>
-#include <libxfs.h>
+#include <xfs/libxfs.h>
+#include <disk/fstyp.h>
+#include <disk/volume.h>
 #include <ctype.h>
 #include "xfs_mkfs.h"
 
diff --git a/repair/phase2.c b/repair/phase2.c
index 08963eb14..84fddd2ee 100644
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index d36443620..a227c3871 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 #include "avl.h"
 #include "avl64.h"
 #include "globals.h"