From 7620e79cad4db56d970a1badb551053de74472b6 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Fri, 12 Feb 2010 10:21:05 +0100
Subject: [PATCH] build-sys: remove duplicate #includes

$ make checkincludes
fsck/fsck.c: errno.h is included more than once.
lib/canonicalize.c: string.h is included more than once.
shlibs/blkid/src/blkidP.h: stdio.h is included more than once.
shlibs/blkid/src/devname.c: string.h is included more than once.
shlibs/blkid/src/devno.c: string.h is included more than once.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 fsck/fsck.c                | 1 -
 lib/canonicalize.c         | 1 -
 shlibs/blkid/src/blkidP.h  | 1 -
 shlibs/blkid/src/devname.c | 1 -
 shlibs/blkid/src/devno.c   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/fsck/fsck.c b/fsck/fsck.c
index 66c027c7..e9e645fe 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <time.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <paths.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index e54cf0c0..29b3f259 100644
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
-#include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 
diff --git a/shlibs/blkid/src/blkidP.h b/shlibs/blkid/src/blkidP.h
index 975878c4..113977bd 100644
--- a/shlibs/blkid/src/blkidP.h
+++ b/shlibs/blkid/src/blkidP.h
@@ -309,7 +309,6 @@ extern int blkid_fstatat(DIR *dir, const char *dirname, const char *filename,
 #define DEBUG_ALL	0xFFFF
 
 #ifdef CONFIG_BLKID_DEBUG
-#include <stdio.h>
 extern int blkid_debug_mask;
 extern void blkid_init_debug(int mask);
 extern void blkid_debug_dump_dev(blkid_dev dev);
diff --git a/shlibs/blkid/src/devname.c b/shlibs/blkid/src/devname.c
index d048c722..87e4fb96 100644
--- a/shlibs/blkid/src/devname.c
+++ b/shlibs/blkid/src/devname.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/shlibs/blkid/src/devno.c b/shlibs/blkid/src/devno.c
index 7b9438ff..aae57568 100644
--- a/shlibs/blkid/src/devno.c
+++ b/shlibs/blkid/src/devno.c
@@ -16,7 +16,6 @@
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <string.h>
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-- 
2.39.5