diff --git a/rigs/dummy/netampctl.c b/rigs/dummy/netampctl.c
index 7dbe134dd..48d83e23f 100644
--- a/rigs/dummy/netampctl.c
+++ b/rigs/dummy/netampctl.c
@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
-#include <errno.h>
 
 #include "hamlib/amplifier.h"
 #include "iofunc.h"
diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index 3aba3defd..07a69eaee 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <errno.h>
 
 #include "hamlib/rig.h"
 #include "network.h"
diff --git a/rigs/dummy/netrotctl.c b/rigs/dummy/netrotctl.c
index a191dd1e5..3f4805ac3 100644
--- a/rigs/dummy/netrotctl.c
+++ b/rigs/dummy/netrotctl.c
@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
-#include <errno.h>
 
 #include "hamlib/rotator.h"
 #include "iofunc.h"
diff --git a/rigs/flexradio/dttsp.c b/rigs/flexradio/dttsp.c
index a780fd109..fe079fada 100644
--- a/rigs/flexradio/dttsp.c
+++ b/rigs/flexradio/dttsp.c
@@ -29,7 +29,6 @@
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
 #include <math.h>
 
 #include "hamlib/rig.h"
diff --git a/rigs/kit/hiqsdr.c b/rigs/kit/hiqsdr.c
index ecb3ab3ec..3b756e03c 100644
--- a/rigs/kit/hiqsdr.c
+++ b/rigs/kit/hiqsdr.c
@@ -23,7 +23,6 @@
 #include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
 
 #include "hamlib/rig.h"
 #include "iofunc.h"
diff --git a/rigs/tentec/tt550.c b/rigs/tentec/tt550.c
index 6c1cc4c75..505a4dae9 100644
--- a/rigs/tentec/tt550.c
+++ b/rigs/tentec/tt550.c
@@ -27,7 +27,6 @@
 #include <string.h>     /* String function definitions */
 #include <unistd.h>     /* UNIX standard function definitions */
 #include <fcntl.h>      /* File control definitions */
-#include <errno.h>      /* Error number definitions */
 
 #include <hamlib/rig.h>
 #include "serial.h"
diff --git a/security/password.c b/security/password.c
index 36a85cbdb..f71ef8188 100644
--- a/security/password.c
+++ b/security/password.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include "hamlib/rig.h"
 #include "password.h"
 #include "md5.h"
diff --git a/src/debug.c b/src/debug.c
index 8d0024993..71be0a4b3 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -36,7 +36,6 @@
 #include <stdio.h>  /* Standard input/output definitions */
 #include <string.h> /* String function definitions */
 #include <fcntl.h>  /* File control definitions */
-#include <errno.h>  /* Error number definitions */
 #include <sys/types.h>
 
 #ifdef ANDROID
diff --git a/src/microham.c b/src/microham.c
index 96a37d7b2..c47a0bb0f 100644
--- a/src/microham.c
+++ b/src/microham.c
@@ -36,10 +36,6 @@
 #include <time.h>
 #include <limits.h>
 
-#ifdef HAVE_ERRNO_H
-#  include <errno.h>
-#endif
-
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
diff --git a/src/misc.c b/src/misc.c
index 008b17542..559e9d6e0 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -35,7 +35,6 @@
 #include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
 
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
diff --git a/src/register.c b/src/register.c
index d49f2b9f2..7b02f3528 100644
--- a/src/register.c
+++ b/src/register.c
@@ -28,7 +28,6 @@
 
 #include <hamlib/config.h>
 
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/usb_port.c b/src/usb_port.c
index 533924ced..4b27f3174 100644
--- a/src/usb_port.c
+++ b/src/usb_port.c
@@ -37,7 +37,6 @@
 
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
-#include <errno.h>
 #include <sys/types.h>
 
 #include <hamlib/rig.h>
diff --git a/tests/memcsv.c b/tests/memcsv.c
index 82becbf4a..e883a312c 100644
--- a/tests/memcsv.c
+++ b/tests/memcsv.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include <getopt.h>
 
diff --git a/tests/rigmem.c b/tests/rigmem.c
index cd5cfaf52..3c240e387 100644
--- a/tests/rigmem.c
+++ b/tests/rigmem.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include <getopt.h>
 
diff --git a/tests/rigsmtr.c b/tests/rigsmtr.c
index 05a45ba64..f582acb15 100644
--- a/tests/rigsmtr.c
+++ b/tests/rigsmtr.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 #include <math.h>
 
 #include <getopt.h>
diff --git a/tests/rigswr.c b/tests/rigswr.c
index e08fafc11..e8e8dbdaf 100644
--- a/tests/rigswr.c
+++ b/tests/rigswr.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include <getopt.h>