From 52be0797d82da0e2c957b100f9fa8f1e31718bab Mon Sep 17 00:00:00 2001
From: Daniele Forsi IU5HKX <iu5hkx@gmail.com>
Date: Tue, 14 Feb 2023 20:01:23 +0100
Subject: [PATCH] [rigs/*] Fix includes

---
 rigs/adat/adat.c             | 4 +---
 rigs/adat/adat.h             | 2 ++
 rigs/adat/adt_200a.h         | 6 ++++++
 rigs/alinco/alinco.h         | 1 -
 rigs/alinco/dx77.c           | 2 ++
 rigs/alinco/dxsr8.c          | 2 ++
 rigs/aor/aor.c               | 2 ++
 rigs/aor/ar2700.c            | 1 +
 rigs/aor/ar3000.c            | 3 ---
 rigs/aor/ar3030.c            | 1 -
 rigs/aor/ar7030.c            | 1 -
 rigs/aor/ar7030p.c           | 1 -
 rigs/aor/ar7030p_utils.c     | 1 -
 rigs/aor/sr2200.c            | 2 --
 rigs/barrett/4050.c          | 3 ---
 rigs/barrett/950.c           | 4 ----
 rigs/barrett/barrett.c       | 1 -
 rigs/codan/codan.c           | 1 -
 rigs/dorji/dra818.c          | 2 --
 rigs/drake/drake.c           | 1 -
 rigs/dummy/aclog.c           | 5 -----
 rigs/dummy/amp_dummy.c       | 1 -
 rigs/dummy/amp_dummy.h       | 1 +
 rigs/dummy/dummy.c           | 2 ++
 rigs/dummy/flrig.c           | 2 --
 rigs/dummy/netampctl.c       | 1 -
 rigs/dummy/netrigctl.c       | 1 -
 rigs/dummy/netrotctl.c       | 6 +-----
 rigs/dummy/rot_dummy.c       | 2 ++
 rigs/dummy/rot_dummy.h       | 1 +
 rigs/dummy/sdrsharp.c        | 5 -----
 rigs/dummy/tci1x.c           | 2 --
 rigs/dummy/trxmanager.c      | 4 ----
 rigs/elad/elad.c             | 2 +-
 rigs/elad/elad.h             | 2 ++
 rigs/elad/fdm_duo.c          | 2 +-
 rigs/flexradio/dttsp.c       | 2 --
 rigs/flexradio/sdr1k.c       | 4 +---
 rigs/gomspace/gs100.c        | 3 ---
 rigs/icmarine/icm700pro.c    | 1 -
 rigs/icmarine/icm710.c       | 3 ---
 rigs/icmarine/icm710.h       | 3 ++-
 rigs/icmarine/icm802.c       | 1 -
 rigs/icmarine/icm803.c       | 1 -
 rigs/icmarine/icmarine.c     | 1 -
 rigs/icmarine/icmarine.h     | 1 -
 rigs/icom/id5100.c           | 2 ++
 rigs/jrc/jrc.c               | 1 +
 rigs/kachina/505dsp.c        | 2 +-
 rigs/kachina/kachina.c       | 1 -
 rigs/kachina/kachina.h       | 1 -
 rigs/kenwood/flex6xxx.c      | 1 +
 rigs/kenwood/th.c            | 1 +
 rigs/kenwood/tmv7.c          | 1 +
 rigs/kenwood/ts890s.c        | 1 +
 rigs/kenwood/ts990s.c        | 1 +
 rigs/kenwood/tx500.c         | 1 +
 rigs/kit/dds60.c             | 1 -
 rigs/kit/drt1.c              | 1 -
 rigs/kit/dwt.c               | 2 --
 rigs/kit/elektor304.c        | 1 -
 rigs/kit/elektor507.c        | 2 --
 rigs/kit/fifisdr.c           | 2 --
 rigs/kit/funcube.c           | 7 -------
 rigs/kit/hiqsdr.c            | 2 +-
 rigs/kit/kit.c               | 1 -
 rigs/kit/kit.h               | 1 +
 rigs/kit/pcrotor.c           | 1 -
 rigs/kit/si570avrusb.c       | 2 --
 rigs/lowe/lowe.c             | 1 -
 rigs/mds/mds.c               | 1 -
 rigs/pcr/pcr.c               | 1 +
 rigs/prm80/prm80.c           | 1 +
 rigs/prm80/prm80.h           | 1 -
 rigs/prm80/prm8060.c         | 1 -
 rigs/racal/ra37xx.c          | 2 --
 rigs/racal/ra6790.c          | 2 +-
 rigs/racal/racal.c           | 1 -
 rigs/racal/racal.h           | 1 +
 rigs/rft/rft.c               | 1 -
 rigs/rs/ek89x.c              | 2 +-
 rigs/rs/gp2000.c             | 2 +-
 rigs/rs/rs.c                 | 1 +
 rigs/skanti/skanti.c         | 1 -
 rigs/skanti/trp8255.c        | 1 -
 rigs/tentec/argonaut.c       | 1 +
 rigs/tentec/omnivii.c        | 1 -
 rigs/tentec/orion.c          | 3 +--
 rigs/tentec/orion.h          | 4 ++++
 rigs/tentec/paragon.c        | 1 -
 rigs/tentec/pegasus.c        | 1 -
 rigs/tentec/rx331.c          | 4 +---
 rigs/tentec/rx331.h          | 2 +-
 rigs/tentec/rx340.c          | 2 --
 rigs/tentec/rx350.c          | 2 +-
 rigs/tentec/tentec.c         | 1 -
 rigs/tentec/tentec2.c        | 2 --
 rigs/tentec/tentec2.h        | 1 -
 rigs/tentec/tt550.c          | 2 +-
 rigs/tuner/tuner.c           | 1 -
 rigs/tuner/v4l.c             | 2 --
 rigs/tuner/v4l2.c            | 2 --
 rigs/uniden/uniden.c         | 1 -
 rigs/uniden/uniden.h         | 2 ++
 rigs/uniden/uniden_digital.c | 1 -
 rigs/winradio/g303.c         | 1 +
 rigs/winradio/g305.c         | 1 +
 rigs/winradio/winradio.c     | 1 -
 rigs/wj/wj.c                 | 2 --
 rigs/wj/wj.h                 | 1 +
 rigs/wj/wj8888.c             | 2 --
 111 files changed, 64 insertions(+), 136 deletions(-)

diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c
index 8c6bdf31b..bec905be1 100644
--- a/rigs/adat/adat.c
+++ b/rigs/adat/adat.c
@@ -25,7 +25,6 @@
 //    SYSTEM INCLUDES
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -36,11 +35,10 @@
 // ---------------------------------------------------------------------------
 
 #include <hamlib/rig.h>
-#include "token.h"
 #include "serial.h"
 #include "misc.h"
 #include "register.h"
-#include "num_stdio.h"
+#include "riglist.h"
 
 // ---------------------------------------------------------------------------
 //    ADAT INCLUDES
diff --git a/rigs/adat/adat.h b/rigs/adat/adat.h
index 9a6564eee..d9b17a4fe 100644
--- a/rigs/adat/adat.h
+++ b/rigs/adat/adat.h
@@ -29,12 +29,14 @@
 // SYSTEM INCLUDES
 // ---------------------------------------------------------------------------
 
+#include <stddef.h>
 
 // ---------------------------------------------------------------------------
 //    HAMLIB INCLUDES
 // ---------------------------------------------------------------------------
 
 #include <hamlib/rig.h>
+#include "token.h"
 
 // ---------------------------------------------------------------------------
 //    GLOBAL DEFINITIONS
diff --git a/rigs/adat/adt_200a.h b/rigs/adat/adt_200a.h
index 102214f08..2f0738c96 100644
--- a/rigs/adat/adt_200a.h
+++ b/rigs/adat/adt_200a.h
@@ -25,6 +25,12 @@
 #if !defined( __ADT_200A_INCLUDED__ )
 #define __ADT_200A_INCLUDED__
 
+// ---------------------------------------------------------------------------
+//    HAMLIB INCLUDES
+// ---------------------------------------------------------------------------
+
+#include "rig.h"
+
 // ---------------------------------------------------------------------------
 //    ADAT INCLUDES
 // ---------------------------------------------------------------------------
diff --git a/rigs/alinco/alinco.h b/rigs/alinco/alinco.h
index ac98d2702..14bbc628d 100644
--- a/rigs/alinco/alinco.h
+++ b/rigs/alinco/alinco.h
@@ -23,7 +23,6 @@
 #define _ALINCO_H 1
 
 #include <hamlib/rig.h>
-#include <tones.h>
 
 #define BACKEND_VER "20200323"
 
diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c
index e3e04b528..baa5a448d 100644
--- a/rigs/alinco/dx77.c
+++ b/rigs/alinco/dx77.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
@@ -27,6 +28,7 @@
 #include "idx_builtin.h"
 #include "alinco.h"
 #include <serial.h>
+#include "tones.h"
 #include <misc.h>
 
 /*
diff --git a/rigs/alinco/dxsr8.c b/rigs/alinco/dxsr8.c
index c95fb0fe1..9bb035512 100644
--- a/rigs/alinco/dxsr8.c
+++ b/rigs/alinco/dxsr8.c
@@ -19,11 +19,13 @@
  *
  */
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 
 #include <hamlib/rig.h>
 #include <serial.h>
+#include "tones.h"
 #include <misc.h>
 #include <iofunc.h>
 #include <num_stdio.h>
diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
index 25281475e..365ca9394 100644
--- a/rigs/aor/aor.c
+++ b/rigs/aor/aor.c
@@ -19,7 +19,9 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "hamlib/rig.h"
 #include "serial.h"
diff --git a/rigs/aor/ar2700.c b/rigs/aor/ar2700.c
index 0055966c4..9b57a3bd3 100644
--- a/rigs/aor/ar2700.c
+++ b/rigs/aor/ar2700.c
@@ -20,6 +20,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <hamlib/rig.h>
 #include "aor.h"
diff --git a/rigs/aor/ar3000.c b/rigs/aor/ar3000.c
index afd55917d..1954d4b28 100644
--- a/rigs/aor/ar3000.c
+++ b/rigs/aor/ar3000.c
@@ -24,9 +24,6 @@
 
 #include <hamlib/rig.h>
 #include <serial.h>
-#include <misc.h>
-
-#include "aor.h"
 
 static int ar3k_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
 static int ar3k_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
diff --git a/rigs/aor/ar3030.c b/rigs/aor/ar3030.c
index 35128ca7f..c72bf4d0e 100644
--- a/rigs/aor/ar3030.c
+++ b/rigs/aor/ar3030.c
@@ -27,7 +27,6 @@
 #include "serial.h"
 #include "idx_builtin.h"
 #include "misc.h"
-#include "aor.h"
 
 
 static int ar3030_set_vfo(RIG *rig, vfo_t vfo);
diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c
index 7605aa47b..6a2503136 100644
--- a/rigs/aor/ar7030.c
+++ b/rigs/aor/ar7030.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 
 #include <hamlib/rig.h>
-#include "aor.h"
 #include "serial.h"
 #include "idx_builtin.h"
 
diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c
index f64dd2965..eb0aa99d3 100644
--- a/rigs/aor/ar7030p.c
+++ b/rigs/aor/ar7030p.c
@@ -31,7 +31,6 @@
 
 #include "hamlib/rig.h"
 #include "ar7030p.h"
-#include "serial.h"
 #include "idx_builtin.h"
 
 #define AR7030P_MODES ( RIG_MODE_AM | \
diff --git a/rigs/aor/ar7030p_utils.c b/rigs/aor/ar7030p_utils.c
index 6547d749c..5a0d1f652 100644
--- a/rigs/aor/ar7030p_utils.c
+++ b/rigs/aor/ar7030p_utils.c
@@ -31,7 +31,6 @@
 #include <hamlib/rig.h>
 #include "ar7030p.h"
 #include "serial.h"
-#include "idx_builtin.h"
 
 static enum PAGE_e curPage = NONE; /* Current memory page */
 static unsigned int curAddr = 65535; /* Current page address */
diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c
index 774990b50..e8b081fa5 100644
--- a/rigs/aor/sr2200.c
+++ b/rigs/aor/sr2200.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <hamlib/rig.h>
 #include "serial.h"
-#include "idx_builtin.h"
-#include "misc.h"
 #include "aor.h"
 
 #define SR2200_MODES (RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_WFM)
diff --git a/rigs/barrett/4050.c b/rigs/barrett/4050.c
index 473b0b14c..285bdcf0b 100644
--- a/rigs/barrett/4050.c
+++ b/rigs/barrett/4050.c
@@ -22,10 +22,7 @@
 #include <stdio.h>
 
 #include <hamlib/rig.h>
-#include "serial.h"
 #include "misc.h"
-#include "token.h"
-#include "register.h"
 
 #include "barrett.h"
 
diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c
index 520fdebc3..550c94294 100644
--- a/rigs/barrett/950.c
+++ b/rigs/barrett/950.c
@@ -23,10 +23,6 @@
 #include <string.h>
 
 #include <hamlib/rig.h>
-#include "serial.h"
-#include "misc.h"
-#include "token.h"
-#include "register.h"
 
 #include "barrett.h"
 
diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c
index 8d6bad5b5..e4992a214 100644
--- a/rigs/barrett/barrett.c
+++ b/rigs/barrett/barrett.c
@@ -26,7 +26,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "token.h"
 #include "register.h"
 
 #include "barrett.h"
diff --git a/rigs/codan/codan.c b/rigs/codan/codan.c
index a9da1bd83..1c38274de 100644
--- a/rigs/codan/codan.c
+++ b/rigs/codan/codan.c
@@ -26,7 +26,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "token.h"
 #include "register.h"
 
 #include "codan.h"
diff --git a/rigs/dorji/dra818.c b/rigs/dorji/dra818.c
index 7d760979e..6a9ba717e 100644
--- a/rigs/dorji/dra818.c
+++ b/rigs/dorji/dra818.c
@@ -26,11 +26,9 @@
 #include "hamlib/rig.h"
 #include "bandplan.h"
 #include "serial.h"
-#include "register.h"
 #include "tones.h"
 
 #include "dra818.h"
-#include "dorji.h"
 
 static const char *dra818_handshake_cmd = "AT+DMOCONNECT\r\n";
 static const char *dra818_handshake_res = "+DMOCONNECT:0\r\n";
diff --git a/rigs/drake/drake.c b/rigs/drake/drake.c
index 933f64e21..64348d1fc 100644
--- a/rigs/drake/drake.c
+++ b/rigs/drake/drake.c
@@ -26,7 +26,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 #include "cal.h"
 #include "register.h"
 
diff --git a/rigs/dummy/aclog.c b/rigs/dummy/aclog.c
index da7cec7a4..0afab5490 100644
--- a/rigs/dummy/aclog.c
+++ b/rigs/dummy/aclog.c
@@ -26,11 +26,6 @@
 #include <hamlib/rig.h>
 #include <serial.h>
 #include <misc.h>
-#include <token.h>
-#include <register.h>
-#include <network.h>
-
-#include "dummy_common.h"
 
 #define DEBUG 1
 #define DEBUG_TRACE DEBUG_VERBOSE
diff --git a/rigs/dummy/amp_dummy.c b/rigs/dummy/amp_dummy.c
index 691a7ed6c..d3eba7fe2 100644
--- a/rigs/dummy/amp_dummy.c
+++ b/rigs/dummy/amp_dummy.c
@@ -23,7 +23,6 @@
 
 #include "hamlib/amplifier.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "amp_dummy.h"
diff --git a/rigs/dummy/amp_dummy.h b/rigs/dummy/amp_dummy.h
index bda8cdf6f..034a3953d 100644
--- a/rigs/dummy/amp_dummy.h
+++ b/rigs/dummy/amp_dummy.h
@@ -22,6 +22,7 @@
 #ifndef _AMP_DUMMY_H
 #define _AMP_DUMMY_H 1
 
+#include "amplifier.h"
 
 extern const struct amp_caps dummy_amp_caps;
 extern const struct amp_caps netampctl_caps;
diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c
index 8b61c76a8..0479f2d7c 100644
--- a/rigs/dummy/dummy.c
+++ b/rigs/dummy/dummy.c
@@ -20,6 +20,8 @@
  *
  */
 
+// cppcheck-suppress *
+#include <stdint.h>
 // cppcheck-suppress *
 #include <stdio.h>
 // cppcheck-suppress *
diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 4f9bd5836..70c1fac7f 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -28,8 +28,6 @@
 #include <serial.h>
 #include <misc.h>
 #include <token.h>
-#include <register.h>
-#include <network.h>
 
 #include "dummy_common.h"
 #include "flrig.h"
diff --git a/rigs/dummy/netampctl.c b/rigs/dummy/netampctl.c
index 92f60c6f6..1de6a5d14 100644
--- a/rigs/dummy/netampctl.c
+++ b/rigs/dummy/netampctl.c
@@ -24,7 +24,6 @@
 
 #include "hamlib/amplifier.h"
 #include "iofunc.h"
-#include "misc.h"
 
 #define CMD_MAX 32
 #define BUF_MAX 64
diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index 6ad58f291..199707552 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -25,7 +25,6 @@
 #include <unistd.h>  /* UNIX standard function definitions */
 
 #include "hamlib/rig.h"
-#include "network.h"
 #include "serial.h"
 #include "iofunc.h"
 #include "misc.h"
diff --git a/rigs/dummy/netrotctl.c b/rigs/dummy/netrotctl.c
index b6a7f1ed9..643b55762 100644
--- a/rigs/dummy/netrotctl.c
+++ b/rigs/dummy/netrotctl.c
@@ -19,16 +19,12 @@
  *
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 
 #include "hamlib/rotator.h"
 #include "iofunc.h"
-#include "misc.h"
-#include "network.h"
-#include "serial.h"
-
-#include "rot_dummy.h"
 
 #define CMD_MAX 32
 #define BUF_MAX 64
diff --git a/rigs/dummy/rot_dummy.c b/rigs/dummy/rot_dummy.c
index 5d6fdfdcf..ed820e44e 100644
--- a/rigs/dummy/rot_dummy.c
+++ b/rigs/dummy/rot_dummy.c
@@ -26,10 +26,12 @@
 
 #include "hamlib/rotator.h"
 #include "dummy_common.h"
+#include "rig.h"
 #include "register.h"
 #include "idx_builtin.h"
 
 #include "rot_dummy.h"
+#include "rotlist.h"
 
 #define DUMMY_ROT_FUNC 0
 #define DUMMY_ROT_LEVEL ROT_LEVEL_SPEED
diff --git a/rigs/dummy/rot_dummy.h b/rigs/dummy/rot_dummy.h
index bb8e82208..febe6bbfd 100644
--- a/rigs/dummy/rot_dummy.h
+++ b/rigs/dummy/rot_dummy.h
@@ -22,6 +22,7 @@
 #ifndef _ROT_DUMMY_H
 #define _ROT_DUMMY_H 1
 
+#include "rotator.h"
 #include "token.h"
 
 /* backend conf */
diff --git a/rigs/dummy/sdrsharp.c b/rigs/dummy/sdrsharp.c
index 6356e536b..e47f694cb 100644
--- a/rigs/dummy/sdrsharp.c
+++ b/rigs/dummy/sdrsharp.c
@@ -26,11 +26,6 @@
 #include <hamlib/rig.h>
 #include <serial.h>
 #include <misc.h>
-#include <token.h>
-#include <register.h>
-#include <network.h>
-
-#include "dummy_common.h"
 
 #define DEBUG 1
 #define DEBUG_TRACE DEBUG_VERBOSE
diff --git a/rigs/dummy/tci1x.c b/rigs/dummy/tci1x.c
index 4d09cbf05..43c37de9d 100644
--- a/rigs/dummy/tci1x.c
+++ b/rigs/dummy/tci1x.c
@@ -27,8 +27,6 @@
 #include <serial.h>
 #include <misc.h>
 #include <token.h>
-#include <register.h>
-#include <network.h>
 
 #include "dummy_common.h"
 
diff --git a/rigs/dummy/trxmanager.c b/rigs/dummy/trxmanager.c
index 42617d9ef..55d5bc4d4 100644
--- a/rigs/dummy/trxmanager.c
+++ b/rigs/dummy/trxmanager.c
@@ -26,10 +26,6 @@
 
 #include <hamlib/rig.h>
 #include <serial.h>
-#include <misc.h>
-#include <token.h>
-#include <register.h>
-#include <network.h>
 
 #include "trxmanager.h"
 
diff --git a/rigs/elad/elad.c b/rigs/elad/elad.c
index cdb6f632d..0caf0b727 100644
--- a/rigs/elad/elad.c
+++ b/rigs/elad/elad.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>  /* String function definitions */
@@ -30,7 +31,6 @@
 #include <ctype.h>
 
 #include "hamlib/rig.h"
-#include "network.h"
 #include "serial.h"
 #include "misc.h"
 #include "register.h"
diff --git a/rigs/elad/elad.h b/rigs/elad/elad.h
index 932bbe70c..f9b976a2b 100644
--- a/rigs/elad/elad.h
+++ b/rigs/elad/elad.h
@@ -26,6 +26,8 @@
 #define _ELAD_H 1
 
 #include <string.h>
+
+#include "rig.h"
 #include "token.h"
 
 #define BACKEND_VER "20220608"
diff --git a/rigs/elad/fdm_duo.c b/rigs/elad/fdm_duo.c
index 37fde5b1b..db60fcc71 100644
--- a/rigs/elad/fdm_duo.c
+++ b/rigs/elad/fdm_duo.c
@@ -21,9 +21,9 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <hamlib/rig.h>
-#include "idx_builtin.h"
 #include "elad.h"
 
 #define FDM_DUO_ALL_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_RTTYR)
diff --git a/rigs/flexradio/dttsp.c b/rigs/flexradio/dttsp.c
index 4830f0425..762020e3d 100644
--- a/rigs/flexradio/dttsp.c
+++ b/rigs/flexradio/dttsp.c
@@ -32,9 +32,7 @@
 #include "iofunc.h"
 #include "misc.h"
 #include "token.h"
-#include "register.h"
 #include "cal.h"
-#include "flexradio.h"
 
 /*
  * This backend is a two layer rig control: DttSP core over a mundane tuner
diff --git a/rigs/flexradio/sdr1k.c b/rigs/flexradio/sdr1k.c
index 8f517ad0a..86bb8fdda 100644
--- a/rigs/flexradio/sdr1k.c
+++ b/rigs/flexradio/sdr1k.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <math.h>
 
@@ -26,9 +27,6 @@
 #include "parallel.h"
 #include "misc.h"
 #include "bandplan.h"
-#include "register.h"
-
-#include "flexradio.h"
 
 static int sdr1k_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
 static int sdr1k_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
diff --git a/rigs/gomspace/gs100.c b/rigs/gomspace/gs100.c
index 5a33e03be..527babd03 100644
--- a/rigs/gomspace/gs100.c
+++ b/rigs/gomspace/gs100.c
@@ -29,10 +29,7 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "parallel.h"
 #include "misc.h"
-#include "tones.h"
-#include "idx_builtin.h"
 #include "register.h"
 
 #include "gs100.h"
diff --git a/rigs/icmarine/icm700pro.c b/rigs/icmarine/icm700pro.c
index 0de0a31fa..c7c96923a 100644
--- a/rigs/icmarine/icm700pro.c
+++ b/rigs/icmarine/icm700pro.c
@@ -24,7 +24,6 @@
 #include "hamlib/rig.h"
 #include "icmarine.h"
 #include "idx_builtin.h"
-#include "bandplan.h"
 
 #define ICM700PRO_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY)
 #define ICM700PRO_RX_MODES (ICM700PRO_MODES|RIG_MODE_AM)
diff --git a/rigs/icmarine/icm710.c b/rigs/icmarine/icm710.c
index f226d21df..b1815c118 100644
--- a/rigs/icmarine/icm710.c
+++ b/rigs/icmarine/icm710.c
@@ -24,13 +24,10 @@
 #include <string.h>
 
 #include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
 #include <token.h>
 #include <register.h>
 
 #include "idx_builtin.h"
-#include "bandplan.h"
 
 #include "icm710.h"
 #include "icmarine.h"
diff --git a/rigs/icmarine/icm710.h b/rigs/icmarine/icm710.h
index e6ea27269..edda6e455 100644
--- a/rigs/icmarine/icm710.h
+++ b/rigs/icmarine/icm710.h
@@ -22,8 +22,9 @@
 #ifndef _ICM710_H
 #define _ICM710_H 1
 
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
-#include "tones.h"
 
 struct icm710_priv_caps {
     unsigned char default_remote_id;  /* the remote default equipment's ID */
diff --git a/rigs/icmarine/icm802.c b/rigs/icmarine/icm802.c
index def8357f3..3e469ed6a 100644
--- a/rigs/icmarine/icm802.c
+++ b/rigs/icmarine/icm802.c
@@ -24,7 +24,6 @@
 #include "hamlib/rig.h"
 #include "icmarine.h"
 #include "idx_builtin.h"
-#include "bandplan.h"
 
 #define ICM802_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY)
 #define ICM802_RX_MODES (ICM802_MODES|RIG_MODE_AM)
diff --git a/rigs/icmarine/icm803.c b/rigs/icmarine/icm803.c
index da477fb10..da0a3cec0 100644
--- a/rigs/icmarine/icm803.c
+++ b/rigs/icmarine/icm803.c
@@ -24,7 +24,6 @@
 #include "hamlib/rig.h"
 #include "icmarine.h"
 #include "idx_builtin.h"
-#include "bandplan.h"
 
 #define ICM803_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY)
 #define ICM803_RX_MODES (ICM803_MODES|RIG_MODE_AM)
diff --git a/rigs/icmarine/icmarine.c b/rigs/icmarine/icmarine.c
index 47dc8ae20..6c7bc8eae 100644
--- a/rigs/icmarine/icmarine.c
+++ b/rigs/icmarine/icmarine.c
@@ -25,7 +25,6 @@
 
 #include <hamlib/rig.h>
 #include <serial.h>
-#include <misc.h>
 #include <token.h>
 #include <register.h>
 
diff --git a/rigs/icmarine/icmarine.h b/rigs/icmarine/icmarine.h
index a08ce765f..8508389de 100644
--- a/rigs/icmarine/icmarine.h
+++ b/rigs/icmarine/icmarine.h
@@ -23,7 +23,6 @@
 #define _ICMARINE_H 1
 
 #include "hamlib/rig.h"
-#include "tones.h"
 
 #define BACKEND_VER "20181007"
 
diff --git a/rigs/icom/id5100.c b/rigs/icom/id5100.c
index f6a0904b7..a3e3cc41b 100644
--- a/rigs/icom/id5100.c
+++ b/rigs/icom/id5100.c
@@ -20,6 +20,8 @@
  *
  */
 
+#include <stddef.h>
+
 #include "hamlib/rig.h"
 #include "idx_builtin.h"
 #include "icom.h"
diff --git a/rigs/jrc/jrc.c b/rigs/jrc/jrc.c
index 8cfdb8c31..49335b369 100644
--- a/rigs/jrc/jrc.c
+++ b/rigs/jrc/jrc.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
diff --git a/rigs/kachina/505dsp.c b/rigs/kachina/505dsp.c
index 80e02df65..6c5fe45fd 100644
--- a/rigs/kachina/505dsp.c
+++ b/rigs/kachina/505dsp.c
@@ -23,7 +23,7 @@
 
 #include <hamlib/rig.h>
 #include "kachina.h"
-
+#include <tones.h>
 
 #define K505DSP_ALL_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM)
 #define K505DSP_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM)
diff --git a/rigs/kachina/kachina.c b/rigs/kachina/kachina.c
index b475452cb..e92215507 100644
--- a/rigs/kachina/kachina.c
+++ b/rigs/kachina/kachina.c
@@ -23,7 +23,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "kachina.h"
diff --git a/rigs/kachina/kachina.h b/rigs/kachina/kachina.h
index 642c49a97..05fa3eb9c 100644
--- a/rigs/kachina/kachina.h
+++ b/rigs/kachina/kachina.h
@@ -23,7 +23,6 @@
 #define _KACHINA_H 1
 
 #include <hamlib/rig.h>
-#include <tones.h>
 
 #define BACKEND_VER "20061007"
 
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 2e80686f8..d58f67eb7 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -24,6 +24,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <math.h>
 
 #include <hamlib/rig.h>
diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c
index 2b06ac138..5d4f548bf 100644
--- a/rigs/kenwood/th.c
+++ b/rigs/kenwood/th.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/rigs/kenwood/tmv7.c b/rigs/kenwood/tmv7.c
index 961d36d4c..d1237b4c4 100644
--- a/rigs/kenwood/tmv7.c
+++ b/rigs/kenwood/tmv7.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>  /* String function definitions */
 
diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index 06003b715..5b01d7cc8 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -20,6 +20,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 
 #include <hamlib/rig.h>
diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c
index 9c9808e3b..40da6012d 100644
--- a/rigs/kenwood/ts990s.c
+++ b/rigs/kenwood/ts990s.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <hamlib/rig.h>
 #include "kenwood.h"
diff --git a/rigs/kenwood/tx500.c b/rigs/kenwood/tx500.c
index 9ba09d402..34587a8d4 100644
--- a/rigs/kenwood/tx500.c
+++ b/rigs/kenwood/tx500.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
 #include <hamlib/rig.h>
diff --git a/rigs/kit/dds60.c b/rigs/kit/dds60.c
index 1cd0f52f2..a8a838d57 100644
--- a/rigs/kit/dds60.c
+++ b/rigs/kit/dds60.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include "hamlib/rig.h"
 
-#include "kit.h"
 #include "parallel.h"
 #include "token.h"
 
diff --git a/rigs/kit/drt1.c b/rigs/kit/drt1.c
index 1e9d95b8c..483f10a26 100644
--- a/rigs/kit/drt1.c
+++ b/rigs/kit/drt1.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include "hamlib/rig.h"
 
-#include "kit.h"
 #include "serial.h"
 #include "token.h"
 
diff --git a/rigs/kit/dwt.c b/rigs/kit/dwt.c
index f0ccfd51f..9cc5d7c8d 100644
--- a/rigs/kit/dwt.c
+++ b/rigs/kit/dwt.c
@@ -24,8 +24,6 @@
 #include <stdio.h>
 #include "hamlib/rig.h"
 
-#include "kit.h"
-
 #define BACKEND_VER "20200112"
 
 /*
diff --git a/rigs/kit/elektor304.c b/rigs/kit/elektor304.c
index cd8969c87..1a311e553 100644
--- a/rigs/kit/elektor304.c
+++ b/rigs/kit/elektor304.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include "hamlib/rig.h"
 
-#include "kit.h"
 #include "serial.h"
 #include "token.h"
 
diff --git a/rigs/kit/elektor507.c b/rigs/kit/elektor507.c
index f41bb56e5..88e5405f2 100644
--- a/rigs/kit/elektor507.c
+++ b/rigs/kit/elektor507.c
@@ -27,8 +27,6 @@
 #include "hamlib/rig.h"
 #include "token.h"
 
-#include "kit.h"
-
 #ifdef _WIN32
 #define USE_FTDI_DLL
 #elif defined(HAVE_LIBUSB) && (defined(HAVE_LIBUSB_H) || defined(HAVE_LIBUSB_1_0_LIBUSB_H))
diff --git a/rigs/kit/fifisdr.c b/rigs/kit/fifisdr.c
index 1ab678736..7afeb7a5b 100644
--- a/rigs/kit/fifisdr.c
+++ b/rigs/kit/fifisdr.c
@@ -34,8 +34,6 @@
 #include "hamlib/rig.h"
 #include "token.h"
 
-#include "kit.h"
-
 /*
  * Compile this model only if libusb is available
  */
diff --git a/rigs/kit/funcube.c b/rigs/kit/funcube.c
index f38999bd9..26b6efb43 100644
--- a/rigs/kit/funcube.c
+++ b/rigs/kit/funcube.c
@@ -25,18 +25,11 @@
 
 #include <hamlib/config.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include "hamlib/rig.h"
-#include "token.h"
 #include "misc.h"
 
-#include "kit.h"
-
 #define BACKEND_VER "20210830"
 
 /*
diff --git a/rigs/kit/hiqsdr.c b/rigs/kit/hiqsdr.c
index c9e210acb..5d8ff06ba 100644
--- a/rigs/kit/hiqsdr.c
+++ b/rigs/kit/hiqsdr.c
@@ -17,13 +17,13 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 
 #include "hamlib/rig.h"
 #include "iofunc.h"
-#include "misc.h"
 #include "token.h"
 
 /*
diff --git a/rigs/kit/kit.c b/rigs/kit/kit.c
index 52651ac49..8d90127c7 100644
--- a/rigs/kit/kit.c
+++ b/rigs/kit/kit.c
@@ -25,7 +25,6 @@
 #include "register.h"
 
 #include "kit.h"
-#include "usrp_impl.h"
 
 /*
  * initrigs_kit is called by rig_backend_load
diff --git a/rigs/kit/kit.h b/rigs/kit/kit.h
index 29fb58842..9aecf8c4b 100644
--- a/rigs/kit/kit.h
+++ b/rigs/kit/kit.h
@@ -23,6 +23,7 @@
 #define _KIT_H 1
 
 #include "hamlib/rig.h"
+#include "rotator.h"
 
 extern const struct rig_caps elektor304_caps;
 extern const struct rig_caps elektor507_caps;
diff --git a/rigs/kit/pcrotor.c b/rigs/kit/pcrotor.c
index af66b6a52..52fd0513f 100644
--- a/rigs/kit/pcrotor.c
+++ b/rigs/kit/pcrotor.c
@@ -23,7 +23,6 @@
 
 #include "hamlib/rotator.h"
 #include "parallel.h"
-#include "misc.h"
 
 
 /* ************************************************************************* */
diff --git a/rigs/kit/si570avrusb.c b/rigs/kit/si570avrusb.c
index 9f061d718..789ee7985 100644
--- a/rigs/kit/si570avrusb.c
+++ b/rigs/kit/si570avrusb.c
@@ -36,8 +36,6 @@
 #include "hamlib/rig.h"
 #include "token.h"
 
-#include "kit.h"
-
 /*
  * Compile this model only if libusb is available
  */
diff --git a/rigs/lowe/lowe.c b/rigs/lowe/lowe.c
index 4ee7f4ddb..e7a3c02be 100644
--- a/rigs/lowe/lowe.c
+++ b/rigs/lowe/lowe.c
@@ -25,7 +25,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "lowe.h"
diff --git a/rigs/mds/mds.c b/rigs/mds/mds.c
index 12f9f0ba4..18c6d222a 100644
--- a/rigs/mds/mds.c
+++ b/rigs/mds/mds.c
@@ -26,7 +26,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "token.h"
 #include "register.h"
 
 #include "mds.h"
diff --git a/rigs/pcr/pcr.c b/rigs/pcr/pcr.c
index a66bfb108..90bce29e2 100644
--- a/rigs/pcr/pcr.c
+++ b/rigs/pcr/pcr.c
@@ -29,6 +29,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>     /* String function definitions */
diff --git a/rigs/prm80/prm80.c b/rigs/prm80/prm80.c
index fdd0642a2..63cfc4282 100644
--- a/rigs/prm80/prm80.c
+++ b/rigs/prm80/prm80.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 
 #include "hamlib/rig.h"
+#include "misc.h"
 #include "serial.h"
 #include "register.h"
 #include "idx_builtin.h"
diff --git a/rigs/prm80/prm80.h b/rigs/prm80/prm80.h
index ac7a957b6..f88180ba5 100644
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -24,7 +24,6 @@
 
 #include <sys/time.h>
 #include <hamlib/rig.h>
-#include "misc.h"
 
 #define BACKEND_VER "20210416"
 
diff --git a/rigs/prm80/prm8060.c b/rigs/prm80/prm8060.c
index 7fc50ad7c..c249c5dc3 100644
--- a/rigs/prm80/prm8060.c
+++ b/rigs/prm80/prm8060.c
@@ -20,7 +20,6 @@
  */
 
 #include "hamlib/rig.h"
-#include "idx_builtin.h"
 #include "prm80.h"
 
 
diff --git a/rigs/racal/ra37xx.c b/rigs/racal/ra37xx.c
index 289ffc8fd..683b8f67a 100644
--- a/rigs/racal/ra37xx.c
+++ b/rigs/racal/ra37xx.c
@@ -25,8 +25,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "register.h"
-#include "token.h"
 
 #include "ra37xx.h"
 
diff --git a/rigs/racal/ra6790.c b/rigs/racal/ra6790.c
index 8d7d9e37f..f82769b21 100644
--- a/rigs/racal/ra6790.c
+++ b/rigs/racal/ra6790.c
@@ -20,7 +20,7 @@
  */
 
 #include <hamlib/rig.h>
-#include "idx_builtin.h"
+
 #include "racal.h"
 
 
diff --git a/rigs/racal/racal.c b/rigs/racal/racal.c
index 735219c60..4d5eeb8a1 100644
--- a/rigs/racal/racal.c
+++ b/rigs/racal/racal.c
@@ -25,7 +25,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 #include "token.h"
 
diff --git a/rigs/racal/racal.h b/rigs/racal/racal.h
index 0b4bee34a..863dda9c4 100644
--- a/rigs/racal/racal.h
+++ b/rigs/racal/racal.h
@@ -23,6 +23,7 @@
 #define _RACAL_H 1
 
 #include "hamlib/rig.h"
+#include "token.h"
 
 #define BACKEND_VER "20200113"
 
diff --git a/rigs/rft/rft.c b/rigs/rft/rft.c
index 6424340cb..b96c43c33 100644
--- a/rigs/rft/rft.c
+++ b/rigs/rft/rft.c
@@ -23,7 +23,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "rft.h"
diff --git a/rigs/rs/ek89x.c b/rigs/rs/ek89x.c
index 729ae0336..47409a47b 100644
--- a/rigs/rs/ek89x.c
+++ b/rigs/rs/ek89x.c
@@ -27,13 +27,13 @@
  * we implement that and then the EK89X uses this interface
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>     /* String function definitions */
 
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "register.h"
 #include "num_stdio.h"
 
 #include "ek89x.h"
diff --git a/rigs/rs/gp2000.c b/rigs/rs/gp2000.c
index 45f63f7c3..cf27f2e7e 100644
--- a/rigs/rs/gp2000.c
+++ b/rigs/rs/gp2000.c
@@ -26,6 +26,7 @@
  * we implement that and then the XK2100 uses this interface
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>     /* String function definitions */
@@ -33,7 +34,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "register.h"
 #include "num_stdio.h"
 
 #include "gp2000.h"
diff --git a/rigs/rs/rs.c b/rigs/rs/rs.c
index b89b1b27c..25ac55639 100644
--- a/rigs/rs/rs.c
+++ b/rigs/rs/rs.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
diff --git a/rigs/skanti/skanti.c b/rigs/skanti/skanti.c
index e91933fef..cc781efe7 100644
--- a/rigs/skanti/skanti.c
+++ b/rigs/skanti/skanti.c
@@ -25,7 +25,6 @@
 
 #include <hamlib/rig.h>
 #include <serial.h>
-#include <misc.h>
 #include <register.h>
 
 #include "skanti.h"
diff --git a/rigs/skanti/trp8255.c b/rigs/skanti/trp8255.c
index 394a683c0..eeed0f515 100644
--- a/rigs/skanti/trp8255.c
+++ b/rigs/skanti/trp8255.c
@@ -24,7 +24,6 @@
 
 #include <hamlib/rig.h>
 #include "idx_builtin.h"
-#include "skanti.h"
 #include "iofunc.h"
 
 
diff --git a/rigs/tentec/argonaut.c b/rigs/tentec/argonaut.c
index a0656a7c9..19f43fc6e 100644
--- a/rigs/tentec/argonaut.c
+++ b/rigs/tentec/argonaut.c
@@ -24,6 +24,7 @@
 #include <hamlib/rig.h>
 #include "tentec2.h"
 #include "bandplan.h"
+#include "idx_builtin.h"
 
 
 #define TT516_MODES (RIG_MODE_FM|RIG_MODE_CW|RIG_MODE_SSB)
diff --git a/rigs/tentec/omnivii.c b/rigs/tentec/omnivii.c
index e13321a73..9c8f6aff0 100644
--- a/rigs/tentec/omnivii.c
+++ b/rigs/tentec/omnivii.c
@@ -27,7 +27,6 @@
 
 #include <serial.h>
 #include <hamlib/rig.h>
-#include "tentec.h"
 #include "tentec2.h"
 #include "bandplan.h"
 
diff --git a/rigs/tentec/orion.c b/rigs/tentec/orion.c
index a48153998..c8f94594d 100644
--- a/rigs/tentec/orion.c
+++ b/rigs/tentec/orion.c
@@ -68,15 +68,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <ctype.h>
 #include <string.h>  /* String function definitions */
 #include <math.h>
 
 #include <hamlib/rig.h>
-#include "bandplan.h"
 #include "serial.h"
 #include "misc.h"
-#include "idx_builtin.h"
 #include "orion.h"
 
 #ifdef TT565_TIME
diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h
index 50546603f..778a47f3d 100644
--- a/rigs/tentec/orion.h
+++ b/rigs/tentec/orion.h
@@ -31,6 +31,10 @@
  * This backend supports the Ten-Tec Orion (565) and Orion II (566) transceivers.
  */
 
+#include <stddef.h>
+#include "bandplan.h"
+#include "rig.h"
+#include "riglist.h"
 
 #define BACKEND_VER "20220614"
 
diff --git a/rigs/tentec/paragon.c b/rigs/tentec/paragon.c
index 55eb6cbac..983eb438f 100644
--- a/rigs/tentec/paragon.c
+++ b/rigs/tentec/paragon.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 
 #include "hamlib/rig.h"
-#include "tentec.h"
 #include "bandplan.h"
 #include "iofunc.h"
 #include "serial.h"
diff --git a/rigs/tentec/pegasus.c b/rigs/tentec/pegasus.c
index c2897ce3d..af44dc6a8 100644
--- a/rigs/tentec/pegasus.c
+++ b/rigs/tentec/pegasus.c
@@ -23,7 +23,6 @@
 
 #include <hamlib/rig.h>
 #include "idx_builtin.h"
-#include "tentec.h"
 #include "tt550.h"
 
 
diff --git a/rigs/tentec/rx331.c b/rigs/tentec/rx331.c
index 31326b335..7841279d0 100644
--- a/rigs/tentec/rx331.c
+++ b/rigs/tentec/rx331.c
@@ -19,15 +19,13 @@
  *
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "hamlib/rig.h"
-#include "bandplan.h"
 #include "serial.h"
-#include "misc.h"
 #include "num_stdio.h"
-#include "token.h"
 
 #include "rx331.h"
 
diff --git a/rigs/tentec/rx331.h b/rigs/tentec/rx331.h
index 6fabc3ef4..0247a6ec1 100644
--- a/rigs/tentec/rx331.h
+++ b/rigs/tentec/rx331.h
@@ -22,7 +22,7 @@
 #ifndef _RX331_H
 #define _RX331_H
 
-#include "hamlib/rig.h"
+#include "token.h"
 
 #define TOK_RIGID TOKEN_BACKEND(1)
 
diff --git a/rigs/tentec/rx340.c b/rigs/tentec/rx340.c
index c3a26545d..6ee0bec70 100644
--- a/rigs/tentec/rx340.c
+++ b/rigs/tentec/rx340.c
@@ -23,9 +23,7 @@
 #include <string.h>
 
 #include "hamlib/rig.h"
-#include "bandplan.h"
 #include "serial.h"
-#include "misc.h"
 #include "num_stdio.h"
 
 
diff --git a/rigs/tentec/rx350.c b/rigs/tentec/rx350.c
index 2e76eaf27..c3904a650 100644
--- a/rigs/tentec/rx350.c
+++ b/rigs/tentec/rx350.c
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
+#include "idx_builtin.h"
 #include "tentec2.h"
-#include "bandplan.h"
 
 
 #define RX350_MODES (RIG_MODE_FM|RIG_MODE_CW|RIG_MODE_SSB|\
diff --git a/rigs/tentec/tentec.c b/rigs/tentec/tentec.c
index dc308d48b..793dcfae1 100644
--- a/rigs/tentec/tentec.c
+++ b/rigs/tentec/tentec.c
@@ -26,7 +26,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "tentec.h"
diff --git a/rigs/tentec/tentec2.c b/rigs/tentec/tentec2.c
index e1684a0ea..cd528158b 100644
--- a/rigs/tentec/tentec2.c
+++ b/rigs/tentec/tentec2.c
@@ -56,8 +56,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
-#include "register.h"
 
 #include "tentec.h"
 #include "tentec2.h"
diff --git a/rigs/tentec/tentec2.h b/rigs/tentec/tentec2.h
index 2aefa1b22..a0389ccdf 100644
--- a/rigs/tentec/tentec2.h
+++ b/rigs/tentec/tentec2.h
@@ -23,7 +23,6 @@
 #define _TENTEC2_H 1
 
 #include <hamlib/rig.h>
-#include <idx_builtin.h>
 
 // The include order will determine which BACKEND_VER is used
 // tentec.h may also be included and the last include is the BACKEND_VER used
diff --git a/rigs/tentec/tt550.c b/rigs/tentec/tt550.c
index 91f54a646..f80d25d20 100644
--- a/rigs/tentec/tt550.c
+++ b/rigs/tentec/tt550.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <stdlib.h>     /* Standard C library */
 #include <stdio.h>      /* Standard input/output definitions */
 #include <string.h>     /* String function definitions */
 #include <unistd.h>     /* UNIX standard function definitions */
diff --git a/rigs/tuner/tuner.c b/rigs/tuner/tuner.c
index a046ba55a..747ae669a 100644
--- a/rigs/tuner/tuner.c
+++ b/rigs/tuner/tuner.c
@@ -21,7 +21,6 @@
 
 #include "tuner.h"  /* config.h */
 
-
 #include "hamlib/rig.h"
 #include "register.h"
 
diff --git a/rigs/tuner/v4l.c b/rigs/tuner/v4l.c
index 48a8bc801..c459bad3b 100644
--- a/rigs/tuner/v4l.c
+++ b/rigs/tuner/v4l.c
@@ -25,8 +25,6 @@
 #include "hamlib/rig.h"
 #include "tuner.h"  /* include config.h */
 
-#include "misc.h"
-
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
diff --git a/rigs/tuner/v4l2.c b/rigs/tuner/v4l2.c
index 912fb8946..c44fab05a 100644
--- a/rigs/tuner/v4l2.c
+++ b/rigs/tuner/v4l2.c
@@ -25,8 +25,6 @@
 #include "hamlib/rig.h"
 #include "tuner.h"  /* include config.h */
 
-#include "misc.h"
-
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
diff --git a/rigs/uniden/uniden.c b/rigs/uniden/uniden.c
index c08838f14..2d3b8cbb2 100644
--- a/rigs/uniden/uniden.c
+++ b/rigs/uniden/uniden.c
@@ -26,7 +26,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 #include "idx_builtin.h"
 
diff --git a/rigs/uniden/uniden.h b/rigs/uniden/uniden.h
index 8a5dcf98e..e5cc7d63d 100644
--- a/rigs/uniden/uniden.h
+++ b/rigs/uniden/uniden.h
@@ -22,6 +22,8 @@
 #ifndef _UNIDEN_H
 #define _UNIDEN_H 1
 
+#include <stddef.h>
+
 #include <hamlib/rig.h>
 
 #define BACKEND_VER	"20200621"
diff --git a/rigs/uniden/uniden_digital.c b/rigs/uniden/uniden_digital.c
index 4b7497eb5..a48db0537 100644
--- a/rigs/uniden/uniden_digital.c
+++ b/rigs/uniden/uniden_digital.c
@@ -25,7 +25,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 
 #include "uniden_digital.h"
 
diff --git a/rigs/winradio/g303.c b/rigs/winradio/g303.c
index f21c967ed..96f1ef8c7 100644
--- a/rigs/winradio/g303.c
+++ b/rigs/winradio/g303.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <hamlib/config.h>
 
 #include <hamlib/rig.h>
 #include "winradio.h"
diff --git a/rigs/winradio/g305.c b/rigs/winradio/g305.c
index 138e99d21..92abc1dfb 100644
--- a/rigs/winradio/g305.c
+++ b/rigs/winradio/g305.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <hamlib/config.h>
 
 #include <hamlib/rig.h>
 #include "winradio.h"
diff --git a/rigs/winradio/winradio.c b/rigs/winradio/winradio.c
index f3fe348aa..00feeb530 100644
--- a/rigs/winradio/winradio.c
+++ b/rigs/winradio/winradio.c
@@ -29,7 +29,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 
diff --git a/rigs/wj/wj.c b/rigs/wj/wj.c
index 54e54830a..1a896c521 100644
--- a/rigs/wj/wj.c
+++ b/rigs/wj/wj.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +27,6 @@
 #include "serial.h"
 #include "misc.h"
 #include "register.h"
-#include "token.h"
 
 #include "wj.h"
 
diff --git a/rigs/wj/wj.h b/rigs/wj/wj.h
index b2d24bc85..6d77213f8 100644
--- a/rigs/wj/wj.h
+++ b/rigs/wj/wj.h
@@ -23,6 +23,7 @@
 #define _WJ_H 1
 
 #include <hamlib/rig.h>
+#include "token.h"
 
 #define BACKEND_VER "20040912"
 
diff --git a/rigs/wj/wj8888.c b/rigs/wj/wj8888.c
index 5d4114e2f..3ae7f48d2 100644
--- a/rigs/wj/wj8888.c
+++ b/rigs/wj/wj8888.c
@@ -19,8 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
-
 
 #include <hamlib/rig.h>
 #include "idx_builtin.h"