From 7d729cedcc62f823d7ca40c362da98b4ee942597 Mon Sep 17 00:00:00 2001
From: Ruslan Bukin <br@FreeBSD.org>
Date: Tue, 3 Jul 2018 15:48:34 +0000
Subject: [PATCH] Revert 335888 ("Ensure va_list is declared by including
 stdarg.h.")

The issue was caused by header pollution brought by GCC 8.1.

We now have to remove include-fixed headers in the GCC installation
directory.

Sponsored by:	DARPA, AFRL
Pointed out by:	jhb
---
 contrib/blacklist/bin/blacklistctl.c | 1 -
 lib/libpjdlog/pjdlog.c               | 2 +-
 sbin/hastd/pjdlog.c                  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/blacklist/bin/blacklistctl.c b/contrib/blacklist/bin/blacklistctl.c
index e7c297f3f8a..8cef404d74b 100644
--- a/contrib/blacklist/bin/blacklistctl.c
+++ b/contrib/blacklist/bin/blacklistctl.c
@@ -35,7 +35,6 @@
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: blacklistctl.c,v 1.21 2016/11/02 03:15:07 jnemeth Exp $");
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <time.h>
 #ifdef HAVE_LIBUTIL_H
diff --git a/lib/libpjdlog/pjdlog.c b/lib/libpjdlog/pjdlog.c
index 72fb412345b..eb7ddb2b7a8 100644
--- a/lib/libpjdlog/pjdlog.c
+++ b/lib/libpjdlog/pjdlog.c
@@ -43,8 +43,8 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <libutil.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <printf.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c
index 9af694ba995..9ac9a69b75d 100644
--- a/sbin/hastd/pjdlog.c
+++ b/sbin/hastd/pjdlog.c
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <assert.h>
 #include <errno.h>
 #include <libutil.h>
-#include <stdarg.h>
 #include <printf.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>