From fd995a99e438513e7185dda5c97e3ccafe6eef64 Mon Sep 17 00:00:00 2001
From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 2 Mar 2017 02:02:52 +0000
Subject: [PATCH 1/3] lib: add stream.h, vty.h, zebra.h to plist.h

Since `afi_t` and `struct vty` are used in plist.h, the appropriate
headers for them should be included.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---
 lib/plist.c | 1 -
 lib/plist.h | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/plist.c b/lib/plist.c
index 9a2fc4af09..3ed5c8fc5c 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -27,7 +27,6 @@
 #include "plist.h"
 #include "sockunion.h"
 #include "buffer.h"
-#include "stream.h"
 #include "log.h"
 #include "routemap.h"
 #include "lib/json.h"
diff --git a/lib/plist.h b/lib/plist.h
index 2c6f13a5c4..89d9a874f0 100644
--- a/lib/plist.h
+++ b/lib/plist.h
@@ -23,6 +23,11 @@
 #ifndef _QUAGGA_PLIST_H
 #define _QUAGGA_PLIST_H
 
+#include <zebra.h>
+
+#include "stream.h"
+#include "vty.h"
+
 enum prefix_list_type 
 {
   PREFIX_DENY,

From 94c6042452e3abaca5afe3f42d0257f76be83bac Mon Sep 17 00:00:00 2001
From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 2 Mar 2017 01:45:55 +0000
Subject: [PATCH 2/3] bgpd: add vty.h to bgpd.h

`struct vty` referenced in body of bgpd.h, so it should be #include'd.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---
 bgpd/bgpd.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 09c64aa331..54bb55749b 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -24,6 +24,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "qobj.h"
 #include "lib/json.h"
 #include "vrf.h"
+#include "vty.h"
 
 /* For union sockunion.  */
 #include "queue.h"

From e9e4c4f8b057b0e85da62395e218dc2b6f231945 Mon Sep 17 00:00:00 2001
From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 2 Mar 2017 02:08:01 +0000
Subject: [PATCH 3/3] bgpd: remove unnecessary #include "vty.h"

Per previous commit, these are no longer necessary.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---
 bgpd/bgp_aspath.c    | 1 -
 bgpd/bgp_attr.c      | 1 -
 bgpd/bgp_bfd.c       | 1 -
 bgpd/bgp_encap_tlv.c | 1 -
 bgpd/bgp_fsm.c       | 1 -
 bgpd/bgp_main.c      | 1 -
 bgpd/bgp_routemap.c  | 1 -
 bgpd/bgp_table.c     | 1 -
 8 files changed, 8 deletions(-)

diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index 2e78c9a3bf..006631c1f0 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -24,7 +24,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "hash.h"
 #include "memory.h"
 #include "vector.h"
-#include "vty.h"
 #include "log.h"
 #include "stream.h"
 #include "command.h"
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 153187fd43..1fccd25c8a 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -24,7 +24,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "prefix.h"
 #include "memory.h"
 #include "vector.h"
-#include "vty.h"
 #include "stream.h"
 #include "log.h"
 #include "hash.h"
diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index b8158dc31e..0a06a57fe5 100644
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -31,7 +31,6 @@
 #include "buffer.h"
 #include "stream.h"
 #include "zclient.h"
-#include "vty.h"
 #include "bfd.h"
 #include "lib/json.h"
 #include "filter.h"
diff --git a/bgpd/bgp_encap_tlv.c b/bgpd/bgp_encap_tlv.c
index 8c5ab8d6f6..7acd23b9ae 100644
--- a/bgpd/bgp_encap_tlv.c
+++ b/bgpd/bgp_encap_tlv.c
@@ -22,7 +22,6 @@
 #include "command.h"
 #include "memory.h"
 #include "prefix.h"
-#include "vty.h"
 #include "filter.h"
 
 #include "bgpd.h"
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index a71364381e..7dc7f053d6 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -23,7 +23,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 #include "linklist.h"
 #include "prefix.h"
-#include "vty.h"
 #include "sockunion.h"
 #include "thread.h"
 #include "log.h"
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 9607d381d9..efd36a0c28 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -21,7 +21,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include <zebra.h>
 
 #include "vector.h"
-#include "vty.h"
 #include "command.h"
 #include "getopt.h"
 #include "thread.h"
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index c7bcfe25f9..bafc81eaf8 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -22,7 +22,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 #include "prefix.h"
 #include "filter.h"
-#include "vty.h"
 #include "routemap.h"
 #include "command.h"
 #include "linklist.h"
diff --git a/bgpd/bgp_table.c b/bgpd/bgp_table.c
index 884523919e..06e443b25a 100644
--- a/bgpd/bgp_table.c
+++ b/bgpd/bgp_table.c
@@ -23,7 +23,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "prefix.h"
 #include "memory.h"
 #include "sockunion.h"
-#include "vty.h"
 #include "queue.h"
 #include "filter.h"
 #include "command.h"