diff --git a/urjtag/include/flash.h b/urjtag/include/flash.h
index addcb7e0..5b56df75 100644
--- a/urjtag/include/flash.h
+++ b/urjtag/include/flash.h
@@ -39,6 +39,7 @@
 
 #include <bus_driver.h>
 
+#if 0
 /* Following moved here from brux/cfi.h */
 
 #include <flash/cfi.h>
@@ -48,6 +49,9 @@ typedef struct
     int width;                  /* 1 for 8 bits, 2 for 16 bits, 4 for 32 bits, etc. */
     urj_flash_cfi_query_structure_t cfi;
 } urj_flash_cfi_chip_t;
+#endif
+
+typedef struct urj_flash_cfi_chip urj_flash_cfi_chip_t;
 
 typedef struct
 {
diff --git a/urjtag/include/flash/cfi.h b/urjtag/src/flash/cfi.h
similarity index 100%
rename from urjtag/include/flash/cfi.h
rename to urjtag/src/flash/cfi.h
diff --git a/urjtag/include/flash/intel.h b/urjtag/src/flash/intel.h
similarity index 100%
rename from urjtag/include/flash/intel.h
rename to urjtag/src/flash/intel.h
diff --git a/urjtag/include/flash/mic.h b/urjtag/src/flash/mic.h
similarity index 100%
rename from urjtag/include/flash/mic.h
rename to urjtag/src/flash/mic.h