5 files changed, 9 insertions, 9 deletions
diff --git a/src/benchmark/benchmark.cpp b/src/benchmark/benchmark.cpp
index af3ef656c..7a78461c2 100644
--- a/src/benchmark/benchmark.cpp
+++ b/src/benchmark/benchmark.cpp
@@ -14,7 +14,6 @@
 #include <memory>
 #include <vector>
 #include <chrono>
-
 namespace Botan {
 
 namespace {
diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index 4fdf1cd30..4dc78ade2 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -7,13 +7,15 @@
 
 #include <botan/libstate.h>
 #include <botan/init.h>
-#include <botan/selftest.h>
-
 #include <botan/internal/defalloc.h>
 #include <botan/internal/default_engine.h>
 #include <botan/internal/stl_util.h>
 #include <algorithm>
 
+#if defined(BOTAN_HAS_SELFTESTS)
+  #include <botan/selftest.h>
+#endif
+
 #if defined(BOTAN_HAS_ALLOC_MMAP)
   #include <botan/internal/mmap_mem.h>
 #endif
@@ -273,8 +275,10 @@ void Library_State::initialize()
 
    m_algorithm_factory = new Algorithm_Factory(engines);
 
+#if defined(BOTAN_HAS_SELFTESTS)
    if(!passes_self_tests(algorithm_factory()))
       throw Self_Test_Failure("Startup self tests failed");
+#endif
    }
 
 /*
diff --git a/src/pubkey/ecdsa/ecdsa_op.cpp b/src/pubkey/ecdsa/ecdsa_op.cpp
index afa7d52bd..7bbeded73 100644
--- a/src/pubkey/ecdsa/ecdsa_op.cpp
+++ b/src/pubkey/ecdsa/ecdsa_op.cpp
@@ -9,9 +9,6 @@
 #include <botan/ecdsa_op.h>
 #include <botan/numthry.h>
 
-#include <stdio.h>
-#include <iostream>
-
 namespace Botan {
 
 Default_ECDSA_Op::Default_ECDSA_Op(const EC_Domain_Params& domain,
diff --git a/src/utils/simd_32/simd_altivec.h b/src/utils/simd_32/simd_altivec.h
index d24c7e73f..9cc5c1068 100644
--- a/src/utils/simd_32/simd_altivec.h
+++ b/src/utils/simd_32/simd_altivec.h
@@ -10,7 +10,7 @@
 
 #if defined(BOTAN_TARGET_CPU_HAS_ALTIVEC)
 
-#include <botan/internal/loadstor.h>
+#include <botan/loadstor.h>
 #include <botan/cpuid.h>
 
 #include <altivec.h>
diff --git a/src/utils/simd_32/simd_scalar.h b/src/utils/simd_32/simd_scalar.h
index e8e46db44..148b76c35 100644
--- a/src/utils/simd_32/simd_scalar.h
+++ b/src/utils/simd_32/simd_scalar.h
@@ -8,8 +8,8 @@
 #ifndef BOTAN_SIMD_SCALAR_H__
 #define BOTAN_SIMD_SCALAR_H__
 
-#include <botan/internal/loadstor.h>
-#include <botan/internal/bswap.h>
+#include <botan/loadstor.h>
+#include <botan/bswap.h>
 
 namespace Botan {