diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c
index d49f92450..fee1993de 100644
--- a/rigs/adat/adat.c
+++ b/rigs/adat/adat.c
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <math.h>
 #include <ctype.h>
-#include <time.h>
 
 // ---------------------------------------------------------------------------
 //    HAMLIB INCLUDES
diff --git a/rigs/barrett/barrett.h b/rigs/barrett/barrett.h
index 1a2feecca..08af6ba4e 100644
--- a/rigs/barrett/barrett.h
+++ b/rigs/barrett/barrett.h
@@ -24,10 +24,6 @@
 
 #include "hamlib/rig.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #define BACKEND_VER "20220113"
 
 #define EOM "\x0d"
diff --git a/rigs/codan/codan.h b/rigs/codan/codan.h
index b5a13bf52..a3af29dbc 100644
--- a/rigs/codan/codan.h
+++ b/rigs/codan/codan.h
@@ -24,10 +24,6 @@
 
 #include "hamlib/rig.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #define BACKEND_VER "20211228"
 
 #define EOM "\x0d"
diff --git a/rigs/dummy/amp_dummy.c b/rigs/dummy/amp_dummy.c
index 9f529d459..92357e538 100644
--- a/rigs/dummy/amp_dummy.c
+++ b/rigs/dummy/amp_dummy.c
@@ -25,8 +25,6 @@
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <math.h>
-#include <sys/time.h>
-#include <time.h>
 
 #include "hamlib/amplifier.h"
 #include "serial.h"
diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index faec35116..0e297944b 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -24,10 +24,6 @@
 
 #include "hamlib/rig.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #define EOM "\r"
 #define TRUE 1
 #define FALSE 0
diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index c6048085e..aa24ce7fb 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -26,7 +26,6 @@
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <math.h>
-#include <time.h>
 #include <errno.h>
 
 #include "hamlib/rig.h"
diff --git a/rigs/dummy/trxmanager.h b/rigs/dummy/trxmanager.h
index 436fa5384..233f65ae8 100644
--- a/rigs/dummy/trxmanager.h
+++ b/rigs/dummy/trxmanager.h
@@ -26,10 +26,6 @@
 
 #include "hamlib/rig.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #define BACKEND_VER "20210613"
 
 #define EOM "\r"
diff --git a/rigs/gomspace/gs100.c b/rigs/gomspace/gs100.c
index d9fea9d71..06913ff0d 100644
--- a/rigs/gomspace/gs100.c
+++ b/rigs/gomspace/gs100.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <math.h>
-#include <time.h>
 #include <assert.h>
 
 #include "hamlib/rig.h"
diff --git a/rigs/icmarine/icm710.h b/rigs/icmarine/icm710.h
index ea2f926fb..e9c07d3c5 100644
--- a/rigs/icmarine/icm710.h
+++ b/rigs/icmarine/icm710.h
@@ -26,10 +26,6 @@
 #include "cal.h"
 #include "tones.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 struct icm710_priv_caps {
     unsigned char default_remote_id;  /* the remote default equipment's ID */
 };
diff --git a/rigs/icmarine/icmarine.h b/rigs/icmarine/icmarine.h
index 9e4766fcc..901ac4b33 100644
--- a/rigs/icmarine/icmarine.h
+++ b/rigs/icmarine/icmarine.h
@@ -26,10 +26,6 @@
 #include "cal.h"
 #include "tones.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #define BACKEND_VER "20181007"
 
 struct icmarine_priv_caps {
diff --git a/rigs/tentec/orion.c b/rigs/tentec/orion.c
index 9a8d9c419..a3fb151c2 100644
--- a/rigs/tentec/orion.c
+++ b/rigs/tentec/orion.c
@@ -72,8 +72,6 @@
 #include <ctype.h>
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <time.h>
-#include <sys/time.h>
 #include <math.h>
 
 #include <hamlib/rig.h>
diff --git a/rigs/winradio/g313-posix.c b/rigs/winradio/g313-posix.c
index 7d7072de4..16efb1559 100644
--- a/rigs/winradio/g313-posix.c
+++ b/rigs/winradio/g313-posix.c
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/rotators/ether6/ether6.c b/rotators/ether6/ether6.c
index 86c0e8035..a023ef9ad 100644
--- a/rotators/ether6/ether6.c
+++ b/rotators/ether6/ether6.c
@@ -26,8 +26,6 @@
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <math.h>
-#include <sys/time.h>
-#include <time.h>
 
 #include <hamlib/rotator.h>
 #include "serial.h"
diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c
index 5e3873115..9f4b44445 100644
--- a/rotators/meade/meade.c
+++ b/rotators/meade/meade.c
@@ -26,7 +26,6 @@
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <math.h>
 #include <sys/time.h>
-#include <time.h>
 
 #include <hamlib/rotator.h>
 #include <num_stdio.h>
diff --git a/rotators/ts7400/ts7400.c b/rotators/ts7400/ts7400.c
index 9ef1bb686..74b232449 100644
--- a/rotators/ts7400/ts7400.c
+++ b/rotators/ts7400/ts7400.c
@@ -26,7 +26,6 @@
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <math.h>
 #include <sys/time.h>
-#include <time.h>
 
 #include <hamlib/rotator.h>
 #include "serial.h"
diff --git a/src/cm108.c b/src/cm108.c
index 21b50a7b3..7a9ad1113 100644
--- a/src/cm108.c
+++ b/src/cm108.c
@@ -40,7 +40,6 @@
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <fcntl.h>   /* File control definitions */
 #include <errno.h>   /* Error number definitions */
-#include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/debug.c b/src/debug.c
index 140539579..f71314b44 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -41,7 +41,6 @@
 #include <errno.h>  /* Error number definitions */
 #include <sys/types.h>
 #include <unistd.h>
-#include <time.h>
 
 #ifdef ANDROID
 #  include <android/log.h>
diff --git a/src/network.c b/src/network.c
index 6c4c70d34..150c1146f 100644
--- a/src/network.c
+++ b/src/network.c
@@ -40,7 +40,6 @@
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <fcntl.h>   /* File control definitions */
 #include <errno.h>   /* Error number definitions */
-#include <sys/time.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <pthread.h>
diff --git a/src/parallel.c b/src/parallel.c
index 3710947b6..0b567fb36 100644
--- a/src/parallel.c
+++ b/src/parallel.c
@@ -36,7 +36,6 @@
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <fcntl.h>   /* File control definitions */
 #include <errno.h>   /* Error number definitions */
-#include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/serial.c b/src/serial.c
index 9129904bc..82b1a6c3a 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -40,7 +40,6 @@
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <fcntl.h>   /* File control definitions */
 #include <errno.h>   /* Error number definitions */
-#include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <ctype.h>
diff --git a/src/sleep.c b/src/sleep.c
index ffcb32733..422829042 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -37,7 +37,6 @@
  */
 #include <unistd.h>
 #include <errno.h>
-#include <time.h>
 #include <pthread.h>
 #include "config.h"
 #include "sleep.h"
diff --git a/tests/ampctl.c b/tests/ampctl.c
index d96cd396e..b527847d5 100644
--- a/tests/ampctl.c
+++ b/tests/ampctl.c
@@ -24,8 +24,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-#include <hamlibdatetime.h>
-
 #include <hamlib/config.h>
 
 #include <stdio.h>
diff --git a/tests/rigctl.c b/tests/rigctl.c
index 08e734165..b23687ea2 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -23,8 +23,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-#include <hamlibdatetime.h>
-
 #include <hamlib/config.h>
 
 #include <stdio.h>
diff --git a/tests/rigctld.c b/tests/rigctld.c
index ae29767c6..e2d169c01 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -69,7 +69,6 @@
 #endif
 
 #include <hamlib/rig.h>
-#include <hamlibdatetime.h>
 #include "misc.h"
 #include "iofunc.h"
 #include "serial.h"
diff --git a/tests/rotctl.c b/tests/rotctl.c
index 1f8f6712b..3982930e0 100644
--- a/tests/rotctl.c
+++ b/tests/rotctl.c
@@ -23,8 +23,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-#include <hamlibdatetime.h>
-
 #include <hamlib/config.h>
 
 #include <stdio.h>