Clean up header includes

Avoid including build.h or assert.h directly, instead always take
them though types.h

Avoid math.h in favor of cmath

7 files changed, 6 insertions, 12 deletions

diff --git a/src/lib/prov/pkcs11/p11_ecc_key.h b/src/lib/prov/pkcs11/p11_ecc_key.h
index 0b4d86243..2ab92790d 100644
--- a/src/lib/prov/pkcs11/p11_ecc_key.h
+++ b/src/lib/prov/pkcs11/p11_ecc_key.h
@@ -9,7 +9,6 @@
 #ifndef BOTAN_P11_ECC_H_
 #define BOTAN_P11_ECC_H_
 
-#include <botan/build.h>
 #include <botan/p11_object.h>
 
 #if defined(BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO)
diff --git a/src/lib/prov/pkcs11/p11_ecdh.h b/src/lib/prov/pkcs11/p11_ecdh.h
index 6ad9d8889..d95966a97 100644
--- a/src/lib/prov/pkcs11/p11_ecdh.h
+++ b/src/lib/prov/pkcs11/p11_ecdh.h
@@ -9,10 +9,10 @@
 #ifndef BOTAN_P11_ECDH_H_
 #define BOTAN_P11_ECDH_H_
 
-#include <botan/build.h>
+#include <botan/p11.h>
+
 #if defined(BOTAN_HAS_ECDH)
 
-#include <botan/p11.h>
 #include <botan/p11_ecc_key.h>
 #include <botan/ecdh.h>
 
diff --git a/src/lib/prov/pkcs11/p11_ecdsa.h b/src/lib/prov/pkcs11/p11_ecdsa.h
index 829eaebe7..ae1a9c0bc 100644
--- a/src/lib/prov/pkcs11/p11_ecdsa.h
+++ b/src/lib/prov/pkcs11/p11_ecdsa.h
@@ -9,7 +9,8 @@
 #ifndef BOTAN_P11_ECDSA_H_
 #define BOTAN_P11_ECDSA_H_
 
-#include <botan/build.h>
+#include <botan/p11.h>
+
 #if defined(BOTAN_HAS_ECDSA)
 
 #include <botan/p11_ecc_key.h>
diff --git a/src/lib/prov/pkcs11/p11_rsa.h b/src/lib/prov/pkcs11/p11_rsa.h
index b5d601365..ba35db240 100644
--- a/src/lib/prov/pkcs11/p11_rsa.h
+++ b/src/lib/prov/pkcs11/p11_rsa.h
@@ -9,8 +9,6 @@
 #ifndef BOTAN_P11_RSA_H_
 #define BOTAN_P11_RSA_H_
 
-#include <botan/build.h>
-#include <botan/p11.h>
 #include <botan/p11_session.h>
 #include <botan/p11_object.h>
 
diff --git a/src/lib/prov/pkcs11/p11_session.h b/src/lib/prov/pkcs11/p11_session.h
index eab686ed8..8b32063e3 100644
--- a/src/lib/prov/pkcs11/p11_session.h
+++ b/src/lib/prov/pkcs11/p11_session.h
@@ -9,7 +9,6 @@
 #ifndef BOTAN_P11_SESSION_H_
 #define BOTAN_P11_SESSION_H_
 
-#include <botan/p11.h>
 #include <botan/p11_slot.h>
 
 #include <utility>
diff --git a/src/lib/prov/pkcs11/p11_slot.h b/src/lib/prov/pkcs11/p11_slot.h
index 1787aab0d..63da32a0e 100644
--- a/src/lib/prov/pkcs11/p11_slot.h
+++ b/src/lib/prov/pkcs11/p11_slot.h
@@ -13,7 +13,6 @@
 #include <vector>
 #include <functional>
 
-#include <botan/p11.h>
 #include <botan/p11_module.h>
 
 namespace Botan {
diff --git a/src/lib/prov/pkcs11/p11_x509.h b/src/lib/prov/pkcs11/p11_x509.h
index 9066e16c8..ed084e9c1 100644
--- a/src/lib/prov/pkcs11/p11_x509.h
+++ b/src/lib/prov/pkcs11/p11_x509.h
@@ -9,13 +9,11 @@
 #ifndef BOTAN_P11_X509_H_
 #define BOTAN_P11_X509_H_
 
-#include <botan/build.h>
-#if defined(BOTAN_HAS_X509_CERTIFICATES)
-
 #include <botan/p11_object.h>
 
-#include <botan/x509cert.h>
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
 
+#include <botan/x509cert.h>
 #include <vector>
 
 namespace Botan {