[PATCH 08/32] lib/smokey: Rearrange includes and harmonize license headers

Moving from "local to global" should help us to keep headers
self-contained.

While at it: Harmonzie license headers. doxygen reported a warning
while generating the docs.

Signed-off-by: Florian Bezdeka <[email protected]>
---
 lib/smokey/helpers.c | 15 +++++----------
 lib/smokey/init.c    | 19 +++++++------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/lib/smokey/helpers.c b/lib/smokey/helpers.c
index f4b9ee1fcd83238508ae722d4c57ee5191099700..fe52f48db08628b79df6e8331e0f67bdf45f7cfa 100644
--- a/lib/smokey/helpers.c
+++ b/lib/smokey/helpers.c
@@ -10,24 +10,19 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
-
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 
-#include <stdio.h>
-#include <stdarg.h>
+#include <boilerplate/ancillaries.h>
+#include <smokey/smokey.h>
+
 #include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
 #include <error.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <sys/wait.h>
-#include <boilerplate/ancillaries.h>
-#include <smokey/smokey.h>
 
 int smokey_int(const char *s, struct smokey_arg *arg)
 {
diff --git a/lib/smokey/init.c b/lib/smokey/init.c
index 19e47f1fbde9d7ed5cc8397453219493ad55528d..1c45572c75e4f58aa845a385a519369909d817ad 100644
--- a/lib/smokey/init.c
+++ b/lib/smokey/init.c
@@ -10,25 +10,20 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
-
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <malloc.h>
-#include <string.h>
-#include <errno.h>
-#include <getopt.h>
-#include <fnmatch.h>
-#include <boilerplate/list.h>
-#include <boilerplate/ancillaries.h>
+#include <copperplate/tunables.h>
 #include <smokey/smokey.h>
 
-#include "copperplate/internal.h"
+#include <ctype.h>
+#include <fnmatch.h>
+#include <getopt.h>
+#include <malloc.h>
+#include <stdlib.h>
 
 /**
  * @defgroup smokey Smokey API

-- 
2.54.0