diff --git a/src/amp_conf.c b/src/amp_conf.c
index 481786b3f..6d47da6ea 100644
--- a/src/amp_conf.c
+++ b/src/amp_conf.c
@@ -37,7 +37,6 @@
 #include <string.h>  /* String function definitions */
 
 #include "hamlib/amplifier.h"
-#include "hamlib/port.h"
 #include "hamlib/amp_state.h"
 
 #include "amp_conf.h"
diff --git a/src/amp_reg.c b/src/amp_reg.c
index c42b3a7d1..2738a2e5b 100644
--- a/src/amp_reg.c
+++ b/src/amp_reg.c
@@ -29,7 +29,6 @@
 
 #include "hamlib/config.h"
 
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/amplifier.c b/src/amplifier.c
index e6dceb5a5..8a278f190 100644
--- a/src/amplifier.c
+++ b/src/amplifier.c
@@ -58,13 +58,11 @@
 #include <fcntl.h>
 
 #include "hamlib/amplifier.h"
-#include "hamlib/port.h"
 #include "hamlib/amp_state.h"
 #include "serial.h"
 #include "parallel.h"
 #include "usb_port.h"
 #include "network.h"
-#include "token.h"
 
 //! @cond Doxygen_Suppress
 #define CHECK_AMP_ARG(r) (!(r) || !(r)->caps || !AMPSTATE(r)->comm_state)
diff --git a/src/cm108.c b/src/cm108.c
index 2b0a0b4d3..1bfbd7e7d 100644
--- a/src/cm108.c
+++ b/src/cm108.c
@@ -45,10 +45,6 @@
 #  include <sys/ioctl.h>
 #endif
 
-#ifdef HAVE_SYS_PARAM_H
-#  include <sys/param.h>
-#endif
-
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #  include "par_nt.h"
@@ -68,8 +64,6 @@
 
 #include "cm108.h"
 
-#include <stdio.h>
-
 const char *get_usb_device_class_string(int device_class)
 {
     switch (device_class)
diff --git a/src/cm108.h b/src/cm108.h
index b388f1639..806b25e7e 100644
--- a/src/cm108.h
+++ b/src/cm108.h
@@ -24,7 +24,6 @@
 #define _CM108_H 1
 
 #include "hamlib/rig.h"
-#include "iofunc.h"
 
 
 __BEGIN_DECLS
diff --git a/src/conf.c b/src/conf.c
index ef845dcde..fba988229 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -38,7 +38,6 @@
 #include <strings.h>
 
 #include "hamlib/rig.h"
-#include "hamlib/port.h"
 #include "hamlib/rig_state.h"
 #include "token.h"
 
diff --git a/src/extamp.c b/src/extamp.c
index 1510d140b..744a9e595 100644
--- a/src/extamp.c
+++ b/src/extamp.c
@@ -47,9 +47,6 @@
 
 #include "hamlib/amplifier.h"
 
-#include "token.h"
-
-
 /**
  * \brief Executes \a cfunc on all the elements stored in the amp_caps::extlevels
  * extension levels table.
diff --git a/src/gpio.c b/src/gpio.c
index 5a192c5a8..3f9ed0c20 100644
--- a/src/gpio.c
+++ b/src/gpio.c
@@ -22,11 +22,9 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "gpio.h"
-#include "hamlib/port.h"
 
 
 int gpio_open(hamlib_port_t *port, int output, int on_value)
diff --git a/src/iofunc.c b/src/iofunc.c
index 99e75414f..c01be13f2 100644
--- a/src/iofunc.c
+++ b/src/iofunc.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "hamlib/port.h"
 #include "iofunc.h"
 #include "misc.h"
 
diff --git a/src/mem.c b/src/mem.c
index 3b69415a2..c3bb4f65a 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <sys/stat.h>
 
 #include "hamlib/rig.h"
 #include "hamlib/rig_state.h"
diff --git a/src/network.c b/src/network.c
index 848a45eae..31e3760bf 100644
--- a/src/network.c
+++ b/src/network.c
@@ -74,7 +74,6 @@
 #endif
 
 #include "hamlib/rig.h"
-#include "hamlib/port.h"
 #include "hamlib/rig_state.h"
 #include "network.h"
 #include "misc.h"
diff --git a/src/parallel.c b/src/parallel.c
index e750bb136..de6c8d606 100644
--- a/src/parallel.c
+++ b/src/parallel.c
@@ -40,10 +40,6 @@
 #  include <sys/ioctl.h>
 #endif
 
-#ifdef HAVE_SYS_PARAM_H
-#  include <sys/param.h>
-#endif
-
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #  include "par_nt.h"
@@ -57,7 +53,6 @@
 #  include <winbase.h>
 #endif
 
-#include "hamlib/port.h"
 #include "parallel.h"
 
 #ifdef HAVE_LINUX_PPDEV_H
diff --git a/src/register.c b/src/register.c
index fd6419e57..17b94eb32 100644
--- a/src/register.c
+++ b/src/register.c
@@ -35,7 +35,6 @@
 #include "register.h"
 
 #include "hamlib/rig.h"
-#include "misc.h"
 
 //! @cond Doxygen_Suppress
 #ifndef PATH_MAX
diff --git a/src/register.h b/src/register.h
index 148f16945..472598b27 100644
--- a/src/register.h
+++ b/src/register.h
@@ -23,8 +23,6 @@
 
 
 #include "hamlib/rig.h"
-#include "hamlib/rotator.h"
-#include "hamlib/amplifier.h"
 #include "hamlib/config.h"
 
 #ifdef __cplusplus
diff --git a/src/rig.c b/src/rig.c
index 4807011db..977919e82 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -52,7 +52,6 @@
 
 #include "hamlib/config.h"
 #include "hamlib/rig.h"
-#include "hamlib/port.h"
 #include "hamlib/rig_state.h"
 #include "fifo.h"
 
diff --git a/src/rot_conf.c b/src/rot_conf.c
index 5f204aed7..22c315e05 100644
--- a/src/rot_conf.c
+++ b/src/rot_conf.c
@@ -38,7 +38,6 @@
 #include <string.h>  /* String function definitions */
 
 #include "hamlib/rotator.h"
-#include "hamlib/port.h"
 #include "hamlib/rot_state.h"
 
 #include "rot_conf.h"
diff --git a/src/rot_reg.c b/src/rot_reg.c
index 89350a9db..66b017ee1 100644
--- a/src/rot_reg.c
+++ b/src/rot_reg.c
@@ -29,7 +29,6 @@
 
 #include "hamlib/config.h"
 
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/rot_settings.c b/src/rot_settings.c
index d406b220e..2a8d55434 100644
--- a/src/rot_settings.c
+++ b/src/rot_settings.c
@@ -38,7 +38,6 @@
 #include "hamlib/config.h"
 
 #include <stdio.h>
-#include <sys/stat.h>
 
 #include "hamlib/rig.h"
 #include "hamlib/rotator.h"
diff --git a/src/rotator.c b/src/rotator.c
index 4ce7b5326..5d71cd236 100644
--- a/src/rotator.c
+++ b/src/rotator.c
@@ -53,11 +53,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "hamlib/rotator.h"
-#include "hamlib/port.h"
 #include "hamlib/rot_state.h"
 #include "serial.h"
 #include "parallel.h"
@@ -65,9 +63,6 @@
 #include "usb_port.h"
 #endif
 #include "network.h"
-#include "rot_conf.h"
-#include "token.h"
-#include "iofunc.h"
 
 
 #ifndef DOC_HIDDEN
diff --git a/src/serial.c b/src/serial.c
index ba82aeaff..3dfce1ec1 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -46,10 +46,6 @@
 #  include <sys/ioctl.h>
 #endif
 
-#ifdef HAVE_SYS_PARAM_H
-#  include <sys/param.h>
-#endif
-
 #ifdef HAVE_TERMIOS_H
 #  include <termios.h> /* POSIX terminal control definitions */
 #else
@@ -63,7 +59,6 @@
 #endif
 
 #include "hamlib/rig.h"
-#include "hamlib/port.h"
 
 //! @cond Doxygen_Suppress
 #if defined(WIN32) && !defined(HAVE_TERMIOS_H)
diff --git a/src/settings.c b/src/settings.c
index 500708c83..5b8b49123 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -999,7 +999,6 @@ int HAMLIB_API rig_setting2idx(setting_t s)
     return 0;
 }
 
-#include <unistd.h>  /* UNIX standard function definitions */
 
 #if 0
 #include "hamlib/config.h"
diff --git a/src/snapshot_data.c b/src/snapshot_data.c
index 8664deb0e..bc5c4e80b 100644
--- a/src/snapshot_data.c
+++ b/src/snapshot_data.c
@@ -2,7 +2,6 @@
 #include <unistd.h>
 #include "hamlib/config.h"
 #include "hamlib/rig.h"
-#include "hamlib/port.h"
 #include "hamlib/rig_state.h"
 #include "misc.h"
 #include "cache.h"
diff --git a/src/sprintflst.c b/src/sprintflst.c
index 8d7e51475..25634eb0a 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -22,7 +22,6 @@
 
 #include "hamlib/config.h"
 
-#include <stdlib.h>
 #include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 
diff --git a/src/usb_port.c b/src/usb_port.c
index 80c9bc9f9..09fa3d9c5 100644
--- a/src/usb_port.c
+++ b/src/usb_port.c
@@ -39,7 +39,6 @@
 #include <strings.h>
 
 #include "hamlib/rig.h"
-#include "hamlib/port.h"
 
 #ifdef HAVE_LIBUSB_H
 #  include <libusb.h>
diff --git a/src/usb_port.h b/src/usb_port.h
index a980db5ec..6e8f1b83c 100644
--- a/src/usb_port.h
+++ b/src/usb_port.h
@@ -23,7 +23,6 @@
 #define _USB_PORT_H 1
 
 #include "hamlib/rig.h"
-#include "iofunc.h"
 
 __BEGIN_DECLS