diff --git a/src/common/kevent.c b/src/common/kevent.c
index 51f347b9..784a0531 100644
--- a/src/common/kevent.c
+++ b/src/common/kevent.c
@@ -145,7 +145,7 @@ kevent_dump(const struct kevent *kev)
 
     snprintf((char *) buf, sizeof(buf),
             "{ ident=%i, filter=%s, %s, %s, data=%d, udata=%p }",
-            (u_int) kev->ident,
+            (unsigned int) kev->ident,
             kevent_filter_dump(kev),
             kevent_flags_dump(kev),
             kevent_fflags_dump(kev),
diff --git a/src/common/kqueue.c b/src/common/kqueue.c
index c532258d..7b856336 100644
--- a/src/common/kqueue.c
+++ b/src/common/kqueue.c
@@ -80,21 +80,23 @@ get_fd_limit(void)
 unsigned int
 get_fd_used(void)
 {
+#ifdef __linux__
     unsigned int fd_max = get_fd_limit();
     unsigned int i;
     unsigned int used = 0;
     int our_errno = errno; /* Preserve errno */
 
-#ifdef __linux__
     for (i = 0; i < fd_max; i++) {
         if (fcntl(i, F_GETFD) == 0)
             used++;
     }
-#endif
 
     errno = our_errno;
 
     return used;
+#else
+    return 0;
+#endif
 }
 
 static struct map *kqmap;
diff --git a/src/solaris/platform.h b/src/solaris/platform.h
index 105bebaf..6334cf3d 100644
--- a/src/solaris/platform.h
+++ b/src/solaris/platform.h
@@ -17,15 +17,23 @@
 #ifndef  _KQUEUE_SOLARIS_PLATFORM_H
 #define  _KQUEUE_SOLARIS_PLATFORM_H
 
+struct filter;
+
 #include <errno.h>
 #include <pthread.h>
+#include <signal.h>
 #include <stdatomic.h>
 #include <string.h>
+#include <stropts.h>
+#include <sys/poll.h>
 #include <sys/queue.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 
 #include "../posix/eventfd.h"
+#include "../posix/platform_ext.h"
+
+#define EVENTFD_PLATFORM_SPECIFIC	POSIX_EVENTFD_PLATFORM_SPECIFIC
 
 /*
  * C11 atomic operations
diff --git a/src/solaris/signal.c b/src/solaris/signal.c
index e614bb10..f0f6a49b 100644
--- a/src/solaris/signal.c
+++ b/src/solaris/signal.c
@@ -41,7 +41,7 @@ signal_handler(int sig)
 
     s = &sigtbl[sig];
     dbg_printf("sig=%d %d", sig, s->st_signum);
-    atomic_inc((volatile uint32_t *) &s->st_count);
+    (void)atomic_inc((volatile uint32_t *) &s->st_count);
     port_send(s->st_port, X_PORT_SOURCE_SIGNAL, &sigtbl[sig]);
     /* TODO: crash if port_send() fails? */
 }
diff --git a/src/solaris/user.c b/src/solaris/user.c
index fc1fbd76..c788dba3 100644
--- a/src/solaris/user.c
+++ b/src/solaris/user.c
@@ -55,7 +55,7 @@ int
 evfilt_user_knote_create(struct filter *filt UNUSED, struct knote *kn UNUSED)
 {
 #if TODO
-    u_int ffctrl;
+    unsigned int ffctrl;
 
     //determine if EV_ADD + NOTE_TRIGGER in the same kevent will cause a trigger */
     if ((!(dst->kev.flags & EV_DISABLE)) && src->fflags & NOTE_TRIGGER) {