diff --git a/openssl-sys/build/run_bindgen.rs b/openssl-sys/build/run_bindgen.rs
index 3a8f5dea52..17ee85cac8 100644
--- a/openssl-sys/build/run_bindgen.rs
+++ b/openssl-sys/build/run_bindgen.rs
@@ -41,7 +41,7 @@
 #include <openssl/srtp.h>
 #endif
 
-#if !(defined(LIBRESSL_VERSION_NUMBER) || defined(OPENSSL_IS_BORINGSSL) || defined(OPENSSL_IS_AWSLC))
+#if !(defined(OPENSSL_IS_BORINGSSL) || defined(OPENSSL_IS_AWSLC))
 #include <openssl/cms.h>
 #endif
 
diff --git a/systest/build.rs b/systest/build.rs
index ca4cd9d870..4b35c148a2 100644
--- a/systest/build.rs
+++ b/systest/build.rs
@@ -72,7 +72,8 @@
         .header("openssl/x509_vfy.h");
 
     if let Some(version) = libressl_version {
-        cfg.header("openssl/poly1305.h");
+        cfg.header("openssl/cms.h")
+            .header("openssl/poly1305.h");
         if version >= 0x30600000 {
             cfg.header("openssl/kdf.h");
         }