diff --git a/edi.c b/edi.c
index bd5b269b5..a2219ac6c 100644
--- a/edi.c
+++ b/edi.c
@@ -16,6 +16,7 @@
 
 #include <string.h>
 #include "flash.h"
+#include "chipdrivers.h"
 #include "ene.h"
 #include "edi.h"
 
diff --git a/hwaccess.c b/hwaccess.c
index bb5aac444..48ccb3485 100644
--- a/hwaccess.c
+++ b/hwaccess.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #endif
 #include "flash.h"
+#include "programmer.h"
 #include "hwaccess.h"
 
 #if !(IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__DJGPP__) || defined(__LIBPAYLOAD__) || defined(__sun) || defined(__gnu_hurd__))
diff --git a/sst_fwhub.c b/sst_fwhub.c
index 398b01b40..c7123034f 100644
--- a/sst_fwhub.c
+++ b/sst_fwhub.c
@@ -19,6 +19,7 @@
 /* Adapted from the Intel FW hub stuff for 82802ax parts. */
 
 #include "flash.h"
+#include "chipdrivers.h"
 
 static int check_sst_fwhub_block_lock(struct flashctx *flash, int offset)
 {
diff --git a/udelay.c b/udelay.c
index f6fd103ca..6c0efc436 100644
--- a/udelay.c
+++ b/udelay.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include "flash.h"
+#include "programmer.h"
 
 static bool use_clock_gettime = false;
 
diff --git a/w29ee011.c b/w29ee011.c
index 8a62e4c71..a570bd6d1 100644
--- a/w29ee011.c
+++ b/w29ee011.c
@@ -16,6 +16,7 @@
 
 #include <string.h>
 #include "flash.h"
+#include "chipdrivers.h"
 
 /* According to the Winbond W29EE011, W29EE012, W29C010M, W29C011A
  * datasheets this is the only valid probe function for those chips.