diff --git a/include/mbedtls/bignum.h b/include/mbedtls/bignum.h
index 3b76c1c..c8d94c9 100644
--- a/include/mbedtls/bignum.h
+++ b/include/mbedtls/bignum.h
@@ -107,10 +107,10 @@
  * architecture by defining MBEDTLS_HAVE_INT32 or MBEDTLS_HAVE_INT64
  * respectively and undefining MBEDTLS_HAVE_ASM.
  *
- * Double length integers (e.g. 128-bit in 64-bit architectures) can be
+ * Double-width integers (e.g. 128-bit in 64-bit architectures) can be
  * disabled by defining MBEDTLS_NO_UDBL_DIVISION.
  *
- * The double length integer types can be configured by defining
+ * The double-width integer types can be configured by defining
  * MBEDTLS_TYPE_UDBL when the type cannot be automatically deduced by the
  * library (e.g. the compiler is unknown). The definition of MBEDTLS_TYPE_UDBL
  * must be a complete statement of the form:
diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 7261e7d..e846b42 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -654,8 +654,8 @@
 #error "MBEDTLS_HAVE_INT32 and MBEDTLS_HAVE_INT64 cannot be defined simultaneously"
 #endif /* MBEDTLS_HAVE_INT32 && MBEDTLS_HAVE_INT64 */
 
-#if (defined(MBEDTLS_HAVE_INT32) || define(MBEDTLS_HAVE_INT64)) && \
-    defined(MBEDTLS_HAVE_ASM
+#if ( defined(MBEDTLS_HAVE_INT32) || defined(MBEDTLS_HAVE_INT64) ) && \
+    defined(MBEDTLS_HAVE_ASM)
 #error "MBEDTLS_HAVE_INT32/MBEDTLS_HAVE_INT64 and MBEDTLS_HAVE_INT64 cannot be"
     "defined simultaneously"
 #endif /* (MBEDTLS_HAVE_INT32 || MBEDTLS_HAVE_INT64) && MBEDTLS_HAVE_ASM */