6 files changed, 17 insertions, 8 deletions
diff --git a/src/entropy/unix_procs/es_unix.cpp b/src/entropy/unix_procs/es_unix.cpp
index fc5b026a4..039479308 100644
--- a/src/entropy/unix_procs/es_unix.cpp
+++ b/src/entropy/unix_procs/es_unix.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/es_unix.h>
-#include <botan/unix_cmd.h>
+#include <botan/internal/es_unix.h>
+#include <botan/internal/unix_cmd.h>
 #include <botan/parsing.h>
 #include <algorithm>
 #include <sys/time.h>
diff --git a/src/entropy/unix_procs/es_unix.h b/src/entropy/unix_procs/es_unix.h
index 1f8abb784..03496b364 100644
--- a/src/entropy/unix_procs/es_unix.h
+++ b/src/entropy/unix_procs/es_unix.h
@@ -9,7 +9,7 @@
 #define BOTAN_ENTROPY_SRC_UNIX_H__
 
 #include <botan/entropy_src.h>
-#include <botan/unix_cmd.h>
+#include <botan/internal/unix_cmd.h>
 #include <vector>
 
 namespace Botan {
@@ -17,7 +17,7 @@ namespace Botan {
 /**
 * Unix Entropy Source
 */
-class BOTAN_DLL Unix_EntropySource : public EntropySource
+class Unix_EntropySource : public EntropySource
    {
    public:
       std::string name() const { return "Unix Entropy Source"; }
diff --git a/src/entropy/unix_procs/info.txt b/src/entropy/unix_procs/info.txt
index 529b56966..2100584e4 100644
--- a/src/entropy/unix_procs/info.txt
+++ b/src/entropy/unix_procs/info.txt
@@ -1,6 +1,15 @@
 define ENTROPY_SRC_UNIX
 
-load_on auto
+<source>
+es_unix.cpp
+unix_cmd.cpp
+unix_src.cpp
+</source>
+
+<header:internal>
+es_unix.h
+unix_cmd.h
+</header:internal>
 
 <os>
 aix
diff --git a/src/entropy/unix_procs/unix_cmd.cpp b/src/entropy/unix_procs/unix_cmd.cpp
index 1cae07e26..34e7c314a 100644
--- a/src/entropy/unix_procs/unix_cmd.cpp
+++ b/src/entropy/unix_procs/unix_cmd.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/unix_cmd.h>
+#include <botan/internal/unix_cmd.h>
 #include <botan/parsing.h>
 #include <botan/exceptn.h>
 
diff --git a/src/entropy/unix_procs/unix_cmd.h b/src/entropy/unix_procs/unix_cmd.h
index aec189176..7decf587f 100644
--- a/src/entropy/unix_procs/unix_cmd.h
+++ b/src/entropy/unix_procs/unix_cmd.h
@@ -31,7 +31,7 @@ struct Unix_Program
 /**
 * Command Output DataSource
 */
-class BOTAN_DLL DataSource_Command : public DataSource
+class DataSource_Command : public DataSource
    {
    public:
       u32bit read(byte[], u32bit);
diff --git a/src/entropy/unix_procs/unix_src.cpp b/src/entropy/unix_procs/unix_src.cpp
index c843af6c2..a72ecf055 100644
--- a/src/entropy/unix_procs/unix_src.cpp
+++ b/src/entropy/unix_procs/unix_src.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/es_unix.h>
+#include <botan/internal/es_unix.h>
 
 namespace Botan {