diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1040868..736e3ae 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-16 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* zebra.h: Must check whether __attribute__ should be defined before
+	  including zassert.h.
+
 2005-03-14 Paul Jakma <paul.jakma@sun.com>
 
 	* command.c: (sort_node) use vector_max instead of referencing 
diff --git a/lib/zebra.h b/lib/zebra.h
index ac236e5..d9c28b0 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -109,7 +109,7 @@
 #endif /* __va_copy */
 #endif /* !va_copy */
 #endif /* !C99 */
-#include "zassert.h"
+
 
 #ifdef HAVE_LCAPS
 #include <sys/capability.h>
@@ -222,6 +222,14 @@
 
 #endif /* BSDI_NRL */
 
+/* Local includes: */
+#if !(defined(__GNUC__) || defined(VTYSH_EXTRACT_PL)) 
+#define __attribute__(x)
+#endif  /* !__GNUC__ || VTYSH_EXTRACT_PL */
+
+#include "zassert.h"
+
+
 #ifdef HAVE_BROKEN_CMSG_FIRSTHDR
 /* This bug is present in Solaris 8 and pre-patch Solaris 9 <sys/socket.h>;
    please refer to http://bugzilla.quagga.net/show_bug.cgi?id=142 */
@@ -273,11 +281,6 @@
 #endif /* CMSG_LEN */
 
 
-
-#if !(defined(__GNUC__) || defined(VTYSH_EXTRACT_PL)) 
-#define __attribute__(x)
-#endif  /* !__GNUC__ */
-
 /*  The definition of struct in_pktinfo is missing in old version of
     GLIBC 2.1 (Redhat 6.1).  */
 #if defined (GNU_LINUX) && ! defined (HAVE_INPKTINFO)