From 18c9df1da418e9aeb575e280522b4a8eb960ad66 Mon Sep 17 00:00:00 2001
From: krw <krw@openbsd.org>
Date: Sat, 7 Aug 2021 13:33:12 +0000
Subject: [PATCH] Nuke unneeded #include's, one param.h -> types.h.

---
 sbin/fdisk/disk.c  | 3 +--
 sbin/fdisk/fdisk.c | 5 ++---
 sbin/fdisk/gpt.c   | 3 +--
 sbin/fdisk/mbr.c   | 3 +--
 sbin/fdisk/misc.c  | 4 +---
 sbin/fdisk/user.c  | 4 +---
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c
index bcc5178d4c2..2337a644b15 100644
--- a/sbin/fdisk/disk.c
+++ b/sbin/fdisk/disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.c,v 1.70 2021/07/26 13:05:14 krw Exp $	*/
+/*	$OpenBSD: disk.c,v 1.71 2021/08/07 13:33:12 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -23,7 +23,6 @@
 #include <sys/disklabel.h>
 
 #include <err.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 3e33e2bcca2..aa1c4f4ad01 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdisk.c,v 1.131 2021/08/07 12:57:48 krw Exp $	*/
+/*	$OpenBSD: fdisk.c,v 1.132 2021/08/07 13:33:12 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>	/* DEV_BSIZE */
+#include <sys/types.h>
 #include <sys/disklabel.h>
 
 #include <ctype.h>
@@ -33,7 +33,6 @@
 #include "disk.h"
 #include "mbr.h"
 #include "misc.h"
-#include "cmd.h"
 #include "user.h"
 #include "gpt.h"
 
diff --git a/sbin/fdisk/gpt.c b/sbin/fdisk/gpt.c
index b4f3722e52d..5ed209a750e 100644
--- a/sbin/fdisk/gpt.c
+++ b/sbin/fdisk/gpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpt.c,v 1.49 2021/08/06 10:41:31 krw Exp $	*/
+/*	$OpenBSD: gpt.c,v 1.50 2021/08/07 13:33:12 krw Exp $	*/
 /*
  * Copyright (c) 2015 Markus Muller <mmu@grummel.net>
  * Copyright (c) 2015 Kenneth R Westerback <krw@openbsd.org>
@@ -26,7 +26,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <uuid.h>
 
 #include "part.h"
diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index 0e1cb8987e5..298c19c4f02 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.c,v 1.97 2021/08/07 12:51:30 krw Exp $	*/
+/*	$OpenBSD: mbr.c,v 1.98 2021/08/07 13:33:12 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -22,7 +22,6 @@
 #include <sys/dkio.h>
 
 #include <err.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sbin/fdisk/misc.c b/sbin/fdisk/misc.c
index ed9eb773e07..e387856c736 100644
--- a/sbin/fdisk/misc.c
+++ b/sbin/fdisk/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.78 2021/07/17 14:16:34 krw Exp $	*/
+/*	$OpenBSD: misc.c,v 1.79 2021/08/07 13:33:12 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -22,11 +22,9 @@
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <uuid.h>
 
 #include "part.h"
 #include "disk.h"
diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c
index 09753167c48..eddd652b4d7 100644
--- a/sbin/fdisk/user.c
+++ b/sbin/fdisk/user.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: user.c,v 1.68 2021/08/06 10:41:31 krw Exp $	*/
+/*	$OpenBSD: user.c,v 1.69 2021/08/07 13:33:12 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -20,10 +20,8 @@
 #include <sys/disklabel.h>
 
 #include <err.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "part.h"
 #include "mbr.h"
-- 
2.20.1