diff --git a/src/amp_conf.c b/src/amp_conf.c
index 6d47da6ea..481786b3f 100644
--- a/src/amp_conf.c
+++ b/src/amp_conf.c
@@ -37,6 +37,7 @@
 #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/amplifier.c b/src/amplifier.c
index 8a278f190..ff321fe76 100644
--- a/src/amplifier.c
+++ b/src/amplifier.c
@@ -58,6 +58,7 @@
 #include <fcntl.h>
 
 #include "hamlib/amplifier.h"
+#include "hamlib/port.h"
 #include "hamlib/amp_state.h"
 #include "serial.h"
 #include "parallel.h"
diff --git a/src/conf.c b/src/conf.c
index 7d4871d13..4691a2407 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -38,6 +38,7 @@
 #include <strings.h>
 
 #include "hamlib/rig.h"
+#include "hamlib/port.h"
 #include "hamlib/rig_state.h"
 #include "token.h"
 
diff --git a/src/gpio.c b/src/gpio.c
index 3f9ed0c20..721501649 100644
--- a/src/gpio.c
+++ b/src/gpio.c
@@ -25,6 +25,7 @@
 #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 c01be13f2..99e75414f 100644
--- a/src/iofunc.c
+++ b/src/iofunc.c
@@ -41,6 +41,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include "hamlib/port.h"
 #include "iofunc.h"
 #include "misc.h"
 
diff --git a/src/network.c b/src/network.c
index 9acfb474a..958075b3d 100644
--- a/src/network.c
+++ b/src/network.c
@@ -74,6 +74,7 @@
 #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 de6c8d606..181ef892b 100644
--- a/src/parallel.c
+++ b/src/parallel.c
@@ -53,6 +53,7 @@
 #  include <winbase.h>
 #endif
 
+#include "hamlib/port.h"
 #include "parallel.h"
 
 #ifdef HAVE_LINUX_PPDEV_H
diff --git a/src/register.h b/src/register.h
index 472598b27..148f16945 100644
--- a/src/register.h
+++ b/src/register.h
@@ -23,6 +23,8 @@
 
 
 #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 8e7c9c05a..3ae69f3a6 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -52,6 +52,7 @@
 
 #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 22c315e05..5f204aed7 100644
--- a/src/rot_conf.c
+++ b/src/rot_conf.c
@@ -38,6 +38,7 @@
 #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/rotator.c b/src/rotator.c
index 5d71cd236..a1db1dc69 100644
--- a/src/rotator.c
+++ b/src/rotator.c
@@ -56,6 +56,7 @@
 #include <fcntl.h>
 
 #include "hamlib/rotator.h"
+#include "hamlib/port.h"
 #include "hamlib/rot_state.h"
 #include "serial.h"
 #include "parallel.h"
@@ -64,7 +65,6 @@
 #endif
 #include "network.h"
 
-
 #ifndef DOC_HIDDEN
 
 #if defined(WIN32) && !defined(__CYGWIN__)
diff --git a/src/serial.c b/src/serial.c
index 3dfce1ec1..71d3c68c8 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -59,6 +59,7 @@
 #endif
 
 #include "hamlib/rig.h"
+#include "hamlib/port.h"
 
 //! @cond Doxygen_Suppress
 #if defined(WIN32) && !defined(HAVE_TERMIOS_H)
diff --git a/src/snapshot_data.c b/src/snapshot_data.c
index bc5c4e80b..8664deb0e 100644
--- a/src/snapshot_data.c
+++ b/src/snapshot_data.c
@@ -2,6 +2,7 @@
 #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/usb_port.c b/src/usb_port.c
index 09fa3d9c5..80c9bc9f9 100644
--- a/src/usb_port.c
+++ b/src/usb_port.c
@@ -39,6 +39,7 @@
 #include <strings.h>
 
 #include "hamlib/rig.h"
+#include "hamlib/port.h"
 
 #ifdef HAVE_LIBUSB_H
 #  include <libusb.h>