diff --git a/src/flash/flash.c b/src/flash/flash.c
index e910e42f9..d16949da4 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -29,7 +29,7 @@
 
 #include "flash.h"
 #include "common.h"
-#include "image.h"
+#include <target/image.h>
 #include <helper/time_support.h>
 
 static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock);
diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c
index ca8f3f519..81223b688 100644
--- a/src/flash/nor/ecos.c
+++ b/src/flash/nor/ecos.c
@@ -23,7 +23,7 @@
 
 #include "flash.h"
 #include <target/embeddedice.h>
-#include "image.h"
+#include <target/image.h>
 #include <target/algorithm.h>
 
 
diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c
index caec2c791..124ca3e1f 100644
--- a/src/flash/nor/faux.c
+++ b/src/flash/nor/faux.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "flash.h"
-#include "image.h"
+#include <target/image.h>
 #include "../hello.h"
 
 
diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index cf746794f..c1fefd70c 100644
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -23,7 +23,7 @@
 #endif
 
 
-#include "image.h"
+#include <target/image.h>
 #include "flash.h"
 #include <helper/binarybuffer.h>
 #include <target/armv4_5.h>
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 5cda21e23..cd8c46cd4 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -33,7 +33,7 @@
 #include "server.h"
 #include "flash.h"
 #include "gdb_server.h"
-#include "image.h"
+#include <target/image.h>
 #include <jtag/jtag.h>