diff --git a/libs/srtp/crypto/include/crypto_math.h b/libs/srtp/crypto/include/crypto_math.h index be6558f638..e91c61992f 100644 --- a/libs/srtp/crypto/include/crypto_math.h +++ b/libs/srtp/crypto/include/crypto_math.h @@ -46,6 +46,10 @@ #define MATH_H #include "datatypes.h" +#ifndef SRTP_KERNEL +# include +#endif + unsigned char v32_weight(v32_t a); diff --git a/libs/srtp/crypto/include/datatypes.h b/libs/srtp/crypto/include/datatypes.h index 17b531beb6..841cca8b93 100644 --- a/libs/srtp/crypto/include/datatypes.h +++ b/libs/srtp/crypto/include/datatypes.h @@ -53,7 +53,6 @@ #include #ifndef SRTP_KERNEL -# include # include # include # ifdef HAVE_NETINET_IN_H diff --git a/libs/srtp/crypto/kernel/crypto_kernel.c b/libs/srtp/crypto/kernel/crypto_kernel.c index 23131c9c54..a0a75df0bc 100644 --- a/libs/srtp/crypto/kernel/crypto_kernel.c +++ b/libs/srtp/crypto/kernel/crypto_kernel.c @@ -46,6 +46,9 @@ #include "alloc.h" #include "crypto_kernel.h" +#ifndef SRTP_KERNEL +# include +#endif /* the debug module for the crypto_kernel */ diff --git a/libs/srtp/crypto/kernel/err.c b/libs/srtp/crypto/kernel/err.c index f68a629975..b9dbb5c2fd 100644 --- a/libs/srtp/crypto/kernel/err.c +++ b/libs/srtp/crypto/kernel/err.c @@ -47,6 +47,9 @@ #endif #include "err.h" +#ifndef SRTP_KERNEL +# include +#endif #ifdef ERR_REPORTING_SYSLOG # ifdef HAVE_SYSLOG_H diff --git a/libs/srtp/crypto/math/math.c b/libs/srtp/crypto/math/math.c index f3aaf65014..0d4757792d 100644 --- a/libs/srtp/crypto/math/math.c +++ b/libs/srtp/crypto/math/math.c @@ -814,7 +814,6 @@ bitvector_get_bit(const bitvector_t *v, int bit_index) { } -#include int bitvector_print_hex(const bitvector_t *v, FILE *stream) {