5 files changed, 9 insertions, 8 deletions
diff --git a/src/utils/assert.cpp b/src/utils/assert.cpp
index 91356f15b..0c6ba38b5 100644
--- a/src/utils/assert.cpp
+++ b/src/utils/assert.cpp
@@ -5,7 +5,6 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/assert.h>
 #include <botan/exceptn.h>
 #include <sstream>
 
diff --git a/src/utils/assert.h b/src/utils/assert.h
index 04b8ce4ed..9265be450 100644
--- a/src/utils/assert.h
+++ b/src/utils/assert.h
@@ -8,16 +8,18 @@
 #ifndef BOTAN_ASSERTION_CHECKING_H__
 #define BOTAN_ASSERTION_CHECKING_H__
 
+#include <botan/build.h>
+
 namespace Botan {
 
 /**
 * Called when an assertion fails
 */
-void assertion_failure(const char* expr_str,
-                       const char* assertion_made,
-                       const char* func,
-                       const char* file,
-                       int line);
+void BOTAN_DLL assertion_failure(const char* expr_str,
+                                 const char* assertion_made,
+                                 const char* func,
+                                 const char* file,
+                                 int line);
 
 /**
 * Make an assertion
diff --git a/src/utils/info.txt b/src/utils/info.txt
index f8202c626..b8e72f42e 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -14,7 +14,6 @@ zero_mem.cpp
 </source>
 
 <header:internal>
-assert.h
 bit_ops.h
 prefetch.h
 rounding.h
@@ -24,6 +23,7 @@ xor_buf.h
 </header:internal>
 
 <header:public>
+assert.h
 bswap.h
 calendar.h
 charset.h
diff --git a/src/utils/sqlite3/sqlite3.cpp b/src/utils/sqlite3/sqlite3.cpp
index 94b55a555..519be9133 100644
--- a/src/utils/sqlite3/sqlite3.cpp
+++ b/src/utils/sqlite3/sqlite3.cpp
@@ -6,7 +6,6 @@
 */
 
 #include <botan/internal/sqlite3.h>
-#include <botan/internal/assert.h>
 #include <stdexcept>
 #include <sqlite3.h>
 
diff --git a/src/utils/types.h b/src/utils/types.h
index 255311580..5d746072c 100644
--- a/src/utils/types.h
+++ b/src/utils/types.h
@@ -9,6 +9,7 @@
 #define BOTAN_TYPES_H__
 
 #include <botan/build.h>
+#include <botan/assert.h>
 #include <stddef.h>
 
 /**