diff --git a/include/tinycrypt/ecc.h b/include/tinycrypt/ecc.h
index 8abc949..ede7544 100644
--- a/include/tinycrypt/ecc.h
+++ b/include/tinycrypt/ecc.h
@@ -68,6 +68,7 @@
  *
  */
 
+#if defined(MBEDTLS_USE_UECC)
 #ifndef __TC_UECC_H__
 #define __TC_UECC_H__
 
@@ -543,3 +544,4 @@
 #endif
 
 #endif /* __TC_UECC_H__ */
+#endif /* MBEDTLS_USE_UECC */
diff --git a/include/tinycrypt/ecc_dh.h b/include/tinycrypt/ecc_dh.h
index b828e19..18a4fd2 100644
--- a/include/tinycrypt/ecc_dh.h
+++ b/include/tinycrypt/ecc_dh.h
@@ -66,6 +66,7 @@
  *  Security: The curve NIST p-256 provides approximately 128 bits of security.
  */
 
+#if defined(MBEDTLS_USE_UECC)
 #ifndef __TC_ECC_DH_H__
 #define __TC_ECC_DH_H__
 
@@ -129,3 +130,4 @@
 #endif
 
 #endif /* __TC_ECC_DH_H__ */
+#endif /* MBEDTLS_USE_UECC */
diff --git a/include/tinycrypt/ecc_dsa.h b/include/tinycrypt/ecc_dsa.h
index aca00bc..8065340 100644
--- a/include/tinycrypt/ecc_dsa.h
+++ b/include/tinycrypt/ecc_dsa.h
@@ -75,6 +75,7 @@
  *          the signer's public key and the signature values (r and s).
  */
 
+#if defined(MBEDTLS_USE_UECC)
 #ifndef __TC_ECC_DSA_H__
 #define __TC_ECC_DSA_H__
 
@@ -137,3 +138,4 @@
 #endif
 
 #endif /* __TC_ECC_DSA_H__ */
+#endif /* MBEDTLS_USE_UECC */
diff --git a/tinycrypt/ecc.c b/tinycrypt/ecc.c
index b398c94..c4a6770 100644
--- a/tinycrypt/ecc.c
+++ b/tinycrypt/ecc.c
@@ -52,6 +52,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(MBEDTLS_USE_UECC)
 #include <tinycrypt/ecc.h>
 #include <string.h>
 
@@ -937,5 +938,5 @@
 	return 1;
 }
 
-
+#endif /* MBEDTLS_USE_UECC */
 
diff --git a/tinycrypt/ecc_dh.c b/tinycrypt/ecc_dh.c
index 48d0da9..7277879 100644
--- a/tinycrypt/ecc_dh.c
+++ b/tinycrypt/ecc_dh.c
@@ -54,6 +54,7 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
+#if defined(MBEDTLS_USE_UECC)
 #include <tinycrypt/ecc.h>
 #include <tinycrypt/ecc_dh.h>
 #include <string.h>
@@ -195,3 +196,4 @@
 
 	return r;
 }
+#endif /* MBEDTLS_USE_UECC */
diff --git a/tinycrypt/ecc_dsa.c b/tinycrypt/ecc_dsa.c
index 9a4c0a5..d3e72a5 100644
--- a/tinycrypt/ecc_dsa.c
+++ b/tinycrypt/ecc_dsa.c
@@ -53,6 +53,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(MBEDTLS_USE_UECC)
 #include <tinycrypt/ecc.h>
 #include <tinycrypt/ecc_dsa.h>
 
@@ -292,3 +293,4 @@
 	return (int)(uECC_vli_equal(rx, r, num_words) == 0);
 }
 
+#endif /* MBEDTLS_USE_UECC */