--- quagga-0.99.22.4.orig/lib/queue.h
+++ quagga-0.99.22.4/lib/queue.h
@@ -33,8 +33,6 @@
 #ifndef _SYS_QUEUE_H_
 #define	_SYS_QUEUE_H_
 
-#include <sys/cdefs.h>
-
 /*
  * This file defines four types of data structures: singly-linked lists,
  * singly-linked tail queues, lists and tail queues.
--- quagga-0.99.22.4.orig/lib/zebra.h
+++ quagga-0.99.22.4/lib/zebra.h
@@ -51,7 +51,6 @@
 #ifdef HAVE_STROPTS_H
 #include <stropts.h>
 #endif /* HAVE_STROPTS_H */
-#include <sys/fcntl.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
--- quagga-0.99.22.4.orig/isisd/include-netbsd/iso.h
+++ quagga-0.99.22.4/isisd/include-netbsd/iso.h
@@ -192,7 +192,7 @@
 #else
 /* user utilities definitions from the iso library */
 
-#ifdef SUNOS_5
+#ifndef __GLIBC__
 #define	__P(x)	x
 #define	__BEGIN_DECLS
 #define	__END_DECLS