Fix inclusion of headers for commoncrypto module

GH #2271

5 files changed, 10 insertions, 14 deletions

diff --git a/src/lib/prov/commoncrypto/commoncrypto_block.cpp b/src/lib/prov/commoncrypto/commoncrypto_block.cpp
index b3680506b..d7d73b569 100644
--- a/src/lib/prov/commoncrypto/commoncrypto_block.cpp
+++ b/src/lib/prov/commoncrypto/commoncrypto_block.cpp
@@ -5,13 +5,12 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
+#include <botan/internal/commoncrypto.h>
+#include <botan/internal/commoncrypto_utils.h>
 #include <botan/hex.h>
-
 #include <botan/block_cipher.h>
-#include <botan/internal/commoncrypto.h>
-#include <CommonCrypto/CommonCrypto.h>
 
-#include "commoncrypto_utils.h"
+#include <CommonCrypto/CommonCrypto.h>
 
 namespace Botan {
 
diff --git a/src/lib/prov/commoncrypto/commoncrypto_hash.cpp b/src/lib/prov/commoncrypto/commoncrypto_hash.cpp
index bb5a5debe..a2125c6db 100644
--- a/src/lib/prov/commoncrypto/commoncrypto_hash.cpp
+++ b/src/lib/prov/commoncrypto/commoncrypto_hash.cpp
@@ -5,11 +5,12 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/hash.h>
 #include <botan/internal/commoncrypto.h>
-#include <CommonCrypto/CommonCrypto.h>
+#include <botan/hash.h>
 #include <unordered_map>
 
+#include <CommonCrypto/CommonCrypto.h>
+
 namespace Botan {
 
 namespace {
diff --git a/src/lib/prov/commoncrypto/commoncrypto_mode.cpp b/src/lib/prov/commoncrypto/commoncrypto_mode.cpp
index cb30b6802..82d4bd552 100644
--- a/src/lib/prov/commoncrypto/commoncrypto_mode.cpp
+++ b/src/lib/prov/commoncrypto/commoncrypto_mode.cpp
@@ -5,11 +5,10 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
+#include <botan/internal/commoncrypto.h>
+#include <botan/internal/commoncrypto_utils.h>
 #include <botan/cipher_mode.h>
 #include <botan/internal/rounding.h>
-#include <botan/internal/commoncrypto.h>
-
-#include "commoncrypto_utils.h"
 
 #include <limits.h>
 
diff --git a/src/lib/prov/commoncrypto/commoncrypto_utils.cpp b/src/lib/prov/commoncrypto/commoncrypto_utils.cpp
index 055f19f90..503a182e6 100644
--- a/src/lib/prov/commoncrypto/commoncrypto_utils.cpp
+++ b/src/lib/prov/commoncrypto/commoncrypto_utils.cpp
@@ -5,14 +5,13 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
+#include <botan/internal/commoncrypto.h>
+#include <botan/internal/commoncrypto_utils.h>
 #include <botan/cipher_mode.h>
 #include <botan/parsing.h>
-#include <botan/internal/commoncrypto.h>
 #include <botan/internal/rounding.h>
 #include <botan/scan_name.h>
 
-#include "commoncrypto_utils.h"
-
 namespace Botan {
 
 std::string CommonCrypto_Error::ccryptorstatus_to_string(CCCryptorStatus status)
diff --git a/src/lib/prov/commoncrypto/commoncrypto_utils.h b/src/lib/prov/commoncrypto/commoncrypto_utils.h
index f4bdf4e24..61e7e456e 100644
--- a/src/lib/prov/commoncrypto/commoncrypto_utils.h
+++ b/src/lib/prov/commoncrypto/commoncrypto_utils.h
@@ -14,8 +14,6 @@
 
 namespace Botan {
 
-class Key_Length_Specification;
-
 struct CommonCryptor_Opts
    {
    CCAlgorithm algo;