Gitiles
Code Review Sign In
gerrit-dev.monogon.dev / monogon / 5308730b6181304ae1d34acf0f2bea6c4cb65339 / . / third_party / xfsprogs / patches / bazel_cc_fix.patch
blob: cc76d99d838d32d600d056e14be45642c5c8c964 [file] [log] [blame]
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1Copyright 2020 The Monogon Project Authors.
2
3Licensed under the Apache License, Version 2.0 (the "License");
4you may not use this file except in compliance with the License.
5You may obtain a copy of the License at
6
7 http://www.apache.org/licenses/LICENSE-2.0
8
9Unless required by applicable law or agreed to in writing, software
10distributed under the License is distributed on an "AS IS" BASIS,
11WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12See the License for the specific language governing permissions and
13limitations under the License.
14
15
16From e0c4f6a85bccab7d7e19d01bb790482e558d3f21 Mon Sep 17 00:00:00 2001
17From: Lorenz Brun <lorenz@nexantic.com>
18Date: Thu, 4 Mar 2021 16:59:13 +0100
19Subject: [PATCH] bazel_cc_fix patch
20
21---
22 include/libxfs.h | 76 ++++++++++++++++++-------------------
23 include/linux.h | 2 +-
24 include/xfs.h | 8 ++--
25 include/xfs_inode.h | 4 +-
26 libfrog/bitmap.c | 4 +-
27 libfrog/bulkstat.c | 2 +-
28 libfrog/convert.c | 2 +-
29 libfrog/crc32.c | 2 +-
30 libfrog/fsgeom.c | 4 +-
31 libfrog/linux.c | 4 +-
32 libfrog/list_sort.c | 2 +-
33 libfrog/paths.c | 2 +-
34 libfrog/projects.h | 2 +-
35 libfrog/scrub.c | 2 +-
36 libfrog/topology.c | 8 ++--
37 libxcmd/command.c | 4 +-
38 libxcmd/help.c | 4 +-
39 libxcmd/input.c | 2 +-
40 libxcmd/quit.c | 4 +-
41 libxfs/cache.c | 2 +-
42 libxfs/defer_item.c | 6 +--
43 libxfs/init.c | 8 ++--
44 libxfs/libxfs_priv.h | 16 ++++----
45 libxfs/logitem.c | 6 +--
46 libxfs/rdwr.c | 8 ++--
47 libxfs/trans.c | 8 ++--
48 libxfs/util.c | 8 ++--
49 libxfs/xfs_ag.c | 2 +-
50 libxfs/xfs_ag_resv.c | 6 +--
51 libxfs/xfs_alloc.c | 6 +--
52 libxfs/xfs_alloc_btree.c | 6 +--
53 libxfs/xfs_attr.c | 8 ++--
54 libxfs/xfs_attr_leaf.c | 8 ++--
55 libxfs/xfs_attr_remote.c | 8 ++--
56 libxfs/xfs_bmap.c | 8 ++--
57 libxfs/xfs_bmap_btree.c | 8 ++--
58 libxfs/xfs_btree.c | 8 ++--
59 libxfs/xfs_btree_staging.c | 8 ++--
60 libxfs/xfs_da_btree.c | 8 ++--
61 libxfs/xfs_defer.c | 8 ++--
62 libxfs/xfs_dir2.c | 8 ++--
63 libxfs/xfs_dir2_block.c | 8 ++--
64 libxfs/xfs_dir2_data.c | 6 +--
65 libxfs/xfs_dir2_leaf.c | 8 ++--
66 libxfs/xfs_dir2_node.c | 8 ++--
67 libxfs/xfs_dir2_sf.c | 8 ++--
68 libxfs/xfs_dquot_buf.c | 6 +--
69 libxfs/xfs_ialloc.c | 8 ++--
70 libxfs/xfs_ialloc_btree.c | 6 +--
71 libxfs/xfs_iext_tree.c | 6 +--
72 libxfs/xfs_inode_buf.c | 6 +--
73 libxfs/xfs_inode_fork.c | 8 ++--
74 libxfs/xfs_log_rlimit.c | 2 +-
75 libxfs/xfs_refcount.c | 6 +--
76 libxfs/xfs_refcount_btree.c | 6 +--
77 libxfs/xfs_rmap.c | 8 ++--
78 libxfs/xfs_rmap_btree.c | 6 +--
79 libxfs/xfs_rtbitmap.c | 6 +--
80 libxfs/xfs_sb.c | 6 +--
81 libxfs/xfs_symlink_remote.c | 6 +--
82 libxfs/xfs_trans_inode.c | 6 +--
83 libxfs/xfs_trans_resv.c | 6 +--
84 libxfs/xfs_types.c | 2 +-
85 mkfs/proto.c | 2 +-
86 mkfs/xfs_mkfs.c | 8 ++--
87 65 files changed, 224 insertions(+), 224 deletions(-)
88
89diff --git a/include/libxfs.h b/include/libxfs.h
90index ad077eaa..d17e7424 100644
91--- a/include/libxfs.h
92+++ b/include/libxfs.h
93@@ -7,7 +7,7 @@
94 #ifndef __LIBXFS_H__
95 #define __LIBXFS_H__
96
97-#include "libxfs_api_defs.h"
98+#include "libxfs/libxfs_api_defs.h"
99 #include "platform_defs.h"
100 #include "xfs.h"
101
102@@ -19,15 +19,15 @@
103 #include "libfrog/radix-tree.h"
104 #include "atomic.h"
105
106-#include "xfs_types.h"
107-#include "xfs_fs.h"
108+#include "libxfs/xfs_types.h"
109+#include "libxfs/xfs_fs.h"
110 #include "xfs_arch.h"
111
112-#include "xfs_shared.h"
113-#include "xfs_format.h"
114-#include "xfs_log_format.h"
115-#include "xfs_quota_defs.h"
116-#include "xfs_trans_resv.h"
117+#include "libxfs/xfs_shared.h"
118+#include "libxfs/xfs_format.h"
119+#include "libxfs/xfs_log_format.h"
120+#include "libxfs/xfs_quota_defs.h"
121+#include "libxfs/xfs_trans_resv.h"
122
123
124 /* CRC stuff, buffer API dependent on it */
125@@ -36,7 +36,7 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len);
126
127 /* fake up kernel's iomap, (not) used in xfs_bmap.[ch] */
128 struct iomap;
129-#include "xfs_cksum.h"
130+#include "libxfs/xfs_cksum.h"
131
132 #define __round_mask(x, y) ((__typeof__(x))((y)-1))
133 #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
134@@ -46,35 +46,35 @@ struct iomap;
135 * This mirrors the kernel include for xfs_buf.h - it's implicitly included in
136 * every files via a similar include in the kernel xfs_linux.h.
137 */
138-#include "libxfs_io.h"
139+#include "libxfs/libxfs_io.h"
140
141-#include "xfs_bit.h"
142-#include "xfs_sb.h"
143+#include "libxfs/xfs_bit.h"
144+#include "libxfs/xfs_sb.h"
145 #include "xfs_mount.h"
146-#include "xfs_defer.h"
147-#include "xfs_errortag.h"
148-#include "xfs_da_format.h"
149-#include "xfs_da_btree.h"
150+#include "libxfs/xfs_defer.h"
151+#include "libxfs/xfs_errortag.h"
152+#include "libxfs/xfs_da_format.h"
153+#include "libxfs/xfs_da_btree.h"
154 #include "xfs_inode.h"
155-#include "xfs_dir2.h"
156-#include "xfs_dir2_priv.h"
157-#include "xfs_bmap_btree.h"
158-#include "xfs_alloc_btree.h"
159-#include "xfs_ialloc_btree.h"
160-#include "xfs_attr_sf.h"
161-#include "xfs_inode_fork.h"
162-#include "xfs_inode_buf.h"
163-#include "xfs_alloc.h"
164-#include "xfs_btree.h"
165-#include "xfs_bmap.h"
166+#include "libxfs/xfs_dir2.h"
167+#include "libxfs/xfs_dir2_priv.h"
168+#include "libxfs/xfs_bmap_btree.h"
169+#include "libxfs/xfs_alloc_btree.h"
170+#include "libxfs/xfs_ialloc_btree.h"
171+#include "libxfs/xfs_attr_sf.h"
172+#include "libxfs/xfs_inode_fork.h"
173+#include "libxfs/xfs_inode_buf.h"
174+#include "libxfs/xfs_alloc.h"
175+#include "libxfs/xfs_btree.h"
176+#include "libxfs/xfs_bmap.h"
177 #include "xfs_trace.h"
178 #include "xfs_trans.h"
179-#include "xfs_ag.h"
180-#include "xfs_rmap_btree.h"
181-#include "xfs_rmap.h"
182-#include "xfs_refcount_btree.h"
183-#include "xfs_refcount.h"
184-#include "xfs_btree_staging.h"
185+#include "libxfs/xfs_ag.h"
186+#include "libxfs/xfs_rmap_btree.h"
187+#include "libxfs/xfs_rmap.h"
188+#include "libxfs/xfs_refcount_btree.h"
189+#include "libxfs/xfs_refcount.h"
190+#include "libxfs/xfs_btree_staging.h"
191
192 #ifndef ARRAY_SIZE
193 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
194@@ -165,11 +165,11 @@ extern void cmn_err(int, char *, ...);
195 enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
196 #endif
197
198-#include "xfs_ialloc.h"
199+#include "libxfs/xfs_ialloc.h"
200
201-#include "xfs_attr_leaf.h"
202-#include "xfs_attr_remote.h"
203-#include "xfs_trans_space.h"
204+#include "libxfs/xfs_attr_leaf.h"
205+#include "libxfs/xfs_attr_remote.h"
206+#include "libxfs/xfs_trans_space.h"
207
208 #define XFS_INOBT_IS_FREE_DISK(rp,i) \
209 ((be64_to_cpu((rp)->ir_free) & XFS_INOBT_MASK(i)) != 0)
210@@ -212,6 +212,6 @@ libxfs_bmbt_disk_get_all(
211 int libxfs_rtfree_extent(struct xfs_trans *, xfs_rtblock_t, xfs_extlen_t);
212 bool libxfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);
213
214-#include "xfs_attr.h"
215+#include "libxfs/xfs_attr.h"
216
217 #endif /* __LIBXFS_H__ */
218diff --git a/include/linux.h b/include/linux.h
219index 03b3278b..b1e03f19 100644
220--- a/include/linux.h
221+++ b/include/linux.h
222@@ -5,7 +5,7 @@
223 #ifndef __XFS_LINUX_H__
224 #define __XFS_LINUX_H__
225
226-#include <uuid/uuid.h>
227+#include "libuuid/src/uuid.h"
228 #include <sys/vfs.h>
229 #include <sys/ioctl.h>
230 #include <sys/param.h>
231diff --git a/include/xfs.h b/include/xfs.h
232index e97158c8..95d63036 100644
233--- a/include/xfs.h
234+++ b/include/xfs.h
235@@ -6,7 +6,7 @@
236 #define __XFS_H__
237
238 #if defined(__linux__)
239-#include <xfs/linux.h>
240+#include "include/linux.h"
241 #else
242 # error unknown platform... have fun porting!
243 #endif
244@@ -40,9 +40,9 @@ extern int xfs_assert_largefile[sizeof(off_t)-8];
245
246 #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))
247
248-#include <xfs/xfs_types.h>
249+#include "libxfs/xfs_types.h"
250 /* Include deprecated/compat pre-vfs xfs-specific symbols */
251-#include <xfs/xfs_fs_compat.h>
252-#include <xfs/xfs_fs.h>
253+#include "include/xfs_fs_compat.h"
254+#include "libxfs/xfs_fs.h"
255
256 #endif /* __XFS_H__ */
257diff --git a/include/xfs_inode.h b/include/xfs_inode.h
258index 742aebc8..b24e9aa9 100644
259--- a/include/xfs_inode.h
260+++ b/include/xfs_inode.h
261@@ -8,8 +8,8 @@
262 #define __XFS_INODE_H__
263
264 /* These match kernel side includes */
265-#include "xfs_inode_buf.h"
266-#include "xfs_inode_fork.h"
267+#include "libxfs/xfs_inode_buf.h"
268+#include "libxfs/xfs_inode_fork.h"
269
270 struct xfs_trans;
271 struct xfs_mount;
272diff --git a/libfrog/bitmap.c b/libfrog/bitmap.c
273index 5af5ab8d..25cd291c 100644
274--- a/libfrog/bitmap.c
275+++ b/libfrog/bitmap.c
276@@ -3,14 +3,14 @@
277 * Copyright (C) 2018 Oracle. All Rights Reserved.
278 * Author: Darrick J. Wong <darrick.wong@oracle.com>
279 */
280-#include "xfs.h"
281+#include "include/xfs.h"
282 #include <stdint.h>
283 #include <stdlib.h>
284 #include <assert.h>
285 #include <pthread.h>
286 #include "platform_defs.h"
287 #include "avl64.h"
288-#include "list.h"
289+#include "include/list.h"
290 #include "bitmap.h"
291
292 /*
293diff --git a/libfrog/bulkstat.c b/libfrog/bulkstat.c
294index 195f6ea0..f347b266 100644
295--- a/libfrog/bulkstat.c
296+++ b/libfrog/bulkstat.c
297@@ -5,7 +5,7 @@
298 */
299 #include <string.h>
300 #include <strings.h>
301-#include "xfs.h"
302+#include "include/xfs.h"
303 #include "fsgeom.h"
304 #include "bulkstat.h"
305
306diff --git a/libfrog/convert.c b/libfrog/convert.c
307index 0ceeb389..46fd3ba0 100644
308--- a/libfrog/convert.c
309+++ b/libfrog/convert.c
310@@ -4,7 +4,7 @@
311 * All Rights Reserved.
312 */
313 #include "platform_defs.h"
314-#include "input.h"
315+#include "include/input.h"
316 #include <ctype.h>
317 #include <stdbool.h>
318
319diff --git a/libfrog/crc32.c b/libfrog/crc32.c
320index 526ce950..c1ef084f 100644
321--- a/libfrog/crc32.c
322+++ b/libfrog/crc32.c
323@@ -34,7 +34,7 @@
324 #include <sys/time.h>
325 #include "platform_defs.h"
326 /* For endian conversion routines */
327-#include "xfs_arch.h"
328+#include "include/xfs_arch.h"
329 #include "crc32defs.h"
330 #include "crc32c.h"
331
332diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
333index 14507668..eb344ba4 100644
334--- a/libfrog/fsgeom.c
335+++ b/libfrog/fsgeom.c
336@@ -3,8 +3,8 @@
337 * Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved.
338 */
339 #include "platform_defs.h"
340-#include "xfs.h"
341-#include "bitops.h"
342+#include "include/xfs.h"
343+#include "include/bitops.h"
344 #include "fsgeom.h"
345 #include "util.h"
346
347diff --git a/libfrog/linux.c b/libfrog/linux.c
348index a45d99ab..3c906342 100644
349--- a/libfrog/linux.c
350+++ b/libfrog/linux.c
351@@ -10,8 +10,8 @@
352 #include <sys/sysinfo.h>
353
354 #include "platform_defs.h"
355-#include "xfs.h"
356-#include "init.h"
357+#include "include/xfs.h"
358+#include "libxfs/init.h"
359
360 extern char *progname;
361 static int max_block_alignment;
362diff --git a/libfrog/list_sort.c b/libfrog/list_sort.c
363index b77eece5..e6ad2266 100644
364--- a/libfrog/list_sort.c
365+++ b/libfrog/list_sort.c
366@@ -1,7 +1,7 @@
367 /* List sorting code from Linux::lib/list_sort.c. */
368 #include <stdlib.h>
369 #include <string.h>
370-#include "list.h"
371+#include "include/list.h"
372
373 #define unlikely(x) (x)
374 #define MAX_LIST_LENGTH_BITS 20
375diff --git a/libfrog/paths.c b/libfrog/paths.c
376index d6793764..2fa74eac 100644
377--- a/libfrog/paths.c
378+++ b/libfrog/paths.c
379@@ -13,7 +13,7 @@
380 #include <sys/types.h>
381 #include <sys/stat.h>
382 #include "paths.h"
383-#include "input.h"
384+#include "include/input.h"
385 #include "projects.h"
386 #include <limits.h>
387
388diff --git a/libfrog/projects.h b/libfrog/projects.h
389index 77919474..e88a39c1 100644
390--- a/libfrog/projects.h
391+++ b/libfrog/projects.h
392@@ -7,7 +7,7 @@
393 #define __LIBFROG_PROJECTS_H__
394
395 #include "platform_defs.h"
396-#include "xfs.h"
397+#include "include/xfs.h"
398
399 extern int setprojid(const char *__name, int __fd, prid_t __id);
400 extern int getprojid(const char *__name, int __fd, prid_t *__id);
401diff --git a/libfrog/scrub.c b/libfrog/scrub.c
402index d900bf2a..0d58114c 100644
403--- a/libfrog/scrub.c
404+++ b/libfrog/scrub.c
405@@ -3,7 +3,7 @@
406 * Copyright (c) 2019 Oracle, Inc.
407 * All Rights Reserved.
408 */
409-#include "xfs.h"
410+#include "include/xfs.h"
411 #include "fsgeom.h"
412 #include "scrub.h"
413
414diff --git a/libfrog/topology.c b/libfrog/topology.c
415index b1b470c9..b44e5b69 100644
416--- a/libfrog/topology.c
417+++ b/libfrog/topology.c
418@@ -4,12 +4,12 @@
419 * All Rights Reserved.
420 */
421
422-#include "libxfs.h"
423-#include "libxcmd.h"
424+#include "include/libxfs.h"
425+#include "include/libxcmd.h"
426 #ifdef ENABLE_BLKID
427-# include <blkid/blkid.h>
428+#include "blkid.h"
429 #endif /* ENABLE_BLKID */
430-#include "xfs_multidisk.h"
431+#include "include/xfs_multidisk.h"
432 #include "topology.h"
433 #include "platform.h"
434
435diff --git a/libxcmd/command.c b/libxcmd/command.c
436index a76d1515..d3ae840a 100644
437--- a/libxcmd/command.c
438+++ b/libxcmd/command.c
439@@ -5,8 +5,8 @@
440 */
441
442 #include "platform_defs.h"
443-#include "command.h"
444-#include "input.h"
445+#include "include/command.h"
446+#include "include/input.h"
447
448 cmdinfo_t *cmdtab;
449 int ncmds;
450diff --git a/libxcmd/help.c b/libxcmd/help.c
451index b7e02073..36cb59ef 100644
452--- a/libxcmd/help.c
453+++ b/libxcmd/help.c
454@@ -5,8 +5,8 @@
455 */
456
457 #include "platform_defs.h"
458-#include "command.h"
459-#include "../quota/init.h"
460+#include "include/command.h"
461+#include "quota/init.h"
462
463 static cmdinfo_t help_cmd;
464 static void help_onecmd(const char *cmd, const cmdinfo_t *ct);
465diff --git a/libxcmd/input.c b/libxcmd/input.c
466index e3fa626a..94907182 100644
467--- a/libxcmd/input.c
468+++ b/libxcmd/input.c
469@@ -5,7 +5,7 @@
470 */
471
472 #include "platform_defs.h"
473-#include "input.h"
474+#include "include/input.h"
475 #include <ctype.h>
476 #include <stdbool.h>
477
478diff --git a/libxcmd/quit.c b/libxcmd/quit.c
479index 7c2d04f8..de618392 100644
480--- a/libxcmd/quit.c
481+++ b/libxcmd/quit.c
482@@ -5,8 +5,8 @@
483 */
484
485 #include "platform_defs.h"
486-#include "command.h"
487-#include "../quota/init.h"
488+#include "include/command.h"
489+#include "quota/init.h"
490
491 static cmdinfo_t quit_cmd;
492
493diff --git a/libxfs/cache.c b/libxfs/cache.c
494index 139c7c1b..f2e955b5 100644
495--- a/libxfs/cache.c
496+++ b/libxfs/cache.c
497@@ -15,7 +15,7 @@
498 #include "xfs_shared.h"
499 #include "xfs_format.h"
500 #include "xfs_trans_resv.h"
501-#include "xfs_mount.h"
502+#include "include/xfs_mount.h"
503 #include "xfs_bit.h"
504
505 #define CACHE_DEBUG 1
506diff --git a/libxfs/defer_item.c b/libxfs/defer_item.c
507index b18182e9..4f31d224 100644
508--- a/libxfs/defer_item.c
509+++ b/libxfs/defer_item.c
510@@ -11,15 +11,15 @@
511 #include "xfs_trans_resv.h"
512 #include "xfs_bit.h"
513 #include "xfs_sb.h"
514-#include "xfs_mount.h"
515+#include "include/xfs_mount.h"
516 #include "xfs_defer.h"
517-#include "xfs_trans.h"
518+#include "include/xfs_trans.h"
519 #include "xfs_bmap.h"
520 #include "xfs_alloc.h"
521 #include "xfs_rmap.h"
522 #include "xfs_refcount.h"
523 #include "xfs_bmap.h"
524-#include "xfs_inode.h"
525+#include "include/xfs_inode.h"
526
527 /* Dummy defer item ops, since we don't do logging. */
528
529diff --git a/libxfs/init.c b/libxfs/init.c
530index bd176b50..94024e9c 100644
531--- a/libxfs/init.c
532+++ b/libxfs/init.c
533@@ -13,17 +13,17 @@
534 #include "xfs_format.h"
535 #include "xfs_log_format.h"
536 #include "xfs_trans_resv.h"
537-#include "xfs_mount.h"
538+#include "include/xfs_mount.h"
539 #include "xfs_defer.h"
540 #include "xfs_inode_buf.h"
541 #include "xfs_inode_fork.h"
542-#include "xfs_inode.h"
543-#include "xfs_trans.h"
544+#include "include/xfs_inode.h"
545+#include "include/xfs_trans.h"
546 #include "xfs_rmap_btree.h"
547 #include "xfs_refcount_btree.h"
548 #include "libfrog/platform.h"
549
550-#include "libxfs.h" /* for now */
551+#include "include/libxfs.h" /* for now */
552
553 char *progname = "libxfs"; /* default, changed by each tool */
554
555diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
556index e92269f0..ec9b0da2 100644
557--- a/libxfs/libxfs_priv.h
558+++ b/libxfs/libxfs_priv.h
559@@ -39,18 +39,18 @@
560
561 #include "libxfs_api_defs.h"
562 #include "platform_defs.h"
563-#include "xfs.h"
564+#include "include/xfs.h"
565
566-#include "list.h"
567-#include "hlist.h"
568-#include "cache.h"
569-#include "bitops.h"
570-#include "kmem.h"
571+#include "include/list.h"
572+#include "include/hlist.h"
573+#include "include/cache.h"
574+#include "include/bitops.h"
575+#include "include/kmem.h"
576 #include "libfrog/radix-tree.h"
577-#include "atomic.h"
578+#include "include/atomic.h"
579
580 #include "xfs_types.h"
581-#include "xfs_arch.h"
582+#include "include/xfs_arch.h"
583
584 #include "xfs_fs.h"
585 #include "libfrog/crc32c.h"
586diff --git a/libxfs/logitem.c b/libxfs/logitem.c
587index 43a98f28..357bf4e5 100644
588--- a/libxfs/logitem.c
589+++ b/libxfs/logitem.c
590@@ -10,11 +10,11 @@
591 #include "xfs_format.h"
592 #include "xfs_log_format.h"
593 #include "xfs_trans_resv.h"
594-#include "xfs_mount.h"
595+#include "include/xfs_mount.h"
596 #include "xfs_inode_buf.h"
597 #include "xfs_inode_fork.h"
598-#include "xfs_inode.h"
599-#include "xfs_trans.h"
600+#include "include/xfs_inode.h"
601+#include "include/xfs_trans.h"
602
603 kmem_zone_t *xfs_buf_item_zone;
604 kmem_zone_t *xfs_ili_zone; /* inode log item zone */
605diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
606index 2e038401..28000567 100644
607--- a/libxfs/rdwr.c
608+++ b/libxfs/rdwr.c
609@@ -12,14 +12,14 @@
610 #include "xfs_format.h"
611 #include "xfs_log_format.h"
612 #include "xfs_trans_resv.h"
613-#include "xfs_mount.h"
614+#include "include/xfs_mount.h"
615 #include "xfs_inode_buf.h"
616 #include "xfs_inode_fork.h"
617-#include "xfs_inode.h"
618-#include "xfs_trans.h"
619+#include "include/xfs_inode.h"
620+#include "include/xfs_trans.h"
621 #include "libfrog/platform.h"
622
623-#include "libxfs.h"
624+#include "include/libxfs.h"
625
626 static void libxfs_brelse(struct cache_node *node);
627
628diff --git a/libxfs/trans.c b/libxfs/trans.c
629index bc4af26c..45bcc8ce 100644
630--- a/libxfs/trans.c
631+++ b/libxfs/trans.c
632@@ -11,14 +11,14 @@
633 #include "xfs_format.h"
634 #include "xfs_log_format.h"
635 #include "xfs_trans_resv.h"
636-#include "xfs_mount.h"
637+#include "include/xfs_mount.h"
638 #include "xfs_inode_buf.h"
639 #include "xfs_inode_fork.h"
640-#include "xfs_inode.h"
641-#include "xfs_trans.h"
642+#include "include/xfs_inode.h"
643+#include "include/xfs_trans.h"
644 #include "xfs_sb.h"
645 #include "xfs_defer.h"
646-#include "xfs_trace.h"
647+#include "include/xfs_trace.h"
648
649 static void xfs_trans_free_items(struct xfs_trans *tp);
650 STATIC struct xfs_trans *xfs_trans_dup(struct xfs_trans *tp);
651diff --git a/libxfs/util.c b/libxfs/util.c
652index 252cf91e..810809e8 100644
653--- a/libxfs/util.c
654+++ b/libxfs/util.c
655@@ -5,7 +5,7 @@
656 */
657
658 #include "libxfs_priv.h"
659-#include "libxfs.h"
660+#include "include/libxfs.h"
661 #include "libxfs_io.h"
662 #include "init.h"
663 #include "xfs_fs.h"
664@@ -13,12 +13,12 @@
665 #include "xfs_format.h"
666 #include "xfs_log_format.h"
667 #include "xfs_trans_resv.h"
668-#include "xfs_mount.h"
669+#include "include/xfs_mount.h"
670 #include "xfs_defer.h"
671 #include "xfs_inode_buf.h"
672 #include "xfs_inode_fork.h"
673-#include "xfs_inode.h"
674-#include "xfs_trans.h"
675+#include "include/xfs_inode.h"
676+#include "include/xfs_trans.h"
677 #include "xfs_bmap.h"
678 #include "xfs_bmap_btree.h"
679 #include "xfs_trans_space.h"
680diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
681index af8a0afd..30cc25ed 100644
682--- a/libxfs/xfs_ag.c
683+++ b/libxfs/xfs_ag.c
684@@ -12,7 +12,7 @@
685 #include "xfs_trans_resv.h"
686 #include "xfs_bit.h"
687 #include "xfs_sb.h"
688-#include "xfs_mount.h"
689+#include "include/xfs_mount.h"
690 #include "xfs_btree.h"
691 #include "xfs_alloc_btree.h"
692 #include "xfs_rmap_btree.h"
693diff --git a/libxfs/xfs_ag_resv.c b/libxfs/xfs_ag_resv.c
694index 530455a5..ab3a031c 100644
695--- a/libxfs/xfs_ag_resv.c
696+++ b/libxfs/xfs_ag_resv.c
697@@ -9,11 +9,11 @@
698 #include "xfs_format.h"
699 #include "xfs_log_format.h"
700 #include "xfs_trans_resv.h"
701-#include "xfs_mount.h"
702+#include "include/xfs_mount.h"
703 #include "xfs_alloc.h"
704 #include "xfs_errortag.h"
705-#include "xfs_trace.h"
706-#include "xfs_trans.h"
707+#include "include/xfs_trace.h"
708+#include "include/xfs_trans.h"
709 #include "xfs_rmap_btree.h"
710 #include "xfs_btree.h"
711 #include "xfs_refcount_btree.h"
712diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
713index 92f61fae..9e426889 100644
714--- a/libxfs/xfs_alloc.c
715+++ b/libxfs/xfs_alloc.c
716@@ -11,15 +11,15 @@
717 #include "xfs_trans_resv.h"
718 #include "xfs_bit.h"
719 #include "xfs_sb.h"
720-#include "xfs_mount.h"
721+#include "include/xfs_mount.h"
722 #include "xfs_defer.h"
723 #include "xfs_btree.h"
724 #include "xfs_rmap.h"
725 #include "xfs_alloc_btree.h"
726 #include "xfs_alloc.h"
727 #include "xfs_errortag.h"
728-#include "xfs_trace.h"
729-#include "xfs_trans.h"
730+#include "include/xfs_trace.h"
731+#include "include/xfs_trans.h"
732 #include "xfs_ag_resv.h"
733 #include "xfs_bmap.h"
734
735diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
736index 2198bbff..1a7a6f1e 100644
737--- a/libxfs/xfs_alloc_btree.c
738+++ b/libxfs/xfs_alloc_btree.c
739@@ -10,13 +10,13 @@
740 #include "xfs_log_format.h"
741 #include "xfs_trans_resv.h"
742 #include "xfs_sb.h"
743-#include "xfs_mount.h"
744+#include "include/xfs_mount.h"
745 #include "xfs_btree.h"
746 #include "xfs_btree_staging.h"
747 #include "xfs_alloc_btree.h"
748 #include "xfs_alloc.h"
749-#include "xfs_trace.h"
750-#include "xfs_trans.h"
751+#include "include/xfs_trace.h"
752+#include "include/xfs_trans.h"
753
754
755 STATIC struct xfs_btree_cur *
756diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
757index 0c75f46f..218d1efd 100644
758--- a/libxfs/xfs_attr.c
759+++ b/libxfs/xfs_attr.c
760@@ -9,13 +9,13 @@
761 #include "xfs_format.h"
762 #include "xfs_log_format.h"
763 #include "xfs_trans_resv.h"
764-#include "xfs_mount.h"
765+#include "include/xfs_mount.h"
766 #include "xfs_defer.h"
767 #include "xfs_da_format.h"
768 #include "xfs_da_btree.h"
769 #include "xfs_attr_sf.h"
770-#include "xfs_inode.h"
771-#include "xfs_trans.h"
772+#include "include/xfs_inode.h"
773+#include "include/xfs_trans.h"
774 #include "xfs_bmap.h"
775 #include "xfs_bmap_btree.h"
776 #include "xfs_attr.h"
777@@ -23,7 +23,7 @@
778 #include "xfs_attr_remote.h"
779 #include "xfs_quota_defs.h"
780 #include "xfs_trans_space.h"
781-#include "xfs_trace.h"
782+#include "include/xfs_trace.h"
783
784 /*
785 * xfs_attr.c
786diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
787index a59660f2..089df469 100644
788--- a/libxfs/xfs_attr_leaf.c
789+++ b/libxfs/xfs_attr_leaf.c
790@@ -11,18 +11,18 @@
791 #include "xfs_log_format.h"
792 #include "xfs_trans_resv.h"
793 #include "xfs_sb.h"
794-#include "xfs_mount.h"
795+#include "include/xfs_mount.h"
796 #include "xfs_da_format.h"
797 #include "xfs_da_btree.h"
798-#include "xfs_inode.h"
799-#include "xfs_trans.h"
800+#include "include/xfs_inode.h"
801+#include "include/xfs_trans.h"
802 #include "xfs_bmap_btree.h"
803 #include "xfs_bmap.h"
804 #include "xfs_attr_sf.h"
805 #include "xfs_attr_remote.h"
806 #include "xfs_attr.h"
807 #include "xfs_attr_leaf.h"
808-#include "xfs_trace.h"
809+#include "include/xfs_trace.h"
810 #include "xfs_dir2.h"
811
812
813diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
814index 3807cd3d..f9f56d1d 100644
815--- a/libxfs/xfs_attr_remote.c
816+++ b/libxfs/xfs_attr_remote.c
817@@ -11,16 +11,16 @@
818 #include "xfs_log_format.h"
819 #include "xfs_trans_resv.h"
820 #include "xfs_bit.h"
821-#include "xfs_mount.h"
822+#include "include/xfs_mount.h"
823 #include "xfs_defer.h"
824 #include "xfs_da_format.h"
825 #include "xfs_da_btree.h"
826-#include "xfs_inode.h"
827-#include "xfs_trans.h"
828+#include "include/xfs_inode.h"
829+#include "include/xfs_trans.h"
830 #include "xfs_bmap.h"
831 #include "xfs_attr.h"
832 #include "xfs_attr_remote.h"
833-#include "xfs_trace.h"
834+#include "include/xfs_trace.h"
835
836 #define ATTR_RMTVALUE_MAPSIZE 1 /* # of map entries at once */
837
838diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
839index e0ca8b05..03999b7e 100644
840--- a/libxfs/xfs_bmap.c
841+++ b/libxfs/xfs_bmap.c
842@@ -11,18 +11,18 @@
843 #include "xfs_trans_resv.h"
844 #include "xfs_bit.h"
845 #include "xfs_sb.h"
846-#include "xfs_mount.h"
847+#include "include/xfs_mount.h"
848 #include "xfs_defer.h"
849 #include "xfs_dir2.h"
850-#include "xfs_inode.h"
851+#include "include/xfs_inode.h"
852 #include "xfs_btree.h"
853-#include "xfs_trans.h"
854+#include "include/xfs_trans.h"
855 #include "xfs_alloc.h"
856 #include "xfs_bmap.h"
857 #include "xfs_bmap_btree.h"
858 #include "xfs_errortag.h"
859 #include "xfs_trans_space.h"
860-#include "xfs_trace.h"
861+#include "include/xfs_trace.h"
862 #include "xfs_attr_leaf.h"
863 #include "xfs_quota_defs.h"
864 #include "xfs_rmap.h"
865diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
866index 1ec9f5ff..c28bba13 100644
867--- a/libxfs/xfs_bmap_btree.c
868+++ b/libxfs/xfs_bmap_btree.c
869@@ -10,14 +10,14 @@
870 #include "xfs_log_format.h"
871 #include "xfs_trans_resv.h"
872 #include "xfs_bit.h"
873-#include "xfs_mount.h"
874-#include "xfs_inode.h"
875-#include "xfs_trans.h"
876+#include "include/xfs_mount.h"
877+#include "include/xfs_inode.h"
878+#include "include/xfs_trans.h"
879 #include "xfs_alloc.h"
880 #include "xfs_btree.h"
881 #include "xfs_bmap_btree.h"
882 #include "xfs_bmap.h"
883-#include "xfs_trace.h"
884+#include "include/xfs_trace.h"
885 #include "xfs_rmap.h"
886
887 /*
888diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
889index a408aa42..cab61bbb 100644
890--- a/libxfs/xfs_btree.c
891+++ b/libxfs/xfs_btree.c
892@@ -10,12 +10,12 @@
893 #include "xfs_log_format.h"
894 #include "xfs_trans_resv.h"
895 #include "xfs_bit.h"
896-#include "xfs_mount.h"
897-#include "xfs_inode.h"
898-#include "xfs_trans.h"
899+#include "include/xfs_mount.h"
900+#include "include/xfs_inode.h"
901+#include "include/xfs_trans.h"
902 #include "xfs_btree.h"
903 #include "xfs_errortag.h"
904-#include "xfs_trace.h"
905+#include "include/xfs_trace.h"
906 #include "xfs_alloc.h"
907 #include "xfs_btree_staging.h"
908
909diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c
910index fe17538d..d0f5c651 100644
911--- a/libxfs/xfs_btree_staging.c
912+++ b/libxfs/xfs_btree_staging.c
913@@ -10,11 +10,11 @@
914 #include "xfs_log_format.h"
915 #include "xfs_trans_resv.h"
916 #include "xfs_bit.h"
917-#include "xfs_mount.h"
918-#include "xfs_inode.h"
919-#include "xfs_trans.h"
920+#include "include/xfs_mount.h"
921+#include "include/xfs_inode.h"
922+#include "include/xfs_trans.h"
923 #include "xfs_btree.h"
924-#include "xfs_trace.h"
925+#include "include/xfs_trace.h"
926 #include "xfs_btree_staging.h"
927
928 /*
929diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
930index 7448ee6c..db8fa1bf 100644
931--- a/libxfs/xfs_da_btree.c
932+++ b/libxfs/xfs_da_btree.c
933@@ -11,14 +11,14 @@
934 #include "xfs_log_format.h"
935 #include "xfs_trans_resv.h"
936 #include "xfs_bit.h"
937-#include "xfs_mount.h"
938-#include "xfs_inode.h"
939+#include "include/xfs_mount.h"
940+#include "include/xfs_inode.h"
941 #include "xfs_dir2.h"
942 #include "xfs_dir2_priv.h"
943-#include "xfs_trans.h"
944+#include "include/xfs_trans.h"
945 #include "xfs_bmap.h"
946 #include "xfs_attr_leaf.h"
947-#include "xfs_trace.h"
948+#include "include/xfs_trace.h"
949
950 /*
951 * xfs_da_btree.c
952diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
953index 1fdf6c72..68c24aab 100644
954--- a/libxfs/xfs_defer.c
955+++ b/libxfs/xfs_defer.c
956@@ -9,11 +9,11 @@
957 #include "xfs_format.h"
958 #include "xfs_log_format.h"
959 #include "xfs_trans_resv.h"
960-#include "xfs_mount.h"
961+#include "include/xfs_mount.h"
962 #include "xfs_defer.h"
963-#include "xfs_trans.h"
964-#include "xfs_inode.h"
965-#include "xfs_trace.h"
966+#include "include/xfs_trans.h"
967+#include "include/xfs_inode.h"
968+#include "include/xfs_trace.h"
969
970 /*
971 * Deferred Operations in XFS
972diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
973index 79196788..0e773062 100644
974--- a/libxfs/xfs_dir2.c
975+++ b/libxfs/xfs_dir2.c
976@@ -9,14 +9,14 @@
977 #include "xfs_format.h"
978 #include "xfs_log_format.h"
979 #include "xfs_trans_resv.h"
980-#include "xfs_mount.h"
981-#include "xfs_inode.h"
982-#include "xfs_trans.h"
983+#include "include/xfs_mount.h"
984+#include "include/xfs_inode.h"
985+#include "include/xfs_trans.h"
986 #include "xfs_bmap.h"
987 #include "xfs_dir2.h"
988 #include "xfs_dir2_priv.h"
989 #include "xfs_errortag.h"
990-#include "xfs_trace.h"
991+#include "include/xfs_trace.h"
992
993 struct xfs_name xfs_name_dotdot = { (unsigned char *)"..", 2, XFS_DIR3_FT_DIR };
994
995diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c
996index eaa2b47a..f8670fe7 100644
997--- a/libxfs/xfs_dir2_block.c
998+++ b/libxfs/xfs_dir2_block.c
999@@ -10,13 +10,13 @@
1000 #include "xfs_format.h"
1001 #include "xfs_log_format.h"
1002 #include "xfs_trans_resv.h"
1003-#include "xfs_mount.h"
1004-#include "xfs_inode.h"
1005-#include "xfs_trans.h"
1006+#include "include/xfs_mount.h"
1007+#include "include/xfs_inode.h"
1008+#include "include/xfs_trans.h"
1009 #include "xfs_bmap.h"
1010 #include "xfs_dir2.h"
1011 #include "xfs_dir2_priv.h"
1012-#include "xfs_trace.h"
1013+#include "include/xfs_trace.h"
1014
1015 /*
1016 * Local function prototypes.
1017diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c
1018index ddd5e885..4f3d62e5 100644
1019--- a/libxfs/xfs_dir2_data.c
1020+++ b/libxfs/xfs_dir2_data.c
1021@@ -10,11 +10,11 @@
1022 #include "xfs_format.h"
1023 #include "xfs_log_format.h"
1024 #include "xfs_trans_resv.h"
1025-#include "xfs_mount.h"
1026-#include "xfs_inode.h"
1027+#include "include/xfs_mount.h"
1028+#include "include/xfs_inode.h"
1029 #include "xfs_dir2.h"
1030 #include "xfs_dir2_priv.h"
1031-#include "xfs_trans.h"
1032+#include "include/xfs_trans.h"
1033
1034 static xfs_failaddr_t xfs_dir2_data_freefind_verify(
1035 struct xfs_dir2_data_hdr *hdr, struct xfs_dir2_data_free *bf,
1036diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c
1037index 0cecd698..c65545f8 100644
1038--- a/libxfs/xfs_dir2_leaf.c
1039+++ b/libxfs/xfs_dir2_leaf.c
1040@@ -10,13 +10,13 @@
1041 #include "xfs_format.h"
1042 #include "xfs_log_format.h"
1043 #include "xfs_trans_resv.h"
1044-#include "xfs_mount.h"
1045-#include "xfs_inode.h"
1046+#include "include/xfs_mount.h"
1047+#include "include/xfs_inode.h"
1048 #include "xfs_bmap.h"
1049 #include "xfs_dir2.h"
1050 #include "xfs_dir2_priv.h"
1051-#include "xfs_trace.h"
1052-#include "xfs_trans.h"
1053+#include "include/xfs_trace.h"
1054+#include "include/xfs_trans.h"
1055
1056 /*
1057 * Local function declarations.
1058diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
1059index ab156a8e..1a098688 100644
1060--- a/libxfs/xfs_dir2_node.c
1061+++ b/libxfs/xfs_dir2_node.c
1062@@ -10,13 +10,13 @@
1063 #include "xfs_format.h"
1064 #include "xfs_log_format.h"
1065 #include "xfs_trans_resv.h"
1066-#include "xfs_mount.h"
1067-#include "xfs_inode.h"
1068+#include "include/xfs_mount.h"
1069+#include "include/xfs_inode.h"
1070 #include "xfs_bmap.h"
1071 #include "xfs_dir2.h"
1072 #include "xfs_dir2_priv.h"
1073-#include "xfs_trace.h"
1074-#include "xfs_trans.h"
1075+#include "include/xfs_trace.h"
1076+#include "include/xfs_trans.h"
1077
1078 /*
1079 * Function declarations.
1080diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c
1081index fbbb6387..8624bc3f 100644
1082--- a/libxfs/xfs_dir2_sf.c
1083+++ b/libxfs/xfs_dir2_sf.c
1084@@ -9,12 +9,12 @@
1085 #include "xfs_format.h"
1086 #include "xfs_log_format.h"
1087 #include "xfs_trans_resv.h"
1088-#include "xfs_mount.h"
1089-#include "xfs_inode.h"
1090-#include "xfs_trans.h"
1091+#include "include/xfs_mount.h"
1092+#include "include/xfs_inode.h"
1093+#include "include/xfs_trans.h"
1094 #include "xfs_dir2.h"
1095 #include "xfs_dir2_priv.h"
1096-#include "xfs_trace.h"
1097+#include "include/xfs_trace.h"
1098
1099 /*
1100 * Prototypes for internal functions.
1101diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c
1102index 0a5a237d..4af23c41 100644
1103--- a/libxfs/xfs_dquot_buf.c
1104+++ b/libxfs/xfs_dquot_buf.c
1105@@ -10,10 +10,10 @@
1106 #include "xfs_format.h"
1107 #include "xfs_log_format.h"
1108 #include "xfs_trans_resv.h"
1109-#include "xfs_mount.h"
1110+#include "include/xfs_mount.h"
1111 #include "xfs_quota_defs.h"
1112-#include "xfs_inode.h"
1113-#include "xfs_trans.h"
1114+#include "include/xfs_inode.h"
1115+#include "include/xfs_trans.h"
1116
1117 int
1118 xfs_calc_dquots_per_chunk(
1119diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
1120index d78f960c..b4407b00 100644
1121--- a/libxfs/xfs_ialloc.c
1122+++ b/libxfs/xfs_ialloc.c
1123@@ -11,16 +11,16 @@
1124 #include "xfs_trans_resv.h"
1125 #include "xfs_bit.h"
1126 #include "xfs_sb.h"
1127-#include "xfs_mount.h"
1128-#include "xfs_inode.h"
1129+#include "include/xfs_mount.h"
1130+#include "include/xfs_inode.h"
1131 #include "xfs_btree.h"
1132 #include "xfs_ialloc.h"
1133 #include "xfs_ialloc_btree.h"
1134 #include "xfs_alloc.h"
1135 #include "xfs_errortag.h"
1136 #include "xfs_bmap.h"
1137-#include "xfs_trans.h"
1138-#include "xfs_trace.h"
1139+#include "include/xfs_trans.h"
1140+#include "include/xfs_trace.h"
1141 #include "xfs_rmap.h"
1142
1143 /*
1144diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
1145index 95341715..af0b1057 100644
1146--- a/libxfs/xfs_ialloc_btree.c
1147+++ b/libxfs/xfs_ialloc_btree.c
1148@@ -10,14 +10,14 @@
1149 #include "xfs_log_format.h"
1150 #include "xfs_trans_resv.h"
1151 #include "xfs_bit.h"
1152-#include "xfs_mount.h"
1153+#include "include/xfs_mount.h"
1154 #include "xfs_btree.h"
1155 #include "xfs_btree_staging.h"
1156 #include "xfs_ialloc.h"
1157 #include "xfs_ialloc_btree.h"
1158 #include "xfs_alloc.h"
1159-#include "xfs_trace.h"
1160-#include "xfs_trans.h"
1161+#include "include/xfs_trace.h"
1162+#include "include/xfs_trans.h"
1163 #include "xfs_rmap.h"
1164
1165 STATIC int
1166diff --git a/libxfs/xfs_iext_tree.c b/libxfs/xfs_iext_tree.c
1167index a52eed04..aafe5541 100644
1168--- a/libxfs/xfs_iext_tree.c
1169+++ b/libxfs/xfs_iext_tree.c
1170@@ -8,10 +8,10 @@
1171 #include "xfs_format.h"
1172 #include "xfs_bit.h"
1173 #include "xfs_log_format.h"
1174-#include "xfs_inode.h"
1175+#include "include/xfs_inode.h"
1176 #include "xfs_trans_resv.h"
1177-#include "xfs_mount.h"
1178-#include "xfs_trace.h"
1179+#include "include/xfs_mount.h"
1180+#include "include/xfs_trace.h"
1181
1182 /*
1183 * In-core extent record layout:
1184diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
1185index 6722d5af..4e5ef001 100644
1186--- a/libxfs/xfs_inode_buf.c
1187+++ b/libxfs/xfs_inode_buf.c
1188@@ -9,10 +9,10 @@
1189 #include "xfs_format.h"
1190 #include "xfs_log_format.h"
1191 #include "xfs_trans_resv.h"
1192-#include "xfs_mount.h"
1193-#include "xfs_inode.h"
1194+#include "include/xfs_mount.h"
1195+#include "include/xfs_inode.h"
1196 #include "xfs_errortag.h"
1197-#include "xfs_trans.h"
1198+#include "include/xfs_trans.h"
1199 #include "xfs_ialloc.h"
1200 #include "xfs_dir2.h"
1201
1202diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
1203index 0b1af501..3e0c4f2d 100644
1204--- a/libxfs/xfs_inode_fork.c
1205+++ b/libxfs/xfs_inode_fork.c
1206@@ -10,13 +10,13 @@
1207 #include "xfs_format.h"
1208 #include "xfs_log_format.h"
1209 #include "xfs_trans_resv.h"
1210-#include "xfs_mount.h"
1211-#include "xfs_inode.h"
1212-#include "xfs_trans.h"
1213+#include "include/xfs_mount.h"
1214+#include "include/xfs_inode.h"
1215+#include "include/xfs_trans.h"
1216 #include "xfs_btree.h"
1217 #include "xfs_bmap_btree.h"
1218 #include "xfs_bmap.h"
1219-#include "xfs_trace.h"
1220+#include "include/xfs_trace.h"
1221 #include "xfs_da_format.h"
1222 #include "xfs_da_btree.h"
1223 #include "xfs_dir2_priv.h"
1224diff --git a/libxfs/xfs_log_rlimit.c b/libxfs/xfs_log_rlimit.c
1225index c8398b7d..0632887d 100644
1226--- a/libxfs/xfs_log_rlimit.c
1227+++ b/libxfs/xfs_log_rlimit.c
1228@@ -9,7 +9,7 @@
1229 #include "xfs_format.h"
1230 #include "xfs_log_format.h"
1231 #include "xfs_trans_resv.h"
1232-#include "xfs_mount.h"
1233+#include "include/xfs_mount.h"
1234 #include "xfs_da_format.h"
1235 #include "xfs_trans_space.h"
1236 #include "xfs_da_btree.h"
1237diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
1238index 723c903e..1fec6a77 100644
1239--- a/libxfs/xfs_refcount.c
1240+++ b/libxfs/xfs_refcount.c
1241@@ -9,15 +9,15 @@
1242 #include "xfs_format.h"
1243 #include "xfs_log_format.h"
1244 #include "xfs_trans_resv.h"
1245-#include "xfs_mount.h"
1246+#include "include/xfs_mount.h"
1247 #include "xfs_defer.h"
1248 #include "xfs_btree.h"
1249 #include "xfs_bmap.h"
1250 #include "xfs_refcount_btree.h"
1251 #include "xfs_alloc.h"
1252 #include "xfs_errortag.h"
1253-#include "xfs_trace.h"
1254-#include "xfs_trans.h"
1255+#include "include/xfs_trace.h"
1256+#include "include/xfs_trans.h"
1257 #include "xfs_bit.h"
1258 #include "xfs_refcount.h"
1259 #include "xfs_rmap.h"
1260diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
1261index eb48197b..c378b024 100644
1262--- a/libxfs/xfs_refcount_btree.c
1263+++ b/libxfs/xfs_refcount_btree.c
1264@@ -10,13 +10,13 @@
1265 #include "xfs_log_format.h"
1266 #include "xfs_trans_resv.h"
1267 #include "xfs_sb.h"
1268-#include "xfs_mount.h"
1269+#include "include/xfs_mount.h"
1270 #include "xfs_btree.h"
1271 #include "xfs_btree_staging.h"
1272 #include "xfs_refcount_btree.h"
1273 #include "xfs_alloc.h"
1274-#include "xfs_trace.h"
1275-#include "xfs_trans.h"
1276+#include "include/xfs_trace.h"
1277+#include "include/xfs_trans.h"
1278 #include "xfs_bit.h"
1279 #include "xfs_rmap.h"
1280
1281diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
1282index 6205b8ed..d0eb95b8 100644
1283--- a/libxfs/xfs_rmap.c
1284+++ b/libxfs/xfs_rmap.c
1285@@ -10,16 +10,16 @@
1286 #include "xfs_log_format.h"
1287 #include "xfs_trans_resv.h"
1288 #include "xfs_bit.h"
1289-#include "xfs_mount.h"
1290+#include "include/xfs_mount.h"
1291 #include "xfs_defer.h"
1292 #include "xfs_btree.h"
1293-#include "xfs_trans.h"
1294+#include "include/xfs_trans.h"
1295 #include "xfs_alloc.h"
1296 #include "xfs_rmap.h"
1297 #include "xfs_rmap_btree.h"
1298-#include "xfs_trace.h"
1299+#include "include/xfs_trace.h"
1300 #include "xfs_errortag.h"
1301-#include "xfs_inode.h"
1302+#include "include/xfs_inode.h"
1303
1304 /*
1305 * Lookup the first record less than or equal to [bno, len, owner, offset]
1306diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
1307index 8ddc1790..18b2a8a9 100644
1308--- a/libxfs/xfs_rmap_btree.c
1309+++ b/libxfs/xfs_rmap_btree.c
1310@@ -10,14 +10,14 @@
1311 #include "xfs_log_format.h"
1312 #include "xfs_trans_resv.h"
1313 #include "xfs_sb.h"
1314-#include "xfs_mount.h"
1315-#include "xfs_trans.h"
1316+#include "include/xfs_mount.h"
1317+#include "include/xfs_trans.h"
1318 #include "xfs_alloc.h"
1319 #include "xfs_btree.h"
1320 #include "xfs_btree_staging.h"
1321 #include "xfs_rmap.h"
1322 #include "xfs_rmap_btree.h"
1323-#include "xfs_trace.h"
1324+#include "include/xfs_trace.h"
1325 #include "xfs_ag_resv.h"
1326
1327 /*
1328diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
1329index dcb94f20..dcbc5a95 100644
1330--- a/libxfs/xfs_rtbitmap.c
1331+++ b/libxfs/xfs_rtbitmap.c
1332@@ -10,10 +10,10 @@
1333 #include "xfs_log_format.h"
1334 #include "xfs_trans_resv.h"
1335 #include "xfs_bit.h"
1336-#include "xfs_mount.h"
1337-#include "xfs_inode.h"
1338+#include "include/xfs_mount.h"
1339+#include "include/xfs_inode.h"
1340 #include "xfs_bmap.h"
1341-#include "xfs_trans.h"
1342+#include "include/xfs_trans.h"
1343
1344 /*
1345 * Realtime allocator bitmap functions shared with userspace.
1346diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
1347index fb2212b8..bd07b00f 100644
1348--- a/libxfs/xfs_sb.c
1349+++ b/libxfs/xfs_sb.c
1350@@ -11,11 +11,11 @@
1351 #include "xfs_trans_resv.h"
1352 #include "xfs_bit.h"
1353 #include "xfs_sb.h"
1354-#include "xfs_mount.h"
1355+#include "include/xfs_mount.h"
1356 #include "xfs_ialloc.h"
1357 #include "xfs_alloc.h"
1358-#include "xfs_trace.h"
1359-#include "xfs_trans.h"
1360+#include "include/xfs_trace.h"
1361+#include "include/xfs_trans.h"
1362 #include "xfs_bmap_btree.h"
1363 #include "xfs_alloc_btree.h"
1364 #include "xfs_rmap_btree.h"
1365diff --git a/libxfs/xfs_symlink_remote.c b/libxfs/xfs_symlink_remote.c
1366index 8eb3d59f..bc184484 100644
1367--- a/libxfs/xfs_symlink_remote.c
1368+++ b/libxfs/xfs_symlink_remote.c
1369@@ -10,9 +10,9 @@
1370 #include "xfs_log_format.h"
1371 #include "xfs_shared.h"
1372 #include "xfs_trans_resv.h"
1373-#include "xfs_mount.h"
1374-#include "xfs_inode.h"
1375-#include "xfs_trans.h"
1376+#include "include/xfs_mount.h"
1377+#include "include/xfs_inode.h"
1378+#include "include/xfs_trans.h"
1379
1380
1381 /*
1382diff --git a/libxfs/xfs_trans_inode.c b/libxfs/xfs_trans_inode.c
1383index 66dadd87..02ae86ff 100644
1384--- a/libxfs/xfs_trans_inode.c
1385+++ b/libxfs/xfs_trans_inode.c
1386@@ -9,9 +9,9 @@
1387 #include "xfs_format.h"
1388 #include "xfs_log_format.h"
1389 #include "xfs_trans_resv.h"
1390-#include "xfs_mount.h"
1391-#include "xfs_inode.h"
1392-#include "xfs_trans.h"
1393+#include "include/xfs_mount.h"
1394+#include "include/xfs_inode.h"
1395+#include "include/xfs_trans.h"
1396
1397
1398 /*
1399diff --git a/libxfs/xfs_trans_resv.c b/libxfs/xfs_trans_resv.c
1400index 9ce7d8f9..07845084 100644
1401--- a/libxfs/xfs_trans_resv.c
1402+++ b/libxfs/xfs_trans_resv.c
1403@@ -10,12 +10,12 @@
1404 #include "xfs_format.h"
1405 #include "xfs_log_format.h"
1406 #include "xfs_trans_resv.h"
1407-#include "xfs_mount.h"
1408+#include "include/xfs_mount.h"
1409 #include "xfs_da_format.h"
1410 #include "xfs_da_btree.h"
1411-#include "xfs_inode.h"
1412+#include "include/xfs_inode.h"
1413 #include "xfs_bmap_btree.h"
1414-#include "xfs_trans.h"
1415+#include "include/xfs_trans.h"
1416 #include "xfs_trans_space.h"
1417 #include "xfs_quota_defs.h"
1418
1419diff --git a/libxfs/xfs_types.c b/libxfs/xfs_types.c
1420index fa113727..b95e6e2a 100644
1421--- a/libxfs/xfs_types.c
1422+++ b/libxfs/xfs_types.c
1423@@ -10,7 +10,7 @@
1424 #include "xfs_shared.h"
1425 #include "xfs_trans_resv.h"
1426 #include "xfs_bit.h"
1427-#include "xfs_mount.h"
1428+#include "include/xfs_mount.h"
1429
1430 /* Find the size of the AG, in blocks. */
1431 xfs_agblock_t
1432diff --git a/mkfs/proto.c b/mkfs/proto.c
1433index 0fa6ffb0..a45c4a5c 100644
1434--- a/mkfs/proto.c
1435+++ b/mkfs/proto.c
1436@@ -4,7 +4,7 @@
1437 * All Rights Reserved.
1438 */
1439
1440-#include "libxfs.h"
1441+#include "include/libxfs.h"
1442 #include <sys/stat.h>
1443 #include "libfrog/convert.h"
1444
1445diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
1446index 47acc127..3bfa5607 100644
1447--- a/mkfs/xfs_mkfs.c
1448+++ b/mkfs/xfs_mkfs.c
1449@@ -4,14 +4,14 @@
1450 * All Rights Reserved.
1451 */
1452 #include "libfrog/util.h"
1453-#include "libxfs.h"
1454+#include "include/libxfs.h"
1455 #include <ctype.h>
1456-#include "xfs_multidisk.h"
1457-#include "libxcmd.h"
1458+#include "include/xfs_multidisk.h"
1459+#include "include/libxcmd.h"
1460 #include "libfrog/fsgeom.h"
1461 #include "libfrog/topology.h"
1462 #include "libfrog/convert.h"
1463-#include <ini.h>
1464+#include "ini.h"
1465
1466 #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog)))
1467 #define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog)))
1468--
14692.25.1
1470