diff --git a/src/pulse/context.c b/src/pulse/context.c
index 0150204cb..efc1685bf 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -33,8 +33,6 @@
 #include <errno.h>
 #include <signal.h>
 #include <limits.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -43,6 +41,9 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index de5fa43e6..7096d65af 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -27,9 +27,13 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <unistd.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif