diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 4ab74dc..8ed1ce0 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -18,9 +18,8 @@
  */
 
 #include "common.h"
-#include "ecp_invasive.h"
 
-#if defined(MBEDTLS_ECP_WITH_MPI_STRUCT)
+#if !defined(MBEDTLS_ECP_WITH_MPI_UINT)
 
 #if defined(MBEDTLS_ECP_LIGHT)
 
@@ -35,6 +34,7 @@
 
 #include "bn_mul.h"
 #include "bignum_core.h"
+#include "ecp_invasive.h"
 
 #include <string.h>
 
@@ -6041,4 +6041,4 @@
 #endif /* MBEDTLS_TEST_HOOKS */
 #endif /* !MBEDTLS_ECP_ALT */
 #endif /* MBEDTLS_ECP_LIGHT */
-#endif /* MBEDTLS_ECP_WITH_MPI_STRUCT */
+#endif /* MBEDTLS_ECP_WITH_MPI_UINT */