From f1fda8b43eb03be951846c6df9d0be81be84808e Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Thu, 19 Mar 2026 06:59:11 +0000
Subject: util/nvmutil: tidy up includes

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 util/nvmutil/include/common.h |  4 ++++
 util/nvmutil/lib/checksum.c   |  9 ---------
 util/nvmutil/lib/command.c    |  8 +-------
 util/nvmutil/lib/file.c       |  8 --------
 util/nvmutil/lib/io.c         |  5 -----
 util/nvmutil/lib/num.c        | 12 +++++-------
 util/nvmutil/lib/state.c      |  2 --
 util/nvmutil/lib/string.c     | 11 -----------
 util/nvmutil/lib/usage.c      | 20 +-------------------
 util/nvmutil/lib/word.c       | 12 ------------
 util/nvmutil/nvmutil.c        |  8 --------
 11 files changed, 11 insertions(+), 88 deletions(-)

diff --git a/util/nvmutil/include/common.h b/util/nvmutil/include/common.h
index f9a4ba1c..881d602f 100644
--- a/util/nvmutil/include/common.h
+++ b/util/nvmutil/include/common.h
@@ -7,6 +7,10 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <limits.h>
+
 /* keep SYS_RENAME 1 to
  * use libc rename()
  * recommended
diff --git a/util/nvmutil/lib/checksum.c b/util/nvmutil/lib/checksum.c
index d006a106..465b76bf 100644
--- a/util/nvmutil/lib/checksum.c
+++ b/util/nvmutil/lib/checksum.c
@@ -7,22 +7,13 @@
  * Related file: word.c
  */
 
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <fcntl.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "../include/common.h"
 
diff --git a/util/nvmutil/lib/command.c b/util/nvmutil/lib/command.c
index b70430aa..6b232b5f 100644
--- a/util/nvmutil/lib/command.c
+++ b/util/nvmutil/lib/command.c
@@ -5,21 +5,15 @@
  * Command handlers for nvmutil
  */
 
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "../include/common.h"
diff --git a/util/nvmutil/lib/file.c b/util/nvmutil/lib/file.c
index 92d7ee7c..7b166744 100644
--- a/util/nvmutil/lib/file.c
+++ b/util/nvmutil/lib/file.c
@@ -5,21 +5,13 @@
  * Safe file handling.
  */
 
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "../include/common.h"
diff --git a/util/nvmutil/lib/io.c b/util/nvmutil/lib/io.c
index 1a234b8f..4c48db5e 100644
--- a/util/nvmutil/lib/io.c
+++ b/util/nvmutil/lib/io.c
@@ -5,21 +5,16 @@
  * I/O functions specific to nvmutil.
  */
 
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "../include/common.h"
diff --git a/util/nvmutil/lib/num.c b/util/nvmutil/lib/num.c
index 374cc9a0..1ee8505d 100644
--- a/util/nvmutil/lib/num.c
+++ b/util/nvmutil/lib/num.c
@@ -9,17 +9,15 @@
 #include <sys/param.h>
 #endif
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include <errno.h>
-#include <fcntl.h>
+#if !((defined(__OpenBSD__) && (OpenBSD) >= 201) || \
+    defined(__FreeBSD__) || \
+    defined(__NetBSD__) || defined(__APPLE__))
+#include <fcntl.h> /* if not arc4random: /dev/urandom */
+#endif
 #include <limits.h>
-#include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "../include/common.h"
diff --git a/util/nvmutil/lib/state.c b/util/nvmutil/lib/state.c
index f4f83e48..b350330e 100644
--- a/util/nvmutil/lib/state.c
+++ b/util/nvmutil/lib/state.c
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: MIT
- *
  * Copyright (c) 2022-2026 Leah Rowe <leah@libreboot.org>
  *
  * This tool lets you modify Intel GbE NVM (Gigabit Ethernet
@@ -21,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "../include/common.h"
diff --git a/util/nvmutil/lib/string.c b/util/nvmutil/lib/string.c
index 517f490b..4f55c0d3 100644
--- a/util/nvmutil/lib/string.c
+++ b/util/nvmutil/lib/string.c
@@ -1,25 +1,14 @@
 /* SPDX-License-Identifier: MIT
- *
  * Copyright (c) 2026 Leah Rowe <leah@libreboot.org>
  *
  * String handling.
  */
 
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "../include/common.h"
diff --git a/util/nvmutil/lib/usage.c b/util/nvmutil/lib/usage.c
index e8a3cdf7..3b0614e8 100644
--- a/util/nvmutil/lib/usage.c
+++ b/util/nvmutil/lib/usage.c
@@ -1,35 +1,17 @@
 /* SPDX-License-Identifier: MIT
- *
  * Copyright (c) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
  * Copyright (c) 2026 Leah Rowe <leah@libreboot.org>
- *
  */
 
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "../include/common.h"
 
 void
 usage(void)
 {
-	const char *util;
-
-	util = getnvmprogname();
+	const char *util = getnvmprogname();
 
 	fprintf(stderr,
 	    "Modify Intel GbE NVM images e.g. set MAC\n"
diff --git a/util/nvmutil/lib/word.c b/util/nvmutil/lib/word.c
index 4647c1f4..6fd5974c 100644
--- a/util/nvmutil/lib/word.c
+++ b/util/nvmutil/lib/word.c
@@ -6,22 +6,10 @@
  * words on Intel GbE NVM configurations.
  */
 
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "../include/common.h"
 
diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c
index 8b4f01d1..8cad0d95 100644
--- a/util/nvmutil/nvmutil.c
+++ b/util/nvmutil/nvmutil.c
@@ -7,22 +7,14 @@
  * These images configure your Intel Gigabit Ethernet adapter.
  */
 
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "include/common.h"
 
-- 
cgit v1.2.1