diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c
index ca42ae4341148322c39f99d34e3bb1dab7623e8c..fd5d5f3770272bcf910487ce25c81febab6a87ab 100644
--- a/src/lib/crypt_ops/crypto_ope.c
+++ b/src/lib/crypt_ops/crypto_ope.c
@@ -18,8 +18,8 @@
 
 #define CRYPTO_OPE_PRIVATE
 #include "lib/crypt_ops/crypto_ope.h"
-#include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_util.h"
+#include "lib/crypt_ops/crypto_cipher.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 #include "lib/arch/bytes.h"
diff --git a/src/test/test_crypto_ope.c b/src/test/test_crypto_ope.c
index 7dcad7b4b2c4404f98cd5beeba2d22ec6d997b0a..4e7b95232705d6933367d74b5333891f30b8ee4d 100644
--- a/src/test/test_crypto_ope.c
+++ b/src/test/test_crypto_ope.c
@@ -7,9 +7,11 @@
 
 #define CRYPTO_OPE_PRIVATE
 
+#include "lib/cc/compat_compiler.h"
 #include "lib/crypt_ops/crypto_ope.h"
-#include "lib/crypt_ops/crypto.h"
+#include "lib/crypt_ops/crypto_cipher.h"
 #include "lib/encoding/binascii.h"
+#include "lib/malloc/malloc.h"
 #include "test/test.h"
 #include "tinytest.h"