diff --git a/src/adsp_config.c b/src/adsp_config.c
index 9c4c94c50..4b086f4fd 100644
--- a/src/adsp_config.c
+++ b/src/adsp_config.c
@@ -18,6 +18,8 @@
 #include "toml.h"
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdarg.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/src/css.c b/src/css.c
index 92f6ea89f..631c3ee43 100644
--- a/src/css.c
+++ b/src/css.c
@@ -6,6 +6,7 @@
 //         Keyon Jie <yang.jie@linux.intel.com>
 
 #include <stdio.h>
+#include <errno.h>
 #include <sys/time.h>
 #include <rimage/rimage.h>
 #include <rimage/css.h>
diff --git a/src/elf.c b/src/elf.c
index 552bc44d3..0275a194e 100644
--- a/src/elf.c
+++ b/src/elf.c
@@ -7,7 +7,9 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <rimage/rimage.h>
 #include <rimage/cse.h>
 #include <rimage/manifest.h>
diff --git a/src/ext_manifest.c b/src/ext_manifest.c
index 6985b919c..8ed899406 100644
--- a/src/ext_manifest.c
+++ b/src/ext_manifest.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include <rimage/ext_manifest_gen.h>
 #include <rimage/sof/kernel/ext_manifest.h>
diff --git a/src/include/rimage/rimage.h b/src/include/rimage/rimage.h
index 063f5ccec..692dbcdd7 100644
--- a/src/include/rimage/rimage.h
+++ b/src/include/rimage/rimage.h
@@ -11,9 +11,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include <openssl/conf.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
 #include <rimage/cavs/cavs_ext_manifest.h>
 #include <rimage/sof/kernel/fw.h>
 
@@ -87,10 +84,8 @@ struct image {
 	int meu_offset;
 	const char *verify_file;
 
-	/* SHA 256 & 384 */
+	/* private key file name*/
 	const char *key_name;
-	EVP_MD_CTX *mdctx;
-	const EVP_MD *md;
 
 	/* file IO */
 	void *fw_image;