diff --git a/library/pkcs7.c b/library/pkcs7.c
index ff0567c6f6..3c5040bfd6 100644
--- a/library/pkcs7.c
+++ b/library/pkcs7.c
@@ -9,7 +9,7 @@
 #include "mbedtls/asn1.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_crl.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/error.h"
 
 #if defined(MBEDTLS_FS_IO)
diff --git a/library/x509.c b/library/x509.c
index 9fc6389d27..e0d54b6dc4 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -21,7 +21,7 @@
 
 #include "mbedtls/asn1.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/library/x509_create.c b/library/x509_create.c
index 48ac080cbe..7ca5517528 100644
--- a/library/x509_create.c
+++ b/library/x509_create.c
@@ -11,7 +11,7 @@
 
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 
 #include <string.h>
 
diff --git a/library/x509_crt.c b/library/x509_crt.c
index faea404dba..959ae21931 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -23,7 +23,7 @@
 
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 
 #include <string.h>
diff --git a/library/x509_csr.c b/library/x509_csr.c
index 2e435645b1..bba9eaae23 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -21,7 +21,7 @@
 
 #include "mbedtls/x509_csr.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 
 #include <string.h>
diff --git a/library/x509_oid.c b/library/x509_oid.c
index 1637c1cff7..6ba04cf80d 100644
--- a/library/x509_oid.c
+++ b/library/x509_oid.c
@@ -11,7 +11,7 @@
 
 #if defined(MBEDTLS_OID_C)
 
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/rsa.h"
 #include "mbedtls/error_common.h"
 #include "mbedtls/pk.h"
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index 7d207481c2..4bacdad531 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -18,7 +18,7 @@
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/md.h"
diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index e65ddb07f4..74991f383d 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -17,7 +17,7 @@
 #include "mbedtls/x509_csr.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 
 #include "psa/crypto.h"
diff --git a/tests/suites/test_suite_x509_oid.function b/tests/suites/test_suite_x509_oid.function
index e96425e1aa..efcfee28f6 100644
--- a/tests/suites/test_suite_x509_oid.function
+++ b/tests/suites/test_suite_x509_oid.function
@@ -1,5 +1,5 @@
 /* BEGIN_HEADER */
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/asn1.h"
 #include "mbedtls/asn1write.h"
 #include "string.h"
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 7bcac865ec..b6fb2020ab 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -6,7 +6,7 @@
 #include "mbedtls/x509_csr.h"
 #include "x509_internal.h"
 #include "mbedtls/pem.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/base64.h"
 #include "mbedtls/error.h"
 #include "mbedtls/pk.h"
diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index f3a161ca52..e30eed949d 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -4,7 +4,7 @@
 #include "mbedtls/x509_csr.h"
 #include "x509_internal.h"
 #include "mbedtls/pem.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/rsa.h"
 #include "mbedtls/asn1.h"
 #include "mbedtls/asn1write.h"