diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
index 789422f640..5a5492aad4 100644
--- a/bgpd/bgp_attr.h
+++ b/bgpd/bgp_attr.h
@@ -60,10 +60,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 struct attr_extra
 {
   /* Multi-Protocol Nexthop, AFI IPv6 */
-#ifdef HAVE_IPV6
   struct in6_addr mp_nexthop_global;
   struct in6_addr mp_nexthop_local;
-#endif /* HAVE_IPV6 */
 
   /* Extended Communities attribute. */
   struct ecommunity *ecommunity;
@@ -75,7 +73,6 @@ struct attr_extra
   struct transit *transit;
 
   struct in_addr mp_nexthop_global_in;
-  struct in_addr mp_nexthop_local_in;
   
   /* Aggregator Router ID attribute */
   struct in_addr aggregator_addr;
diff --git a/configure.ac b/configure.ac
index e39cc71b10..578f5a2c0a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -815,15 +815,6 @@ AC_CHECK_FUNCS([dup2 ftruncate getcwd gethostbyname getpagesize gettimeofday \
 	if_nametoindex if_indextoname getifaddrs \
 	uname fcntl])
 
-AC_CHECK_FUNCS(setproctitle, ,
-  [AC_CHECK_LIB(util, setproctitle, 
-     [LIBS="$LIBS -lutil"
-      AC_DEFINE(HAVE_SETPROCTITLE,, Have setproctitle)
-     ]
-   )
-  ]
-)
-
 dnl ------------------------------------
 dnl Determine routing get and set method
 dnl ------------------------------------