diff --git a/interface-definitions/include/interface/default-route-distance.xml.i b/interface-definitions/include/interface/default-route-distance.xml.i
new file mode 100644
index 000000000..6eda52c91
--- /dev/null
+++ b/interface-definitions/include/interface/default-route-distance.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from interface/default-route-distance.xml.i -->
+<leafNode name="default-route-distance">
+  <properties>
+    <help>Distance for installed default route</help>
+    <valueHelp>
+      <format>u32:1-255</format>
+      <description>Distance for the default route from DHCP server</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-255"/>
+    </constraint>
+  </properties>
+  <defaultValue>210</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i
index 098d02919..914b60503 100644
--- a/interface-definitions/include/interface/dhcp-options.xml.i
+++ b/interface-definitions/include/interface/dhcp-options.xml.i
@@ -1,61 +1,44 @@
 <!-- include start from interface/dhcp-options.xml.i -->
 <node name="dhcp-options">
   <properties>
     <help>DHCP client settings/options</help>
   </properties>
   <children>
     <leafNode name="client-id">
       <properties>
         <help>Identifier used by client to identify itself to the DHCP server</help>
       </properties>
     </leafNode>
     <leafNode name="host-name">
       <properties>
         <help>Override system host-name sent to DHCP server</help>
       </properties>
     </leafNode>
     <leafNode name="vendor-class-id">
       <properties>
         <help>Identify the vendor client type to the DHCP server</help>
       </properties>
     </leafNode>
-    <leafNode name="no-default-route">
-      <properties>
-        <help>Do not request routers from DHCP server</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="default-route-distance">
-      <properties>
-        <help>Distance for the default route from DHCP server</help>
-        <valueHelp>
-          <format>u32:1-255</format>
-          <description>Distance for the default route from DHCP server</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-255"/>
-        </constraint>
-      </properties>
-      <defaultValue>210</defaultValue>
-    </leafNode>
+    #include <include/interface/no-default-route.xml.i>
+    #include <include/interface/default-route-distance.xml.i>
     <leafNode name="reject">
       <properties>
         <help>IP addresses or subnets from which to reject DHCP leases</help>
         <valueHelp>
           <format>ipv4</format>
           <description>IPv4 address to match</description>
         </valueHelp>
         <valueHelp>
           <format>ipv4net</format>
           <description>IPv4 prefix to match</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-address"/>
           <validator name="ipv4-prefix"/>
         </constraint>
         <multi/>
       </properties>
     </leafNode>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/no-default-route.xml.i b/interface-definitions/include/interface/no-default-route.xml.i
new file mode 100644
index 000000000..307fcff1e
--- /dev/null
+++ b/interface-definitions/include/interface/no-default-route.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/dhcp-options.xml.i -->
+<leafNode name="no-default-route">
+  <properties>
+    <help>Do not install default route to system</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->