diff --git a/watchquagga/ChangeLog b/watchquagga/ChangeLog
index 4cea8b4..28a3a29 100644
--- a/watchquagga/ChangeLog
+++ b/watchquagga/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* watchquagga.c: Fix headers: get most stuff from zebra.h.
+
 2004-12-23 Paul Jakma <paul@dishone.st>
 
 	* watchquagga.c: Add missing getopt.h include
diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index fb1dbdd..e67c61d 100644
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1,5 +1,5 @@
 /*
-    $Id: watchquagga.c,v 1.6 2004/12/23 19:35:56 paul Exp $
+    $Id: watchquagga.c,v 1.7 2004/12/29 17:39:10 ajs Exp $
 
     Monitor status of quagga daemons and restart if necessary.
 
@@ -20,31 +20,14 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* System headers: */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-/* Quagga headers: */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include <zebra.h>
 #include <thread.h>
 #include <log.h>
 #include <sigevent.h>
-#include <version.h>
+#include <lib/version.h>
 #include <getopt.h>
+#include <sys/un.h>
+#include <sys/wait.h>
 
 #ifndef MIN
 #define MIN(X,Y) (((X) <= (Y)) ? (X) : (Y))