From adb29d588ed8497d2c51f1d6d5e45a1e0d80a1dd Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:20:31 +0900
Subject: [PATCH] tree-wide: drop blkid.h when blkid-util.h is included

---
 src/boot/bootctl.c                          | 1 -
 src/gpt-auto-generator/gpt-auto-generator.c | 1 -
 src/nspawn/nspawn.c                         | 1 -
 src/udev/udev-builtin-blkid.c               | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 3c4c095e2fb..fa846b1d263 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <blkid.h>
 #include <ctype.h>
 #include <errno.h>
 #include <ftw.h>
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 5affc57b790..e4612edff88 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <blkid.h>
 #include <stdlib.h>
 #include <sys/statfs.h>
 #include <unistd.h>
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 3a866980c8c..6439e604da9 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #if HAVE_BLKID
-#include <blkid.h>
 #endif
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index 33bc59daccb..8798a5a5e29 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -5,7 +5,6 @@
  * Copyright © 2011 Karel Zak <kzak@redhat.com>
  */
 
-#include <blkid.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-- 
2.47.3