From beedbb56b50163e4fbf2cbc44785ebd962d1692d Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Wed, 20 Feb 2013 15:03:24 -0800
Subject: [PATCH] include: fixup header inclusion

---
 include/cmodelint.h   | 1 +
 include/impatomic.h   | 2 ++
 include/memoryorder.h | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/cmodelint.h b/include/cmodelint.h
index 232648cd..24c5f6fb 100644
--- a/include/cmodelint.h
+++ b/include/cmodelint.h
@@ -5,6 +5,7 @@
 #ifndef CMODELINT_H
 #define CMODELINT_H
 #include <inttypes.h>
+#include "memoryorder.h"
 
 #if __cplusplus
 using std::memory_order;
diff --git a/include/impatomic.h b/include/impatomic.h
index ed3afa71..60e5d365 100644
--- a/include/impatomic.h
+++ b/include/impatomic.h
@@ -14,6 +14,8 @@
 
 #ifdef __cplusplus
 namespace std {
+#else
+#include <stdbool.h>
 #endif
 
 #define CPP0X( feature )
diff --git a/include/memoryorder.h b/include/memoryorder.h
index 8c4c2a04..ba0dafd6 100644
--- a/include/memoryorder.h
+++ b/include/memoryorder.h
@@ -10,7 +10,6 @@
 namespace std {
 #else
 #include <stddef.h>
-#include <stdbool.h>
 #endif
 
 
-- 
2.34.1