diff --git a/src/flash/at91sam7.h b/src/flash/at91sam7.h
index f57f36ec8cc156b6cd32f248eedf01d5716bdc35..5e652bf06d8da692ad145dcfaa26d1f902ed34fc 100644
--- a/src/flash/at91sam7.h
+++ b/src/flash/at91sam7.h
@@ -24,7 +24,6 @@
 #define AT91SAM7_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct at91sam7_flash_bank_s
 {
diff --git a/src/flash/avrf.h b/src/flash/avrf.h
index 6c5868c4d74cbb550b4c93a8959ca71356ddc0bd..12ef8bdb659ca9c63b6b6221d0822547dfbd9d34 100644
--- a/src/flash/avrf.h
+++ b/src/flash/avrf.h
@@ -20,6 +20,8 @@
 #ifndef AVRF_H
 #define AVRF_H
 
+#include "types.h"
+
 typedef struct avrf_type_s
 {
 	char name[15];
diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index dc43dd18bda7523a87645ae287f95f65097a06e7..49fbad49777b192a1f51be369a9b8f2fa4b2d367 100644
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -21,7 +21,6 @@
 #define CFI_H
 
 #include "flash.h"
-#include "target.h"
 
 #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */
diff --git a/src/flash/flash.h b/src/flash/flash.h
index 817c60628320c53eb42d319aaf51e04c1cae6e7b..1a98286cc535c371966397c69d8c54fe5a3df248 100644
--- a/src/flash/flash.h
+++ b/src/flash/flash.h
@@ -27,7 +27,9 @@
 #define FLASH_H
 
 #include "target.h"
-#include "image.h"
+#include "log.h"
+
+struct image_s;
 
 #define FLASH_MAX_ERROR_STR	(128)
 
@@ -65,7 +67,7 @@ typedef struct flash_driver_s
 
 typedef struct flash_bank_s
 {
-	target_t *target;
+	struct target_s *target;
 	flash_driver_t *driver;
 	void *driver_priv;
 	int bank_number;
@@ -81,8 +83,8 @@ typedef struct flash_bank_s
 extern int flash_register_commands(struct command_context_s *cmd_ctx);
 extern int flash_init_drivers(struct command_context_s *cmd_ctx);
 
-extern int flash_erase_address_range(target_t *target, u32 addr, u32 length);
-extern int flash_write(target_t *target, image_t *image, u32 *written, int erase);
+extern int flash_erase_address_range(struct target_s *target, u32 addr, u32 length);
+extern int flash_write(struct target_s *target, struct image_s *image, u32 *written, int erase);
 extern void flash_set_dirty(void);
 extern int flash_get_bank_count(void);
 extern int default_flash_blank_check(struct flash_bank_s *bank);
@@ -90,7 +92,7 @@ extern int default_flash_mem_blank_check(struct flash_bank_s *bank);
 
 extern flash_bank_t *get_flash_bank_by_num(int num);
 extern flash_bank_t *get_flash_bank_by_num_noprobe(int num);
-extern flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr);
+extern flash_bank_t *get_flash_bank_by_addr(struct target_s *target, u32 addr);
 
 #define ERROR_FLASH_BANK_INVALID			(-900)
 #define ERROR_FLASH_SECTOR_INVALID			(-901)
diff --git a/src/flash/lpc2000.h b/src/flash/lpc2000.h
index c527588cda428c92abe32f3f576269bdce93af13..a047381fbe94803e74a97764ffed6939ba851dc3 100644
--- a/src/flash/lpc2000.h
+++ b/src/flash/lpc2000.h
@@ -21,7 +21,6 @@
 #define LPC2000_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct lpc2000_flash_bank_s
 {
diff --git a/src/flash/lpc288x.h b/src/flash/lpc288x.h
index d9f99dd442b10bab95c04f8d3bbb30841f3fe66c..522d0eb4988dbb2358591b791c334384f5de147c 100644
--- a/src/flash/lpc288x.h
+++ b/src/flash/lpc288x.h
@@ -22,7 +22,6 @@
 #define lpc288x_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct lpc288x_flash_bank_s
 {
diff --git a/src/flash/mflash.h b/src/flash/mflash.h
index 4f9e0a003e5227c4fcbc7cc589ff13a7571f3162..e78f24864ff481cf62954ff90e957e45ef9f0038 100644
--- a/src/flash/mflash.h
+++ b/src/flash/mflash.h
@@ -20,6 +20,8 @@
 #ifndef _MFLASH_H
 #define _MFLASH_H
 
+#include "target.h"
+
 typedef unsigned long mg_io_uint32;
 typedef unsigned short mg_io_uint16;
 typedef unsigned char mg_io_uint8;
diff --git a/src/flash/non_cfi.h b/src/flash/non_cfi.h
index e4b33d403d3274958de06d83fe763b47d1d6c2e3..3950e21b96052e9005f75fbe8fec6e916eb8b469 100644
--- a/src/flash/non_cfi.h
+++ b/src/flash/non_cfi.h
@@ -20,7 +20,7 @@
 #ifndef NON_CFI_H
 #define NON_CFI_H
 
-#include "types.h"
+#include "flash.h"
 
 typedef struct non_cfi_s
 {
diff --git a/src/flash/pic32mx.h b/src/flash/pic32mx.h
index f799a467ba542c055a9182fcce92eff88c0f7760..da102c07163e60b5d0fad350771ec56c6b0111ba 100644
--- a/src/flash/pic32mx.h
+++ b/src/flash/pic32mx.h
@@ -27,7 +27,6 @@
 #define PIC32MX_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct pic32mx_flash_bank_s
 {
diff --git a/src/flash/s3c24xx_nand.h b/src/flash/s3c24xx_nand.h
index d77bafe558570a83755363d201e447491f8dc910..8f96f2d27fb026a4d9b883e780d85a42dc45938f 100644
--- a/src/flash/s3c24xx_nand.h
+++ b/src/flash/s3c24xx_nand.h
@@ -24,7 +24,7 @@
  * Many thanks to Simtec Electronics for sponsoring this work.
  */
 
-#include "target.h"
+#include "nand.h"
 #include "s3c24xx_regs_nand.h"
 
 typedef struct s3c24xx_nand_controller_s
diff --git a/src/flash/stellaris.h b/src/flash/stellaris.h
index 2bf4aa6c2a922ab139379ad171c1e7deebf09202..317309a63cf256dbaab933e5d19cb85576cab7dc 100644
--- a/src/flash/stellaris.h
+++ b/src/flash/stellaris.h
@@ -21,7 +21,6 @@
 #define STELLARIS_FLASH_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct stellaris_flash_bank_s
 {
diff --git a/src/flash/stm32x.h b/src/flash/stm32x.h
index 1357162c8be826ef25003aadcb76679945a3d668..587f97f7f89d05f2c83446ab6097743cd0726c06 100644
--- a/src/flash/stm32x.h
+++ b/src/flash/stm32x.h
@@ -24,7 +24,6 @@
 #define STM32X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct stm32x_options_s
 {
diff --git a/src/flash/str7x.h b/src/flash/str7x.h
index b602498cdaef9e870cd7e34f85b588d88750fe61..5d0b1824a9eec4ab4ae0933de00d40a769f58009 100644
--- a/src/flash/str7x.h
+++ b/src/flash/str7x.h
@@ -24,7 +24,6 @@
 #define STR7X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str7x_flash_bank_s
 {
diff --git a/src/flash/str9x.h b/src/flash/str9x.h
index 5e36e48de0fbd3ca57abfd39156fff9d4d0aeb4b..b5e569d0ede3f5a15cec3049992da692bcd72a3a 100644
--- a/src/flash/str9x.h
+++ b/src/flash/str9x.h
@@ -24,7 +24,6 @@
 #define STR9X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str9x_flash_bank_s
 {
diff --git a/src/flash/str9xpec.h b/src/flash/str9xpec.h
index 7796026f7507d33e4e3b27832f03d3222958157c..250e251b5b8ac6c8b770df04b52346c9b53c0537 100644
--- a/src/flash/str9xpec.h
+++ b/src/flash/str9xpec.h
@@ -24,7 +24,6 @@
 #define STR9XPEC_H
 
 #include "flash.h"
-#include "target.h"
 #include "jtag.h"
 
 typedef struct str9xpec_flash_controller_s