diff --git a/lib/daemon.c b/lib/daemon.c
index e73a74f..c473555 100644
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -21,6 +21,7 @@
  */
 
 #include <zebra.h>
+#include <log.h>
 
 #ifndef HAVE_DAEMON
 
diff --git a/lib/filter.c b/lib/filter.c
index 069919b..7aeb8de 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -138,7 +138,7 @@
 }
 
 /* Return string of filter_type. */
-const static char *
+static const char *
 filter_type_str (struct filter *filter)
 {
   switch (filter->type)
diff --git a/lib/log.c b/lib/log.c
index 677cf9a..407904d 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -30,6 +30,10 @@
 #ifndef SUNOS_5
 #include <sys/un.h>
 #endif
+/* for printstack on solaris */
+#ifdef HAVE_UCONTEXT_H
+#include <ucontext.h>
+#endif
 
 static int logfile_fd = -1;	/* Used in signal handler. */
 
diff --git a/lib/plist.c b/lib/plist.c
index 6caece0..4b498c4 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -518,7 +518,7 @@
 }
 
 /* Return string of prefix_list_type. */
-const static char *
+static const char *
 prefix_list_type_str (struct prefix_list_entry *pentry)
 {
   switch (pentry->type)