diff --git a/zebra/ipforward_solaris.c b/zebra/ipforward_solaris.c
index fe06e74..791d175 100644
--- a/zebra/ipforward_solaris.c
+++ b/zebra/ipforward_solaris.c
@@ -24,6 +24,8 @@
 #include "log.h"
 #include "prefix.h"
 
+#include "privs.h"
+
 /*
 ** Solaris should define IP_DEV_NAME in <inet/ip.h>, but we'll save
 ** configure.in changes for another day.  We can use the same device
@@ -33,11 +35,11 @@
 #ifndef IP_DEV_NAME
 #define IP_DEV_NAME "/dev/ip"
 #endif
-/*
+
 
 extern struct zebra_privs_t zserv_privs;
 
-** This is a limited ndd style function that operates one integer
+/* This is a limited ndd style function that operates one integer
 ** value only.  Errors return -1. ND_SET commands return 0 on
 ** success. ND_GET commands return the value on success (which could
 ** be -1 and be confused for an error).  The parameter is the string
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index 30e0fb1..9527315 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -38,6 +38,7 @@
 #include "zebra/debug.h"
 
 extern struct zebra_privs_t zserv_privs;
+extern struct zebra_t zebrad;
 
 /* Socket length roundup function. */
 #define ROUNDUP(a) \
@@ -679,8 +680,6 @@
 #include "thread.h"
 #include "zebra/zserv.h"
 
-extern struct thread_master *master;
-
 /* For debug purpose. */
 void
 rtmsg_debug (struct rt_msghdr *rtm)
@@ -764,7 +763,7 @@
       return 0;
     }
 
-  thread_add_read (master, kernel_read, NULL, sock);
+  thread_add_read (zebrad.master, kernel_read, NULL, sock);
 
   if (IS_ZEBRA_DEBUG_KERNEL)
     rtmsg_debug (&buf.r.rtm);
@@ -820,7 +819,7 @@
     zlog_err ("routing_socket: Can't lower privileges");
 
   /* kernel_read needs rewrite. */
-  thread_add_read (master, kernel_read, NULL, routing_sock);
+  thread_add_read (zebrad.master, kernel_read, NULL, routing_sock);
 }
 
 /* Exported interface function.  This function simply calls