diff --git a/src/ecosboard.c b/src/ecosboard.c
index b42a777cd..2464868e7 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -27,7 +27,7 @@
 #include <helper/configuration.h>
 #include "xsvf.h"
 #include "svf.h"
-#include "nand.h"
+#include <flash/nand.h>
 #include "pld.h"
 
 #include "server.h"
diff --git a/src/flash/arm_nandio.h b/src/flash/arm_nandio.h
index 6788e36b6..27b3ad351 100644
--- a/src/flash/arm_nandio.h
+++ b/src/flash/arm_nandio.h
@@ -1,7 +1,7 @@
 #ifndef __ARM_NANDIO_H
 #define __ARM_NANDIO_H
 
-#include "nand.h"
+#include <flash/nand.h>
 #include <helper/binarybuffer.h>
 
 /**
diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index 031e6b1d7..80284cc62 100644
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "lpc3180.h"
-#include "nand.h"
+#include <flash/nand.h>
 
 static int lpc3180_reset(struct nand_device *nand);
 static int lpc3180_controller_ready(struct nand_device *nand, int timeout);
diff --git a/src/flash/nand/mx3.h b/src/flash/nand/mx3.h
index 09289ae27..94dbf0cba 100644
--- a/src/flash/nand/mx3.h
+++ b/src/flash/nand/mx3.h
@@ -25,7 +25,7 @@
  *
  * Many thanks to Ben Dooks for writing s3c24xx driver.
  */
-#include "nand.h"
+#include <flash/nand.h>
 
 #define		MX3_NF_BASE_ADDR		0xb8000000
 #define		MX3_NF_BUFSIZ			(MX3_NF_BASE_ADDR + 0xe00)
diff --git a/src/flash/nand/nonce.c b/src/flash/nand/nonce.c
index dae62a72d..f4411640a 100644
--- a/src/flash/nand/nonce.c
+++ b/src/flash/nand/nonce.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "nand.h"
+#include <flash/nand.h>
 
 
 static int nonce_nand_command(struct nand_device *nand, uint8_t command)
diff --git a/src/flash/nand/s3c24xx.h b/src/flash/nand/s3c24xx.h
index 38057b270..0f899dad3 100644
--- a/src/flash/nand/s3c24xx.h
+++ b/src/flash/nand/s3c24xx.h
@@ -27,7 +27,7 @@
  * Many thanks to Simtec Electronics for sponsoring this work.
  */
 
-#include "nand.h"
+#include <flash/nand.h>
 #include "s3c24xx_regs.h"
 
 struct s3c24xx_nand_controller
diff --git a/src/openocd.c b/src/openocd.c
index eae8c0c01..9377816ff 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -34,7 +34,7 @@
 #include <helper/configuration.h>
 #include "xsvf.h"
 #include "svf.h"
-#include "nand.h"
+#include <flash/nand.h>
 #include "pld.h"
 #include <flash/mflash.h>