diff --git a/src/modules/gsettings/module-gsettings.c b/src/modules/gsettings/module-gsettings.c
index 6cfac77bb..1500e7636 100644
--- a/src/modules/gsettings/module-gsettings.c
+++ b/src/modules/gsettings/module-gsettings.c
@@ -23,6 +23,7 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <signal.h>
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 05267c93a..765a32358 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -305,7 +305,7 @@ all_modules += [
 # FIXME: meson doesn't support multiple RPATH arguments currently
 rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir)
 
-if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
+if host_machine.system() != 'windows' and host_machine.system() != 'darwin' and host_machine.system() != 'sunos'
   no_undefined_args = ['-Wl,--no-undefined']
 else
   no_undefined_args = []
diff --git a/src/modules/oss/oss-util.c b/src/modules/oss/oss-util.c
index 80b6c8c63..5623c9ddc 100644
--- a/src/modules/oss/oss-util.c
+++ b/src/modules/oss/oss-util.c
@@ -31,6 +31,10 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+
 #include <pulse/xmalloc.h>
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
diff --git a/src/pulse/meson.build b/src/pulse/meson.build
index 1cf878dfd..d55cc70a2 100644
--- a/src/pulse/meson.build
+++ b/src/pulse/meson.build
@@ -70,7 +70,7 @@ if glib_dep.found()
   libpulse_headers += 'glib-mainloop.h'
 endif
 
-if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
+if host_machine.system() != 'windows' and host_machine.system() != 'darwin' and host_machine.system() != 'sunos'
   run_target('update-map-file',
     command : [ join_paths(meson.project_source_root(), 'scripts/generate-map-file.sh'), 'map-file', 'libpulse.def',
                 [ libpulse_headers, 'simple.h', join_paths(meson.project_build_root(), 'src', 'pulse', 'version.h') ] ])