From 420125b8bc5bec3e1d6d3cb1dbdab4fe3c156793 Mon Sep 17 00:00:00 2001
From: Daniele Forsi IU5HKX <iu5hkx@gmail.com>
Date: Tue, 14 Feb 2023 20:00:57 +0100
Subject: [PATCH] [kenwood] Fix includes

---
 rigs/kenwood/elecraft.c | 3 ++-
 rigs/kenwood/elecraft.h | 1 +
 rigs/kenwood/flex6xxx.c | 1 -
 rigs/kenwood/ic10.c     | 2 +-
 rigs/kenwood/k3.c       | 6 ++++--
 rigs/kenwood/kenwood.c  | 3 ++-
 rigs/kenwood/kenwood.h  | 1 -
 rigs/kenwood/th.c       | 1 -
 rigs/kenwood/th.h       | 4 +++-
 rigs/kenwood/thd72.c    | 7 +++----
 rigs/kenwood/thd74.c    | 7 +++----
 rigs/kenwood/tmd710.c   | 4 ++--
 rigs/kenwood/trc80.c    | 1 -
 rigs/kenwood/ts2000.c   | 1 +
 rigs/kenwood/ts480.c    | 2 ++
 rigs/kenwood/ts590.c    | 3 ++-
 rigs/kenwood/ts870s.c   | 1 +
 rigs/kenwood/xg3.c      | 1 +
 18 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/rigs/kenwood/elecraft.c b/rigs/kenwood/elecraft.c
index 4d93369c5..49d5d6aa0 100644
--- a/rigs/kenwood/elecraft.c
+++ b/rigs/kenwood/elecraft.c
@@ -24,11 +24,12 @@
  */
 
 #include <string.h>
-#include <stdlib.h>
+#include <stdio.h>
 
 #include "serial.h"
 #include "elecraft.h"
 #include "kenwood.h"
+#include "misc.h"
 
 
 static const struct elec_ext_id_str elec_ext_id_str_lst[] =
diff --git a/rigs/kenwood/elecraft.h b/rigs/kenwood/elecraft.h
index dcd633e97..a294e453d 100644
--- a/rigs/kenwood/elecraft.h
+++ b/rigs/kenwood/elecraft.h
@@ -23,6 +23,7 @@
 #define _ELECRAFT_H 1
 
 #include <hamlib/rig.h>
+#include "token.h"
 
 /* The Elecraft Programmer's Reference details the extension level that
  * a K2 or K3 may have in effect which modify certain commands.
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index bd2340caa..2e80686f8 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -30,7 +30,6 @@
 #include "kenwood.h"
 #include "bandplan.h"
 #include "flex.h"
-#include "token.h"
 
 #define F6K_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB)
 
diff --git a/rigs/kenwood/ic10.c b/rigs/kenwood/ic10.c
index afa5d78c0..f0dc6f199 100644
--- a/rigs/kenwood/ic10.c
+++ b/rigs/kenwood/ic10.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>  /* String function definitions */
@@ -29,7 +30,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "register.h"
 
 #include "kenwood.h"
 #include "ic10.h"
diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c
index d2fd4608d..d79c9d317 100644
--- a/rigs/kenwood/k3.c
+++ b/rigs/kenwood/k3.c
@@ -22,17 +22,19 @@
  *
  */
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
 
 #include <hamlib/rig.h>
+
 #include "idx_builtin.h"
 #include "kenwood.h"
+#include "misc.h"
 #include "bandplan.h"
 #include "elecraft.h"
-#include "token.h"
 #include "cal.h"
-#include "iofunc.h"
 
 #define K3_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
     RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_PKTUSB|\
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 800457bd1..4a0be32c7 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>  /* String function definitions */
@@ -28,11 +29,11 @@
 #include <ctype.h>
 
 #include "hamlib/rig.h"
-#include "network.h"
 #include "serial.h"
 #include "register.h"
 #include "cal.h"
 #include "cache.h"
+#include "misc.h"
 
 #include "kenwood.h"
 #include "ts990s.h"
diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h
index 66e64f12b..6fd3a1a9a 100644
--- a/rigs/kenwood/kenwood.h
+++ b/rigs/kenwood/kenwood.h
@@ -26,7 +26,6 @@
 
 #include <string.h>
 #include "token.h"
-#include "misc.h"
 #include "idx_builtin.h"
 
 #define BACKEND_VER "20230208"
diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c
index 05d50063c..2b06ac138 100644
--- a/rigs/kenwood/th.c
+++ b/rigs/kenwood/th.c
@@ -28,7 +28,6 @@
 #include "hamlib/rig.h"
 #include "kenwood.h"
 #include "th.h"
-#include "serial.h"
 #include "misc.h"
 #include "num_stdio.h"
 
diff --git a/rigs/kenwood/th.h b/rigs/kenwood/th.h
index 7458a5fca..d80121e3f 100644
--- a/rigs/kenwood/th.h
+++ b/rigs/kenwood/th.h
@@ -21,7 +21,9 @@
 #ifndef __TH_H__
 #define __TH_H__ 1
 
-#include "idx_builtin.h"
+#include <stddef.h>
+
+#include "rig.h"
 
 #define TH_VER "20200701"
 
diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c
index ef4f2d40e..9ee9f3280 100644
--- a/rigs/kenwood/thd72.c
+++ b/rigs/kenwood/thd72.c
@@ -19,15 +19,14 @@
  *
  */
 
-#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 #include <math.h>
 
 #include "hamlib/rig.h"
 #include "kenwood.h"
 #include "th.h"
-#include "num_stdio.h"
-#include "iofunc.h"
-#include "serial.h"
 #include "misc.h"
 
 
diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c
index 2f2aade92..07ba4660a 100644
--- a/rigs/kenwood/thd74.c
+++ b/rigs/kenwood/thd74.c
@@ -19,15 +19,14 @@
  *
  */
 
-#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 #include <math.h>
 
 #include "hamlib/rig.h"
 #include "kenwood.h"
 #include "th.h"
-#include "num_stdio.h"
-#include "iofunc.h"
-#include "serial.h"
 #include "misc.h"
 
 
diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c
index 54d37aa59..d4c787930 100644
--- a/rigs/kenwood/tmd710.c
+++ b/rigs/kenwood/tmd710.c
@@ -34,16 +34,16 @@
  *
  */
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
-#include <ctype.h>
 
 #include "hamlib/rig.h"
 #include "kenwood.h"
 #include "th.h"
 #include "tones.h"
 #include "num_stdio.h"
-#include "misc.h"
 
 static int tmd710_open(RIG *rig);
 static int tmd710_do_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
diff --git a/rigs/kenwood/trc80.c b/rigs/kenwood/trc80.c
index c0f7d1696..0b353c055 100644
--- a/rigs/kenwood/trc80.c
+++ b/rigs/kenwood/trc80.c
@@ -20,7 +20,6 @@
  */
 
 #include "hamlib/rig.h"
-#include "bandplan.h"
 #include "kenwood.h"
 
 
diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c
index d4ca0e366..a9008cd09 100644
--- a/rigs/kenwood/ts2000.c
+++ b/rigs/kenwood/ts2000.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index 392b017ed..781434d7d 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -22,11 +22,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <hamlib/rig.h>
 #include "cal.h"
 #include "idx_builtin.h"
 #include "iofunc.h"
+#include "misc.h"
 #include "token.h"
 #include "kenwood.h"
 
diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c
index 19f193475..11ae695c4 100644
--- a/rigs/kenwood/ts590.c
+++ b/rigs/kenwood/ts590.c
@@ -20,10 +20,11 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include "hamlib/rig.h"
-#include "idx_builtin.h"
 #include "kenwood.h"
+#include "misc.h"
 #include "cal.h"
 
 
diff --git a/rigs/kenwood/ts870s.c b/rigs/kenwood/ts870s.c
index 048d4d0d4..b63105838 100644
--- a/rigs/kenwood/ts870s.c
+++ b/rigs/kenwood/ts870s.c
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <hamlib/rig.h>
 #include "kenwood.h"
diff --git a/rigs/kenwood/xg3.c b/rigs/kenwood/xg3.c
index 6c6f2d233..01624d195 100644
--- a/rigs/kenwood/xg3.c
+++ b/rigs/kenwood/xg3.c
@@ -23,6 +23,7 @@
  *
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>