From e8c2d2858078bd515db63ea44bc04c932adf4168 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 13 Jun 2011 01:04:00 +0000
Subject: [PATCH] Apparently makefs needs a few more system headers to compile
 during buildworld.

---
 usr.sbin/makefs/ffs/ffs_bswap.c | 2 ++
 usr.sbin/makefs/ffs/ffs_subr.c  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c
index 04683a6c87c5..7049991168b8 100644
--- a/usr.sbin/makefs/ffs/ffs_bswap.c
+++ b/usr.sbin/makefs/ffs/ffs_bswap.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/queue.h>
+#include <sys/lock.h>
+#include <sys/lockmgr.h>
 #if defined(_KERNEL)
 #include <sys/systm.h>
 #endif
diff --git a/usr.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c
index 5f9b6f2b7dc9..19d3543c292c 100644
--- a/usr.sbin/makefs/ffs/ffs_subr.c
+++ b/usr.sbin/makefs/ffs/ffs_subr.c
@@ -35,6 +35,9 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/lock.h>
+#include <sys/lockmgr.h>
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>