From e9fd43caa76f91bd2b1784ce5ccadf8edd0170d7 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 17 Sep 2017 23:38:25 -0500
Subject: [PATCH] libpkgconf: clean up header includes (closes #137)

---
 libpkgconf/argvsplit.c  | 1 +
 libpkgconf/cache.c      | 1 +
 libpkgconf/client.c     | 2 ++
 libpkgconf/dependency.c | 1 +
 libpkgconf/fileio.c     | 1 +
 libpkgconf/fragment.c   | 1 +
 libpkgconf/libpkgconf.h | 5 ++++-
 libpkgconf/path.c       | 1 +
 libpkgconf/pkg.c        | 1 +
 libpkgconf/queue.c      | 1 +
 libpkgconf/tuple.c      | 1 +
 main.c                  | 1 +
 12 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/libpkgconf/argvsplit.c b/libpkgconf/argvsplit.c
index 85f7f57..81a2ec1 100644
--- a/libpkgconf/argvsplit.c
+++ b/libpkgconf/argvsplit.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
diff --git a/libpkgconf/cache.c b/libpkgconf/cache.c
index 21ba6ca..1662ce5 100644
--- a/libpkgconf/cache.c
+++ b/libpkgconf/cache.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
diff --git a/libpkgconf/client.c b/libpkgconf/client.c
index 5d146de..f5f4717 100644
--- a/libpkgconf/client.c
+++ b/libpkgconf/client.c
@@ -13,8 +13,10 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 #include <libpkgconf/config.h>
+
 /*
  * !doc
  *
diff --git a/libpkgconf/dependency.c b/libpkgconf/dependency.c
index 1e32226..3078102 100644
--- a/libpkgconf/dependency.c
+++ b/libpkgconf/dependency.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
diff --git a/libpkgconf/fileio.c b/libpkgconf/fileio.c
index d1c848f..eb073d5 100644
--- a/libpkgconf/fileio.c
+++ b/libpkgconf/fileio.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 char *
diff --git a/libpkgconf/fragment.c b/libpkgconf/fragment.c
index f2fd419..b405631 100644
--- a/libpkgconf/fragment.c
+++ b/libpkgconf/fragment.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index 4c2a53b..d7fe911 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -16,7 +16,10 @@
 #ifndef LIBPKGCONF__LIBPKGCONF_H
 #define LIBPKGCONF__LIBPKGCONF_H
 
-#include <libpkgconf/stdinc.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdbool.h>
 #include <libpkgconf/iter.h>
 #include <libpkgconf/bsdstubs.h>
 #include <libpkgconf/libpkgconf-api.h>
diff --git a/libpkgconf/path.c b/libpkgconf/path.c
index 57faaed..5b7aa1c 100644
--- a/libpkgconf/path.c
+++ b/libpkgconf/path.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 #include <libpkgconf/config.h>
 
diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c
index ca3a8c2..1a2f6b4 100644
--- a/libpkgconf/pkg.c
+++ b/libpkgconf/pkg.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/config.h>
 #include <libpkgconf/libpkgconf.h>
 
diff --git a/libpkgconf/queue.c b/libpkgconf/queue.c
index 227b160..73507fa 100644
--- a/libpkgconf/queue.c
+++ b/libpkgconf/queue.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c
index b502b1c..b0cda45 100644
--- a/libpkgconf/tuple.c
+++ b/libpkgconf/tuple.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
diff --git a/main.c b/main.c
index 0cd2ce0..a8bae10 100644
--- a/main.c
+++ b/main.c
@@ -14,6 +14,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 #include "libpkgconf/config.h"
 #include "getopt_long.h"