diff --git a/simulators/simeasycomm.c b/simulators/simeasycomm.c
index 2a92869ba..6935c3b13 100644
--- a/simulators/simeasycomm.c
+++ b/simulators/simeasycomm.c
@@ -13,6 +13,8 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <pthread.h>
+
 #include "../include/hamlib/rig.h"
 
 #define BUFSIZE 256
diff --git a/simulators/simelecraft.c b/simulators/simelecraft.c
index f52903254..c68081891 100644
--- a/simulators/simelecraft.c
+++ b/simulators/simelecraft.c
@@ -13,8 +13,10 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+
 #include "hamlib/rig.h"
 #include "sim.h"
+#include "misc.h"
 
 #define BUFSIZE 256
 
diff --git a/simulators/simelecraftk4.c b/simulators/simelecraftk4.c
index fae2f2cb7..0acac4449 100644
--- a/simulators/simelecraftk4.c
+++ b/simulators/simelecraftk4.c
@@ -13,8 +13,10 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+
 #include "hamlib/rig.h"
 #include "sim.h"
+#include "misc.h"
 
 #define BUFSIZE 256
 
diff --git a/simulators/simflex.c b/simulators/simflex.c
index 3c0565568..0b127e26b 100644
--- a/simulators/simflex.c
+++ b/simulators/simflex.c
@@ -2,6 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 #if defined(WIN32) || defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
diff --git a/simulators/simic2730.c b/simulators/simic2730.c
index b4268d4af..1410067bd 100644
--- a/simulators/simic2730.c
+++ b/simulators/simic2730.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic275.c b/simulators/simic275.c
index a9098a426..0486bdc3a 100644
--- a/simulators/simic275.c
+++ b/simulators/simic275.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic7000.c b/simulators/simic7000.c
index 44de80e6e..9a09881b3 100644
--- a/simulators/simic7000.c
+++ b/simulators/simic7000.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic7100.c b/simulators/simic7100.c
index 1071f1d16..6c0e3fb51 100644
--- a/simulators/simic7100.c
+++ b/simulators/simic7100.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic7200.c b/simulators/simic7200.c
index 8dfdfa9ec..865428434 100644
--- a/simulators/simic7200.c
+++ b/simulators/simic7200.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic7300.c b/simulators/simic7300.c
index a39c2b7ae..7fd1bcd33 100644
--- a/simulators/simic7300.c
+++ b/simulators/simic7300.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic7600.c b/simulators/simic7600.c
index 2c13dbc3e..55d15233b 100644
--- a/simulators/simic7600.c
+++ b/simulators/simic7600.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic7610.c b/simulators/simic7610.c
index e6e45ac01..decdd1c31 100644
--- a/simulators/simic7610.c
+++ b/simulators/simic7610.c
@@ -15,6 +15,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic7700.c b/simulators/simic7700.c
index 4db844a1d..ad2e9e492 100644
--- a/simulators/simic7700.c
+++ b/simulators/simic7700.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic7851.c b/simulators/simic7851.c
index 311f379d4..57c880c48 100644
--- a/simulators/simic7851.c
+++ b/simulators/simic7851.c
@@ -15,6 +15,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simic905.c b/simulators/simic905.c
index e99d33e9d..b01946bd3 100644
--- a/simulators/simic905.c
+++ b/simulators/simic905.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 #include "sim.h"
diff --git a/simulators/simic910.c b/simulators/simic910.c
index b50a6fd80..703093bf5 100644
--- a/simulators/simic910.c
+++ b/simulators/simic910.c
@@ -15,6 +15,9 @@ struct ip_mreq
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 #include "sim.h"
diff --git a/simulators/simic9100.c b/simulators/simic9100.c
index c4054f0c3..ca53dffca 100644
--- a/simulators/simic9100.c
+++ b/simulators/simic9100.c
@@ -9,7 +9,6 @@ struct ip_mreq
     int dummy;
 };
 #endif
-#include "hamlib/rig.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,7 +16,10 @@ struct ip_mreq
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
+
+#include "hamlib/rig.h"
 #include "sim.h"
+#include "misc.h"
 
 #define BUFSIZE 256
 //#define X25
diff --git a/simulators/simic9700.c b/simulators/simic9700.c
index 887722edc..0b14f8b10 100644
--- a/simulators/simic9700.c
+++ b/simulators/simic9700.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 #include "sim.h"
diff --git a/simulators/simicgeneric.c b/simulators/simicgeneric.c
index 922a7a72a..452d1c6c1 100644
--- a/simulators/simicgeneric.c
+++ b/simulators/simicgeneric.c
@@ -15,6 +15,9 @@ struct ip_mreq
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 #include "sim.h"
diff --git a/simulators/simicr8600.c b/simulators/simicr8600.c
index f46855996..4b18ecf4d 100644
--- a/simulators/simicr8600.c
+++ b/simulators/simicr8600.c
@@ -15,6 +15,9 @@ struct ip_mreq
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 #include "sim.h"
diff --git a/simulators/simid5100.c b/simulators/simid5100.c
index ba9fb224d..05ad0608b 100644
--- a/simulators/simid5100.c
+++ b/simulators/simid5100.c
@@ -16,6 +16,8 @@ struct ip_mreq
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simpstrotator.c b/simulators/simpstrotator.c
index 74e7cd01a..f63847aae 100644
--- a/simulators/simpstrotator.c
+++ b/simulators/simpstrotator.c
@@ -3,6 +3,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
 #define SERVER_PORT 12001
 #define REPLY_PORT 12002
diff --git a/simulators/simqrplabs.c b/simulators/simqrplabs.c
index c389ff2c8..4bd34be1a 100644
--- a/simulators/simqrplabs.c
+++ b/simulators/simqrplabs.c
@@ -13,6 +13,8 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 
 #define BUFSIZE 256
diff --git a/simulators/simrotorez.c b/simulators/simrotorez.c
index d1688a9b3..57e2ec73c 100644
--- a/simulators/simrotorez.c
+++ b/simulators/simrotorez.c
@@ -13,6 +13,8 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <pthread.h>
+
 #include "../include/hamlib/rig.h"
 
 #define BUFSIZE 256
diff --git a/simulators/simtrusdx.c b/simulators/simtrusdx.c
index e12b5d22a..ffd210bdc 100644
--- a/simulators/simtrusdx.c
+++ b/simulators/simtrusdx.c
@@ -13,8 +13,11 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "sim.h"
+#include "misc.h"
 
 #define BUFSIZE 256
 
diff --git a/simulators/simts450.c b/simulators/simts450.c
index 81f7d5615..b4d9a59a9 100644
--- a/simulators/simts450.c
+++ b/simulators/simts450.c
@@ -13,8 +13,11 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "sim.h"
+#include "misc.h"
 
 #define BUFSIZE 256
 
diff --git a/simulators/simts590.c b/simulators/simts590.c
index 6bad05597..27cb56f28 100644
--- a/simulators/simts590.c
+++ b/simulators/simts590.c
@@ -13,8 +13,11 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "sim.h"
+#include "misc.h"
 
 #define BUFSIZE 256
 
diff --git a/simulators/simts950.c b/simulators/simts950.c
index b7a1d6c08..9deb8b6b1 100644
--- a/simulators/simts950.c
+++ b/simulators/simts950.c
@@ -13,6 +13,8 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 
 #define BUFSIZE 256
diff --git a/simulators/simts990.c b/simulators/simts990.c
index d30b90349..b2cbbe84c 100644
--- a/simulators/simts990.c
+++ b/simulators/simts990.c
@@ -13,6 +13,8 @@ struct ip_mreq
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 
 #define BUFSIZE 256
diff --git a/simulators/simxiegug90.c b/simulators/simxiegug90.c
index 1b44d73d6..6553a051f 100644
--- a/simulators/simxiegug90.c
+++ b/simulators/simxiegug90.c
@@ -15,6 +15,8 @@ struct ip_mreq
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simxiegux108g.c b/simulators/simxiegux108g.c
index 0c3a49801..1b675f739 100644
--- a/simulators/simxiegux108g.c
+++ b/simulators/simxiegux108g.c
@@ -15,6 +15,8 @@ struct ip_mreq
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"
 
diff --git a/simulators/simxiegux6100.c b/simulators/simxiegux6100.c
index b19bee620..714bf160c 100644
--- a/simulators/simxiegux6100.c
+++ b/simulators/simxiegux6100.c
@@ -15,6 +15,8 @@ struct ip_mreq
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+
 #include "hamlib/rig.h"
 #include "../src/misc.h"