diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h
index 7ed481d..d86fee0 100644
--- a/isisd/isis_circuit.h
+++ b/isisd/isis_circuit.h
@@ -23,6 +23,8 @@
 #ifndef ISIS_CIRCUIT_H
 #define ISIS_CIRCUIT_H
 
+#include "vty.h"
+
 #define CIRCUIT_MAX 255
 
 struct password
diff --git a/lib/distribute.h b/lib/distribute.h
index 5072016..a2ffffd 100644
--- a/lib/distribute.h
+++ b/lib/distribute.h
@@ -24,6 +24,7 @@
 
 #include <zebra.h>
 #include "if.h"
+#include "filter.h"
 
 /* Disctirubte list types. */
 enum distribute_type
diff --git a/lib/smux.h b/lib/smux.h
index 72b4eaf..02e9630 100644
--- a/lib/smux.h
+++ b/lib/smux.h
@@ -25,6 +25,8 @@
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 #include <net-snmp/agent/snmp_vars.h>
 
+#include "thread.h"
+
 /* Structures here are mostly compatible with UCD SNMP 4.1.1 */
 #define MATCH_FAILED     (-1)
 #define MATCH_SUCCEEDED  0
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 772caff..7c2d46f 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -40,6 +40,7 @@
 #include "ospf6_neighbor.h"
 #include "ospf6_intra.h"
 #include "ospf6_spf.h"
+#include "ospf6_snmp.h"
 #include "ospf6d.h"
 
 unsigned char conf_debug_ospf6_interface = 0;
diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index f20c83b..4e63797 100644
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -38,6 +38,7 @@
 #include "ospf6_neighbor.h"
 #include "ospf6_intra.h"
 #include "ospf6_flood.h"
+#include "ospf6_snmp.h"
 #include "ospf6d.h"
 
 unsigned char conf_debug_ospf6_neighbor = 0;
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 4be8be0..5d10ce6 100644
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -40,6 +40,8 @@
 #include "ospf6_interface.h"
 #include "ospf6_message.h"
 #include "ospf6_neighbor.h"
+#include "ospf6_abr.h"
+#include "ospf6_asbr.h"
 #include "ospf6d.h"
 #include "ospf6_snmp.h"
 
diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c
index 58676c1..8f2cf42 100644
--- a/vtysh/vtysh_user.c
+++ b/vtysh/vtysh_user.c
@@ -37,6 +37,7 @@
 #include "memory.h"
 #include "linklist.h"
 #include "command.h"
+#include "vtysh_user.h"
 
 #ifdef USE_PAM
 static struct pam_conv conv = 
diff --git a/zebra/if_sysctl.c b/zebra/if_sysctl.c
index 5e80996..ffa6927 100644
--- a/zebra/if_sysctl.c
+++ b/zebra/if_sysctl.c
@@ -29,6 +29,7 @@
 #include "memory.h"
 #include "ioctl.h"
 #include "log.h"
+#include "interface.h"
 
 #include "zebra/rt.h"
 #include "zebra/kernel_socket.h"