13 files changed, 20 insertions, 23 deletions
diff --git a/src/engine/openssl/arc4_openssl.cpp b/src/engine/openssl/arc4_openssl.cpp
index 793e1faff..d76bce349 100644
--- a/src/engine/openssl/arc4_openssl.cpp
+++ b/src/engine/openssl/arc4_openssl.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
+#include <botan/internal/openssl_engine.h>
 #include <botan/parsing.h>
 #include <openssl/rc4.h>
 
diff --git a/src/engine/openssl/bn_powm.cpp b/src/engine/openssl/bn_powm.cpp
index 7b836d170..abf4f47c9 100644
--- a/src/engine/openssl/bn_powm.cpp
+++ b/src/engine/openssl/bn_powm.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
-#include <botan/bn_wrap.h>
+#include <botan/internal/openssl_engine.h>
+#include <botan/internal/bn_wrap.h>
 
 namespace Botan {
 
diff --git a/src/engine/openssl/bn_wrap.cpp b/src/engine/openssl/bn_wrap.cpp
index e1cfe3f95..6f1b5ef25 100644
--- a/src/engine/openssl/bn_wrap.cpp
+++ b/src/engine/openssl/bn_wrap.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/bn_wrap.h>
+#include <botan/internal/bn_wrap.h>
 
 namespace Botan {
 
diff --git a/src/engine/openssl/bn_wrap.h b/src/engine/openssl/bn_wrap.h
index 4d18be1b5..0307189a9 100644
--- a/src/engine/openssl/bn_wrap.h
+++ b/src/engine/openssl/bn_wrap.h
@@ -16,7 +16,7 @@ namespace Botan {
 /*
 * Lightweight OpenSSL BN Wrapper
 */
-class BOTAN_DLL OSSL_BN
+class OSSL_BN
    {
    public:
       BIGNUM* value;
@@ -36,7 +36,7 @@ class BOTAN_DLL OSSL_BN
 /*
 * Lightweight OpenSSL BN_CTX Wrapper
 */
-class BOTAN_DLL OSSL_BN_CTX
+class OSSL_BN_CTX
    {
    public:
       BN_CTX* value;
diff --git a/src/engine/openssl/info.txt b/src/engine/openssl/info.txt
index d30e76293..c65f80a29 100644
--- a/src/engine/openssl/info.txt
+++ b/src/engine/openssl/info.txt
@@ -6,11 +6,8 @@ load_on request
 all -> crypto
 </libs>
 
-<header:public>
-eng_ossl.h
-</header:public>
-
 <header:internal>
+openssl_engine.h
 bn_wrap.h
 </header:internal>
 
diff --git a/src/engine/openssl/eng_ossl.h b/src/engine/openssl/openssl_engine.h
index 7105546dd..4ee2be2c0 100644
--- a/src/engine/openssl/eng_ossl.h
+++ b/src/engine/openssl/openssl_engine.h
@@ -15,7 +15,7 @@ namespace Botan {
 /*
 * OpenSSL Engine
 */
-class BOTAN_DLL OpenSSL_Engine : public Engine
+class OpenSSL_Engine : public Engine
    {
    public:
       /**
diff --git a/src/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp
index 7fdf54e42..98a5b6963 100644
--- a/src/engine/openssl/ossl_bc.cpp
+++ b/src/engine/openssl/ossl_bc.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
+#include <botan/internal/openssl_engine.h>
 #include <openssl/evp.h>
 
 namespace Botan {
diff --git a/src/engine/openssl/ossl_dh.cpp b/src/engine/openssl/ossl_dh.cpp
index 72eab8a48..7cbe6477d 100644
--- a/src/engine/openssl/ossl_dh.cpp
+++ b/src/engine/openssl/ossl_dh.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
-#include <botan/bn_wrap.h>
+#include <botan/internal/openssl_engine.h>
+#include <botan/internal/bn_wrap.h>
 #include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x0090700F
diff --git a/src/engine/openssl/ossl_dsa.cpp b/src/engine/openssl/ossl_dsa.cpp
index bfffb8796..66529bcec 100644
--- a/src/engine/openssl/ossl_dsa.cpp
+++ b/src/engine/openssl/ossl_dsa.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
-#include <botan/bn_wrap.h>
+#include <botan/internal/openssl_engine.h>
+#include <botan/internal/bn_wrap.h>
 #include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x0090700F
diff --git a/src/engine/openssl/ossl_elg.cpp b/src/engine/openssl/ossl_elg.cpp
index aefda9a1e..35c59a7ff 100644
--- a/src/engine/openssl/ossl_elg.cpp
+++ b/src/engine/openssl/ossl_elg.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
-#include <botan/bn_wrap.h>
+#include <botan/internal/openssl_engine.h>
+#include <botan/internal/bn_wrap.h>
 #include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x0090700F
diff --git a/src/engine/openssl/ossl_if.cpp b/src/engine/openssl/ossl_if.cpp
index bbc10d549..a30a4d8b4 100644
--- a/src/engine/openssl/ossl_if.cpp
+++ b/src/engine/openssl/ossl_if.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
-#include <botan/bn_wrap.h>
+#include <botan/internal/openssl_engine.h>
+#include <botan/internal/bn_wrap.h>
 #include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x0090700F
diff --git a/src/engine/openssl/ossl_md.cpp b/src/engine/openssl/ossl_md.cpp
index 1e01a6f25..f41e0f950 100644
--- a/src/engine/openssl/ossl_md.cpp
+++ b/src/engine/openssl/ossl_md.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
+#include <botan/internal/openssl_engine.h>
 #include <openssl/evp.h>
 
 namespace Botan {
diff --git a/src/engine/openssl/ossl_nr.cpp b/src/engine/openssl/ossl_nr.cpp
index 532e4b8be..b14ec7f8c 100644
--- a/src/engine/openssl/ossl_nr.cpp
+++ b/src/engine/openssl/ossl_nr.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/eng_ossl.h>
-#include <botan/bn_wrap.h>
+#include <botan/internal/openssl_engine.h>
+#include <botan/internal/bn_wrap.h>
 #include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x0090700F