5 files changed, 10 insertions, 14 deletions
diff --git a/tests/aspath_test.c b/tests/aspath_test.c
index 5a0899ec..d75cf9c4 100644
--- a/tests/aspath_test.c
+++ b/tests/aspath_test.c
@@ -25,6 +25,7 @@
 #include "stream.h"
 #include "privs.h"
 #include "filter.h"
+#include "linklist.h"
 
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_aspath.h"
diff --git a/tests/bgp_capability_test.c b/tests/bgp_capability_test.c
index a3813518..c53b0590 100644
--- a/tests/bgp_capability_test.c
+++ b/tests/bgp_capability_test.c
@@ -26,6 +26,7 @@
 #include "privs.h"
 #include "memory.h"
 #include "filter.h"
+#include "linklist.h"
 
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_open.h"
@@ -635,15 +636,11 @@ main (void)
   struct peer *peer;
   int i, j;
   
-  conf_bgp_debug_fsm = -1UL;
-  conf_bgp_debug_events = -1UL;
+  conf_bgp_debug_neighbor_events = -1UL;
   conf_bgp_debug_packet = -1UL;
-  conf_bgp_debug_normal = -1UL;
   conf_bgp_debug_as4 = -1UL;
-  term_bgp_debug_fsm = -1UL;
-  term_bgp_debug_events = -1UL;
+  term_bgp_debug_neighbor_events = -1UL;
   term_bgp_debug_packet = -1UL;
-  term_bgp_debug_normal = -1UL;
   term_bgp_debug_as4 = -1UL;
   
   master = thread_master_create ();
diff --git a/tests/bgp_mp_attr_test.c b/tests/bgp_mp_attr_test.c
index 5400dd17..2df2a2e6 100644
--- a/tests/bgp_mp_attr_test.c
+++ b/tests/bgp_mp_attr_test.c
@@ -26,6 +26,7 @@
 #include "privs.h"
 #include "memory.h"
 #include "filter.h"
+#include "linklist.h"
 
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_attr.h"
@@ -742,15 +743,11 @@ main (void)
   struct peer *peer;
   int i, j;
   
-  conf_bgp_debug_fsm = -1UL;
-  conf_bgp_debug_events = -1UL;
+  conf_bgp_debug_neighbor_events = -1UL;
   conf_bgp_debug_packet = -1UL;
-  conf_bgp_debug_normal = -1UL;
   conf_bgp_debug_as4 = -1UL;
-  term_bgp_debug_fsm = -1UL;
-  term_bgp_debug_events = -1UL;
+  term_bgp_debug_neighbor_events = -1UL;
   term_bgp_debug_packet = -1UL;
-  term_bgp_debug_normal = -1UL;
   term_bgp_debug_as4 = -1UL;
   
   master = thread_master_create ();
diff --git a/tests/bgp_mpath_test.c b/tests/bgp_mpath_test.c
index 174d2998..75797147 100644
--- a/tests/bgp_mpath_test.c
+++ b/tests/bgp_mpath_test.c
@@ -158,9 +158,9 @@ run_bgp_cfg_maximum_paths (testcase_t *t)
     for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)
       {
         /* test bgp_maximum_paths_set */
-        api_result = bgp_maximum_paths_set (bgp, afi, safi, BGP_PEER_EBGP, 10);
+        api_result = bgp_maximum_paths_set (bgp, afi, safi, BGP_PEER_EBGP, 10, 0);
         EXPECT_TRUE (api_result == 0, test_result);
-        api_result = bgp_maximum_paths_set (bgp, afi, safi, BGP_PEER_IBGP, 10);
+        api_result = bgp_maximum_paths_set (bgp, afi, safi, BGP_PEER_IBGP, 10, 0);
         EXPECT_TRUE (api_result == 0, test_result);
         EXPECT_TRUE (bgp->maxpaths[afi][safi].maxpaths_ebgp == 10, test_result);
         EXPECT_TRUE (bgp->maxpaths[afi][safi].maxpaths_ibgp == 10, test_result);
diff --git a/tests/ecommunity_test.c b/tests/ecommunity_test.c
index 23ee4058..ac2f5d00 100644
--- a/tests/ecommunity_test.c
+++ b/tests/ecommunity_test.c
@@ -25,6 +25,7 @@
 #include "privs.h"
 #include "memory.h"
 #include "filter.h"
+#include "linklist.h"
 
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_ecommunity.h"