diff --git a/rotators/amsat/if100.c b/rotators/amsat/if100.c
index 2eb347c40..c928e267b 100644
--- a/rotators/amsat/if100.c
+++ b/rotators/amsat/if100.c
@@ -28,7 +28,6 @@
 
 #include <hamlib/rotator.h>
 #include "parallel.h"
-#include "misc.h"
 #include "register.h"
 
 static int
diff --git a/rotators/apex/apex.h b/rotators/apex/apex.h
index 30b1178d3..c07c9f1b7 100644
--- a/rotators/apex/apex.h
+++ b/rotators/apex/apex.h
@@ -21,6 +21,8 @@
 #ifndef _ROT_APEX_H
 #define _ROT_APEX_H 1
 
+#include "rotator.h"
+
 extern const struct rot_caps apex_shared_loop_rot_caps;
 
 extern float apex_azimuth;
diff --git a/rotators/celestron/celestron.c b/rotators/celestron/celestron.c
index 1d86bd02c..e7608a74d 100644
--- a/rotators/celestron/celestron.c
+++ b/rotators/celestron/celestron.c
@@ -21,11 +21,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "hamlib/rotator.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "celestron.h"
diff --git a/rotators/celestron/celestron.h b/rotators/celestron/celestron.h
index dfa480b1d..f7263036e 100644
--- a/rotators/celestron/celestron.h
+++ b/rotators/celestron/celestron.h
@@ -20,6 +20,8 @@
 #ifndef _ROT_CELESTRON_H
 #define _ROT_CELESTRON_H 1
 
+#include "rotator.h"
+
 extern const struct rot_caps nexstar_rot_caps;
 
 #endif /* _ROT_CELESTRON_H */
diff --git a/rotators/cnctrk/cnctrk.c b/rotators/cnctrk/cnctrk.c
index 3f5f984a2..23618f452 100644
--- a/rotators/cnctrk/cnctrk.c
+++ b/rotators/cnctrk/cnctrk.c
@@ -27,7 +27,6 @@
 #endif
 
 #include "hamlib/rotator.h"
-#include "misc.h"
 #include "register.h"
 
 char axcmd[512];
diff --git a/rotators/easycomm/easycomm.c b/rotators/easycomm/easycomm.c
index 6ac40cc7a..0e325aefe 100644
--- a/rotators/easycomm/easycomm.c
+++ b/rotators/easycomm/easycomm.c
@@ -27,7 +27,6 @@
 
 #include "hamlib/rotator.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 #include "idx_builtin.h"
 
diff --git a/rotators/easycomm/easycomm.h b/rotators/easycomm/easycomm.h
index f4e80e019..090d60290 100644
--- a/rotators/easycomm/easycomm.h
+++ b/rotators/easycomm/easycomm.h
@@ -24,6 +24,7 @@
 #ifndef _ROT_EASYCOMM_H
 #define _ROT_EASYCOMM_H 1
 
+#include "rotator.h"
 #include "token.h"
 
 extern const struct rot_caps easycomm1_rot_caps;
diff --git a/rotators/ether6/ether6.c b/rotators/ether6/ether6.c
index e50ffc310..11166fd35 100644
--- a/rotators/ether6/ether6.c
+++ b/rotators/ether6/ether6.c
@@ -20,12 +20,12 @@
  *
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 
 #include <hamlib/rotator.h>
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 #include "idx_builtin.h"
 
diff --git a/rotators/ether6/ether6.h b/rotators/ether6/ether6.h
index e89f8019c..b4013a73a 100644
--- a/rotators/ether6/ether6.h
+++ b/rotators/ether6/ether6.h
@@ -23,6 +23,8 @@
 #ifndef _ROT_ETHER6_H
 #define _ROT_ETHER6_H 1
 
+#include "rotator.h"
+
 #define ROTORCTL_RET "OK"
 
 extern const struct rot_caps ether6_rot_caps;
diff --git a/rotators/flir/flir.c b/rotators/flir/flir.c
index d1ec10e58..fad23c17a 100644
--- a/rotators/flir/flir.c
+++ b/rotators/flir/flir.c
@@ -19,6 +19,8 @@
  *
  */
 
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 #include <math.h>
diff --git a/rotators/flir/flir.h b/rotators/flir/flir.h
index e20c05c79..3a032956e 100644
--- a/rotators/flir/flir.h
+++ b/rotators/flir/flir.h
@@ -22,6 +22,7 @@
 #ifndef _ROT_FLIR_H
 #define _ROT_FLIR_H 1
 
+#include "rotator.h"
 #include "token.h"
 
 /* backend conf */
diff --git a/rotators/fodtrack/fodtrack.h b/rotators/fodtrack/fodtrack.h
index 36f5e91cb..25bcb5fb9 100644
--- a/rotators/fodtrack/fodtrack.h
+++ b/rotators/fodtrack/fodtrack.h
@@ -22,6 +22,8 @@
 #ifndef _ROT_FODTRACK_H
 #define _ROT_FODTRACK_H 1
 
+#include "rotator.h"
+
 extern const struct rot_caps fodtrack_rot_caps;
 
 #endif /* _ROT_FODTRACK_H */
diff --git a/rotators/grbltrk/grbltrk.c b/rotators/grbltrk/grbltrk.c
index 0a598d6ae..a1b0cb9ce 100644
--- a/rotators/grbltrk/grbltrk.c
+++ b/rotators/grbltrk/grbltrk.c
@@ -23,6 +23,8 @@
 #include "config.h"
 #endif
 
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
@@ -34,10 +36,8 @@
 #include "hamlib/rotator.h"
 #include "hamlib/rig.h"
 
-#include "misc.h"
 #include "serial.h"
 #include "token.h"
-#include "network.h"
 
 #include "register.h"
 
diff --git a/rotators/gs232a/gs232.c b/rotators/gs232a/gs232.c
index 83429832b..977c12b70 100644
--- a/rotators/gs232a/gs232.c
+++ b/rotators/gs232a/gs232.c
@@ -26,10 +26,6 @@
 
 #include "hamlib/rotator.h"
 #include "serial.h"
-#include "misc.h"
-#include "register.h"
-
-#include "gs232a.h"
 
 #define EOM "\r"
 #define REPLY_EOM "\r"
diff --git a/rotators/gs232a/gs232a.h b/rotators/gs232a/gs232a.h
index 47f1d2d9f..ddd181bb2 100644
--- a/rotators/gs232a/gs232a.h
+++ b/rotators/gs232a/gs232a.h
@@ -22,6 +22,8 @@
 #ifndef _ROT_GS232A_H
 #define _ROT_GS232A_H 1
 
+#include "rotator.h"
+
 extern const struct rot_caps gs232a_rot_caps;
 extern const struct rot_caps gs232a_az_rot_caps;
 extern const struct rot_caps gs232a_el_rot_caps;
diff --git a/rotators/heathkit/hd1780.c b/rotators/heathkit/hd1780.c
index a76708ff1..2dcd18701 100644
--- a/rotators/heathkit/hd1780.c
+++ b/rotators/heathkit/hd1780.c
@@ -33,7 +33,6 @@
 
 #include "hamlib/rotator.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "hd1780.h"
diff --git a/rotators/heathkit/hd1780.h b/rotators/heathkit/hd1780.h
index 5489c7fc1..ce764a0a2 100644
--- a/rotators/heathkit/hd1780.h
+++ b/rotators/heathkit/hd1780.h
@@ -27,6 +27,8 @@
 #ifndef _ROT_HD1780_H
 #define _ROT_HD1780_H 1
 
+#include "rotator.h"
+
 #define AZ_READ_LEN 6
 
 extern const struct rot_caps hd1780_rot_caps;
diff --git a/rotators/ioptron/rot_ioptron.c b/rotators/ioptron/rot_ioptron.c
index 414a4bcec..ef4abbf15 100644
--- a/rotators/ioptron/rot_ioptron.c
+++ b/rotators/ioptron/rot_ioptron.c
@@ -21,13 +21,10 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <stddef.h>
-#include <stdint.h>
 
 #include "hamlib/rotator.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "rot_ioptron.h"
diff --git a/rotators/m2/rc2800.c b/rotators/m2/rc2800.c
index a43456d5a..21816bfed 100644
--- a/rotators/m2/rc2800.c
+++ b/rotators/m2/rc2800.c
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "hamlib/rotator.h"
 #include "serial.h"
diff --git a/rotators/m2/rc2800.h b/rotators/m2/rc2800.h
index c059a0fd4..df8a00320 100644
--- a/rotators/m2/rc2800.h
+++ b/rotators/m2/rc2800.h
@@ -21,6 +21,8 @@
 #ifndef _ROT_RC2800_H
 #define _ROT_RC2800_H 1
 
+#include "rotator.h"
+
 extern const struct rot_caps rc2800_rot_caps;
 
 #endif /* _ROT_RC2800_H */
diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c
index 5b047791a..108fdc415 100644
--- a/rotators/meade/meade.c
+++ b/rotators/meade/meade.c
@@ -29,7 +29,6 @@
 #include <num_stdio.h>
 
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "meade.h"
diff --git a/rotators/meade/meade.h b/rotators/meade/meade.h
index 855f531a5..c4335e6e7 100644
--- a/rotators/meade/meade.h
+++ b/rotators/meade/meade.h
@@ -22,6 +22,8 @@
 #ifndef _MEADE_H
 #define _MEADE_H 1
 
+#include "rotator.h"
+
 #define BUFSIZE 128
 #define CR "\r"
 #define LF "\x0a"
diff --git a/rotators/prosistel/prosistel.h b/rotators/prosistel/prosistel.h
index 2b1b90c89..8b715614f 100644
--- a/rotators/prosistel/prosistel.h
+++ b/rotators/prosistel/prosistel.h
@@ -22,6 +22,8 @@
 #ifndef _ROT_PROSISTEL_H
 #define _ROT_PROSISTEL_H 1
 
+#include "rotator.h"
+
 extern const struct rot_caps prosistel_d_az_rot_caps;
 extern const struct rot_caps prosistel_d_el_rot_caps;
 extern const struct rot_caps prosistel_combi_track_azel_rot_caps;
diff --git a/rotators/rotorez/rotorez.c b/rotators/rotorez/rotorez.c
index f36a18e8b..6867acea7 100644
--- a/rotators/rotorez/rotorez.c
+++ b/rotators/rotorez/rotorez.c
@@ -37,7 +37,6 @@
 
 #include "hamlib/rotator.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 #include "iofunc.h"
 
diff --git a/rotators/rotorez/rotorez.h b/rotators/rotorez/rotorez.h
index 49d8759ef..a30a6522f 100644
--- a/rotators/rotorez/rotorez.h
+++ b/rotators/rotorez/rotorez.h
@@ -28,6 +28,7 @@
 #ifndef _ROT_ROTOREZ_H
 #define _ROT_ROTOREZ_H 1
 
+#include "rotator.h"
 #include "token.h"
 
 #define AZ_READ_LEN 4
diff --git a/rotators/sartek/sartek.h b/rotators/sartek/sartek.h
index 6498af470..2c1ba0575 100644
--- a/rotators/sartek/sartek.h
+++ b/rotators/sartek/sartek.h
@@ -23,6 +23,8 @@
 #ifndef _ROT_SARTEK_H
 #define _ROT_SARTEK_H 1
 
+#include "rotator.h"
+
 #define AZ_READ_LEN 4
 
 extern const struct rot_caps sartek_rot_caps;
diff --git a/rotators/satel/satel.c b/rotators/satel/satel.c
index 59c8d1c67..c0a846d1c 100644
--- a/rotators/satel/satel.c
+++ b/rotators/satel/satel.c
@@ -24,14 +24,11 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <stdbool.h>
 
 #include "hamlib/rotator.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "satel.h"
diff --git a/rotators/spid/spid.c b/rotators/spid/spid.c
index f8fd4e6c5..072d019ca 100644
--- a/rotators/spid/spid.c
+++ b/rotators/spid/spid.c
@@ -26,7 +26,6 @@
 
 #include "hamlib/rotator.h"
 #include "serial.h"
-#include "misc.h"
 #include "register.h"
 
 #include "spid.h"
diff --git a/rotators/spid/spid.h b/rotators/spid/spid.h
index 3814f9420..7eb521e16 100644
--- a/rotators/spid/spid.h
+++ b/rotators/spid/spid.h
@@ -22,6 +22,8 @@
 #ifndef _ROT_SPID_H
 #define _ROT_SPID_H 1
 
+#include "rotator.h"
+
 extern const struct rot_caps spid_rot1prog_rot_caps;
 extern const struct rot_caps spid_rot2prog_rot_caps;
 extern const struct rot_caps spid_md01_rot2prog_rot_caps;
diff --git a/rotators/ts7400/ts7400.h b/rotators/ts7400/ts7400.h
index 3d8982277..e36b1b7c2 100644
--- a/rotators/ts7400/ts7400.h
+++ b/rotators/ts7400/ts7400.h
@@ -22,6 +22,7 @@
 #ifndef _ROT_ts7400_H
 #define _ROT_ts7400_H 1
 
+#include "rotator.h"
 
 extern const struct rot_caps ts7400_rot_caps;
 extern const struct rot_caps netrotctl_caps;