diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am
index af6c8faf03..b6ed9a4d6d 100644
--- a/bgpd/Makefile.am
+++ b/bgpd/Makefile.am
@@ -107,6 +107,7 @@ module_LTLIBRARIES += bgpd_snmp.la
 endif
 
 bgpd_snmp_la_SOURCES = bgp_snmp.c
+bgpd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 bgpd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 bgpd_snmp_la_LIBADD = ../lib/libfrrsnmp.la
 
diff --git a/ospf6d/Makefile.am b/ospf6d/Makefile.am
index 933a97ca8f..75dd8ffe46 100644
--- a/ospf6d/Makefile.am
+++ b/ospf6d/Makefile.am
@@ -35,6 +35,7 @@ if SNMP
 module_LTLIBRARIES += ospf6d_snmp.la
 endif
 ospf6d_snmp_la_SOURCES = ospf6_snmp.c
+ospf6d_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 ospf6d_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 ospf6d_snmp_la_LIBADD = ../lib/libfrrsnmp.la
 
diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index e9d0ed2192..c6a5ec91d2 100644
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -38,6 +38,7 @@ if SNMP
 module_LTLIBRARIES += ospfd_snmp.la
 endif
 ospfd_snmp_la_SOURCES = ospf_snmp.c
+ospfd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 ospfd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 ospfd_snmp_la_LIBADD = ../lib/libfrrsnmp.la
 
diff --git a/ripd/Makefile.am b/ripd/Makefile.am
index 827869121c..9c034f0c38 100644
--- a/ripd/Makefile.am
+++ b/ripd/Makefile.am
@@ -28,6 +28,7 @@ if SNMP
 module_LTLIBRARIES += ripd_snmp.la
 endif
 ripd_snmp_la_SOURCES = rip_snmp.c
+ripd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 ripd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 ripd_snmp_la_LIBADD = ../lib/libfrrsnmp.la
 
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index d02ec9661f..544b467e32 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -44,27 +44,67 @@ vtysh_scan += $(top_srcdir)/pimd/pim_cmd.c
 endif
 
 if BGPD
-vtysh_scan += $(top_srcdir)/bgpd/*.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_bfd.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_debug.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_dump.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_encap.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_evpn_vty.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_filter.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_mplsvpn.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_route.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_routemap.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_vty.c
 endif
 
 if ISISD
-vtysh_scan += $(top_srcdir)/isisd/*.c
+vtysh_scan += $(top_srcdir)/isisd/isis_redist.c
+vtysh_scan += $(top_srcdir)/isisd/isis_spf.c
+vtysh_scan += $(top_srcdir)/isisd/isis_te.c
+vtysh_scan += $(top_srcdir)/isisd/isis_vty.c
+vtysh_scan += $(top_srcdir)/isisd/isisd.c
 endif
 
 if OSPFD
-vtysh_scan += $(top_srcdir)/ospfd/*.c
+vtysh_scan += $(top_srcdir)/ospfd/ospf_bfd.c
+vtysh_scan += $(top_srcdir)/ospfd/ospf_dump.c
+vtysh_scan += $(top_srcdir)/ospfd/ospf_opaque.c
+vtysh_scan += $(top_srcdir)/ospfd/ospf_ri.c
+vtysh_scan += $(top_srcdir)/ospfd/ospf_routemap.c
+vtysh_scan += $(top_srcdir)/ospfd/ospf_te.c
+vtysh_scan += $(top_srcdir)/ospfd/ospf_vty.c
 endif
 
 if OSPF6D
-vtysh_scan += $(top_srcdir)/ospf6d/*.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_abr.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_area.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_bfd.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_flood.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_interface.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_intra.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_lsa.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_message.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_neighbor.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_route.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_spf.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_top.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6_zebra.c
+vtysh_scan += $(top_srcdir)/ospf6d/ospf6d.c
 endif
 
 if RIPD
-vtysh_scan += $(top_srcdir)/ripd/*.c
+vtysh_scan += $(top_srcdir)/ripd/rip_debug.c
+vtysh_scan += $(top_srcdir)/ripd/rip_interface.c
+vtysh_scan += $(top_srcdir)/ripd/rip_offset.c
+vtysh_scan += $(top_srcdir)/ripd/rip_zebra.c
+vtysh_scan += $(top_srcdir)/ripd/ripd.c
 endif
 
 if RIPNGD
-vtysh_scan += $(top_srcdir)/ripngd/*.c
+vtysh_scan += $(top_srcdir)/ripngd/ripng_debug.c
+vtysh_scan += $(top_srcdir)/ripngd/ripng_interface.c
+vtysh_scan += $(top_srcdir)/ripngd/ripng_offset.c
+vtysh_scan += $(top_srcdir)/ripngd/ripng_zebra.c
+vtysh_scan += $(top_srcdir)/ripngd/ripngd.c
 endif
 
 if NHRPD
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index af7a513d2f..3e0de3b463 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -61,6 +61,7 @@ if SNMP
 module_LTLIBRARIES += zebra_snmp.la
 endif
 zebra_snmp_la_SOURCES = zebra_snmp.c
+zebra_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 zebra_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 zebra_snmp_la_LIBADD = ../lib/libfrrsnmp.la