From 4ebac79f015c67aee373c0673496e72c01d18dbd Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 7 Jan 2015 19:44:26 +0000
Subject: [PATCH] build-sys: fix make checkincludes warnings

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 configure.ac        |  1 +
 lib/blkdev.c        | 12 ++++--------
 term-utils/agetty.c |  7 ++++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 871a5b7d37..a5bfc61fab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,7 @@ AC_CHECK_HEADERS([ \
 	sys/ioccom.h \
 	sys/ioctl.h \
 	sys/mkdev.h \
+	sys/param.h \
 	sys/prctl.h \
 	sys/queue.h \
 	sys/resource.h \
diff --git a/lib/blkdev.c b/lib/blkdev.c
index a293529631..c4ebfaba00 100644
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -19,14 +19,10 @@
 #endif
 
 #ifdef HAVE_SYS_DISK_H
-#ifdef HAVE_SYS_QUEUE_H
-#include <sys/queue.h> /* for LIST_HEAD */
-#endif
-#include <sys/disk.h>
-#endif
-
-#ifdef __FreeBSD_kernel__
-#include <sys/disk.h>
+# ifdef HAVE_SYS_QUEUE_H
+#  include <sys/queue.h>	/* for LIST_HEAD */
+# endif
+# include <sys/disk.h>
 #endif
 
 #include "blkdev.h"
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 2ac0644dfe..1aafe72a16 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -45,15 +45,16 @@
 #include "widechar.h"
 #include "ttyutils.h"
 
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
 #if defined(__FreeBSD_kernel__)
 #include <pty.h>
-#include <sys/param.h>
 #endif
 
-
 #ifdef __linux__
 #  include <sys/kd.h>
-#  include <sys/param.h>
 #  define USE_SYSLOG
 #  ifndef DEFAULT_VCTERM
 #    define DEFAULT_VCTERM "linux"
-- 
2.47.3