diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 2717adcb0..a491ebfb6 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -37,10 +37,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <time.h>
-#include <hamlib/config.h>
-#ifdef HAVE_PTHREAD
 #include <pthread.h>
-#endif
 
 /* Rig list is in a separate file so as not to mess up w/ this one */
 #include <hamlib/riglist.h>
@@ -2571,9 +2568,7 @@ struct rig_state {
     void *async_data_handler_priv_data;
     volatile int poll_routine_thread_run;
     void *poll_routine_priv_data;
-#ifdef HAVE_PTHREAD
     pthread_mutex_t mutex_set_transaction;
-#endif
     hamlib_port_t rigport;  /*!< Rig port (internal use). */
     hamlib_port_t pttport;  /*!< PTT port (internal use). */
     hamlib_port_t dcdport;  /*!< DCD port (internal use). */
diff --git a/security/security.c b/security/security.c
index cc661eee2..bc45f3228 100644
--- a/security/security.c
+++ b/security/security.c
@@ -27,6 +27,7 @@
 #include "AESStringCrypt.h"
 #include "password.h"
 #include "../src/misc.h"
+#include "hamlib/config.h"
 
 #if defined(_WIN32)
 // gmtime_r can be defined by mingw
diff --git a/src/misc.h b/src/misc.h
index 063385e84..b85f969b1 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -23,6 +23,7 @@
 #define _MISC_H 1
 
 #include <hamlib/rig.h>
+#include <hamlib/config.h>
 
 
 /*