From e3c17738ab168ad03bcae519aed99bf22e646928 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Sun, 18 Feb 2024 12:23:07 -0800
Subject: [PATCH] maint: Prefer #include <...> for gnulib substitute headers

* src/shuf.c: Change #include "getopt.h" to #include <getopt.h>.
* src/stat.c: Change #include "getopt.h" to #include <getopt.h>.
* src/system.h: Change #include "error.h" to #include <error.h>.

Copyright-paperwork-exempt: Yes
---
 src/shuf.c   | 2 +-
 src/stat.c   | 2 +-
 src/system.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shuf.c b/src/shuf.c
index b7d6bbf31..5b17ccf56 100644
--- a/src/shuf.c
+++ b/src/shuf.c
@@ -20,10 +20,10 @@
 #include <config.h>
 
 #include <sys/types.h>
+#include <getopt.h>
 #include "system.h"
 
 #include "fadvise.h"
-#include "getopt.h"
 #include "linebuffer.h"
 #include "quote.h"
 #include "randint.h"
diff --git a/src/stat.c b/src/stat.c
index 9aee46dd5..cb618b49f 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -53,6 +53,7 @@
 # include <fs_info.h>
 #endif
 #include <selinux/selinux.h>
+#include <getopt.h>
 
 #include "system.h"
 
@@ -62,7 +63,6 @@
 #include "file-type.h"
 #include "filemode.h"
 #include "fs.h"
-#include "getopt.h"
 #include "mountlist.h"
 #include "quote.h"
 #include "stat-size.h"
diff --git a/src/system.h b/src/system.h
index 8b3c40d8d..43c78de3f 100644
--- a/src/system.h
+++ b/src/system.h
@@ -717,7 +717,7 @@ usable_st_size (struct stat const *sb)
 
 _Noreturn void usage (int status);
 
-#include "error.h"
+#include <error.h>
 
 /* Like error(0, 0, ...), but without an implicit newline.
    Also a noop unless the global DEV_DEBUG is set.  */
-- 
2.39.2