From d4a1703d801d1c2e60a573ce23be440d20d26fe0 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Tue, 29 Nov 2016 12:00:13 +0000
Subject: [PATCH] Missing includes in some header files.

---
 src/error.h      |  9 +++++++--
 src/intrinsics.h | 10 ++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/error.h b/src/error.h
index 92a9ce71a3..cad442fab3 100644
--- a/src/error.h
+++ b/src/error.h
@@ -21,16 +21,21 @@
 #ifndef SWIFT_ERROR_H
 #define SWIFT_ERROR_H
 
+/* Config parameters. */
+#include "../config.h"
+
 /* Some standard headers. */
 #include <stdio.h>
-
-#include "clocks.h"
+#include <stdlib.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
 #include <mpi.h>
 #endif
 
+/* Local headers. */
+#include "clocks.h"
+
 /**
  * @brief Error macro. Prints the message given in argument and aborts.
  *
diff --git a/src/intrinsics.h b/src/intrinsics.h
index 27e0bcc729..42dddf77c0 100644
--- a/src/intrinsics.h
+++ b/src/intrinsics.h
@@ -19,11 +19,17 @@
 #ifndef SWIFT_INTRINSICS_H
 #define SWIFT_INTRINSICS_H
 
+/* Config parameters. */
+#include "../config.h"
+
+/* Local headers. */
+#include "inline.h"
+
 /**
  * @brief Returns the number of leading 0-bits in x, starting at the most
  * significant bit position. If x is 0, the result is undefined.
  *
- * This is a wrapper for the GCC intrinsics with an implementation (from
+ * This is a wrapper for the GNU intrinsic with an implementation (from
  * Hacker's Delight) if the compiler intrinsics are not available.
  */
 __attribute__((always_inline)) INLINE static int intrinsics_clz(
@@ -63,7 +69,7 @@ __attribute__((always_inline)) INLINE static int intrinsics_clz(
 /**
  * @brief Returns the number of 1-bits in x.
  *
- * This is a wrapper for the GCC intrinsics with an implementation (from
+ * This is a wrapper for the GNU intrinsic with an implementation (from
  * Hacker's Delight) if the compiler intrinsics are not available.
  */
 __attribute__((always_inline)) INLINE static int intrinsics_popcount(
-- 
GitLab