diff --git a/include/mbedtls/oid.h b/include/mbedtls/oid.h
index 8ab7f7f944..9545072296 100644
--- a/include/mbedtls/oid.h
+++ b/include/mbedtls/oid.h
@@ -34,6 +34,7 @@
 #include "mbedtls/cipher.h"
 #endif
 
+#include "mbedtls/md.h"
 
 /** OID is not found. */
 #define MBEDTLS_ERR_OID_NOT_FOUND                         -0x002E
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index b69e3150fb..debb1cc2c1 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -40,6 +40,7 @@
 #include "mbedtls/dhm.h"
 #endif
 
+#include "mbedtls/md.h"
 
 #if defined(MBEDTLS_KEY_EXCHANGE_SOME_ECDH_OR_ECDHE_ANY_ENABLED)
 #include "mbedtls/ecdh.h"
diff --git a/include/mbedtls/ssl_ciphersuites.h b/include/mbedtls/ssl_ciphersuites.h
index 07791e5411..07f2facef5 100644
--- a/include/mbedtls/ssl_ciphersuites.h
+++ b/include/mbedtls/ssl_ciphersuites.h
@@ -27,6 +27,7 @@
 
 #include "mbedtls/pk.h"
 #include "mbedtls/cipher.h"
+#include "mbedtls/md.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index c0657a8275..a8a3022cb5 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -33,6 +33,7 @@
 #include "mbedtls/oid.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/platform_util.h"
+#include "mbedtls/md.h"
 
 #include <string.h>
 #include <stdint.h>
diff --git a/tests/suites/test_suite_entropy.function b/tests/suites/test_suite_entropy.function
index 7c7e43f17e..0e013b740d 100644
--- a/tests/suites/test_suite_entropy.function
+++ b/tests/suites/test_suite_entropy.function
@@ -1,6 +1,7 @@
 /* BEGIN_HEADER */
 #include "mbedtls/entropy.h"
 #include "entropy_poll.h"
+#include "mbedtls/md.h"
 #include "string.h"
 
 typedef enum {
diff --git a/tests/suites/test_suite_md.function b/tests/suites/test_suite_md.function
index 71dcb87655..866ff588f8 100644
--- a/tests/suites/test_suite_md.function
+++ b/tests/suites/test_suite_md.function
@@ -1,4 +1,5 @@
 /* BEGIN_HEADER */
+#include "mbedtls/md.h"
 #include "md_psa.h"
 
 #include "mbedtls/oid.h"
diff --git a/tests/suites/test_suite_pkcs1_v15.function b/tests/suites/test_suite_pkcs1_v15.function
index 716ae4453d..7113274550 100644
--- a/tests/suites/test_suite_pkcs1_v15.function
+++ b/tests/suites/test_suite_pkcs1_v15.function
@@ -1,5 +1,6 @@
 /* BEGIN_HEADER */
 #include "mbedtls/rsa.h"
+#include "mbedtls/md.h"
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES