diff --git a/edi.c b/edi.c
index c1eb64a..68918b7 100644
--- a/edi.c
+++ b/edi.c
@@ -16,7 +16,7 @@
 
 #include <string.h>
 #include "flash.h"
-#include "chipdrivers.h"
+#include "chipdrivers/edi.h"
 #include "spi_command.h"
 #include "ene.h"
 #include "edi.h"
diff --git a/flashchips.c b/flashchips.c
index a573a25..37f85b6 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -21,6 +21,7 @@
 #include "flash.h"
 #include "flashchips.h"
 #include "chipdrivers.h"
+#include "chipdrivers/edi.h"
 #include "chipdrivers/spi.h"
 #include "writeprotect.h"
 
diff --git a/include/chipdrivers.h b/include/chipdrivers.h
index 10fd843..7fcdcfe 100644
--- a/include/chipdrivers.h
+++ b/include/chipdrivers.h
@@ -97,12 +97,6 @@
 int probe_en29lv640b(struct flashctx *flash);
 int write_en29lv640b(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
 
-/* edi.c */
-int edi_chip_block_erase(struct flashctx *flash, unsigned int page, unsigned int size);
-int edi_chip_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
-int edi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
-int edi_probe_kb9012(struct flashctx *flash);
-
 /* memory_bus.c */
 int prepare_memory_access(struct flashctx *, enum preparation_steps);
 int prepare_memory_register_access(struct flashctx *, enum preparation_steps);
diff --git a/include/chipdrivers/edi.h b/include/chipdrivers/edi.h
new file mode 100644
index 0000000..9cf2a28
--- /dev/null
+++ b/include/chipdrivers/edi.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the flashrom project.
+ *
+ * Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __CHIPDRIVERS_EDI_H__
+#define __CHIPDRIVERS_EDI_H__ 1
+
+#include <stdint.h>
+
+struct flashprog_flashctx;
+
+int edi_chip_block_erase(struct flashprog_flashctx *, unsigned int page, unsigned int size);
+int edi_chip_write(struct flashprog_flashctx *, const uint8_t *buf, unsigned int start, unsigned int len);
+int edi_chip_read(struct flashprog_flashctx *, uint8_t *buf, unsigned int start, unsigned int len);
+int edi_probe_kb9012(struct flashprog_flashctx *);
+
+#endif /* !__CHIPDRIVERS_EDI_H__ */