diff --git a/edid.c b/edid.c
index 32e795e..fc6bd8b 100644
--- a/edid.c
+++ b/edid.c
@@ -9,11 +9,6 @@
  * The size of an EDID block, defined in section 2.2.
  */
 #define EDID_BLOCK_SIZE 128
-/**
- * The maximum number of EDID blocks (including the base block), defined in
- * section 2.2.1.
- */
-#define EDID_MAX_BLOCK_COUNT 256
 
 /**
  * Fixed EDID header, defined in section 3.1.
@@ -168,12 +163,6 @@ di_edid_parse(const void *data, size_t size)
 
 	parse_vendor_product(data, &edid->vendor_product);
 
-	edid->exts = calloc(exts_len + 1, sizeof(struct di_edid_ext *));
-	if (!edid->exts) {
-		di_edid_destroy(edid);
-		return NULL;
-	}
-
 	for (i = 0; i < exts_len; i++) {
 		ext_data = (const uint8_t *) data + (i + 1) * EDID_BLOCK_SIZE;
 		if (!parse_ext(edid, ext_data) && errno != ENOTSUP) {
@@ -194,7 +183,6 @@ di_edid_destroy(struct di_edid *edid)
 		free(edid->exts[i]);
 	}
 
-	free(edid->exts);
 	free(edid);
 }
 
diff --git a/include/edid.h b/include/edid.h
index f062833..7533492 100644
--- a/include/edid.h
+++ b/include/edid.h
@@ -9,11 +9,17 @@
 
 #include <libdisplay-info/edid.h>
 
+/**
+ * The maximum number of EDID blocks (including the base block), defined in
+ * section 2.2.1.
+ */
+#define EDID_MAX_BLOCK_COUNT 256
+
 struct di_edid {
 	struct di_edid_vendor_product vendor_product;
 	int version, revision;
 	/* NULL-terminated, doesn't include the base block */
-	struct di_edid_ext **exts;
+	struct di_edid_ext *exts[EDID_MAX_BLOCK_COUNT];
 	size_t exts_len;
 };