xfsprogs: simplify internal includes

We don't need the xfs/ prefix for local includes if we just add the
libxfs directory to the include path.  Once that is done we only
need to link the installed headers into include/xfs.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 44a32e810cc0322c0882f1ac86b4ddd69213d737..4a5a8a645b64ee2335445f2ccd1dd59f7f357783 100644 (file)
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <pthread.h>

diff --git a/db/addr.c b/db/addr.c
index a3ac5d682ed2423bbfb3493d0268b3bf7cab2a34..e835dbbf6ffaeee2dbdc3b9464c98d7b9d280f16 100644 (file)
--- a/db/addr.c
+++ b/db/addr.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "addr.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/agf.c b/db/agf.c
index e144bd65a48d8aa39150f78abf5d6b2fe4f64456..e10526ded5b5ee3514740e51bf33e459e4730e03 100644 (file)
--- a/db/agf.c
+++ b/db/agf.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/agfl.c b/db/agfl.c
index b821b13aac9b37fb7fc80d6d94b633237e72bf4c..472873e0ab37b5fce37c639058732d5fa69475ee 100644 (file)
--- a/db/agfl.c
+++ b/db/agfl.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/agi.c b/db/agi.c
index 634429e91ac9baf5c52a94ef273dece9b45c7a28..285a3c5fc371d5ae91b98e95f84c4ff52daba83a 100644 (file)
--- a/db/agi.c
+++ b/db/agi.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/attr.c b/db/attr.c
index e14e32e9781f49431307b15548b3f62c8e8b9fe0..897834b5f1cb6ddc9540931faa1282ec83c4694e 100644 (file)
--- a/db/attr.c
+++ b/db/attr.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/attrset.c b/db/attrset.c
index 1afadd2c744bceac69c628f56ae7d402cc956d19..ec9da5a7baf7a7a1e45e9b3c8289bd11cc0cb9f0 100644 (file)
--- a/db/attrset.c
+++ b/db/attrset.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "attrset.h"
 #include "io.h"

diff --git a/db/attrshort.c b/db/attrshort.c
index 7dc5640fe454e3ba3f8bd3fdcc8a58f8724d981c..d82559ccf0efaec5349a545a7a2535061ac15796 100644 (file)
--- a/db/attrshort.c
+++ b/db/attrshort.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/bit.c b/db/bit.c
index b85ed6a8e40b5aa16f8b5ceb82e1517ac7992297..24872bf7b204b925d7523d71601d42a3084c5265 100644 (file)
--- a/db/bit.c
+++ b/db/bit.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "bit.h"
 
 #undef setbit  /* defined in param.h on Linux */

diff --git a/db/block.c b/db/block.c
index 9319cce2566eaaec9eb206aac2477039291e5ea5..4a357ced0dd8501f571d13a6218b37afc4f18fe8 100644 (file)
--- a/db/block.c
+++ b/db/block.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "block.h"
 #include "bmap.h"
 #include "command.h"

diff --git a/db/bmap.c b/db/bmap.c
index 60d6a80e185fdc66867a4ef6db2a830aa3457701..92057b4f01046549aa34e73e04b522dab6a58e20 100644 (file)
--- a/db/bmap.c
+++ b/db/bmap.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "fprint.h"

diff --git a/db/bmroot.c b/db/bmroot.c
index 95be2dd900140c23149722e6b0ac1ce83395b883..0950e191baa34f37dbe24d827e62862f68147c29 100644 (file)
--- a/db/bmroot.c
+++ b/db/bmroot.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/btblock.c b/db/btblock.c
index 1953e05a97f093592d0c16c14478caa597942cfc..46140fc124190e246814044d12cf53dc45f751c0 100644 (file)
--- a/db/btblock.c
+++ b/db/btblock.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/check.c b/db/check.c
index c109f20629890f85c88edae947ed53785937cedf..afeea32dcfad9886c202949d51d0edd6c1f5900f 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <math.h>
 #include <sys/time.h>
 #include "bmap.h"

diff --git a/db/command.c b/db/command.c
index eb1efb6dbf487edef1ce388c7d06dd55a637f833..2189e008689e8676d536fc29ed3c4df207362179 100644 (file)
--- a/db/command.c
+++ b/db/command.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "addr.h"
 #include "attrset.h"
 #include "block.h"

diff --git a/db/convert.c b/db/convert.c
index d2bf1a955844b2dbde5cc650a8ffe04fafeff8f0..09f92252aa96b0482bb61cf30189ab5e32288a4f 100644 (file)
--- a/db/convert.c
+++ b/db/convert.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "convert.h"
 #include "output.h"

diff --git a/db/debug.c b/db/debug.c
index 13a319ff9edee8616e9c81472248bcf904dfaefd..2875858ca68e3d9bac66932532011e36c3c32e7b 100644 (file)
--- a/db/debug.c
+++ b/db/debug.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "debug.h"
 #include "output.h"

diff --git a/db/dir2.c b/db/dir2.c
index 75aaed5f87b195832eec8d34802de90d326ccfde..7f69e6f6cdeecf0328d0041e048b65473e57f2dd 100644 (file)
--- a/db/dir2.c
+++ b/db/dir2.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/dir2sf.c b/db/dir2sf.c
index 831d6f2b48652fd84d1ab3c4abc54a50bdb312c8..a56590b0bad5250f6bb4f04bd2037e01c8733356 100644 (file)
--- a/db/dir2sf.c
+++ b/db/dir2sf.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/dquot.c b/db/dquot.c
index 611825636f8541660055df4dbc38551847e65678..3adde3b657c32f6c4f6e1bc695b7d51800e0290d 100644 (file)
--- a/db/dquot.c
+++ b/db/dquot.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "bit.h"
 #include "bmap.h"
 #include "command.h"

diff --git a/db/echo.c b/db/echo.c
index f2b7ab8358610946e5642abc78a7106f0a1c4f74..9a8ae7299b0533fdaaaee96607bd9194f6142950 100644 (file)
--- a/db/echo.c
+++ b/db/echo.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "echo.h"
 #include "output.h"

diff --git a/db/faddr.c b/db/faddr.c
index 17451c2687bd6135b74c88c683c311aa9909ddd7..e368d0da8f66b96c90d7d37138ee6c21353a3991 100644 (file)
--- a/db/faddr.c
+++ b/db/faddr.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "type.h"
 #include "fprint.h"
 #include "faddr.h"

diff --git a/db/field.c b/db/field.c
index f68809ac54654f03fcfda94ce86220ad1daa8508..843c385cbe3ffd37a40e0081dc5ecd3f116d743c 100644 (file)
--- a/db/field.c
+++ b/db/field.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/flist.c b/db/flist.c
index 848478e74150a357370461920055d1b7d3afa07c..84065a20a60d066502297d85a66d1f440b77ac25 100644 (file)
--- a/db/flist.c
+++ b/db/flist.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/fprint.c b/db/fprint.c
index f36cdc80f9c537e02c8586a72fe8aee97780d9fd..f2b3794abe45e44e3af98daae57a3c100a38e5fb 100644 (file)
--- a/db/fprint.c
+++ b/db/fprint.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <ctype.h>
 #include <time.h>
 #include "type.h"

diff --git a/db/frag.c b/db/frag.c
index 309db7fe602ac0ef16035ded661d889707cca732..1cc922eff1f655f963459caccf8c3198b7a77e33 100644 (file)
--- a/db/frag.c
+++ b/db/frag.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <sys/time.h>
 #include "bmap.h"
 #include "command.h"

diff --git a/db/freesp.c b/db/freesp.c
index b0fc95ebc21d59d4656f97aa73a35489ac6b6e8e..27e9f5a3ca4c9968544edecd2fad8951b0fa3c91 100644 (file)
--- a/db/freesp.c
+++ b/db/freesp.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "freesp.h"
 #include "io.h"

diff --git a/db/hash.c b/db/hash.c
index e02857f12d55662edb0c49b5edccd341aa9a5a07..c535fc9d8870eaf5cc1f01c88aec470ad476e3c9 100644 (file)
--- a/db/hash.c
+++ b/db/hash.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "addr.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/help.c b/db/help.c
index d6a56b09414ac2a508436ca56d5db7ed778f225b..59a7ba67da0a1a8270ae50483d453819613b42a7 100644 (file)
--- a/db/help.c
+++ b/db/help.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "help.h"
 #include "output.h"

diff --git a/db/init.c b/db/init.c
index 8efd8835cd7903363d4bc899c1d75c4a21e4ed4e..9537a388ff4bc0ee1666369ea834e37eb2b521fe 100644 (file)
--- a/db/init.c
+++ b/db/init.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <signal.h>
 #include "command.h"
 #include "init.h"

diff --git a/db/inode.c b/db/inode.c
index e4d80aec90c666dbca9f01d342a312909cdcb49a..e86dabdba0861ac72e3b09357d74ef48649edf92 100644 (file)
--- a/db/inode.c
+++ b/db/inode.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/input.c b/db/input.c
index ec1b986ca01cd0ac0511ffb0991c028d7102c818..a90de6c47c1f32c5a44c882e0e92a186c88ea0ff 100644 (file)
--- a/db/input.c
+++ b/db/input.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <signal.h>
 #include "command.h"
 #include "input.h"

diff --git a/db/io.c b/db/io.c
index 0f360a867d97e9d9583b2382669757ddf11e560e..9fa52b880c1a197254686e7ac8fe33c224a1bce3 100644 (file)
--- a/db/io.c
+++ b/db/io.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/malloc.c b/db/malloc.c
index 00cbfe13797dd572a09829fbfd565e05597f338a..9037bc140ea14270982d2bc3bed7c8dc01fa5ec3 100644 (file)
--- a/db/malloc.c
+++ b/db/malloc.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "init.h"
 #include "malloc.h"
 #include "output.h"

diff --git a/db/metadump.c b/db/metadump.c
index 24a79f5668ea16bdf92a8a7bc8ae1d3ea129ffff..af96e128be73a983ea8b286a61b5843910b6fad3 100644 (file)
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 #include "bmap.h"
 #include "command.h"
 #include "metadump.h"

diff --git a/db/output.c b/db/output.c
index 8f6e9cda608275ce44d843eda43fbfd1e6c5a367..14f7c4a9b1e63b0f58e766951a75bcdbf6ca0d1c 100644 (file)
--- a/db/output.c
+++ b/db/output.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <stdarg.h>
 #include "command.h"
 #include "output.h"

diff --git a/db/print.c b/db/print.c
index 9f08b9fa4dab2be859ea2b109d170d277fe6b1fc..3ff2548e9fe30c6cc17d1d57aa65f796160107bb 100644 (file)
--- a/db/print.c
+++ b/db/print.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/quit.c b/db/quit.c
index 7d352a6c955e911a27bd03fb770d4d6dee767707..1103a7aef21ad98ff0b2e4214f08094cccdd139c 100644 (file)
--- a/db/quit.c
+++ b/db/quit.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "command.h"
 #include "quit.h"
 

diff --git a/db/sb.c b/db/sb.c
index 7305ab96f84d756aa5b5cfc30bede839fb2f4822..1aaa8385d5e43b345ce023b6ca4d5c5703766a5c 100644 (file)
--- a/db/sb.c
+++ b/db/sb.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/sig.c b/db/sig.c
index 025c603c71ad8e889746c96d5ae85b086b23d5ab..031567e0a2b1a8a4ff78551589b77e141997e890 100644 (file)
--- a/db/sig.c
+++ b/db/sig.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <signal.h>
 #include "sig.h"
 

diff --git a/db/strvec.c b/db/strvec.c
index 3fa10bea7b386cd133eb9b9581d98de3ff018b43..dd834487330e0bf1a2c63112375fcd29759828c1 100644 (file)
--- a/db/strvec.c
+++ b/db/strvec.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "strvec.h"
 #include "output.h"
 #include "malloc.h"

diff --git a/db/symlink.c b/db/symlink.c
index 01719a70770d9f74f03eaa000286bfd7ce051c25..ce96556210420dd6706a246df7f47b61aec9d00d 100644 (file)
--- a/db/symlink.c
+++ b/db/symlink.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/text.c b/db/text.c
index a0d4c899a3ad5303a457cc2a313576b3f5407246..f6c623cd7e2b3e7123c955236178c2aa7974ea4f 100644 (file)
--- a/db/text.c
+++ b/db/text.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <ctype.h>
 #include "block.h"
 #include "bmap.h"

diff --git a/db/type.c b/db/type.c
index 07888c486fbb8545f32efc8104951bdba97d6f1f..5c60736919b300484c5cc61ac932a936874cc90c 100644 (file)
--- a/db/type.c
+++ b/db/type.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "block.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/write.c b/db/write.c
index 6a33dba53ed3fb2948253fab5a8a4b3f34995672..9f5b4234d4a4f2c135863a836480873ed080495e 100644 (file)
--- a/db/write.c
+++ b/db/write.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <ctype.h>
 #include <time.h>
 #include "bit.h"

diff --git a/estimate/xfs_estimate.c b/estimate/xfs_estimate.c
index 636691b879c99210211501d9dfa42e0c44989474..65b7168d92345d9d85c66a09fa5eb49d9ef75cf6 100644 (file)
--- a/estimate/xfs_estimate.c
+++ b/estimate/xfs_estimate.c
@@ -21,7 +21,7 @@
  *
  * XXX: assumes dirv1 format.
  */
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <sys/stat.h>
 #include <ftw.h>
 

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index efc17a81906afb90ce528454879bd46ae9a752e5..7c1d776fab1d9e4589105c325e60abd44baed5c2 100644 (file)
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -16,12 +16,12 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#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 "libxfs.h"
+#include "xfs.h"
+#include "xfs_types.h"
+#include "jdm.h"
+#include "xfs_bmap_btree.h"
+#include "xfs_attr_sf.h"
 
 #include <fcntl.h>
 #include <errno.h>

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index 309b915a621c672d346787a1b288d19a5604c9bb..56315f956ce9bd0b8e2c5cb39a88a5eee0178177 100644 (file)
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
-#include "xfs/path.h"
+#include "libxfs.h"
+#include "path.h"
 
 static void
 usage(void)

diff --git a/include/Makefile b/include/Makefile
index 705090a28f632ee5066f9c1ec19c8e6a8c263e01..46209cea12274c5a207382771a32f697527a2871 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -65,7 +65,7 @@ disk:
 include $(BUILDRULES)
 
 # set up include/xfs header directory
-install-headers: $(addsuffix -hdrs, $(HFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES))
+install-headers: $(addsuffix -hdrs, $(PHFILES) $(DKHFILES) $(HFILES))
 
 %-hdrs:
        $(Q)$(LN_S) -f $(PWD)/include/$* xfs/$*

diff --git a/include/builddefs.in b/include/builddefs.in
index 7e9f53df03c3c4d977da3a74931bf8e7be440dba..6ee95b7830207de37984fe3357d7848697b1b067 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -134,7 +134,7 @@ endif
 
 GCFLAGS = $(OPTIMIZER) $(DEBUG) \
          -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\"  \
-         -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include
+         -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
 
 ifeq ($(ENABLE_GETTEXT),yes)
 GCFLAGS += -DENABLE_GETTEXT

diff --git a/include/input.h b/include/input.h
index ae273addc226efca6c29e5e211421ae7621ef4c1..d02170f47cfb0026eca4375a35710ca308bbb84e 100644 (file)
--- 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 "project.h"
 #include <stdbool.h>
 
 extern char    **breakline(char *input, int *count);

diff --git a/include/libxfs.h b/include/libxfs.h
index eda664f5dc864314a1368047ad32d8589bdb6a52..1fb2d6dd53ecc8aaab78640c9bb42e9cbdb32491 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -19,26 +19,26 @@
 #ifndef __LIBXFS_H__
 #define __LIBXFS_H__
 
-#include "xfs/libxfs_api_defs.h"
-#include "xfs/platform_defs.h"
+#include "libxfs_api_defs.h"
+#include "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/atomic.h"
+#include "list.h"
+#include "hlist.h"
+#include "cache.h"
+#include "bitops.h"
+#include "kmem.h"
+#include "radix-tree.h"
+#include "atomic.h"
 
-#include "xfs/xfs_types.h"
-#include "xfs/xfs_fs.h"
-#include "xfs/xfs_arch.h"
+#include "xfs_types.h"
+#include "xfs_fs.h"
+#include "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_shared.h"
+#include "xfs_format.h"
+#include "xfs_log_format.h"
+#include "xfs_quota_defs.h"
+#include "xfs_trans_resv.h"
 
 
 /* CRC stuff, buffer API dependent on it */
@@ -48,33 +48,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_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 "libxfs_io.h"
+
+#include "xfs_bit.h"
+#include "xfs_sb.h"
+#include "xfs_mount.h"
+#include "xfs_da_format.h"
+#include "xfs_da_btree.h"
+#include "xfs_dir2.h"
+#include "xfs_bmap_btree.h"
+#include "xfs_alloc_btree.h"
+#include "xfs_ialloc_btree.h"
+#include "xfs_attr_sf.h"
+#include "xfs_inode_fork.h"
+#include "xfs_inode_buf.h"
+#include "xfs_inode.h"
+#include "xfs_alloc.h"
+#include "xfs_btree.h"
+#include "xfs_btree_trace.h"
+#include "xfs_bmap.h"
+#include "xfs_trace.h"
+#include "xfs_trans.h"
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -173,11 +173,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_ialloc.h"
 
-#include "xfs/xfs_attr_leaf.h"
-#include "xfs/xfs_attr_remote.h"
-#include "xfs/xfs_trans_space.h"
+#include "xfs_attr_leaf.h"
+#include "xfs_attr_remote.h"
+#include "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 0c55a86b93e773fd835d77d9d938d8a2b2da7c69..05b16e8de7582665ef56ab09f076b14b80f74628 100644 (file)
--- 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_log_recover.h"
 
 /*
  * macros mapping kernel code to user code

diff --git a/include/path.h b/include/path.h
index c8746cb9895088bbe282c1f9879adc28fbe15f33..58955efa80aa610e5bcc5787b8f589a0c56e58f9 100644 (file)
--- a/include/path.h
+++ b/include/path.h
@@ -18,7 +18,7 @@
 #ifndef __PATH_H__
 #define __PATH_H__
 
-#include "xfs/xfs.h"
+#include "xfs.h"
 
 /*
  * XFS Filesystem Paths

diff --git a/include/project.h b/include/project.h
index a458a61381db24caa0441c91431149b4f53a34b7..63bdffd3e0c1bebe76d6e943a66f3bbe75672edb 100644 (file)
--- a/include/project.h
+++ b/include/project.h
@@ -18,7 +18,7 @@
 #ifndef __PROJECT_H__
 #define __PROJECT_H__
 
-#include "xfs/xfs.h"
+#include "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_inode.h b/include/xfs_inode.h
index 303efe0e4aff81a3abddd1456b1834db52ec77a9..71c0fb48c7b95d90110ba6d60b5f930cc62fb95e 100644 (file)
--- 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_inode_buf.h"
+#include "xfs_inode_fork.h"
 
 struct xfs_trans;
 struct xfs_mount;

diff --git a/io/attr.c b/io/attr.c
index dfae36ed4f43b6acbec37a1b0c1a40885c128d32..bc1ab56e5d6022f81a9f17edb1bf58b6411f7453 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/bmap.c b/io/bmap.c
index d96f7d4098e1d78ef45bdc628e23e0340ff66066..432ddb7fa6e29cab176f3f5917fc0fdb431640ae 100644 (file)
--- 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.h"
+#include "command.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/fadvise.c b/io/fadvise.c
index 3b76ab9a7373a94ea8c6426d9af7bd64e3e4cd43..fa586d3e097872ffb0f8f7fb4740f6a1c5e086d5 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/fiemap.c b/io/fiemap.c
index 363d1d9d10e3bd71fc9fd46b3cbb1d78e01312fa..8482c9920ea3a006f410b319f52244ea7f3e2984 100644 (file)
--- 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.h"
+#include "command.h"
 #include <linux/fiemap.h>
 #include <linux/fs.h>
 #include "init.h"

diff --git a/io/file.c b/io/file.c
index 0eadcab6330094bd8de85c602345114d954832ea..91dd38e2f6266b8b5dc8fdf5fbad2f27ef92a21e 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include <sys/mman.h>
 #include "init.h"
 #include "io.h"

diff --git a/io/freeze.c b/io/freeze.c
index a12ed67e631456bca73f5cdafe6ac5c9b32e9521..90f5b664e2358b6443537472e915f2a7b4fe8f26 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/fsync.c b/io/fsync.c
index d9c45f1c17572573b46ada38bf788f4225a838a2..6c93dffbefccf60898ef68e71de6489f0298404f 100644 (file)
--- 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.h"
+#include "command.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/getrusage.c b/io/getrusage.c
index 35dc4bfe82fb7e41ecf8abffc94829971f6babd5..28b8453d7e5c7b57605c008133dafe6d47aa5fd9 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include <sys/time.h>
 #include <sys/resource.h>
 #include "init.h"

diff --git a/io/imap.c b/io/imap.c
index a615467691abe43743cd830e55ae436d746265c7..7c24bcd332ed2c2e0c81b8b3c63d7e2359a7b048 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/init.c b/io/init.c
index 78a49b6155d9c2c28749a4c75b49f75d4690b2ca..70214f9a230f136767ca7f14b590e3ec04f010e5 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/inject.c b/io/inject.c
index f0aaf97a043c9862b49833224599feb45699624c..23eb4a20862071438e18f6296717e83b6465953e 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/link.c b/io/link.c
index 092e0d47f3e777f12f81b93894c6bf1f3b8d15a7..7fb81e13f56b72ed43680f4e65916950a4b0b904 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/madvise.c b/io/madvise.c
index 4f3f91bf4b73dddf8153e1922a101cf317346a44..b30d28babd3ad187a8445444e1cad27eaef4036a 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include <sys/mman.h>
 #include "init.h"
 #include "io.h"

diff --git a/io/mincore.c b/io/mincore.c
index 234e0a106e8bc3c28bdeb57053ca76dcb24880d3..670d4c8d55052b4bf0660865210e084b17cc600c 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include <sys/mman.h>
 #include "init.h"
 #include "io.h"

diff --git a/io/mmap.c b/io/mmap.c
index 06f678f64b1bb949807fffcc2ce8388e647e2a0b..33747c17d6c969a2cd41fa9ade3ea38508a19d36 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include <sys/mman.h>
 #include <signal.h>
 #include "init.h"

diff --git a/io/open.c b/io/open.c
index 795adebf3304fb5fc485f04eef58a9f302a1368e..33d9f8dfe3acd4d4da18720d4e0ccea79375d5ec 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/parent.c b/io/parent.c
index e883f652039c745eea3a9854b36e415a730b04e1..a374b3e9df6b9e42ee785d82c3e0de6da5962ef6 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
+#include "path.h"
+#include "parent.h"
+#include "handle.h"
+#include "jdm.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/pread.c b/io/pread.c
index 280cc9d784ae03e29fb76f0fb1d7f47ea204c2c4..9205e34e55061de2cbe75b5c88a302e701515c35 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include <ctype.h>
 #include "init.h"
 #include "io.h"

diff --git a/io/prealloc.c b/io/prealloc.c
index e458a9279aaebc0709520befe4bb80e4de95c1e2..b60d2dc580810e4e6681e61317aff96cf6cc03c8 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/pwrite.c b/io/pwrite.c
index 69f67af933ae38fa8ea3215e11080698add9ca82..c9d2b1ac6e11efdde0a4028032eb905f2320103f 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/readdir.c b/io/readdir.c
index 20b8898771d01b658484bed4043f1cc77d0e1414..f8b2755dce02113f68e5f1d1fccfbc8a73eac039 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/resblks.c b/io/resblks.c
index 197f7e8a1d27eec2626bf7e4d7bac2b3a24f212f..df032d590c3069bdbccd6e6c631617541a0330b2 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/seek.c b/io/seek.c
index 9b281d5dffa325c99fb28c06ce61dafb5dd184de..39dab61d8066f080bb0c230dea62c6682e4b41ac 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include <sys/types.h>
 #include <unistd.h>
 #include "init.h"

diff --git a/io/sendfile.c b/io/sendfile.c
index 22a5a4f519feb8524976b6322bb75a771d725440..744b6187f5b139c9116decd68b8da5f298ae7127 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include <sys/sendfile.h>
 #include "init.h"
 #include "io.h"

diff --git a/io/shutdown.c b/io/shutdown.c
index 2c86cf9cbadc01ae6f2459017d4e40e8a6f6d635..b75278ada49e229a1f5fcda3b09bd51eff208185 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/sync.c b/io/sync.c
index c7bbbf1a640e899793d94c46c432fe4b0ef2a239..0e7b82d912b3c26694df6b08512d2fa284f8c349 100644 (file)
--- 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.h"
+#include "command.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/sync_file_range.c b/io/sync_file_range.c
index 636633109968895260ecb3dd677c214dad186f3b..8e66773590ce7e166df7d2ac77f71d6188c6f2b5 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/io/truncate.c b/io/truncate.c
index 401d2a5f74c2fcd6ef148efad7670e8b5ff87a0c..5b2ac018b0857568419221c5bea7474d6a9716f4 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 #include "io.h"
 

diff --git a/libdisk/drivers.h b/libdisk/drivers.h
index 22ac1ea179845c5d1286e54e43f0fd83d7c74877..4d105684fbea406370c83ad9af1c47c6c77c1ecb 100644 (file)
--- a/libdisk/drivers.h
+++ b/libdisk/drivers.h
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <sys/stat.h>
 #include <volume.h>
 

diff --git a/libhandle/handle.c b/libhandle/handle.c
index 54e6f717d64cb8a7a781d3c5b1553cd322bf2a1e..7313e3b9c663ddfa64e2af7fadbc98c1cc8d7450 100644 (file)
--- 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.h"
+#include "handle.h"
+#include "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 2f2f3fd4c961ad7eb0b4d3c9469991ee110da04b..13196d145276fc3aacd4cffcfd701da64d150d15 100644 (file)
--- 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.h"
+#include "handle.h"
+#include "jdm.h"
+#include "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 148e58b0a93f306c9187929eb5899a0a5d269445..5d0649b7026928c2e79482ace76ee0021385457d 100644 (file)
--- 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.h"
+#include "command.h"
+#include "input.h"
 
 cmdinfo_t      *cmdtab;
 int            ncmds;

diff --git a/libxcmd/help.c b/libxcmd/help.c
index bcd5641a1bee573146ea56f9f584099a817d51d1..023b830885c6ed9e386166b7e8671e3a691d0c5e 100644 (file)
--- 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.h"
+#include "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 83aeeb5325531984b168c6e9b36b93fa5a17aba2..966a7ff8859f76014be565e5863d565c612d3cc5 100644 (file)
--- 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.h"
+#include "input.h"
 #include <ctype.h>
 #include <stdbool.h>
 

diff --git a/libxcmd/paths.c b/libxcmd/paths.c
index c0b1ddb978b197afd3e63d6eaf6a96bebe69bbd2..c56b06b9eb81525850fbf2c76b1ce5aeedd48ea2 100644 (file)
--- 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 "path.h"
+#include "input.h"
+#include "project.h"
 #include <limits.h>
 
 extern char *progname;

diff --git a/libxcmd/projects.c b/libxcmd/projects.c
index b00e4c8de0df629fea78b92e85e6da6f4e08fe1e..24ef70a113f3e0bac0d0b18d608461c565c5037c 100644 (file)
--- 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 "project.h"
 
 #define PROJID         "/etc/projid"
 #define PROJECT_PATHS  "/etc/projects"

diff --git a/libxcmd/quit.c b/libxcmd/quit.c
index 0921bbb75416e69acb11d0ebc5cc01a92e52e05b..0a2dd409ac41e75d63faecb4fb7ca1a213fe156b 100644 (file)
--- 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.h"
+#include "command.h"
 
 static cmdinfo_t quit_cmd;
 

diff --git a/libxfs/Makefile b/libxfs/Makefile
index ebbe40ee7041a5e27025ba614542a8585ccb035a..95de27ea08bc185ac7d31fafa9d4eb5f40f168e7 100644 (file)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -17,7 +17,7 @@ PKGHFILES = xfs_fs.h \
        xfs_format.h \
        xfs_log_format.h
 
-LIBHFILES = \
+HFILES = \
        xfs_alloc.h \
        xfs_alloc_btree.h \
        xfs_attr_leaf.h \
@@ -40,11 +40,8 @@ LIBHFILES = \
        xfs_trans_resv.h \
        xfs_trans_space.h \
        libxfs_io.h \
-       libxfs_api_defs.h
-
-
-# headers with build dependencies
-HFILES = init.h \
+       libxfs_api_defs.h \
+       init.h \
        crc32defs.h \
        crc32table.h \
        libxfs_priv.h \
@@ -90,7 +87,6 @@ CFILES = cache.c \
 CFILES += $(PKG_PLATFORM).c
 PCFILES = darwin.c freebsd.c irix.c linux.c
 LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
-LSRCFILES += $(LIBHFILES)
 LSRCFILES += gen_crc32table.c
 
 #
@@ -135,7 +131,7 @@ include $(BUILDRULES)
 install: default
        $(INSTALL) -m 755 -d $(PKG_INC_DIR)
 
-install-headers: $(addsuffix -hdrs, $(PKGHFILES) $(LIBHFILES))
+install-headers: $(addsuffix -hdrs, $(PKGHFILES))
 
 %-hdrs:
        $(Q)$(LN_S) -f $(PWD)/libxfs/$* $(TOPDIR)/include/xfs/$*

diff --git a/libxfs/crc32.c b/libxfs/crc32.c
index 63b1467fcedfb7fe4cd7e58c3f8d052d30857a1b..b2c7ec07189bceab8f1aa750ba4447fd7e0f614f 100644 (file)
--- a/libxfs/crc32.c
+++ b/libxfs/crc32.c
@@ -33,8 +33,8 @@
  * match the hardware acceleration available on Intel CPUs.
  */
 
-#include "xfs/platform_defs.h"
-#include "xfs/xfs_arch.h"
+#include "platform_defs.h"
+#include "xfs_arch.h"
 #include "crc32defs.h"
 
 /* types specifc to this file */

diff --git a/libxfs/darwin.c b/libxfs/darwin.c
index f4a38987f7fa3d18ee2a5229441f4fb394c65394..b9c314ffa8afaa83ff23fefdcad29329bea04490 100644 (file)
--- a/libxfs/darwin.c
+++ b/libxfs/darwin.c
@@ -21,7 +21,7 @@
 #include <sys/mount.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 
 int platform_has_uuid = 1;
 extern char *progname;

diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index ec131db23b2b4e72de397c29a643a7441cf4da98..6c9f089d7408d35241c0acdfafa9715b57db28cc 100644 (file)
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <sys/stat.h>
 #include <sys/disk.h>
 #include <sys/mount.h>

diff --git a/libxfs/init.c b/libxfs/init.c
index d287c1dc229e23e27da483423d7fa1f32c644ab2..2859f94a95d7e2caf7fe79b0872633b7cbfa4283 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -31,7 +31,7 @@
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 
-#include "xfs/libxfs.h"                /* for now */
+#include "libxfs.h"            /* for now */
 
 char *progname = "libxfs";     /* default, changed by each tool */
 

diff --git a/libxfs/irix.c b/libxfs/irix.c
index 69e6d815f8f511b010b0737cd7cad2b824ea3949..65aaa7ef066a376e8eddc256b0b9770a874c2d4c 100644 (file)
--- a/libxfs/irix.c
+++ b/libxfs/irix.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <diskinfo.h>
 #include <sys/sysmp.h>
 

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 445a6dc830e7dcb343929ff541a9f061b69e4016..7a29fd74ef571026e80a0cd494fcfd897d07af4f 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -58,20 +58,20 @@
                                 (ip)->d_ops, hdr, loghead)
 
 #include "libxfs_api_defs.h"
-#include "xfs/platform_defs.h"
+#include "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/atomic.h"
+#include "list.h"
+#include "hlist.h"
+#include "cache.h"
+#include "bitops.h"
+#include "kmem.h"
+#include "radix-tree.h"
+#include "atomic.h"
 
-#include "xfs/xfs_types.h"
-#include "xfs/xfs_arch.h"
+#include "xfs_types.h"
+#include "xfs_arch.h"
 
-#include "xfs/xfs_fs.h"
+#include "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);
@@ -80,7 +80,7 @@ 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_cksum.h"
 
 /*
  * This mirrors the kernel include for xfs_buf.h - it's implicitly included in

diff --git a/libxfs/radix-tree.c b/libxfs/radix-tree.c
index c859f286854031cd6dbb4087448eb422499a8690..9e395be159e04df43db13837b541fc58c16ad673 100644 (file)
--- 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 "platform_defs.h"
 #include "radix-tree.h"
 
 #ifndef ARRAY_SIZE

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 4e0c75b8a2ff6a3a7eb64e917908c871d434ada6..4f8212fe3e89e0a1e3eff295e5f0ee881585e276 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -30,7 +30,7 @@
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 
-#include "xfs/libxfs.h"                /* for LIBXFS_EXIT_ON_FAILURE */
+#include "libxfs.h"            /* for LIBXFS_EXIT_ON_FAILURE */
 
 /*
  * Important design/architecture note:

diff --git a/libxlog/util.c b/libxlog/util.c
index a0e35ccf1beff3a601d211223c5d1353a3b31ae1..2feae827730e6068684cec0a732b716b133fa6f4 100644 (file)
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 
 int print_exit;
 int print_skip_uuid;

diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index a80c4313bb3f67653ade7ec6e931545cbd03e40a..ef7cf68b4380d98d7093c3fc557317429a5e2772 100644 (file)
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -15,8 +15,8 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 
 #define xfs_readonly_buftarg(buftarg)                  (0)
 

diff --git a/logprint/log_copy.c b/logprint/log_copy.c
index ea55a1f0e6ba46d3413c4c1acabd95fc44e613e7..1cc4c211b686b8c5265c4c661b615d2b76ece7e8 100644 (file)
--- a/logprint/log_copy.c
+++ b/logprint/log_copy.c
@@ -15,8 +15,8 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 
 #include "logprint.h"
 

diff --git a/logprint/log_dump.c b/logprint/log_dump.c
index efcf62eb5e2172fc19e49e7517dae2c8d5aa2130..2bccb50fc95f7b8a733c27e311eaa6d0a0e382ae 100644 (file)
--- a/logprint/log_dump.c
+++ b/logprint/log_dump.c
@@ -15,8 +15,8 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 
 #include "logprint.h"
 

diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 7ea6edc8d8d59a4a4c4b1e8d0c135ab121422fe3..fd306797306cbc0868e958f78637e1354ef9fe64 100644 (file)
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -15,8 +15,8 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 
 #include "logprint.h"
 

diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index 656996878504dc3fd7da85b623a0d7773d3b1a7c..9f1a7abf305265813337048b602356a1af39b449 100644 (file)
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -15,8 +15,8 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 
 #include "logprint.h"
 

diff --git a/logprint/log_print_trans.c b/logprint/log_print_trans.c
index cbd7a9c65b9527e0e000e7b15c2a539686176d76..9bf2b3762a68b14e70832321473cb61c715d31f3 100644 (file)
--- a/logprint/log_print_trans.c
+++ b/logprint/log_print_trans.c
@@ -15,8 +15,8 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 
 #include "logprint.h"
 

diff --git a/logprint/logprint.c b/logprint/logprint.c
index 2ad2ec0bf444b78cfa793ad0a29d9f2036c93478..a5c9b324e194d71dff91822c872b19ea47e25b0a 100644 (file)
--- a/logprint/logprint.c
+++ b/logprint/logprint.c
@@ -18,8 +18,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 
 #include "logprint.h"
 

diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index ea7298d8d7b0528e7053defdb0d30e37f04ff1e5..5764616f970df186c8cc45ccf06651fc4a46c1e0 100644 (file)
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "xfs_metadump.h"
 
 char           *progname;

diff --git a/mkfs/fstyp.c b/mkfs/fstyp.c
index 741051624fb6dd6e24904fa205b1a1d7ddbb5cd0..7f3da06593f272da0c68c1fc4c8beb4f0c1d89dd 100644 (file)
--- a/mkfs/fstyp.c
+++ b/mkfs/fstyp.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <disk/fstyp.h>
 
 /*

diff --git a/mkfs/maxtrres.c b/mkfs/maxtrres.c
index f6bcec0f685346ff18c24d05f518950620907aea..e1d5ee97a7c87a46fb6a45fc1a42be1b5bdec851 100644 (file)
--- a/mkfs/maxtrres.c
+++ b/mkfs/maxtrres.c
@@ -24,7 +24,7 @@
  * directory block size.
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "xfs_mkfs.h"
 
 int

diff --git a/mkfs/proto.c b/mkfs/proto.c
index 17308bc89f6eb3c2c6e960be248cfc2486641958..cb34b282bfaf568c345cc32f5ba22349eca862e6 100644 (file)
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <sys/stat.h>
 #include "xfs_mkfs.h"
 

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 11e9f4b0ccca46566ab984a5dd2603272401c31f..80cdd10b29890f6f64f439f9a0da5664fcfd962b 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <ctype.h>
 #ifdef ENABLE_BLKID
 #include <blkid/blkid.h>

diff --git a/quota/edit.c b/quota/edit.c
index 0170d51a69e5a3e785573b6d01e615ff28cd8208..d226e89b610df96a546b1fdc35d4b955bfbc6f31 100644 (file)
--- 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 "input.h"
+#include "command.h"
 #include "init.h"
 #include "quota.h"
 

diff --git a/quota/free.c b/quota/free.c
index 72ab503293761f1999e7984267a0c776ead4e853..dcbe8ce05c73165031010ecc7343b247de7bd0b5 100644 (file)
--- 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 "command.h"
 #include "init.h"
 #include "quota.h"
 

diff --git a/quota/init.c b/quota/init.c
index 019e2c56f9a4c18fa5d47bcb5af809046282f836..52f7941b03533eeaa575541e751d30e3fa188fa9 100644 (file)
--- 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 "path.h"
+#include "command.h"
+#include "input.h"
 #include "init.h"
 
 char   *progname;

diff --git a/quota/path.c b/quota/path.c
index 9a35332d342911d3f43c19aeef514e17e6e608b7..bdb8c98c5176337addfa03a491989191eb485f94 100644 (file)
--- 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 "command.h"
+#include "input.h"
 #include "init.h"
 #include "quota.h"
 

diff --git a/quota/project.c b/quota/project.c
index f30c6c645603d7422c4d7ff2134767942b7730a7..17a83b04cf43fa9d03c5045b0896fa47010bbcb3 100644 (file)
--- 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 "command.h"
+#include "input.h"
 #include "init.h"
 #include "quota.h"
 

diff --git a/quota/quot.c b/quota/quot.c
index be41026361a51d5e1fd60a673103626b81ee2add..9116e4812c3b3d5aa2dc1da928ee687f0adf5b37 100644 (file)
--- 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 "command.h"
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>

diff --git a/quota/quota.c b/quota/quota.c
index d24974056dd8a3690000a511d1572a2eb6575959..f6b24c35c48189164cc8731c97fee9b3598acc5f 100644 (file)
--- 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 "command.h"
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>

diff --git a/quota/quota.h b/quota/quota.h
index 974747f5add363269a85ac95583939dc8518b32a..a905ce5694880d3cb66d071457bcf2f21b06452f 100644 (file)
--- 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 "xqm.h"
+#include "path.h"
+#include "project.h"
 #include <stdbool.h>
 
 /*

diff --git a/quota/report.c b/quota/report.c
index 7c3cf451ee1a602d2396f745dfc7c6a45de3c95c..3d84447042cac34841dda0a311ba551eaa9077cb 100644 (file)
--- 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 "command.h"
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>

diff --git a/quota/state.c b/quota/state.c
index b1827b6f5c20f94729467357e4942cd918774847..0173f408fa46a1daea39e721014368a8ab4d40aa 100644 (file)
--- 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 "command.h"
 #include "init.h"
 #include "quota.h"
 

diff --git a/repair/agheader.c b/repair/agheader.c
index a216afa9bff515e58c6a5575f679bc5d2f08cc05..c79031f99f565fe99ff9572bbbee4dc605aae03e 100644 (file)
--- a/repair/agheader.c
+++ b/repair/agheader.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "globals.h"
 #include "agheader.h"
 #include "protos.h"

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index e2bfd449513e4ff308d00ad55cbc1ba1f9f87437..62f80e7abd65646244fecefbb249932a9cc2c271 100644 (file)
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "globals.h"
 #include "err_protos.h"
 #include "attr_repair.h"

diff --git a/repair/avl.c b/repair/avl.c
index 83e308702e3f69f4fb5d20488c617e72417144dc..e3843ae6b2fca00f70d2626bacb40770cb30c8bd 100644 (file)
--- a/repair/avl.c
+++ b/repair/avl.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 
 #define CERT   ASSERT

diff --git a/repair/avl64.c b/repair/avl64.c
index 64f53588e41482c02fd519a81a341426b4ce9177..51cd624c7249e609226e128fb36bbd3af94b3cc7 100644 (file)
--- a/repair/avl64.c
+++ b/repair/avl64.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl64.h"
 
 #define CERT   ASSERT

diff --git a/repair/bmap.c b/repair/bmap.c
index c5c50c3b3c929fa296ea2d39bd54d2f556a6b15d..26556328c48123490c17d298180fca3aaeb83c4b 100644 (file)
--- a/repair/bmap.c
+++ b/repair/bmap.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "err_protos.h"
 #include "bmap.h"
 

diff --git a/repair/btree.c b/repair/btree.c
index bc4ed989c52567362aea59b03522791f15c05d4d..66fb40b131c9d5828ff4b265f0301988385e4b00 100644 (file)
--- a/repair/btree.c
+++ b/repair/btree.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "btree.h"
 
 /*

diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c
index d484a1d0970e95f788cc136220fd4bc3c5f1c0e0..7dbaca667446607bd6f670dbe1364a5004fd403e 100644 (file)
--- a/repair/dino_chunks.c
+++ b/repair/dino_chunks.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/dinode.c b/repair/dinode.c
index 09db966c8872ba0a6e443c80676a6bd648643c7c..c6303fa45e10f5a534eae83759d53387ccb3f4d9 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/dir2.c b/repair/dir2.c
index c89f478f42f8b84b7a2157b242a0f4066684c110..187e069cea78ebc0465c45ef3c38abff0a9932ed 100644 (file)
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "incore.h"

diff --git a/repair/globals.c b/repair/globals.c
index d0ca3fb3b2c930162bb64f2cbde288e099142336..9619220050c92e25617278eb750037753bc6823b 100644 (file)
--- a/repair/globals.c
+++ b/repair/globals.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 
 #define EXTERN
 #include "globals.h"

diff --git a/repair/incore.c b/repair/incore.c
index d5ecfd6daf17ecf957f96dba9bde59f3b8fa1294..cb573165cae5f20cbb1f29b0bf7eb1f978ab8821 100644 (file)
--- a/repair/incore.c
+++ b/repair/incore.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "btree.h"
 #include "globals.h"

diff --git a/repair/incore_bmc.c b/repair/incore_bmc.c
index c1e855d24dda02694639408960e15e41626b8972..de142ee3d4b3a153381d134f8663bd75d66f94a3 100644 (file)
--- a/repair/incore_bmc.c
+++ b/repair/incore_bmc.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "incore.h"

diff --git a/repair/incore_ext.c b/repair/incore_ext.c
index c15e57de9e7592e559eaeb063826349dc1935c27..cac379c105db6fa05a9ac2b06fa48471d27e8c4d 100644 (file)
--- a/repair/incore_ext.c
+++ b/repair/incore_ext.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "btree.h"
 #include "globals.h"

diff --git a/repair/incore_ino.c b/repair/incore_ino.c
index 7e19657efea576080c5bce0f0d0c721d4ca1d583..32d767860ad2c2ddb08a582ea8fd1269de81b5f2 100644 (file)
--- a/repair/incore_ino.c
+++ b/repair/incore_ino.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "incore.h"

diff --git a/repair/init.c b/repair/init.c
index a7547cb8e8f35b83aece89e21a23d6679843f8f0..609229c8f088e1126d79efb318a792775e8edd07 100644 (file)
--- a/repair/init.c
+++ b/repair/init.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "globals.h"
 #include "agheader.h"
 #include "protos.h"

diff --git a/repair/phase1.c b/repair/phase1.c
index bd9adcbba130e01017acfb8e7ce328dfdad3262d..126d0b35b038f14780fa4b4228ccfbc3b6d9e41a 100644 (file)
--- a/repair/phase1.c
+++ b/repair/phase1.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "globals.h"
 #include "agheader.h"
 #include "protos.h"

diff --git a/repair/phase2.c b/repair/phase2.c
index aee39130dba5841e8bdbd97eec1a5d804939242e..7e264c41af031add845fba139bc98fdf02e4c372 100644 (file)
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/phase3.c b/repair/phase3.c
index 4751e56b94af551fb1f821fbedef140985bb93a6..20786af338f457dd8e921aa2ed7e17f38ce9f11b 100644 (file)
--- a/repair/phase3.c
+++ b/repair/phase3.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "threads.h"
 #include "prefetch.h"
 #include "avl.h"

diff --git a/repair/phase4.c b/repair/phase4.c
index 8d3525c088953a2545ee9f6a2894b8c1f1754d3e..e0571e87431e78c475e91409ef38de63ecdebe7d 100644 (file)
--- a/repair/phase4.c
+++ b/repair/phase4.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "threads.h"
 #include "prefetch.h"
 #include "avl.h"

diff --git a/repair/phase5.c b/repair/phase5.c
index 9b3d73b916ffd52663cf18a54caa31185e2fb4a8..b9a64b938eac0cb9181d3c71dadb90ae8578cc1a 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/phase6.c b/repair/phase6.c
index 9a5cba7fc22ef139ae877af52dd94029f747322c..672c6f12537e82de273d9f822d2f6eb13177ca0c 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "threads.h"
 #include "prefetch.h"
 #include "avl.h"

diff --git a/repair/phase7.c b/repair/phase7.c
index 56c0379f0a8e3bb8997e6b10a7174b258d0da93a..b1e3a5527a81b454123400266b17f14bdfc01859 100644 (file)
--- a/repair/phase7.c
+++ b/repair/phase7.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/prefetch.c b/repair/prefetch.c
index 08c03945e4b3791678a90fd4f70c9ea143e7662f..8b261ae6be810e8d348175e3ed44559fb86a3102 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -1,4 +1,4 @@
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <pthread.h>
 #include "avl.h"
 #include "btree.h"

diff --git a/repair/progress.c b/repair/progress.c
index 1b279247e8adab1c4124353a11d34269890f5117..27cbaefbfad4cfee5859544482543bf7135c2f6a 100644 (file)
--- a/repair/progress.c
+++ b/repair/progress.c
@@ -1,5 +1,5 @@
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "globals.h"
 #include "progress.h"
 #include "err_protos.h"

diff --git a/repair/rt.c b/repair/rt.c
index b412a0fccd388ffea388cda4f3d353be49ca2f4f..3290d2c7a22e8b870f40289490d36171b31f597d 100644 (file)
--- a/repair/rt.c
+++ b/repair/rt.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/sb.c b/repair/sb.c
index f6a1f151a7c2fe7c717273fa3df1b2faa8f35e7a..4eef14af14a47d2e3214bd796571201f9c6cec24 100644 (file)
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 #include "agheader.h"
 #include "globals.h"
 #include "protos.h"

diff --git a/repair/scan.c b/repair/scan.c
index e9a8ab408fb89c8515d4c2ab5b8ac40bd5d4165e..dd610462022176cd38c9d143d93bccf0d050efe9 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/threads.c b/repair/threads.c
index a5fb8564f24b8b76b8d79f1d3a7d2fe3efcdaf4c..631531f574ec25fc66f778f659af8857dd4a5ccd 100644 (file)
--- a/repair/threads.c
+++ b/repair/threads.c
@@ -1,4 +1,4 @@
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 #include <pthread.h>
 #include <signal.h>
 #include "threads.h"

diff --git a/repair/versions.c b/repair/versions.c
index 0bf4ab3d02904fa347bc1230f1bd9b72671b7350..fb1b3e428a833370506ef4ffc5f1faa7f64c27b8 100644 (file)
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 
 #define EXTERN
 #include "versions.h"

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index df1fd7841c70c336f02169f7d1d1ad9db442cd0d..db703d0ef4cabb1b32762761339d163e5f64e374 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -16,8 +16,8 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
-#include "xfs/libxlog.h"
+#include "libxfs.h"
+#include "libxlog.h"
 #include <sys/resource.h>
 #include "avl.h"
 #include "avl64.h"

diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c
index 7f48060d261209ac57e9bb7b13522d3680dbdc0a..f604b46404bc54f6cf8ab3aef21ea2b6476ae85e 100644 (file)
--- a/rtcp/xfs_rtcp.c
+++ b/rtcp/xfs_rtcp.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/libxfs.h"
+#include "libxfs.h"
 
 int rtcp(char *, char *, int);
 int xfsrtextsize(char *path);