diff --git a/src/crypto/aes.h b/src/crypto/aes.h --- a/src/crypto/aes.h +++ b/src/crypto/aes.h @@ -8,7 +8,7 @@ #define BITCOIN_CRYPTO_AES_H extern "C" { -#include "crypto/ctaes/ctaes.h" +#include } static const int AES_BLOCKSIZE = 16; diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "aes.h" -#include "crypto/common.h" +#include +#include #include #include extern "C" { -#include "crypto/ctaes/ctaes.c" +#include } AES128Encrypt::AES128Encrypt(const uint8_t key[16]) { diff --git a/src/crypto/chacha20.cpp b/src/crypto/chacha20.cpp --- a/src/crypto/chacha20.cpp +++ b/src/crypto/chacha20.cpp @@ -5,8 +5,8 @@ // Based on the public domain implementation 'merged' by D. J. Bernstein // See https://cr.yp.to/chacha.html. -#include "crypto/chacha20.h" -#include "crypto/common.h" +#include +#include #include diff --git a/src/crypto/common.h b/src/crypto/common.h --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -6,13 +6,13 @@ #define BITCOIN_CRYPTO_COMMON_H #if defined(HAVE_CONFIG_H) -#include "config/bitcoin-config.h" +#include #endif #include #include -#include "compat/endian.h" +#include static inline uint16_t ReadLE16(const uint8_t *ptr) { uint16_t x; diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h --- a/src/crypto/hmac_sha256.h +++ b/src/crypto/hmac_sha256.h @@ -5,7 +5,7 @@ #ifndef BITCOIN_CRYPTO_HMAC_SHA256_H #define BITCOIN_CRYPTO_HMAC_SHA256_H -#include "crypto/sha256.h" +#include #include #include diff --git a/src/crypto/hmac_sha256.cpp b/src/crypto/hmac_sha256.cpp --- a/src/crypto/hmac_sha256.cpp +++ b/src/crypto/hmac_sha256.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "crypto/hmac_sha256.h" +#include #include diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h --- a/src/crypto/hmac_sha512.h +++ b/src/crypto/hmac_sha512.h @@ -5,7 +5,7 @@ #ifndef BITCOIN_CRYPTO_HMAC_SHA512_H #define BITCOIN_CRYPTO_HMAC_SHA512_H -#include "crypto/sha512.h" +#include #include #include diff --git a/src/crypto/hmac_sha512.cpp b/src/crypto/hmac_sha512.cpp --- a/src/crypto/hmac_sha512.cpp +++ b/src/crypto/hmac_sha512.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "crypto/hmac_sha512.h" +#include #include diff --git a/src/crypto/ripemd160.cpp b/src/crypto/ripemd160.cpp --- a/src/crypto/ripemd160.cpp +++ b/src/crypto/ripemd160.cpp @@ -2,9 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "crypto/ripemd160.h" +#include -#include "crypto/common.h" +#include #include diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp --- a/src/crypto/sha1.cpp +++ b/src/crypto/sha1.cpp @@ -2,9 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "crypto/sha1.h" +#include -#include "crypto/common.h" +#include #include diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "crypto/sha256.h" -#include "crypto/common.h" +#include +#include #include #include diff --git a/src/crypto/sha256_avx2.cpp b/src/crypto/sha256_avx2.cpp --- a/src/crypto/sha256_avx2.cpp +++ b/src/crypto/sha256_avx2.cpp @@ -3,8 +3,8 @@ #include #include -#include "crypto/common.h" -#include "crypto/sha256.h" +#include +#include namespace sha256d64_avx2 { namespace { diff --git a/src/crypto/sha256_sse41.cpp b/src/crypto/sha256_sse41.cpp --- a/src/crypto/sha256_sse41.cpp +++ b/src/crypto/sha256_sse41.cpp @@ -3,8 +3,8 @@ #include #include -#include "crypto/common.h" -#include "crypto/sha256.h" +#include +#include namespace sha256d64_sse41 { namespace { diff --git a/src/crypto/sha512.cpp b/src/crypto/sha512.cpp --- a/src/crypto/sha512.cpp +++ b/src/crypto/sha512.cpp @@ -2,9 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "crypto/sha512.h" +#include -#include "crypto/common.h" +#include #include