From e9405db556aa78ff34aaf84990322e2272fd1846 Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Mon, 9 Dec 2019 08:29:38 -0500
Subject: [PATCH] getting....there.... (i hope)

---
 schema/lib/types/aif.xsd   |  63 +++++++----------
 schema/lib/types/bsd.xsd   |  20 ++----
 schema/lib/types/linux.xsd | 134 +++++++++++++++----------------------
 schema/lib/types/net.xsd   |  22 +++---
 schema/lib/types/std.xsd   |  28 ++++----
 schema/lib/types/sys.xsd   |   4 +-
 schema/lib/types/unix.xsd  |  51 ++++++--------
 schema/projects/bdisk.xsd  |   4 +-
 8 files changed, 129 insertions(+), 197 deletions(-)

diff --git a/schema/lib/types/aif.xsd b/schema/lib/types/aif.xsd
index 35af114..e08dd2f 100644
--- a/schema/lib/types/aif.xsd
+++ b/schema/lib/types/aif.xsd
@@ -1,26 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/aif.xsd"
-           xmlns="https://schema.xml.r00t2.io/lib/types/aif.xsd"
-           xmlns:t_aif="https://schema.xml.r00t2.io/lib/types/aif.xsd"
-           xmlns:linux="https://schema.xml.r00t2.io/lib/types/linux.xsd"
-           xmlns:net="https://schema.xml.r00t2.io/lib/types/net.xsd"
-           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
-           xmlns:unix="https://schema.xml.r00t2.io/lib/types/unix.xsd"
+<xs:schema xmlns:t_aif="https://schema.xml.r00t2.io/lib/types/aif.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/linux.xsd"
-               schemaLocation="./linux.xsd"/>
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/net.xsd"
-               schemaLocation="./net.xsd"/>
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
-               schemaLocation="./std.xsd"/>
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/unix.xsd"
-               schemaLocation="./unix.xsd"/>
+    <xs:include schemaLocation="./linux.xsd"/>
+    <xs:include schemaLocation="./net.xsd"/>
+    <xs:include schemaLocation="./std.xsd"/>
+    <xs:include schemaLocation="./unix.xsd"/>
 
         <xs:simpleType name="t_auto_ip6">
-        <xs:union memberTypes="net:t_auto_ip6">
+        <xs:union memberTypes="t_auto_ip6">
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="false"/>
@@ -66,9 +56,8 @@
                                             <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
                                                 <xs:complexType>
                                                     <xs:simpleContent>
-                                                        <xs:extension base="net:t_qualified_addr_ip4">
-                                                            <xs:attribute name="gateway"
-                                                                          type="net:t_addr_ip4"
+                                                        <xs:extension base="t_qualified_addr_ip4">
+                                                            <xs:attribute name="gateway" type="t_addr_ip4"
                                                                           use="optional"/>
                                                         </xs:extension>
                                                     </xs:simpleContent>
@@ -88,20 +77,18 @@
                                             <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
                                                 <xs:complexType>
                                                     <xs:simpleContent>
-                                                        <xs:extension base="net:t_qualified_addr_ip6">
-                                                            <xs:attribute name="gateway"
-                                                                          type="net:t_addr_ip6"
+                                                        <xs:extension base="t_qualified_addr_ip6">
+                                                            <xs:attribute name="gateway" type="t_addr_ip6"
                                                                           use="optional"/>
                                                         </xs:extension>
                                                     </xs:simpleContent>
                                                 </xs:complexType>
                                             </xs:element>
                                         </xs:sequence>
-                                        <xs:attribute name="auto" type="net:t_auto_ip6"
-                                                      use="optional" default="slaac"/>
+                                        <xs:attribute name="auto" type="t_auto_ip6" use="optional" default="slaac"/>
                                     </xs:complexType>
                                     <xs:unique name="uniq_ipv6_addr">
-                                        <xs:selector xpath="t_aif:address"/>
+                                        <xs:selector xpath="address"/>
                                         <xs:field xpath="."/>
                                     </xs:unique>
                                 </xs:element>
@@ -113,7 +100,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="t_both_addr"/>
                                 <xs:element name="ipv4" minOccurs="0" maxOccurs="1">
                                     <xs:complexType>
                                         <xs:attribute name="auto" type="xs:boolean"
@@ -140,9 +127,9 @@
                                             <xs:element name="route" minOccurs="0" maxOccurs="unbounded">
                                                 <xs:complexType>
                                                     <xs:simpleContent>
-                                                        <xs:extension base="net:t_qualified_addr_ip4">
+                                                        <xs:extension base="t_qualified_addr_ip4">
                                                             <xs:attribute name="gateway"
-                                                                          type="net:t_addr_ip4"
+                                                                          type="t_addr_ip4"
                                                                           use="required"/>
                                                         </xs:extension>
                                                     </xs:simpleContent>
@@ -152,7 +139,7 @@
                                         <xs:attribute name="auto" type="xs:boolean" use="optional" default="true"/>
                                     </xs:complexType>
                                     <xs:unique name="uniq_ipv4_route">
-                                        <xs:selector xpath="t_aif:route"/>
+                                        <xs:selector xpath="route"/>
                                         <xs:field xpath="."/>
                                     </xs:unique>
                                 </xs:element>
@@ -162,9 +149,9 @@
                                             <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
                                                 <xs:complexType>
                                                     <xs:simpleContent>
-                                                        <xs:extension base="net:t_qualified_addr_ip6">
+                                                        <xs:extension base="t_qualified_addr_ip6">
                                                             <xs:attribute name="gateway"
-                                                                          type="net:t_addr_ip6"
+                                                                          type="t_addr_ip6"
                                                                           use="required"/>
                                                         </xs:extension>
                                                     </xs:simpleContent>
@@ -180,7 +167,7 @@
                                         <xs:attribute name="auto" type="xs:boolean" use="optional" default="true"/>
                                     </xs:complexType>
                                     <xs:unique name="uniq_ipv6_route">
-                                        <xs:selector xpath="t_aif:route"/>
+                                        <xs:selector xpath="route"/>
                                         <xs:field xpath="."/>
                                     </xs:unique>
                                 </xs:element>
@@ -191,13 +178,13 @@
             </xs:choice>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" use="required"/>
-        <xs:attribute name="device" type="linux:t_iface_name" use="required"/>
+        <xs:attribute name="device" type="t_iface_name" use="required"/>
         <xs:attribute name="defroute" type="xs:boolean" use="optional" default="false"/>
-        <xs:attribute name="searchDomain" type="std:t_nonempty" use="optional"/>
+        <xs:attribute name="searchDomain" type="t_nonempty" use="optional"/>
     </xs:complexType>
 
     <xs:simpleType name="t_iface_name">
-        <xs:union memberTypes="linux:t_iface_name">
+        <xs:union memberTypes="t_iface_name">
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="auto"/>
@@ -210,18 +197,18 @@
         <xs:complexContent>
             <xs:extension base="t_iface">
                 <xs:sequence>
-                    <xs:element name="encryption" type="net:t_wifi_crypto" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="encryption" type="t_wifi_crypto" minOccurs="0" maxOccurs="1"/>
                 </xs:sequence>
                 <!-- TODO: SSID needs to support unicode chars in both XML(/XSD type=?) and program -->
                 <xs:attribute name="essid" type="xs:string" use="required"/>
-                <xs:attribute name="bssid" type="net:t_mac_addr" use="optional"/>
+                <xs:attribute name="bssid" type="t_mac_addr" use="optional"/>
                 <xs:attribute name="hidden" type="xs:boolean" use="optional" default="false"/>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
 
     <xs:simpleType name="t_netproto">
-        <xs:union memberTypes="net:t_netproto">
+        <xs:union memberTypes="t_netproto">
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="both"/>
diff --git a/schema/lib/types/bsd.xsd b/schema/lib/types/bsd.xsd
index 95c005d..81d1073 100644
--- a/schema/lib/types/bsd.xsd
+++ b/schema/lib/types/bsd.xsd
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
-           xmlns="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
-           xmlns:bsd="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
-           xmlns:linux="https://schema.xml.r00t2.io/lib/types/linux.xsd"
-           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
-           xmlns:unix="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
+<xs:schema xmlns:bsd="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/linux.xsd"
-               schemaLocation="./linux.xsd"/>
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
-               schemaLocation="./std.xsd"/>
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/unix.xsd"
-               schemaLocation="./unix.xsd"/>
+    <xs:include schemaLocation="./linux.xsd"/>
+    <xs:include schemaLocation="./std.xsd"/>
+    <xs:include schemaLocation="./unix.xsd"/>
 
     <xs:simpleType name="t_passwd_hashtypes">
-        <xs:union memberTypes="linux:t_passwd_hashtypes">
+        <xs:union memberTypes="t_passwd_hashtypes">
             <xs:simpleType>
                 <xs:restriction>
                     <!-- <xs:enumeration value="des"/> -->
@@ -30,7 +22,7 @@
     </xs:simpleType>
 
     <xs:simpleType name="t_shadowhash">
-        <xs:union memberTypes="linux:t_shadowhash">
+        <xs:union memberTypes="t_shadowhash">
             <xs:simpleType>
                 <xs:restriction>
                     <!-- Blowfish/bcrypt -->
diff --git a/schema/lib/types/linux.xsd b/schema/lib/types/linux.xsd
index 8ee05e2..b66d771 100644
--- a/schema/lib/types/linux.xsd
+++ b/schema/lib/types/linux.xsd
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/linux.xsd"
-           xmlns="https://schema.xml.r00t2.io/lib/types/linux.xsd"
-           xmlns:linux="https://schema.xml.r00t2.io/lib/types/linux.xsd"
-           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
-           xmlns:sys="https://schema.xml.r00t2.io/lib/types/sys.xsd"
-           xmlns:unix="https://schema.xml.r00t2.io/lib/types/unix.xsd"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
-               schemaLocation="./std.xsd"/>
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/sys.xsd"
-               schemaLocation="./sys.xsd"/>
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/unix.xsd"
-               schemaLocation="./unix.xsd"/>
+    <xs:include schemaLocation="./std.xsd"/>
+    <xs:include schemaLocation="./sys.xsd"/>
+    <xs:include schemaLocation="./unix.xsd"/>
 
     <xs:simpleType name="t_console_pageformats">
         <xs:restriction base="xs:positiveInteger">
@@ -26,11 +17,11 @@
 
     <xs:complexType name="t_disk">
         <xs:sequence>
-            <xs:element name="part" minOccurs="1" maxOccurs="unbounded" type="linux:t_partition"/>
+            <xs:element name="part" minOccurs="1" maxOccurs="unbounded" type="t_partition"/>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" use="required"/>
-        <xs:attribute name="device" type="linux:t_diskdev" use="required"/>
-        <xs:attribute name="diskFormat" type="sys:t_diskfmt" use="required"/>
+        <xs:attribute name="device" type="t_diskdev" use="required"/>
+        <xs:attribute name="diskFormat" type="t_diskfmt" use="required"/>
     </xs:complexType>
 
     <xs:simpleType name="t_diskdev">
@@ -49,7 +40,7 @@
     </xs:simpleType>
 
     <xs:simpleType name="t_fstype">
-        <xs:union memberTypes="std:t_UUID4">
+        <xs:union memberTypes="t_UUID4">
             <xs:simpleType>
                 <!-- parted names -->
                 <!-- https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs -->
@@ -118,7 +109,7 @@
                         <xs:element name="secrets" minOccurs="1" maxOccurs="10" type="t_luks_secrets"/>
                     </xs:sequence>
                     <xs:attribute name="id" type="xs:ID" use="required"/>
-                    <xs:attribute name="name" type="std:t_nonempty" use="required"/>
+                    <xs:attribute name="name" type="t_nonempty" use="required"/>
                     <xs:attribute name="source" type="xs:IDREF" use="required"/>
                 </xs:complexType>
             </xs:element>
@@ -127,13 +118,12 @@
 
     <xs:complexType name="t_luks_secrets">
         <xs:sequence minOccurs="1" maxOccurs="unbounded">
-            <xs:element name="passphrase" minOccurs="0" maxOccurs="unbounded"
-                        type="std:t_nonempty"/>
+            <xs:element name="passphrase" minOccurs="0" maxOccurs="unbounded" type="t_nonempty"/>
             <!-- TODO: support URI to *read* bytes from? -->
             <xs:element name="keyFile" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:simpleContent>
-                        <xs:extension base="unix:t_filepath">
+                        <xs:extension base="t_filepath">
                             <xs:attribute name="size" type="xs:positiveInteger" use="optional"/>
                         </xs:extension>
                     </xs:simpleContent>
@@ -150,15 +140,15 @@
                         <xs:element name="physicalVolumes" minOccurs="1" maxOccurs="1">
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="pv" minOccurs="1" maxOccurs="unbounded" type="linux:t_lvm_pv"/>
+                                    <xs:element name="pv" minOccurs="1" maxOccurs="unbounded" type="t_lvm_pv"/>
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
-                        <xs:element name="logicalVolumes" minOccurs="1" maxOccurs="1" type="linux:t_lvm_lv"/>
+                        <xs:element name="logicalVolumes" minOccurs="1" maxOccurs="1" type="t_lvm_lv"/>
                     </xs:all>
                     <xs:attribute name="id" type="xs:ID" use="required"/>
-                    <xs:attribute name="name" type="std:t_nonempty" use="required"/>
-                    <xs:attribute name="extentSize" type="linux:t_pesize" use="optional" default="0"/>
+                    <xs:attribute name="name" type="t_nonempty" use="required"/>
+                    <xs:attribute name="extentSize" type="t_pesize" use="optional" default="0"/>
                 </xs:complexType>
             </xs:element>
         </xs:sequence>
@@ -176,8 +166,8 @@
                         </xs:element>
                     </xs:sequence>
                     <xs:attribute name="id" type="xs:ID" use="required"/>
-                    <xs:attribute name="name" type="std:t_nonempty" use="required"/>
-                    <xs:attribute name="size" type="linux:t_lvsize" use="required"/>
+                    <xs:attribute name="name" type="t_nonempty" use="required"/>
+                    <xs:attribute name="size" type="t_lvsize" use="required"/>
                 </xs:complexType>
             </xs:element>
         </xs:sequence>
@@ -203,29 +193,26 @@
                     <xs:sequence minOccurs="1" maxOccurs="unbounded">
                         <xs:element name="member" minOccurs="1" maxOccurs="unbounded">
                             <xs:complexType>
-                                <xs:attribute name="source" type="xs:IDREF"
-                                              use="required"/>
+                                <xs:attribute name="source" type="xs:IDREF" use="required"/>
                             </xs:complexType>
                         </xs:element>
                     </xs:sequence>
                     <xs:attribute name="id" use="required" type="xs:ID"/>
-                    <xs:attribute name="name" use="required" type="std:t_nonempty"/>
-                    <xs:attribute name="meta" use="optional" default="1.2" type="linux:t_raid_meta"/>
-                    <xs:attribute name="level" use="required" type="linux:t_raid_levels"/>
+                    <xs:attribute name="name" use="required" type="t_nonempty"/>
+                    <xs:attribute name="meta" use="optional" default="1.2" type="t_raid_meta"/>
+                    <xs:attribute name="level" use="required" type="t_raid_levels"/>
                     <!-- KB *only*. -->
                     <!-- Can be pretty important!
                          https://www.zdnet.com/article/chunks-the-hidden-key-to-raid-performance/ -->
-                    <xs:attribute name="chunkSize" use="optional" type="xs:positiveInteger"
-                                  default="512"/>
-                    <xs:attribute name="layout" use="optional" type="linux:t_raid_layout"
-                                  default="none"/>
+                    <xs:attribute name="chunkSize" use="optional" type="xs:positiveInteger" default="512"/>
+                    <xs:attribute name="layout" use="optional" type="t_raid_layout" default="none"/>
                 </xs:complexType>
             </xs:element>
         </xs:sequence>
     </xs:complexType>
 
     <xs:simpleType name="t_mountpath">
-        <xs:union memberTypes="unix:t_filepath">
+        <xs:union memberTypes="t_filepath">
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="swap"/>
@@ -239,11 +226,10 @@
             <xs:element name="mount" minOccurs="1" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:sequence minOccurs="0" maxOccurs="unbounded">
-                        <xs:element name="opt" minOccurs="1" maxOccurs="unbounded"
-                                    type="std:t_cmdopts"/>
+                        <xs:element name="opt" minOccurs="1" maxOccurs="unbounded" type="t_cmdopts"/>
                     </xs:sequence>
                     <xs:attribute name="source" type="xs:IDREF" use="required"/>
-                    <xs:attribute name="target" type="linux:t_mountpath" use="required"/>
+                    <xs:attribute name="target" type="t_mountpath" use="required"/>
                 </xs:complexType>
             </xs:element>
         </xs:sequence>
@@ -255,8 +241,7 @@
                 <xs:complexType>
                     <xs:simpleContent>
                         <xs:extension base="xs:string">
-                            <xs:attribute name="hashType" use="optional" default="sha512"
-                                          type="linux:t_passwd_hashtypes"/>
+                            <xs:attribute name="hashType" use="optional" default="sha512" type="t_passwd_hashtypes"/>
                             <xs:attribute name="rounds" use="optional" default="5000" type="xs:positiveInteger"/>
                         </xs:extension>
                     </xs:simpleContent>
@@ -265,9 +250,9 @@
             <xs:element name="passwordHash">
                 <xs:complexType>
                     <xs:simpleContent>
-                        <xs:extension base="linux:t_shadowhash">
+                        <xs:extension base="t_shadowhash">
                             <xs:attribute name="hashType" use="optional" default="(detect)"
-                                          type="linux:t_passwd_hashtypes_detect"/>
+                                          type="t_passwd_hashtypes_detect"/>
                         </xs:extension>
                     </xs:simpleContent>
                 </xs:complexType>
@@ -278,8 +263,8 @@
 
     <xs:complexType name="t_package">
         <xs:simpleContent>
-            <xs:extension base="std:t_nonempty">
-                <xs:attribute name="repo" type="std:t_nonempty" use="optional"/>
+            <xs:extension base="t_nonempty">
+                <xs:attribute name="repo" type="t_nonempty" use="optional"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
@@ -339,18 +324,18 @@
 
     <xs:complexType name="t_partition">
         <xs:sequence minOccurs="0" maxOccurs="1">
-            <xs:element name="partitionFlag" minOccurs="1" maxOccurs="unbounded" type="linux:t_part_flags"/>
+            <xs:element name="partitionFlag" minOccurs="1" maxOccurs="unbounded" type="t_part_flags"/>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" use="required"/>
-        <xs:attribute name="name" type="std:t_nonempty" use="optional"/>
-        <xs:attribute name="label" type="std:t_nonempty" use="optional"/>
-        <xs:attribute name="start" type="linux:t_disksize" use="required"/>
-        <xs:attribute name="stop" type="linux:t_disksize" use="required"/>
-        <xs:attribute name="fsType" type="linux:t_fstype" use="required"/>
+        <xs:attribute name="name" type="t_nonempty" use="optional"/>
+        <xs:attribute name="label" type="t_nonempty" use="optional"/>
+        <xs:attribute name="start" type="t_disksize" use="required"/>
+        <xs:attribute name="stop" type="t_disksize" use="required"/>
+        <xs:attribute name="fsType" type="t_fstype" use="required"/>
     </xs:complexType>
 
     <xs:simpleType name="t_passwd_hashtypes">
-        <xs:union memberTypes="unix:t_passwd_hashtypes">
+        <xs:union memberTypes="t_passwd_hashtypes">
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <!-- Unsupported in glibc. libxcrypt (https://github.com/besser82/libxcrypt/) has additional support. -->
@@ -366,7 +351,7 @@
     </xs:simpleType>
 
     <xs:simpleType name="t_passwd_hashtypes_detect">
-        <xs:union memberTypes="linux:t_passwd_hashtypes">
+        <xs:union memberTypes="t_passwd_hashtypes">
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="(detect)"/>
@@ -425,14 +410,14 @@
 
     <xs:complexType name="t_service">
         <xs:simpleContent>
-            <xs:extension base="std:t_nonempty">
+            <xs:extension base="t_nonempty">
                 <xs:attribute name="status" type="xs:boolean" use="optional" default="true"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
 
     <xs:simpleType name="t_shadowhash">
-        <xs:union memberTypes="unix:t_shadowhash">
+        <xs:union memberTypes="t_shadowhash">
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <xs:pattern value="($5)?($[a-zA-Z0-9./]{1,16})$[a-zA-Z0-9./]{43}"/><!-- sha256 -->
@@ -445,15 +430,12 @@
     <xs:complexType name="t_user">
         <xs:sequence>
             <xs:element name="password" minOccurs="0" maxOccurs="1"
-                        type="linux:t_nixpass"/>
+                        type="t_nixpass"/>
             <xs:element name="xGroup" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
-                    <xs:attribute name="name" type="unix:t_posixUserGroup"
-                                  use="required"/>
-                    <xs:attribute name="create" type="xs:boolean" use="optional"
-                                  default="false"/>
-                    <xs:attribute name="gid" type="xs:positiveInteger"
-                                  use="optional"/>
+                    <xs:attribute name="name" type="t_posixUserGroup" use="required"/>
+                    <xs:attribute name="create" type="xs:boolean" use="optional" default="false"/>
+                    <xs:attribute name="gid" type="xs:positiveInteger" use="optional"/>
                 </xs:complexType>
                 <xs:unique name="uniq_grp">
                     <xs:selector xpath="."/>
@@ -461,29 +443,23 @@
                 </xs:unique>
             </xs:element>
         </xs:sequence>
-        <xs:attribute name="name" type="unix:t_posixUserGroup" use="required"/>
-        <xs:attribute name="home" type="unix:t_filepath" use="optional"/>
+        <xs:attribute name="name" type="t_posixUserGroup" use="required"/>
+        <xs:attribute name="home" type="t_filepath" use="optional"/>
         <xs:attribute name="uid" type="xs:positiveInteger" use="optional"/>
-        <xs:attribute name="group" type="unix:t_posixUserGroup" use="optional"/>
+        <xs:attribute name="group" type="t_posixUserGroup" use="optional"/>
         <xs:attribute name="gid" type="xs:positiveInteger" use="optional"/>
-        <xs:attribute name="comment" type="std:t_nonempty" use="optional"/>
-        <xs:attribute name="sudo" type="xs:boolean" use="optional"
-                      default="false"/>
-        <xs:attribute name="sudoPassword" type="xs:boolean" use="optional"
-                      default="true"/>
-        <xs:attribute name="shell" type="unix:t_filepath" use="optional"
-                      default="/bin/bash"/>
+        <xs:attribute name="comment" type="t_nonempty" use="optional"/>
+        <xs:attribute name="sudo" type="xs:boolean" use="optional" default="false"/>
+        <xs:attribute name="sudoPassword" type="xs:boolean" use="optional" default="true"/>
+        <xs:attribute name="shell" type="t_filepath" use="optional" default="/bin/bash"/>
         <!-- TODO: change the positiveIntegers to xs:duration? or union? -->
         <!-- Might be pointless since the smallest increment is 1 day in
              shadow(5). -->
         <xs:attribute name="minAge" type="xs:positiveInteger" use="optional"/>
         <xs:attribute name="maxAge" type="xs:positiveInteger" use="optional"/>
-        <xs:attribute name="warnDays" type="xs:positiveInteger"
-                      use="optional"/>
-        <xs:attribute name="inactiveDays" type="xs:positiveInteger"
-                      use="optional"/>
-        <xs:attribute name="expireDate" type="std:t_epoch_or_iso"
-                      use="optional"/>
+        <xs:attribute name="warnDays" type="xs:positiveInteger" use="optional"/>
+        <xs:attribute name="inactiveDays" type="xs:positiveInteger" use="optional"/>
+        <xs:attribute name="expireDate" type="t_epoch_or_iso" use="optional"/>
     </xs:complexType>
 
 </xs:schema>
diff --git a/schema/lib/types/net.xsd b/schema/lib/types/net.xsd
index d9e7d6f..85bcd5d 100644
--- a/schema/lib/types/net.xsd
+++ b/schema/lib/types/net.xsd
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/net.xsd"
-           xmlns="https://schema.xml.r00t2.io/lib/types/net.xsd"
-           xmlns:net="https://schema.xml.r00t2.io/lib/types/net.xsd"
-           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
+<xs:schema xmlns:net="https://schema.xml.r00t2.io/lib/types/net.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
-               schemaLocation="./std.xsd"/>
+    <xs:include schemaLocation="./std.xsd"/>
 
     <xs:simpleType name="t_addr_ip4">
         <xs:restriction base="xs:string">
@@ -45,20 +41,20 @@
     </xs:simpleType>
 
     <xs:simpleType name="t_both_addr">
-        <xs:union memberTypes="net:t_addr_ip4 net:t_addr_ip6"/>
+        <xs:union memberTypes="t_addr_ip4 t_addr_ip6"/>
     </xs:simpleType>
 
     <xs:simpleType name="t_both_qualified_addr">
-        <xs:union memberTypes="net:t_qualified_addr_ip4 net:t_qualified_addr_ip6"/>
+        <xs:union memberTypes="t_qualified_addr_ip4 t_qualified_addr_ip6"/>
     </xs:simpleType>
 
     <xs:complexType name="t_http_resource">
         <xs:simpleContent>
-            <xs:extension base="std:t_uri">
-                <xs:attribute name="user" type="std:t_nonempty" use="optional"/>
-                <xs:attribute name="password" type="std:t_nonempty" use="optional"/>
-                <xs:attribute name="realm" type="std:t_nonempty" use="optional"/>
-                <xs:attribute name="authtype" type="net:t_authselect" use="optional" default="none"/>
+            <xs:extension base="t_uri">
+                <xs:attribute name="user" type="t_nonempty" use="optional"/>
+                <xs:attribute name="password" type="t_nonempty" use="optional"/>
+                <xs:attribute name="realm" type="t_nonempty" use="optional"/>
+                <xs:attribute name="authtype" type="t_authselect" use="optional" default="none"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
diff --git a/schema/lib/types/std.xsd b/schema/lib/types/std.xsd
index 517aa2d..d04770d 100644
--- a/schema/lib/types/std.xsd
+++ b/schema/lib/types/std.xsd
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
-           xmlns="https://schema.xml.r00t2.io/lib/types/std.xsd"
-           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
+<xs:schema xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
@@ -15,16 +13,16 @@
 
     <xs:complexType name="t_cksum">
         <xs:simpleContent>
-            <xs:extension base="std:t_cksum_hashtypes">
-                <xs:attribute name="hashType" use="required" type="std:t_cksum_hashtypes"/>
+            <xs:extension base="t_cksum_hashtypes">
+                <xs:attribute name="hashType" use="required" type="t_cksum_hashtypes"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
 
     <xs:complexType name="t_cksum_file">
         <xs:simpleContent>
-            <xs:extension base="std:t_uri">
-                <xs:attribute name="hashType" use="required" type="std:t_cksum_hashtypes"/>
+            <xs:extension base="t_uri">
+                <xs:attribute name="hashType" use="required" type="t_cksum_hashtypes"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
@@ -66,7 +64,7 @@
 
     <xs:complexType name="t_gpg_keys">
         <xs:sequence minOccurs="1" maxOccurs="unbounded">
-            <xs:element name="keyID" minOccurs="1" maxOccurs="unbounded" type="std:t_gpg_key_id"/>
+            <xs:element name="keyID" minOccurs="1" maxOccurs="unbounded" type="t_gpg_key_id"/>
         </xs:sequence>
     </xs:complexType>
     
@@ -102,7 +100,7 @@
 
     <xs:complexType name="t_verifyfile">
         <xs:all minOccurs="1">
-            <xs:element name="gpg" minOccurs="0" maxOccurs="1" type="std:t_verify_gpg">
+            <xs:element name="gpg" minOccurs="0" maxOccurs="1" type="t_verify_gpg">
                 <xs:unique name="uniq_gpg_sig">
                     <xs:selector xpath="std:signature"/>
                     <xs:field xpath="."/>
@@ -112,22 +110,22 @@
                     <xs:field xpath="."/>
                 </xs:unique>
             </xs:element>
-            <xs:element name="hash" minOccurs="0" maxOccurs="1" type="std:t_verify_cksum"/>
+            <xs:element name="hash" minOccurs="0" maxOccurs="1" type="t_verify_cksum"/>
         </xs:all>
     </xs:complexType>
 
     <xs:complexType name="t_verify_cksum">
         <xs:sequence>
-            <xs:element name="checksum" minOccurs="0" maxOccurs="unbounded" type="std:t_cksum"/>
-            <xs:element name="checksumFile" minOccurs="0" maxOccurs="unbounded" type="std:t_cksum_file"/>
+            <xs:element name="checksum" minOccurs="0" maxOccurs="unbounded" type="t_cksum"/>
+            <xs:element name="checksumFile" minOccurs="0" maxOccurs="unbounded" type="t_cksum_file"/>
         </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="t_verify_gpg">
         <xs:choice minOccurs="1" maxOccurs="1">
-            <xs:element name="signature" minOccurs="0" maxOccurs="unbounded" type="std:t_gpg_sig"/>
-            <xs:element name="signatureFile" minOccurs="0" maxOccurs="unbounded" type="std:t_uri"/>
-            <xs:element name="gpgKeyIDs" minOccurs="1" maxOccurs="1" type="std:t_gpg_keys">
+            <xs:element name="signature" minOccurs="0" maxOccurs="unbounded" type="t_gpg_sig"/>
+            <xs:element name="signatureFile" minOccurs="0" maxOccurs="unbounded" type="t_uri"/>
+            <xs:element name="gpgKeyIDs" minOccurs="1" maxOccurs="1" type="t_gpg_keys">
                 <xs:unique name="uniq_key_id">
                     <xs:selector xpath="std:keyID"/>
                     <xs:field xpath="."/>
diff --git a/schema/lib/types/sys.xsd b/schema/lib/types/sys.xsd
index 37ee35f..0be9726 100644
--- a/schema/lib/types/sys.xsd
+++ b/schema/lib/types/sys.xsd
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/sys.xsd"
-           xmlns="https://schema.xml.r00t2.io/lib/types/sys.xsd"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
diff --git a/schema/lib/types/unix.xsd b/schema/lib/types/unix.xsd
index 83c319e..dd3e3b4 100644
--- a/schema/lib/types/unix.xsd
+++ b/schema/lib/types/unix.xsd
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/unix.xsd"
-           xmlns="https://schema.xml.r00t2.io/lib/types/unix.xsd"
-           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
-           xmlns:unix="https://schema.xml.r00t2.io/lib/types/unix.xsd"
+<xs:schema xmlns:unix="https://schema.xml.r00t2.io/lib/types/unix.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
-               schemaLocation="./std.xsd"/>
+    <xs:include schemaLocation="./std.xsd"/>
 
     <xs:simpleType name="t_filepath">
         <xs:restriction base="xs:string">
@@ -22,7 +18,7 @@
                 <xs:complexType>
                     <xs:simpleContent>
                         <xs:extension base="xs:string">
-                            <xs:attribute name="hashType" use="optional" default="md5" type="unix:t_passwd_hashtypes"/>
+                            <xs:attribute name="hashType" use="optional" default="md5" type="t_passwd_hashtypes"/>
                             <xs:attribute name="rounds" use="optional" default="5000" type="xs:positiveInteger"/>
                         </xs:extension>
                     </xs:simpleContent>
@@ -31,8 +27,8 @@
             <xs:element name="passwordHash">
                 <xs:complexType>
                     <xs:simpleContent>
-                        <xs:extension base="unix:t_shadowhash">
-                            <xs:attribute name="hashType" use="optional" default="md5" type="unix:t_passwd_hashtypes"/>
+                        <xs:extension base="t_shadowhash">
+                            <xs:attribute name="hashType" use="optional" default="md5" type="t_passwd_hashtypes"/>
                         </xs:extension>
                     </xs:simpleContent>
                 </xs:complexType>
@@ -67,15 +63,12 @@
 
     <xs:complexType name="t_user">
         <xs:sequence>
-            <xs:element name="password" minOccurs="0" maxOccurs="1" type="unix:t_nixpass"/>
+            <xs:element name="password" minOccurs="0" maxOccurs="1" type="t_nixpass"/>
             <xs:element name="xGroup" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
-                    <xs:attribute name="name" type="unix:t_posixUserGroup"
-                                  use="required"/>
-                    <xs:attribute name="create" type="xs:boolean" use="optional"
-                                  default="false"/>
-                    <xs:attribute name="gid" type="xs:positiveInteger"
-                                  use="optional"/>
+                    <xs:attribute name="name" type="t_posixUserGroup" use="required"/>
+                    <xs:attribute name="create" type="xs:boolean" use="optional" default="false"/>
+                    <xs:attribute name="gid" type="xs:positiveInteger" use="optional"/>
                 </xs:complexType>
                 <xs:unique name="uniq_grp">
                     <xs:selector xpath="unix:xGroup"/>
@@ -83,29 +76,23 @@
                 </xs:unique>
             </xs:element>
         </xs:sequence>
-        <xs:attribute name="name" type="unix:t_posixUserGroup" use="required"/>
-        <xs:attribute name="home" type="unix:t_filepath" use="optional"/>
+        <xs:attribute name="name" type="t_posixUserGroup" use="required"/>
+        <xs:attribute name="home" type="t_filepath" use="optional"/>
         <xs:attribute name="uid" type="xs:positiveInteger" use="optional"/>
-        <xs:attribute name="group" type="unix:t_posixUserGroup" use="optional"/>
+        <xs:attribute name="group" type="t_posixUserGroup" use="optional"/>
         <xs:attribute name="gid" type="xs:positiveInteger" use="optional"/>
-        <xs:attribute name="comment" type="std:t_nonempty" use="optional"/>
-        <xs:attribute name="sudo" type="xs:boolean" use="optional"
-                      default="false"/>
-        <xs:attribute name="sudoPassword" type="xs:boolean" use="optional"
-                      default="true"/>
-        <xs:attribute name="shell" type="unix:t_filepath" use="optional"
-                      default="/bin/bash"/>
+        <xs:attribute name="comment" type="t_nonempty" use="optional"/>
+        <xs:attribute name="sudo" type="xs:boolean" use="optional" default="false"/>
+        <xs:attribute name="sudoPassword" type="xs:boolean" use="optional" default="true"/>
+        <xs:attribute name="shell" type="t_filepath" use="optional" default="/bin/bash"/>
         <!-- TODO: change the positiveIntegers to xs:duration? or union? -->
         <!-- Might be pointless since the smallest increment is 1 day in
              shadow(5). -->
         <xs:attribute name="minAge" type="xs:positiveInteger" use="optional"/>
         <xs:attribute name="maxAge" type="xs:positiveInteger" use="optional"/>
-        <xs:attribute name="warnDays" type="xs:positiveInteger"
-                      use="optional"/>
-        <xs:attribute name="inactiveDays" type="xs:positiveInteger"
-                      use="optional"/>
-        <xs:attribute name="expireDate" type="std:t_epoch_or_iso"
-                      use="optional"/>
+        <xs:attribute name="warnDays" type="xs:positiveInteger" use="optional"/>
+        <xs:attribute name="inactiveDays" type="xs:positiveInteger" use="optional"/>
+        <xs:attribute name="expireDate" type="t_epoch_or_iso" use="optional"/>
     </xs:complexType>
 
 </xs:schema>
diff --git a/schema/projects/bdisk.xsd b/schema/projects/bdisk.xsd
index 5da27b5..8b52135 100644
--- a/schema/projects/bdisk.xsd
+++ b/schema/projects/bdisk.xsd
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="http://schema.xml.r00t2.io/bdisk.xsd"
-           xmlns="http://schema.xml.r00t2.io/bdisk.xsd"
-           xmlns:bdisk="http://schema.xml.r00t2.io/bdisk.xsd"
+<xs:schema xmlns:bdisk="http://schema.xml.r00t2.io/bdisk.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">