diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 8ebe438..fe86c1e 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -78,7 +78,7 @@
 #endif
 
 #if defined(MBEDTLS_CMAC_C) && \
-    !defined(MBEDTLS_AES_C) && !defined(MBEDTLS_CAMELLIA_C) && !defined(MBEDTLS_DES_C)
+    !defined(MBEDTLS_AES_C) && !defined(MBEDTLS_DES_C)
 #error "MBEDTLS_CMAC_C defined, but not all prerequisites"
 #endif
 
diff --git a/include/mbedtls/cmac.h b/include/mbedtls/cmac.h
index 71f7ab4..d94c015 100644
--- a/include/mbedtls/cmac.h
+++ b/include/mbedtls/cmac.h
@@ -30,10 +30,13 @@
 extern "C" {
 #endif
 
+#define MBEDTLS_AES_BLOCK_SIZE          16
+#define MBEDTLS_DES3_BLOCK_SIZE         8
+
 #if defined(MBEDTLS_AES_C)
-#define MBEDTLS_CIPHER_BLKSIZE_MAX_SIZE     16  /* longest known is AES */
+#define MBEDTLS_CIPHER_BLKSIZE_MAX      16  /* longest used by CMAC is AES */
 #else
-#define MBEDTLS_CIPHER_BLKSIZE_MAX_SIZE     8   /* longest known is 3DES */
+#define MBEDTLS_CIPHER_BLKSIZE_MAX      8   /* longest used by CMAC is 3DES */
 #endif
 
 /**
@@ -43,11 +46,11 @@
 {
 
     /** Internal state of the CMAC algorithm  */
-    unsigned char       state[MBEDTLS_CIPHER_BLKSIZE_MAX_SIZE];
+    unsigned char       state[MBEDTLS_CIPHER_BLKSIZE_MAX];
 
     /** Unprocessed data - either data that was not block aligned and is still 
      *  pending to be processed, or the final block */
-    unsigned char       unprocessed_block[MBEDTLS_CIPHER_BLKSIZE_MAX_SIZE];
+    unsigned char       unprocessed_block[MBEDTLS_CIPHER_BLKSIZE_MAX];
 
     /** Length of data pending to be processed */
     size_t              unprocessed_len;
@@ -133,7 +136,7 @@
                          const unsigned char *input, size_t ilen,
                          unsigned char *output );
 
-#ifdef MBEDTLS_AES_C
+#if defined(MBEDTLS_AES_C)
 /**
  * \brief           AES-CMAC-128-PRF
  *                  Implementation of (AES-CMAC-PRF-128), as defined in RFC 4615
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 4546d59..498e5b5 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -1679,7 +1679,7 @@
  *
  * Module:  library/cmac.c
  *
- * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C or MBEDTLS_DES_C
+ * Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
  *
  */
 //#define MBEDTLS_CMAC_C