From 7e686dde6f965d159b57e8394db3233b7cc20c56 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 7 Oct 2017 23:20:36 +0200
Subject: [PATCH] Unconditionally include stdbool.h and inttypes.h.

---
 src/have.h   | 12 ++++++------
 src/system.h |  6 ------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/have.h b/src/have.h
index 5bd4d66e..11fa56ad 100644
--- a/src/have.h
+++ b/src/have.h
@@ -30,15 +30,19 @@
 #endif
 
 #include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <inttypes.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
-#include <signal.h>
 #include <errno.h>
+#include <limits.h>
+
 #include <fcntl.h>
 #include <unistd.h>
-#include <limits.h>
+#include <signal.h>
 
 #ifdef HAVE_MINGW
 #include <w32api.h>
@@ -55,10 +59,6 @@
 #include <termios.h>
 #endif
 
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
diff --git a/src/system.h b/src/system.h
index 504e59ce..14db7f5d 100644
--- a/src/system.h
+++ b/src/system.h
@@ -25,12 +25,6 @@
 
 #include "have.h"
 
-#ifndef HAVE_STDBOOL_H
-typedef int bool;
-#define true 1
-#define false 0
-#endif
-
 #ifndef HAVE_STRSIGNAL
 # define strsignal(p) ""
 #endif
-- 
2.20.1