diff --git a/yang/frr-bgp-bmp.yang b/yang/frr-bgp-bmp.yang
index 2417874ea0..cf945cabef 100644
--- a/yang/frr-bgp-bmp.yang
+++ b/yang/frr-bgp-bmp.yang
@@ -13,6 +13,8 @@ submodule frr-bgp-bmp {
     prefix frr-bt;
   }
 
+  include "frr-bgp-common-multiprotocol";
+
   organization
     "FRRouting";
   contact
diff --git a/yang/frr-bgp-common-structure.yang b/yang/frr-bgp-common-structure.yang
index 2ad22a1435..3378c10c03 100644
--- a/yang/frr-bgp-common-structure.yang
+++ b/yang/frr-bgp-common-structure.yang
@@ -25,6 +25,8 @@ submodule frr-bgp-common-structure {
     prefix frr-bt;
   }
 
+  include "frr-bgp-common";
+
   organization
     "FRRouting";
   contact
diff --git a/yang/frr-bgp-neighbor.yang b/yang/frr-bgp-neighbor.yang
index 03af643ba2..6d73580661 100644
--- a/yang/frr-bgp-neighbor.yang
+++ b/yang/frr-bgp-neighbor.yang
@@ -5,6 +5,10 @@ submodule frr-bgp-neighbor {
     prefix "bgp";
   }
 
+  include "frr-bgp-common-multiprotocol";
+
+  include "frr-bgp-common-structure";
+
   organization
     "FRRouting";
   contact
diff --git a/yang/frr-bgp-peer-group.yang b/yang/frr-bgp-peer-group.yang
index 80c9ecff2a..15c31bf010 100644
--- a/yang/frr-bgp-peer-group.yang
+++ b/yang/frr-bgp-peer-group.yang
@@ -13,6 +13,10 @@ submodule frr-bgp-peer-group {
     prefix frr-bt;
   }
 
+  include "frr-bgp-common-structure";
+
+  include "frr-bgp-neighbor";
+
   organization
     "FRRouting";
   contact