diff --git a/src/flash/davinci_nand.c b/src/flash/davinci_nand.c
index b3164abfc..d4c161975 100644
--- a/src/flash/davinci_nand.c
+++ b/src/flash/davinci_nand.c
@@ -744,7 +744,7 @@ fail:
 	return ERROR_NAND_OPERATION_FAILED;
 }
 
-nand_flash_controller_t davinci_nand_controller = {
+struct nand_flash_controller davinci_nand_controller = {
 	.name			= "davinci",
 	.nand_device_command	= davinci_nand_device_command,
 	.register_commands	= davinci_register_commands,
diff --git a/src/flash/lpc3180_nand_controller.c b/src/flash/lpc3180_nand_controller.c
index 319858cb2..016fa70cb 100644
--- a/src/flash/lpc3180_nand_controller.c
+++ b/src/flash/lpc3180_nand_controller.c
@@ -882,7 +882,7 @@ static int lpc3180_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-nand_flash_controller_t lpc3180_nand_controller = {
+struct nand_flash_controller lpc3180_nand_controller = {
 		.name = "lpc3180",
 		.nand_device_command = lpc3180_nand_device_command,
 		.register_commands = lpc3180_register_commands,
diff --git a/src/flash/mx3_nand.c b/src/flash/mx3_nand.c
index bce7aa8f3..531111660 100644
--- a/src/flash/mx3_nand.c
+++ b/src/flash/mx3_nand.c
@@ -868,7 +868,7 @@ static int do_data_output (struct nand_device_s *nand)
 	return ERROR_OK;
 }
 
-nand_flash_controller_t imx31_nand_flash_controller = {
+struct nand_flash_controller imx31_nand_flash_controller = {
 		.name = "imx31",
 		.nand_device_command = &imx31_nand_device_command,
 		.register_commands = &imx31_register_commands,
diff --git a/src/flash/nand.c b/src/flash/nand.c
index 44207a823..1249327ae 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -35,18 +35,18 @@ static int nand_write_page(struct nand_device_s *nand, uint32_t page, uint8_t *d
 
 /* NAND flash controller
  */
-extern nand_flash_controller_t davinci_nand_controller;
-extern nand_flash_controller_t lpc3180_nand_controller;
-extern nand_flash_controller_t orion_nand_controller;
-extern nand_flash_controller_t s3c2410_nand_controller;
-extern nand_flash_controller_t s3c2412_nand_controller;
-extern nand_flash_controller_t s3c2440_nand_controller;
-extern nand_flash_controller_t s3c2443_nand_controller;
-extern nand_flash_controller_t imx31_nand_flash_controller;
+extern struct nand_flash_controller davinci_nand_controller;
+extern struct nand_flash_controller lpc3180_nand_controller;
+extern struct nand_flash_controller orion_nand_controller;
+extern struct nand_flash_controller s3c2410_nand_controller;
+extern struct nand_flash_controller s3c2412_nand_controller;
+extern struct nand_flash_controller s3c2440_nand_controller;
+extern struct nand_flash_controller s3c2443_nand_controller;
+extern struct nand_flash_controller imx31_nand_flash_controller;
 
-/* extern nand_flash_controller_t boundary_scan_nand_controller; */
+/* extern struct nand_flash_controller boundary_scan_nand_controller; */
 
-static nand_flash_controller_t *nand_flash_controllers[] =
+static struct nand_flash_controller *nand_flash_controllers[] =
 {
 	&davinci_nand_controller,
 	&lpc3180_nand_controller,
diff --git a/src/flash/nand.h b/src/flash/nand.h
index 57076d548..ce7ed9df4 100644
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -32,7 +32,7 @@ struct nand_device_s;
 #define __NAND_DEVICE_COMMAND(name) \
 		COMMAND_HELPER(name, struct nand_device_s *nand)
 
-typedef struct nand_flash_controller_s
+struct nand_flash_controller
 {
 	char *name;
 	__NAND_DEVICE_COMMAND((*nand_device_command));
@@ -49,7 +49,7 @@ typedef struct nand_flash_controller_s
 	int (*read_page)(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
 	int (*controller_ready)(struct nand_device_s *nand, int timeout);
 	int (*nand_ready)(struct nand_device_s *nand, int timeout);
-} nand_flash_controller_t;
+};
 
 #define NAND_DEVICE_COMMAND_HANDLER(name) static __NAND_DEVICE_COMMAND(name)
 
@@ -75,7 +75,7 @@ typedef struct nand_ecclayout_s {
 
 typedef struct nand_device_s
 {
-	nand_flash_controller_t *controller;
+	struct nand_flash_controller *controller;
 	void *controller_priv;
 	struct nand_manufacturer_s *manufacturer;
 	struct nand_info_s *device;
diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c
index b112c9e3d..03280c189 100644
--- a/src/flash/orion_nand.c
+++ b/src/flash/orion_nand.c
@@ -169,7 +169,7 @@ static int orion_nand_init(struct nand_device_s *nand)
 	return ERROR_OK;
 }
 
-nand_flash_controller_t orion_nand_controller =
+struct nand_flash_controller orion_nand_controller =
 {
 	.name			= "orion",
 	.command		= orion_nand_command,
diff --git a/src/flash/s3c2410_nand.c b/src/flash/s3c2410_nand.c
index 5badf1a4a..c57fe9369 100644
--- a/src/flash/s3c2410_nand.c
+++ b/src/flash/s3c2410_nand.c
@@ -107,7 +107,7 @@ static int s3c2410_nand_ready(struct nand_device_s *nand, int timeout)
 	return 0;
 }
 
-nand_flash_controller_t s3c2410_nand_controller = {
+struct nand_flash_controller s3c2410_nand_controller = {
 		.name = "s3c2410",
 		.nand_device_command = &s3c2410_nand_device_command,
 		.register_commands = &s3c24xx_register_commands,
diff --git a/src/flash/s3c2412_nand.c b/src/flash/s3c2412_nand.c
index 958f013d0..b41705dc4 100644
--- a/src/flash/s3c2412_nand.c
+++ b/src/flash/s3c2412_nand.c
@@ -61,7 +61,7 @@ static int s3c2412_init(struct nand_device_s *nand)
 	return ERROR_OK;
 }
 
-nand_flash_controller_t s3c2412_nand_controller = {
+struct nand_flash_controller s3c2412_nand_controller = {
 		.name = "s3c2412",
 		.nand_device_command = &s3c2412_nand_device_command,
 		.register_commands = &s3c24xx_register_commands,
diff --git a/src/flash/s3c2440_nand.c b/src/flash/s3c2440_nand.c
index 80020f63d..8c0568780 100644
--- a/src/flash/s3c2440_nand.c
+++ b/src/flash/s3c2440_nand.c
@@ -153,7 +153,7 @@ int s3c2440_write_block_data(struct nand_device_s *nand, uint8_t *data, int data
 	return ERROR_OK;
 }
 
-nand_flash_controller_t s3c2440_nand_controller = {
+struct nand_flash_controller s3c2440_nand_controller = {
 		.name = "s3c2440",
 		.nand_device_command = &s3c2440_nand_device_command,
 		.register_commands = &s3c24xx_register_commands,
diff --git a/src/flash/s3c2443_nand.c b/src/flash/s3c2443_nand.c
index af7d9a9aa..30549f6b7 100644
--- a/src/flash/s3c2443_nand.c
+++ b/src/flash/s3c2443_nand.c
@@ -62,7 +62,7 @@ static int s3c2443_init(struct nand_device_s *nand)
 	return ERROR_OK;
 }
 
-nand_flash_controller_t s3c2443_nand_controller = {
+struct nand_flash_controller s3c2443_nand_controller = {
 		.name = "s3c2443",
 		.nand_device_command = &s3c2443_nand_device_command,
 		.register_commands = &s3c24xx_register_commands,