diff --git a/library/cipher.c b/library/cipher.c
index f38eb04..a0354d6 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -29,7 +29,7 @@
 #include "mbedtls/cipher_internal.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
-#include "constant_time.h"
+#include "mbedtls/constant_time.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/library/constant_time.c b/library/constant_time.c
index 952528d..9779712 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -24,6 +24,7 @@
 
 #include "common.h"
 #include "constant_time.h"
+#include "mbedtls/constant_time.h"
 #include "mbedtls/error.h"
 #include "mbedtls/platform_util.h"
 
diff --git a/library/constant_time.h b/library/constant_time.h
index 26e0dd0..d78dd70 100644
--- a/library/constant_time.h
+++ b/library/constant_time.h
@@ -33,25 +33,6 @@
 #include <stddef.h>
 
 
-/** Constant-time buffer comparison without branches.
- *
- * This is equivalent to the standard memncmp function, but is likely to be
- * compiled to code using bitwise operation rather than a branch.
- *
- * This function can be used to write constant-time code by replacing branches
- * with bit operations using masks.
- *
- * \param a     Pointer to the first buffer.
- * \param b     Pointer to the second buffer.
- * \param n     The number of bytes to compare in the buffer.
- *
- * \return      Zero if the content of the two buffer is the same,
- *              otherwise non-zero.
- */
-int mbedtls_cf_memcmp( const void *a,
-                       const void *b,
-                       size_t n );
-
 /** Turn a value into a mask:
  * - if \p value == 0, return the all-bits 0 mask, aka 0
  * - otherwise, return the all-bits 1 mask, aka (unsigned) -1
diff --git a/library/nist_kw.c b/library/nist_kw.c
index 98c237b..e5d7fcd 100644
--- a/library/nist_kw.c
+++ b/library/nist_kw.c
@@ -34,7 +34,7 @@
 #include "mbedtls/nist_kw.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
-#include "constant_time.h"
+#include "mbedtls/constant_time.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/library/rsa.c b/library/rsa.c
index ea88871..351f4af 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -45,6 +45,7 @@
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
 #include "constant_time.h"
+#include "mbedtls/constant_time.h"
 
 #include <string.h>
 
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 0bc39fa..def6c7b 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -33,7 +33,7 @@
 #include "mbedtls/ssl_internal.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/error.h"
-#include "constant_time.h"
+#include "mbedtls/constant_time.h"
 
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
 #include "mbedtls/psa_util.h"
diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c
index d19a13a..cdc2364 100644
--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@@ -36,7 +36,7 @@
 #include "mbedtls/ssl_internal.h"
 #include "mbedtls/error.h"
 #include "mbedtls/platform_util.h"
-#include "constant_time.h"
+#include "mbedtls/constant_time.h"
 
 #include <string.h>
 
diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 57a56f4..83c4a4b 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -45,6 +45,7 @@
 #include "mbedtls/platform_util.h"
 #include "mbedtls/version.h"
 #include "constant_time.h"
+#include "mbedtls/constant_time.h"
 
 #include <string.h>
 
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index c50ce92..d9d49a2 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -35,6 +35,7 @@
 #include "mbedtls/error.h"
 #include "mbedtls/platform_util.h"
 #include "constant_time.h"
+#include "mbedtls/constant_time.h"
 
 #include <string.h>
 
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 3fafb7d..f6c593d 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -43,7 +43,7 @@
 #include "mbedtls/error.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/version.h"
-#include "constant_time.h"
+#include "mbedtls/constant_time.h"
 
 #include <string.h>