From 0d98c79b103a5bb2dfb684549077096853e08c55 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 29 Dec 2022 21:07:38 -0700
Subject: [PATCH] [util] Centralize includes again

---
 util/helper-cairo.hh | 5 -----
 util/options.hh      | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/util/helper-cairo.hh b/util/helper-cairo.hh
index 544e1851f..3505794eb 100644
--- a/util/helper-cairo.hh
+++ b/util/helper-cairo.hh
@@ -33,11 +33,6 @@
 #  include "helper-cairo-ft.hh"
 #endif
 
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h> /* for isatty() */
-#endif
-
 #include <cairo.h>
 #include <hb.h>
 #include <hb-cairo.h>
diff --git a/util/options.hh b/util/options.hh
index 39c537adb..4336a1dcd 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -41,6 +41,10 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
 #include <io.h> /* for setmode() under Windows */
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h> /* for isatty() */
+#endif
+
 
 #include <hb.h>
 #include <hb-ot.h>