diff --git a/lib/core-net/server.c b/lib/core-net/server.c
index ef35e6c23..f595de673 100644
--- a/lib/core-net/server.c
+++ b/lib/core-net/server.c
@@ -185,6 +185,9 @@ lws_json_dump_context(const struct lws_context *context, char *buf, int len,
 			    (long)d);
 
 #ifdef LWS_HAVE_GETLOADAVG
+#if defined(__sun)
+#include <sys/loadavg.h>
+#endif
 	{
 		double d[3];
 		int m;
diff --git a/lib/misc/dir.c b/lib/misc/dir.c
index f98f49427..8e712fec8 100644
--- a/lib/misc/dir.c
+++ b/lib/misc/dir.c
@@ -106,7 +106,7 @@ lws_dir(const char *dirpath, void *user, lws_dir_callback_function cb)
 		 * files are LDOT_UNKNOWN
 		 */
 
-#if defined(__illumos__)
+#if defined(__sun)
         struct stat s;
         stat(namelist[i]->d_name, &s);
 		switch (s.st_mode) {
diff --git a/lwsws/main.c b/lwsws/main.c
index 4a193071b..64d7c2da3 100644
--- a/lwsws/main.c
+++ b/lwsws/main.c
@@ -252,7 +252,7 @@ int main(int argc, char **argv)
 	signal(SIGHUP, reload_handler);
 	signal(SIGINT, reload_handler);
 
-	fprintf(stderr, "Root process is %u\n", getpid());
+	fprintf(stderr, "Root process is %u\n", (unsigned int)getpid());
 
 	while (1) {
 		if (do_reload) {