diff --git a/schema/aif.xsd b/schema/aif.xsd
index 41e3c3e..c7e90b0 100644
--- a/schema/aif.xsd
+++ b/schema/aif.xsd
@@ -2,22 +2,24 @@
 <xs:schema targetNamespace="http://schema.xml.r00t2.io/aif.xsd"
            xmlns="http://schema.xml.r00t2.io/aif.xsd"
            xmlns:aif="http://schema.xml.r00t2.io/aif.xsd"
-           xmlns:linux="http://schema.xml.r00t2.io/linux.xsd"
-           xmlns:net="http://schema.xml.r00t2.io/net.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
-           xmlns:sys="http://schema.xml.r00t2.io/sys.xsd"
-           xmlns:unix="http://schema.xml.r00t2.io/unix.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
            attributeFormDefault="qualified">
 
+    <xs:include schemaLocation="http://schema.xml.r00t2.io/linux.xsd"/>
+    <xs:include schemaLocation="http://schema.xml.r00t2.io/net.xsd"/>
+    <xs:include schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
+    <xs:include schemaLocation="http://schema.xml.r00t2.io/sys.xsd"/>
+    <xs:include schemaLocation="http://schema.xml.r00t2.io/unix.xsd"/>
+
     <xs:simpleType name="t_auto_ip6">
         <xs:union memberTypes="net:t_auto_ip6">
             <xs:simpleType>
-                <xs:restriction>
+                <xs:restriction base="xs:string">
                     <xs:enumeration value="false"/>
                     <xs:enumeration value="none"/>
                     <xs:enumeration value="0"/>
+                    <xs:whiteSpace value="collapse"/>
                 </xs:restriction>
             </xs:simpleType>
         </xs:union>
@@ -104,8 +106,7 @@
                     <xs:complexType>
                         <xs:sequence minOccurs="1" maxOccurs="unbounded">
                             <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element name="resolver" minOccurs="1" maxOccurs="unbounded"
-                                            type="net:t_both_addr"/>
+                                <xs:element name="resolver" minOccurs="1" maxOccurs="unbounded" type="net:t_both_addr"/>
                                 <xs:element name="ipv4" minOccurs="0" maxOccurs="1">
                                     <xs:complexType>
                                         <xs:attribute name="auto" type="xs:boolean"