diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c
index a43a8fe23..edf4155bc 100644
--- a/rigs/dummy/dummy.c
+++ b/rigs/dummy/dummy.c
@@ -43,6 +43,7 @@
 #include "tones.h"
 #include "idx_builtin.h"
 #include "register.h"
+#include "cache.h"
 
 #include "dummy.h"
 
diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 7d41e1df9..a150e1bc9 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -32,6 +32,7 @@
 
 #include "dummy_common.h"
 #include "flrig.h"
+#include "cache.h"
 
 #define DEBUG 1
 #define DEBUG_TRACE DEBUG_VERBOSE
diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index 5fa28a110..b7c6c817c 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -33,7 +33,6 @@
 #include "icom.h"
 #include "icom_defs.h"
 #include "frame.h"
-#include "cache.h"
 
 /*
  * Build a CI-V frame.
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index fe633a77e..3c495563b 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -30,6 +30,7 @@
 #include "icom.h"
 #include "icom_defs.h"
 #include "misc.h"
+#include "cache.h"
 #include "bandplan.h"
 #include "tones.h"
 #include "ic7300.h"
diff --git a/rigs/icom/ic821h.c b/rigs/icom/ic821h.c
index 9c1e4b2ba..83527e30a 100644
--- a/rigs/icom/ic821h.c
+++ b/rigs/icom/ic821h.c
@@ -25,7 +25,7 @@
 #include <hamlib/rig.h>
 #include "icom.h"
 #include "misc.h"
-
+#include "cache.h"
 
 #define IC821H_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_FM)
 
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index c25c713da..828731d2e 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -39,6 +39,7 @@
 #include "frame.h"
 #include "misc.h"
 #include "event.h"
+#include "cache.h"
 
 // we automatically determine availability of the 1A 03 command
 enum { ENUM_1A_03_UNK, ENUM_1A_03_YES, ENUM_1A_03_NO };
diff --git a/rigs/icom/id5100.c b/rigs/icom/id5100.c
index 9e86b2a5f..deeada4aa 100644
--- a/rigs/icom/id5100.c
+++ b/rigs/icom/id5100.c
@@ -26,6 +26,7 @@
 #include "icom_defs.h"
 #include "frame.h"
 #include "misc.h"
+#include "cache.h"
 
 enum
 {
diff --git a/rigs/icom/xiegu.c b/rigs/icom/xiegu.c
index b35382fa6..d1e19a886 100644
--- a/rigs/icom/xiegu.c
+++ b/rigs/icom/xiegu.c
@@ -38,6 +38,7 @@
 #include "icom_defs.h"
 #include "frame.h"
 #include "misc.h"
+#include "cache.h"
 #include "tones.h"
 #include "bandplan.h"
 
diff --git a/rigs/jrc/jst145.c b/rigs/jrc/jst145.c
index 573fd268d..a309b3ba4 100644
--- a/rigs/jrc/jst145.c
+++ b/rigs/jrc/jst145.c
@@ -24,6 +24,7 @@
 #include <string.h>
 
 #include "hamlib/rig.h"
+#include "cache.h"
 #include "iofunc.h"
 #include "jrc.h"
 
diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c
index b7c1ac5ad..5c25d3461 100644
--- a/rigs/kenwood/ts2000.c
+++ b/rigs/kenwood/ts2000.c
@@ -28,6 +28,7 @@
 #include "kenwood.h"
 #include "token.h"
 #include "misc.h"
+#include "cache.h"
 #include "iofunc.h"
 #include "cal.h"
 
diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c
index a21528cc5..3cc9cc786 100644
--- a/rigs/kenwood/ts590.c
+++ b/rigs/kenwood/ts590.c
@@ -27,6 +27,7 @@
 #include "hamlib/rig.h"
 #include "kenwood.h"
 #include "misc.h"
+#include "cache.h"
 #include "cal.h"
 #include "iofunc.h"
 
diff --git a/rigs/tentec/orion.c b/rigs/tentec/orion.c
index fbed4962d..2ad454553 100644
--- a/rigs/tentec/orion.c
+++ b/rigs/tentec/orion.c
@@ -77,6 +77,7 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
+#include "cache.h"
 #include "orion.h"
 
 #ifdef TT565_TIME
diff --git a/rigs/yaesu/ft100.c b/rigs/yaesu/ft100.c
index 94b7cbb3c..ec4084ddd 100644
--- a/rigs/yaesu/ft100.c
+++ b/rigs/yaesu/ft100.c
@@ -34,6 +34,7 @@
 #include "yaesu.h"
 #include "ft100.h"
 #include "misc.h"
+#include "cache.h"
 #include "bandplan.h"
 
 enum ft100_native_cmd_e
diff --git a/rigs/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c
index e6a7d4745..0ae60a82e 100644
--- a/rigs/yaesu/ft1000d.c
+++ b/rigs/yaesu/ft1000d.c
@@ -35,6 +35,7 @@
 #include "bandplan.h"
 #include "serial.h"
 #include "misc.h"
+#include "cache.h"
 #include "yaesu.h"
 #include "ft1000d.h"
 
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 86b5b63c0..9b16ba60b 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -38,6 +38,7 @@
 #include "bandplan.h"
 #include "serial.h"
 #include "misc.h"
+#include "cache.h"
 #include "yaesu.h"
 #include "ft1000mp.h"
 
diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c
index b8ad27ffa..6426fcaa0 100644
--- a/rigs/yaesu/ft747.c
+++ b/rigs/yaesu/ft747.c
@@ -39,6 +39,7 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
+#include "cache.h"
 #include "yaesu.h"
 #include "ft747.h"
 
diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 125e2696b..49bf79981 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -57,6 +57,7 @@
 #include "yaesu.h"
 #include "ft817.h"
 #include "misc.h"
+#include "cache.h"
 #include "tones.h"
 #include "bandplan.h"
 #include "cal.h"
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index eee908bc2..e514bc2fb 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -63,6 +63,7 @@
 #include "ft857.h"
 #include "ft817.h" /* We use functions from the 817 code */
 #include "misc.h"
+#include "cache.h"
 #include "tones.h"
 #include "bandplan.h"
 #include "cal.h"
diff --git a/rigs/yaesu/ft990v12.c b/rigs/yaesu/ft990v12.c
index f56d1bdc3..bd99ce350 100644
--- a/rigs/yaesu/ft990v12.c
+++ b/rigs/yaesu/ft990v12.c
@@ -45,6 +45,7 @@
 #include "bandplan.h"
 #include "serial.h"
 #include "misc.h"
+//#include "cache.h"
 #include "yaesu.h"
 #include "ft990v12.h"
 
diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c
index c68b8e920..6417d523e 100644
--- a/rigs/yaesu/ft991.c
+++ b/rigs/yaesu/ft991.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include "hamlib/rig.h"
 #include "misc.h"
+#include "cache.h"
 #include "newcat.h"
 #include "yaesu.h"
 #include "ft991.h"
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index b64cce03a..82ed2caf7 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -34,6 +34,7 @@
 #include "hamlib/rig.h"
 #include "iofunc.h"
 #include "misc.h"
+#include "cache.h"
 #include "cal.h"
 #include "newcat.h"
 #include "serial.h"
diff --git a/rigs/yaesu/pmr171.c b/rigs/yaesu/pmr171.c
index 260395fdc..8c5758c86 100644
--- a/rigs/yaesu/pmr171.c
+++ b/rigs/yaesu/pmr171.c
@@ -43,6 +43,7 @@
 //#include "pmr171.h"
 #include "misc.h"
 #include "tones.h"
+#include "cache.h"
 #include "bandplan.h"
 #include "cal.h"
 
diff --git a/src/misc.c b/src/misc.c
index 091655dca..37566539d 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -50,6 +50,7 @@
 #include <hamlib/amplifier.h>
 
 #include "misc.h"
+#include "cache.h"
 #include "serial.h"
 #include "network.h"
 #include "sprintflst.h"
diff --git a/src/multicast.c b/src/multicast.c
index e68e4efd1..6822ea51d 100644
--- a/src/multicast.c
+++ b/src/multicast.c
@@ -13,6 +13,7 @@
 #endif
 #include "hamlib/rig.h"
 #include "misc.h"
+#include "cache.h"
 #include "multicast.h"
 #include "network.h"
 #include "sprintflst.h"
diff --git a/src/snapshot_data.c b/src/snapshot_data.c
index c68f13a90..c89b43617 100644
--- a/src/snapshot_data.c
+++ b/src/snapshot_data.c
@@ -4,6 +4,7 @@
 #include <hamlib/config.h>
 #include <hamlib/rig.h>
 #include "misc.h"
+#include "cache.h"
 #include "snapshot_data.h"
 #include "hamlibdatetime.h"
 #include "sprintflst.h"
diff --git a/tests/rigctlcom.c b/tests/rigctlcom.c
index e7b8fbf07..8570c33f7 100644
--- a/tests/rigctlcom.c
+++ b/tests/rigctlcom.c
@@ -78,6 +78,7 @@
 
 #include <hamlib/rig.h>
 #include "misc.h"
+#include "cache.h"
 #include "iofunc.h"
 #include "rigctl_parse.h"
 #include "riglist.h"