diff --git a/lib/zclient.c b/lib/zclient.c
index 3b5477e..709d9b9 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -148,7 +148,7 @@
 #ifdef HAVE_TCP_ZEBRA
 
 /* Make socket to zebra daemon. Return zebra socket. */
-static int
+int
 zclient_socket(void)
 {
   int sock;
diff --git a/lib/zclient.h b/lib/zclient.h
index a660bbf..b0b7644 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -132,6 +132,7 @@
 extern void zclient_reset (struct zclient *);
 extern void zclient_free (struct zclient *);
 
+extern int zclient_socket(void);
 extern int  zclient_socket_connect (struct zclient *);
 extern void zclient_serv_path_set  (char *path);
 
diff --git a/lib/zebra.h b/lib/zebra.h
index 67d714c..57e591f 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -435,20 +435,8 @@
  */
 #define ZEBRA_HEADER_MARKER              255
 
-/* Zebra route's types. */
-#define ZEBRA_ROUTE_SYSTEM               0
-#define ZEBRA_ROUTE_KERNEL               1
-#define ZEBRA_ROUTE_CONNECT              2
-#define ZEBRA_ROUTE_STATIC               3
-#define ZEBRA_ROUTE_RIP                  4
-#define ZEBRA_ROUTE_RIPNG                5
-#define ZEBRA_ROUTE_OSPF                 6
-#define ZEBRA_ROUTE_OSPF6                7
-#define ZEBRA_ROUTE_ISIS                 8
-#define ZEBRA_ROUTE_BGP                  9
-#define ZEBRA_ROUTE_HSLS		 10
-#define ZEBRA_ROUTE_PIM                  11
-#define ZEBRA_ROUTE_MAX                  12
+/* Zebra route's types are defined in route_types.h */
+#include "route_types.h"
 
 /* Note: whenever a new route-type or zserv-command is added the
  * corresponding {command,route}_types[] table in lib/log.c MUST be