3 files changed, 14 insertions, 5 deletions
diff --git a/src/alloc/system_alloc/defalloc.cpp b/src/alloc/system_alloc/defalloc.cpp
index b1b338d71..faaeb3c58 100644
--- a/src/alloc/system_alloc/defalloc.cpp
+++ b/src/alloc/system_alloc/defalloc.cpp
@@ -5,9 +5,9 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/defalloc.h>
+#include <botan/internal/defalloc.h>
+#include <botan/internal/mlock.h>
 #include <botan/libstate.h>
-#include <botan/mlock.h>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/src/alloc/system_alloc/defalloc.h b/src/alloc/system_alloc/defalloc.h
index 627e8df70..0c8804223 100644
--- a/src/alloc/system_alloc/defalloc.h
+++ b/src/alloc/system_alloc/defalloc.h
@@ -8,14 +8,14 @@
 #ifndef BOTAN_BASIC_ALLOC_H__
 #define BOTAN_BASIC_ALLOC_H__
 
-#include <botan/mem_pool.h>
+#include <botan/internal/mem_pool.h>
 
 namespace Botan {
 
 /*
 * Malloc Allocator
 */
-class BOTAN_DLL Malloc_Allocator : public Allocator
+class Malloc_Allocator : public Allocator
    {
    public:
       void* allocate(u32bit);
@@ -27,7 +27,7 @@ class BOTAN_DLL Malloc_Allocator : public Allocator
 /*
 * Locking Allocator
 */
-class BOTAN_DLL Locking_Allocator : public Pooling_Allocator
+class Locking_Allocator : public Pooling_Allocator
    {
    public:
       Locking_Allocator(Mutex* m) : Pooling_Allocator(m) {}
diff --git a/src/alloc/system_alloc/info.txt b/src/alloc/system_alloc/info.txt
index 8826440d4..87de0cb67 100644
--- a/src/alloc/system_alloc/info.txt
+++ b/src/alloc/system_alloc/info.txt
@@ -1,3 +1,12 @@
+
+<source>
+defalloc.cpp
+</source>
+
+<header:internal>
+defalloc.h
+</header:internal>
+
 <requires>
 libstate
 mem_pool