From c79102ec493a0f8d5ba4047a8f010acf7a1b5a88 Mon Sep 17 00:00:00 2001
From: "Samuel K. Gutierrez" <samuel@lanl.gov>
Date: Mon, 30 Apr 2018 12:46:58 -0600
Subject: [PATCH] Add header checks in configury.

---
 configure.ac        | 7 +++++++
 src/sdsdkv-client.h | 1 -
 src/sdsdkv-impl.h   | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index cc9de14..32a516f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,13 @@ LT_INIT
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 
+################################################################################
+# Header checks.
+################################################################################
+AC_CHECK_HEADERS([\
+inttypes.h sys/types.h unistd.h stdint.h
+])
+
 ################################################################################
 # External package dependencies
 ################################################################################
diff --git a/src/sdsdkv-client.h b/src/sdsdkv-client.h
index 3b5d4b6..2f8156c 100644
--- a/src/sdsdkv-client.h
+++ b/src/sdsdkv-client.h
@@ -19,7 +19,6 @@
 #include "sdskv-client.h"
 #include "ch-placement.h"
 
-#include <iostream> // TODO(skg) Not really needed. Just for debug.
 #include <vector>
 #include <utility>
 
diff --git a/src/sdsdkv-impl.h b/src/sdsdkv-impl.h
index f32814a..1ee945e 100644
--- a/src/sdsdkv-impl.h
+++ b/src/sdsdkv-impl.h
@@ -12,12 +12,20 @@
 
 #pragma once
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "sdsdkv-personality-factory.h"
 #include "sdsdkv-mpi.h"
 #include "sdsdkv-config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 
 #include <iostream>
 #include <stdexcept>