diff --git a/include/mbedtls/debug.h b/include/mbedtls/debug.h
index c293e87..bdfc597 100644
--- a/include/mbedtls/debug.h
+++ b/include/mbedtls/debug.h
@@ -14,10 +14,6 @@
 
 #include "mbedtls/ssl.h"
 
-#if defined(MBEDTLS_ECP_C)
-#include "mbedtls/private/ecp.h"
-#endif
-
 #if defined(MBEDTLS_DEBUG_C)
 
 #define MBEDTLS_DEBUG_STRIP_PARENS(...)   __VA_ARGS__
@@ -32,11 +28,6 @@
 #define MBEDTLS_SSL_DEBUG_BUF(level, text, buf, len)           \
     mbedtls_debug_print_buf(ssl, level, __FILE__, __LINE__, text, buf, len)
 
-#if defined(MBEDTLS_BIGNUM_C)
-#define MBEDTLS_SSL_DEBUG_MPI(level, text, X)                  \
-    mbedtls_debug_print_mpi(ssl, level, __FILE__, __LINE__, text, X)
-#endif
-
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
 #define MBEDTLS_SSL_DEBUG_CRT(level, text, crt)                \
@@ -51,7 +42,6 @@
 #define MBEDTLS_SSL_DEBUG_MSG(level, args)            do { } while (0)
 #define MBEDTLS_SSL_DEBUG_RET(level, text, ret)       do { } while (0)
 #define MBEDTLS_SSL_DEBUG_BUF(level, text, buf, len)  do { } while (0)
-#define MBEDTLS_SSL_DEBUG_MPI(level, text, X)         do { } while (0)
 #define MBEDTLS_SSL_DEBUG_ECP(level, text, X)         do { } while (0)
 #define MBEDTLS_SSL_DEBUG_CRT(level, text, crt)       do { } while (0)
 
diff --git a/include/mbedtls/x509.h b/include/mbedtls/x509.h
index f76928a..8b6a1da 100644
--- a/include/mbedtls/x509.h
+++ b/include/mbedtls/x509.h
@@ -16,10 +16,6 @@
 #include "mbedtls/asn1.h"
 #include "mbedtls/pk.h"
 
-#if defined(MBEDTLS_RSA_C)
-#include "mbedtls/private/rsa.h"
-#endif
-
 /**
  * \addtogroup x509_module
  * \{
diff --git a/library/debug_internal.h b/library/debug_internal.h
index 3ffcee1..79a4c45 100644
--- a/library/debug_internal.h
+++ b/library/debug_internal.h
@@ -73,9 +73,7 @@
 
 #if defined(MBEDTLS_BIGNUM_C)
 /**
- * \brief   Print a MPI variable to the debug output. This function is always
- *          used through the MBEDTLS_SSL_DEBUG_MPI() macro, which supplies the
- *          ssl context, file and line number parameters.
+ * \brief   Print a MPI variable to the debug output.
  *
  * \param ssl       SSL context
  * \param level     error level of the debug message