From f4e0adc0f9bf6a437952d05acc08c1bcae516226 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 15 Oct 2013 17:59:54 +0200
Subject: [PATCH] 	Remove leftover references to some of the system
 headers.

---
 ChangeLog                          | 4 ++++
 grub-core/kern/emu/main.c          | 2 --
 grub-core/kern/emu/misc.c          | 2 --
 grub-core/osdep/windows/hostdisk.c | 1 -
 grub-core/tests/video_checksum.c   | 7 +------
 util/grub-probe.c                  | 1 -
 util/misc.c                        | 2 --
 7 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f71c5ef19..e083e56a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove leftover references to some of the system headers.
+
 2013-10-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/geli.c (grub_util_get_geli_uuid): Close handle after
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 08526129a..51ede76c0 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -23,11 +23,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <setjmp.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <grub/dl.h>
 #include <grub/mm.h>
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index b4d2e69b5..43471b4ef 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -27,8 +27,6 @@
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 #include <grub/mm.h>
 #include <grub/err.h>
diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c
index 74c9adc08..aaaa519c0 100644
--- a/grub-core/osdep/windows/hostdisk.c
+++ b/grub-core/osdep/windows/hostdisk.c
@@ -37,7 +37,6 @@
 #include <assert.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/grub-core/tests/video_checksum.c b/grub-core/tests/video_checksum.c
index 865266f9f..6d9d664da 100644
--- a/grub-core/tests/video_checksum.c
+++ b/grub-core/tests/video_checksum.c
@@ -246,12 +246,7 @@ struct grub_video_mode_info grub_test_video_modes[30] = {
 };
 
 #ifdef GRUB_MACHINE_EMU
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <grub/emu/hostfile.h>
 
 struct bmp_header
 {
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 47482f8b6..d29d562aa 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -43,7 +43,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <assert.h>
 
 #define _GNU_SOURCE	1
diff --git a/util/misc.c b/util/misc.c
index 1f7784ba9..8b6a678fa 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -26,9 +26,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/time.h>
-#include <unistd.h>
 #include <time.h>
 
 #include <grub/kernel.h>
-- 
2.39.5