diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 81b810a8af..fa2a13ae4a 100644
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-20 Paul Jakma <paul.jakma@sun.com>
+
+        * (general) remove includes of very common system headers,
+          these are already picked up by zebra.h. Further, including
+          them before zebra.h messes up all our lovely (sarcasm)
+          autoconf'd detecting of platform specific things. Recent
+          addition of stdint.h to configure.ac and zebra.h appears
+          particularly to throw up this problem.
+
 2005-10-01 Hasso Tepper <hasso at quagga.net>
 
 	* isis_adjacency.c: Stop expire timer while deleting adjacency.
diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index a4078d7211..d8c7448e83 100644
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -21,9 +21,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <stdio.h>
-#include <limits.h>
-#include <string.h>
 #include <zebra.h>
 
 #include "log.h"
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index ee73dc4435..76145f026b 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -19,9 +19,6 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
 #include <zebra.h>
 #ifdef GNU_LINUX
 #include <net/ethernet.h>
diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c
index 13acae71f3..0b758c856e 100644
--- a/isisd/isis_dynhn.c
+++ b/isisd/isis_dynhn.c
@@ -20,7 +20,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <time.h>
 #include <zebra.h>
 
 #include "vty.h"
diff --git a/isisd/isis_events.c b/isisd/isis_events.c
index 8b37e8c517..4380092243 100644
--- a/isisd/isis_events.c
+++ b/isisd/isis_events.c
@@ -19,9 +19,6 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
 #include <zebra.h>
 
 #include "log.h"
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 7b4491c2fa..63f2b6b963 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -21,8 +21,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <zebra.h>
 
 #include "linklist.h"
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index bc90847bf7..6971874d4e 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -20,7 +20,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <stdio.h>
 #include <zebra.h>
 
 #include "getopt.h"
diff --git a/isisd/isis_misc.c b/isisd/isis_misc.c
index a56856e04f..384ebe0bb1 100644
--- a/isisd/isis_misc.c
+++ b/isisd/isis_misc.c
@@ -21,12 +21,7 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <ctype.h>
 #include <zebra.h>
-#include <sys/utsname.h>
 
 #include "stream.h"
 #include "vty.h"
diff --git a/isisd/isis_network.c b/isisd/isis_network.c
index 466a91778b..56459ecab8 100644
--- a/isisd/isis_network.c
+++ b/isisd/isis_network.c
@@ -20,9 +20,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <errno.h>
 #include <zebra.h>
 #ifdef GNU_LINUX
 #include <net/ethernet.h>	/* the L2 protocols */
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index 90a51a2187..2dc821560d 100644
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -21,8 +21,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <zebra.h>
 
 #include "memory.h"
diff --git a/isisd/isis_route.c b/isisd/isis_route.c
index 7d0239ca9c..c8f0aaba7b 100644
--- a/isisd/isis_route.c
+++ b/isisd/isis_route.c
@@ -22,8 +22,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <zebra.h>
 
 #include "thread.h"
diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c
index db52f328ac..4235d882f3 100644
--- a/isisd/isis_routemap.c
+++ b/isisd/isis_routemap.c
@@ -20,8 +20,6 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-#include <stdlib.h>
-#include <stdio.h>
 #include <zebra.h>
 
 #include "thread.h"
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 988ad9b24d..706ed16c3e 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -21,8 +21,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <zebra.h>
 
 #include "thread.h"