diff --git a/src/flash/non_cfi.c b/src/flash/non_cfi.c
index 0da8ba377..808e642ea 100644
--- a/src/flash/non_cfi.c
+++ b/src/flash/non_cfi.c
@@ -32,7 +32,7 @@
 #define ERASE_REGION(num, size) (((size/256) << 16) | (num-1))
 
 /* non-CFI compatible flashes */
-static non_cfi_t non_cfi_flashes[] = {
+static struct non_cfi non_cfi_flashes[] = {
 	{
 		.mfr = CFI_MFR_SST,
 		.id = 0xd4,
@@ -406,7 +406,7 @@ static non_cfi_t non_cfi_flashes[] = {
 void cfi_fixup_non_cfi(flash_bank_t *bank)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	non_cfi_t *non_cfi = non_cfi_flashes;
+	struct non_cfi *non_cfi = non_cfi_flashes;
 
 	for (non_cfi = non_cfi_flashes; non_cfi->mfr; non_cfi++)
 	{
diff --git a/src/flash/non_cfi.h b/src/flash/non_cfi.h
index 14a6df72d..ef50ae5c5 100644
--- a/src/flash/non_cfi.h
+++ b/src/flash/non_cfi.h
@@ -22,7 +22,7 @@
 
 #include "flash.h"
 
-typedef struct non_cfi_s
+struct non_cfi
 {
 	uint16_t mfr;
 	uint16_t id;
@@ -33,7 +33,7 @@ typedef struct non_cfi_s
 	uint8_t num_erase_regions;
 	uint32_t erase_region_info[6];
 	uint8_t  status_poll_mask;
-} non_cfi_t;
+};
 
 void cfi_fixup_non_cfi(flash_bank_t *bank);