6 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/utils/assert.h b/src/lib/utils/assert.h
index ab0616ff9..3f5f0231d 100644
--- a/src/lib/utils/assert.h
+++ b/src/lib/utils/assert.h
@@ -9,7 +9,7 @@
 #ifndef BOTAN_ASSERTION_CHECKING_H_
 #define BOTAN_ASSERTION_CHECKING_H_
 
-#include <botan/build.h>
+#include <botan/compiler.h>
 
 namespace Botan {
 
diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h
index ff7f36571..00f22358a 100644
--- a/src/lib/utils/compiler.h
+++ b/src/lib/utils/compiler.h
@@ -5,6 +5,10 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
+/* This header is included in both C++ and C (via ffi.h) and should only
+   contain macro definitions.
+*/
+
 #ifndef BOTAN_UTIL_COMPILER_FLAGS_H_
 #define BOTAN_UTIL_COMPILER_FLAGS_H_
 
diff --git a/src/lib/utils/dyn_load/dyn_load.cpp b/src/lib/utils/dyn_load/dyn_load.cpp
index 2b24e5f6c..2cacf7c46 100644
--- a/src/lib/utils/dyn_load/dyn_load.cpp
+++ b/src/lib/utils/dyn_load/dyn_load.cpp
@@ -6,7 +6,6 @@
 */
 
 #include <botan/dyn_load.h>
-#include <botan/build.h>
 #include <botan/exceptn.h>
 
 #if defined(BOTAN_TARGET_OS_HAS_DLOPEN)
diff --git a/src/lib/utils/dyn_load/dyn_load.h b/src/lib/utils/dyn_load/dyn_load.h
index 31da6b7a2..581eac724 100644
--- a/src/lib/utils/dyn_load/dyn_load.h
+++ b/src/lib/utils/dyn_load/dyn_load.h
@@ -8,8 +8,8 @@
 #ifndef BOTAN_DYNAMIC_LOADER_H_
 #define BOTAN_DYNAMIC_LOADER_H_
 
+#include <botan/types.h>
 #include <string>
-#include <botan/build.h>
 
 namespace Botan {
 
diff --git a/src/lib/utils/mutex.h b/src/lib/utils/mutex.h
index e8718d5eb..46a652bba 100644
--- a/src/lib/utils/mutex.h
+++ b/src/lib/utils/mutex.h
@@ -7,7 +7,6 @@
 #ifndef BOTAN_UTIL_MUTEX_H_
 #define BOTAN_UTIL_MUTEX_H_
 
-#include <botan/build.h>
 #include <botan/types.h>
 
 #if defined(BOTAN_TARGET_OS_HAS_THREADS)
diff --git a/src/lib/utils/rounding.h b/src/lib/utils/rounding.h
index e74a80798..a06626b88 100644
--- a/src/lib/utils/rounding.h
+++ b/src/lib/utils/rounding.h
@@ -9,7 +9,6 @@
 #define BOTAN_ROUNDING_H_
 
 #include <botan/types.h>
-#include <botan/assert.h>
 
 namespace Botan {