diff --git a/src/modbus-tcp.c b/src/modbus-tcp.c
index 60ac6b46..8e5e37cd 100644
--- a/src/modbus-tcp.c
+++ b/src/modbus-tcp.c
@@ -42,8 +42,12 @@
 # include <netinet/in_systm.h>
 #endif
 
-# include <netinet/in.h>
-# include <netinet/ip.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif /* HAVE_NETINET_IN_H */
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif /* HAVE_NETINET_IP_H */
 # include <netinet/tcp.h>
 # include <arpa/inet.h>
 # include <netdb.h>
diff --git a/tests/bandwidth-server-many-up.c b/tests/bandwidth-server-many-up.c
index f6eb7d7f..544f0371 100644
--- a/tests/bandwidth-server-many-up.c
+++ b/tests/bandwidth-server-many-up.c
@@ -17,7 +17,9 @@
 #include <ws2tcpip.h>
 #else
 #include <arpa/inet.h>
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif /* HAVE_NETINET_IN_H */
 #include <sys/select.h>
 #include <sys/socket.h>
 #endif