diff --git a/.gitignore b/.gitignore
index 76d7e66..f1202e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-platforms/**/*.xml
 platforms/**/*.bin
+platforms/**/.built
+platforms/**/*.xml
diff --git a/Makefile b/Makefile
index e2b8f68..82ec1e2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 TOPDIR := $(PWD)
 PARTITIONS := $(wildcard platforms/*/*/partitions.conf)
-PARTITIONS_XML := $(patsubst %.conf,%.xml, $(PARTITIONS))
-PLATFORMS := $(patsubst %/partitions.conf,%/gpt, $(PARTITIONS))
+STAMPS := $(patsubst %/partitions.conf,%/.built, $(PARTITIONS))
 
 CONTENTS_XML_IN := $(wildcard platforms/*/*/contents.xml.in)
 CONTENTS_XML := $(patsubst %.xml.in,%.xml, $(CONTENTS_XML_IN))
@@ -13,16 +12,35 @@ BUILD_ID ?=
 
 .PHONY: all check clean lint integration
 
-all: $(PLATFORMS) $(PARTITIONS_XML) $(CONTENTS_XML)
+all: $(STAMPS) $(CONTENTS_XML)
 
-%/gpt: %/partitions.xml
-	cd $(shell dirname $^) && $(TOPDIR)/ptool.py -x partitions.xml
+# Generate partitions.xml and GPT binaries from partitions.conf
+# - single-disk: writes partitions.xml in the platform dir, runs ptool there
+# - multi-disk: writes partitions0.xml, partitions1.xml, ... in the platform dir,
+#   runs ptool in disk0/, disk1/, ... subdirectories
+%/.built: %/partitions.conf
+	$(TOPDIR)/gen_partition.py -i $< -o $*/partitions.xml
+	@if [ -f $*/partitions.xml ]; then \
+		(cd $* && $(TOPDIR)/ptool.py -x partitions.xml); \
+	else \
+		i=0; \
+		while [ -f $*/partitions$${i}.xml ]; do \
+			mkdir -p $*/disk$${i}; \
+			(cd $*/disk$${i} && $(TOPDIR)/ptool.py -x ../partitions$${i}.xml); \
+			i=$$((i+1)); \
+		done; \
+	fi
+	@touch $@
 
-%/partitions.xml: %/partitions.conf
-	$(TOPDIR)/gen_partition.py -i $^ -o $@
-
-%/contents.xml: %/partitions.xml %/contents.xml.in
-	$(TOPDIR)/gen_contents.py -p $< -t $@.in -o $@ $${BUILD_ID:+ -b $(BUILD_ID)}
+%/contents.xml: %/contents.xml.in %/.built
+	# default to partitions.xml from same dir; for multi-disk use partitions0.xml
+	# with an explicit file prefix of disk0 for gen_contents
+	@partxml="$*/partitions.xml"; prefix=""; \
+	if [ ! -f "$$partxml" ]; then \
+		partxml="$*/partitions0.xml"; prefix="disk0"; \
+	fi; \
+	$(TOPDIR)/gen_contents.py -p "$$partxml" -t $@.in -o $@ \
+		$${prefix:+ -f $$prefix} $${BUILD_ID:+ -b $(BUILD_ID)}
 
 lint:
 	# W605: invalid escape sequence
@@ -33,8 +51,16 @@ lint:
 	pycodestyle --ignore=E501 gen_contents.py
 
 integration: all
-	# make sure generated output has created expected files
-	tests/integration/check-missing-files platforms/*/*/*.xml
+	# check files mentioned in generated XML outputs
+	tests/integration/check-missing-files \
+		$$(find platforms \
+				-name 'contents.xml' -o \
+				-name 'partitions.xml' -o \
+				-name 'patch*.xml' -o \
+				-name 'rawprogram*.xml' -o \
+				-name 'wipe_*.xml')
+	# test %include and multi-disk features
+	tests/integration/check-include-multidisk
 
 check: lint integration
 
@@ -43,4 +69,6 @@ install: $(BINS)
 	install -m 755 $^ $(DESTDIR)$(PREFIX)/bin
 
 clean:
-	@rm -f platforms/*/*/*.xml platforms/*/*/*.bin
+	@rm -f platforms/*/*/*.xml platforms/*/*/*.bin platforms/*/*/*/*.xml platforms/*/*/*/*.bin
+	@rm -f platforms/*/*/.built
+	@rm -rf platforms/*/*/disk[0-9]*/
diff --git a/gen_contents.py b/gen_contents.py
index 0261601..789f303 100755
--- a/gen_contents.py
+++ b/gen_contents.py
@@ -11,7 +11,7 @@
 def usage():
     print(
         (
-            "\n\tUsage: %s -t <template> -p <partitions_xml_path> -o <output> \n\tVersion 0.1\n"
+            "\n\tUsage: %s -t <template> -p <partitions_xml_path> -o <output> [-f <file_prefix>]\n\tVersion 0.1\n"
             % (sys.argv[0])
         )
     )
@@ -31,7 +31,7 @@ def ParseXML(XMLFile):
         return None
 
 
-def UpdateMetaData(TemplateRoot, PartitionRoot, BuildId):
+def UpdateMetaData(TemplateRoot, PartitionRoot, BuildId, FilePrefix=""):
     ChipIdList = TemplateRoot.findall("product_info/chipid")
     DefaultStorageType = None
     for ChipId in ChipIdList:
@@ -54,8 +54,10 @@ def _add_file_elements(parent_element, pathname, file_path_flavor=None):
         """Helper function to add file_name and file_path sub-elements."""
         file_name_text = os.path.basename(pathname)
         file_path_text = os.path.dirname(pathname)
-        if not file_path_text:  # no directory, use explicit . as current dir
-            file_path_text = "."
+        if not file_path_text:
+            file_path_text = FilePrefix if FilePrefix else "."
+        elif FilePrefix:
+            file_path_text = FilePrefix + "/" + file_path_text
 
         new_file_name = ET.SubElement(parent_element, "file_name")
         new_file_name.text = file_name_text
@@ -133,7 +135,8 @@ def _add_file_elements(parent_element, pathname, file_path_flavor=None):
         usage()
     try:
         build_id = ""
-        opts, rem = getopt.getopt(sys.argv[1:], "t:p:o:b:")
+        file_prefix_override = None
+        opts, rem = getopt.getopt(sys.argv[1:], "t:p:o:b:f:")
         for opt, arg in opts:
             if opt in ["-t"]:
                 template = arg
@@ -143,6 +146,8 @@ def _add_file_elements(parent_element, pathname, file_path_flavor=None):
                 output_xml = arg
             elif opt in ["-b"]:
                 build_id = arg
+            elif opt in ["-f"]:
+                file_prefix_override = arg
             else:
                 usage()
     except Exception as argerr:
@@ -155,7 +160,19 @@ def _add_file_elements(parent_element, pathname, file_path_flavor=None):
     print("Selected Partition XML:  " + partition_xml)
     partition_root = ParseXML(partition_xml)
 
-    UpdateMetaData(xml_root, partition_root, build_id)
+    # compute file prefix: relative path from output dir to partitions.xml dir
+    # e.g., output=spinor-nvme/contents.xml, partition=spinor-nvme/disk0/partitions.xml
+    # gives prefix "disk0". Can be overridden with -f.
+    if file_prefix_override is not None:
+        file_prefix = file_prefix_override
+    else:
+        output_dir = os.path.dirname(os.path.abspath(output_xml))
+        partition_dir = os.path.dirname(os.path.abspath(partition_xml))
+        file_prefix = os.path.relpath(partition_dir, output_dir)
+        if file_prefix == ".":
+            file_prefix = ""
+
+    UpdateMetaData(xml_root, partition_root, build_id, file_prefix)
 
     OutputTree = ET.ElementTree(xml_root)
     ET.indent(OutputTree, space="\t", level=0)
diff --git a/gen_partition.py b/gen_partition.py
index f665b99..147a78a 100755
--- a/gen_partition.py
+++ b/gen_partition.py
@@ -29,6 +29,7 @@
 
 import getopt
 import re
+import os
 import sys
 import xml.etree.ElementTree as ET
 from collections import OrderedDict
@@ -68,15 +69,42 @@ def usage():
 }
 
 ##################################################################
-# store entries read from input file
-disk_entry = None
-partition_entries = []
 # store partition image map passed from command line
 partition_image_map = {}
 input_file = None
 output_xml = None
 
 
+def expand_includes(filepath, include_stack=None):
+    """Read a file and expand %include directives recursively.
+
+    Returns a list of stripped lines.
+    Paths in %include are resolved relative to the including file's directory.
+    Raises ValueError on circular includes or missing files.
+    """
+    if include_stack is None:
+        include_stack = []
+    filepath = os.path.realpath(filepath)
+    if not os.path.exists(filepath):
+        raise ValueError("File not found: %s" % filepath)
+    if filepath in include_stack:
+        raise ValueError("Circular include detected: %s\nInclude stack: %s" % (
+            filepath, " -> ".join(include_stack)))
+    # make a copy, instead of mutating as we're recursing
+    include_stack = include_stack + [filepath]
+    base_dir = os.path.dirname(filepath)
+    lines = []
+    with open(filepath) as f:
+        for raw_line in f:
+            stripped = raw_line.strip()
+            if stripped.startswith('%include '):
+                inc_path = stripped[len('%include '):]
+                inc_full = os.path.join(base_dir, inc_path)
+                lines.extend(expand_includes(inc_full, include_stack))
+            else:
+                lines.append(stripped)
+    return lines
+
 def disk_options(argv):
     disk_params = disk_params_defaults.copy()
     for opt, arg in argv:
@@ -231,7 +259,6 @@ def generate_partition_xml(disk_params, partitions, output_xml):
 
 ###############################################################################
 # main
-disk_entry_err_msg = "contains more than one --disk entries"
 
 if len(sys.argv) < 3:
     usage()
@@ -257,30 +284,50 @@ def generate_partition_xml(disk_params, partitions, output_xml):
     except Exception as argerr:
         print(str(argerr))
         usage()
-    f = open(input_file)
-    line = f.readline()
-    while line:
-        if not re.search(r"^\s*#", line) and not re.search(r"^\s*$", line):
-            line = line.strip()
-            if re.search("^--disk", line):
-                if disk_entry is None:
-                    disk_entry = line
-                else:
-                    print("%s %s" % (sys.argv[1], disk_entry_err_msg))
-                    print("%s\n%s" % (disk_entry, line))
-                    sys.exit(1)
-            elif re.search("^--partition", line):
-                partition_entries.append(line)
-            else:
-                print("Ignoring %s" % (line))
-        line = f.readline()
-    f.close()
+
+    # Parse expanded lines into disk sections
+    disk_sections = []  # list of (disk_line, [partition_lines])
+    current_disk = None
+    current_partitions = []
+
+    for line in expand_includes(input_file):
+        if re.search(r"^\s*#", line) or re.search(r"^\s*$", line):
+            continue
+        if re.search("^--disk", line):
+            if current_disk is not None:
+                disk_sections.append((current_disk, current_partitions))
+                current_partitions = []
+            current_disk = line
+        elif re.search("^--partition", line):
+            current_partitions.append(line)
+        else:
+            print("Ignoring %s" % (line))
+    if current_disk is not None:
+        disk_sections.append((current_disk, current_partitions))
+
+    if not disk_sections:
+        print("Error: no --disk entry found in %s" % input_file)
+        sys.exit(1)
+
+    if output_xml:
+        if len(disk_sections) == 1:
+            disk_params = parse_disk_entry(disk_sections[0][0])
+            partitions = parse_partition_entries(disk_sections[0][1])
+            generate_partition_xml(disk_params, partitions, output_xml)
+        else:
+            # Multi-disk: derive output filenames by inserting an index before
+            # the extension, e.g. partitions.xml -> partitions0.xml, partitions1.xml
+            base, ext = os.path.splitext(output_xml)
+            for idx, (disk_line, part_lines) in enumerate(disk_sections):
+                disk_params = parse_disk_entry(disk_line)
+                partitions = parse_partition_entries(part_lines)
+                out_path = "%s%d%s" % (base, idx, ext)
+                generate_partition_xml(disk_params, partitions, out_path)
+    else:
+        print("Error: -o is required")
+        sys.exit(1)
 except Exception as e:
     print("Error: ", e)
     sys.exit(1)
 
-disk_params = parse_disk_entry(disk_entry)
-partitions = parse_partition_entries(partition_entries)
-generate_partition_xml(disk_params, partitions, output_xml)
-
 sys.exit(0)
diff --git a/platforms/glymur-crd/spinor/contents.xml.in b/platforms/glymur-crd/spinor-nvme/contents.xml.in
similarity index 86%
rename from platforms/glymur-crd/spinor/contents.xml.in
rename to platforms/glymur-crd/spinor-nvme/contents.xml.in
index 58f3d1e..9de9387 100644
--- a/platforms/glymur-crd/spinor/contents.xml.in
+++ b/platforms/glymur-crd/spinor-nvme/contents.xml.in
@@ -60,41 +60,41 @@
       <download_file>
         <fastboot_complete>{partition_name}</fastboot_complete>
         <file_name>{image_name}</file_name>
-        <file_path>.</file_path>
+        <file_path>disk0</file_path>
       </download_file>
       <partition_file>
         <storage_type>{storage_type}</storage_type>
         <file_name>{partition_file_name}</file_name>
-        <file_path flavor="default">.</file_path>
+        <file_path flavor="default">disk0</file_path>
       </partition_file>
       <partition_patch_file>
         <storage_type>{storage_type}</storage_type>
         <file_name>{partition_patch_file_name}</file_name>
-        <file_path flavor="default">.</file_path>
+        <file_path flavor="default">disk0</file_path>
       </partition_patch_file>
       <download_file storage_type="nvme" fastboot_complete="efi">
         <file_name>efi.bin</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" fastboot_complete="rootfs">
         <file_name>rootfs.img</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" flavor="qcom_server">
         <file_name>gpt_main0.bin</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" flavor="qcom_server">
         <file_name>gpt_backup0.bin</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </download_file>
       <partition_file storage_type="nvme" flavor="qcom_server">
         <file_name>rawprogram0.xml</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </partition_file>
       <partition_patch_file storage_type="nvme" flavor="qcom_server">
         <file_name>patch0.xml</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </partition_patch_file>
     </build>
   </builds_flat>
diff --git a/platforms/glymur-crd/spinor-nvme/partitions.conf b/platforms/glymur-crd/spinor-nvme/partitions.conf
new file mode 100644
index 0000000..8b59e8d
--- /dev/null
+++ b/platforms/glymur-crd/spinor-nvme/partitions.conf
@@ -0,0 +1,8 @@
+# Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+#
+# Combined NVMe + SPINOR partition layout for Glymur CRD.
+# NHLOS firmware on SPINOR, HLOS (Linux) on NVMe.
+
+%include ../spinor/partitions.conf
+%include ../nvme/partitions.conf
diff --git a/platforms/iq-x7181-evk/spinor/contents.xml.in b/platforms/iq-x7181-evk/spinor-nvme/contents.xml.in
similarity index 86%
rename from platforms/iq-x7181-evk/spinor/contents.xml.in
rename to platforms/iq-x7181-evk/spinor-nvme/contents.xml.in
index e41a420..cdbc6ee 100644
--- a/platforms/iq-x7181-evk/spinor/contents.xml.in
+++ b/platforms/iq-x7181-evk/spinor-nvme/contents.xml.in
@@ -65,41 +65,41 @@
       <download_file>
         <fastboot_complete>{partition_name}</fastboot_complete>
         <file_name>{image_name}</file_name>
-        <file_path>.</file_path>
+        <file_path>disk0</file_path>
       </download_file>
       <partition_file>
         <storage_type>{storage_type}</storage_type>
         <file_name>{partition_file_name}</file_name>
-        <file_path flavor="default">.</file_path>
+        <file_path flavor="default">disk0</file_path>
       </partition_file>
       <partition_patch_file>
         <storage_type>{storage_type}</storage_type>
         <file_name>{partition_patch_file_name}</file_name>
-        <file_path flavor="default">.</file_path>
+        <file_path flavor="default">disk0</file_path>
       </partition_patch_file>
       <download_file storage_type="nvme" fastboot_complete="efi">
         <file_name>efi.bin</file_name>
-        <file_path flavor="ub_qcom_server">../</file_path>
+        <file_path flavor="ub_qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" fastboot_complete="rootfs">
         <file_name>rootfs.img</file_name>
-        <file_path flavor="ub_qcom_server">../</file_path>
+        <file_path flavor="ub_qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" flavor="ub_qcom_server">
         <file_name>gpt_main0.bin</file_name>
-        <file_path flavor="ub_qcom_server">../</file_path>
+        <file_path flavor="ub_qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" flavor="ub_qcom_server">
         <file_name>gpt_backup0.bin</file_name>
-        <file_path flavor="ub_qcom_server">../</file_path>
+        <file_path flavor="ub_qcom_server">disk1</file_path>
       </download_file>
       <partition_file storage_type="nvme" flavor="ub_qcom_server">
         <file_name>rawprogram0.xml</file_name>
-        <file_path flavor="ub_qcom_server">../</file_path>
+        <file_path flavor="ub_qcom_server">disk1</file_path>
       </partition_file>
       <partition_patch_file storage_type="nvme" flavor="ub_qcom_server">
         <file_name>patch0.xml</file_name>
-        <file_path flavor="ub_qcom_server">../</file_path>
+        <file_path flavor="ub_qcom_server">disk1</file_path>
       </partition_patch_file>
     </build>
   </builds_flat>
diff --git a/platforms/iq-x7181-evk/spinor-nvme/partitions.conf b/platforms/iq-x7181-evk/spinor-nvme/partitions.conf
new file mode 100644
index 0000000..492c483
--- /dev/null
+++ b/platforms/iq-x7181-evk/spinor-nvme/partitions.conf
@@ -0,0 +1,8 @@
+# Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+#
+# Combined NVMe + SPINOR partition layout for IQ-X7181 EVK.
+# NHLOS firmware on SPINOR, HLOS (Linux) on NVMe.
+
+%include ../spinor/partitions.conf
+%include ../nvme/partitions.conf
diff --git a/platforms/qrb2210-unoq/emmc-16GB-arduino/partitions.conf b/platforms/qrb2210-unoq/emmc-16GB-arduino/partitions.conf
index f9843f0..902be43 100644
--- a/platforms/qrb2210-unoq/emmc-16GB-arduino/partitions.conf
+++ b/platforms/qrb2210-unoq/emmc-16GB-arduino/partitions.conf
@@ -1,96 +1,8 @@
 # Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause-Clear
+#
+# eMMC 16GB partition layout for UnoQ (Arduino variant).
+# Adds a userdata partition on top of the base layout.
 
-# select disk type emmc | nand | ufs Mandatory
-# disk size in bytes Mandatory
-# options if not explicitly provide
-
---disk --type=emmc --size=76841669632 --write-protect-boundary=65536 --sector-size-in-bytes=512 --grow-last-partition
-
-# per partition entry
-# mandatory options:
-#   --lun (mandatory for UFS, emmc no need this)
-#   --name
-#   --size in bytes
-#   --type-guid
-# optional options: (defaults used if not provided)
-#   --attributes  1000000000000004
-#   --filename    ""
-#   --readonly    true
-#   --sparse      false
-
-# This is physical partition 0
---partition --name=xbl_a --size=3584KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98 --filename=xbl.elf
---partition --name=xbl_b --size=3584KB --type-guid=7A3DF1A3-A31A-454D-BD78-DF259ED486BE --filename=xbl.elf
---partition --name=xbl_config_a --size=128KB --type-guid=5A325AE4-4276-B66D-0ADD-3494DF27706A --filename=xbl_feature_config.elf
---partition --name=xbl_config_b --size=128KB --type-guid=F462E0EA-A20E-4B10-867A-2D4455366548 --filename=xbl_feature_config.elf
---partition --name=tz_a --size=4096KB --type-guid=A053AA7F-40B8-4B1C-BA08-2F68AC71A4F4 --filename=tz.mbn
---partition --name=tz_b --size=4096KB --type-guid=C832EA16-8B0D-4398-A67B-EBB30EF98E7E --filename=tz.mbn
---partition --name=rpm_a --size=512KB --type-guid=098DF793-D712-413D-9D4E-89D711772228 --filename=rpm.mbn
---partition --name=rpm_b --size=512KB --type-guid=EDE665C0-9F65-47D9-A8C1-73D61EF3C7D6 --filename=rpm.mbn
---partition --name=hyp_a --size=8192KB --type-guid=E1A6A689-0C8D-4CC6-B4E8-55A4320FBD8A --filename=hyp.mbn
---partition --name=hyp_b --size=8192KB --type-guid=CB45ECA0-504E-42BB-91BA-C9B3236F6A6E --filename=hyp.mbn
---partition --name=boot_a --size=4096KB --type-guid=20117F86-E985-4357-B9EE-374BC1D8487D --filename=boot.img
---partition --name=boot_b --size=4096KB --type-guid=77036CD4-03D5-42BB-8ED1-37E5A88BAA34 --filename=boot.img
---partition --name=uefi_a --size=8192KB --type-guid=400FFDCD-22E0-47E7-9A23-F16ED9382388
---partition --name=uefi_b --size=8192KB --type-guid=9F234B5B-0EFB-4313-8E4C-0AF1F605536B
---partition --name=uefi_dtb_a --size=1024KB --type-guid=C84D3B5E-EF34-4FA4-8118-30EAE18D3FA6
---partition --name=uefi_dtb_b --size=1024KB --type-guid=5F7D760A-3EF5-4AA5-B915-69A4ECAAE662
---partition --name=dtb_a --size=65536KB --type-guid=2A1A52FC-AA0B-401C-A808-5EA0F91068F8 --filename=dtb.bin
---partition --name=dtb_b --size=65536KB --type-guid=A166F11A-2B39-4FAA-B7E7-F8AA080D0587 --filename=dtb.bin
---partition --name=recoveryinfo --size=4KB --type-guid=7374B391-291C-49FA-ABC2-0463AB5F713F
---partition --name=keymaster_a --size=512KB --type-guid=A11D2A7C-D82A-4C2F-8A01-1805240E6626 --filename=km4.mbn
---partition --name=keymaster_b --size=512KB --type-guid=77036CD4-03D5-42BB-8ED1-37E5A88BAA34 --filename=km4.mbn
---partition --name=mdtpsecapp_a --size=4096KB --type-guid=EA02D680-8712-4552-A3BE-E6087829C1E6
---partition --name=mdtpsecapp_b --size=4096KB --type-guid=77036CD4-03D5-42BB-8ED1-37E5A88BAA34
---partition --name=mdtp_a --size=32768KB --type-guid=3878408A-E263-4B67-B878-6340B35B11E3
---partition --name=mdtp_b --size=32768KB --type-guid=77036CD4-03D5-42BB-8ED1-37E5A88BAA34
---partition --name=abl_a --size=1024KB --type-guid=BD6928A1-4CE0-A038-4F3A-1495E3EDDFFB --filename=abl.elf
---partition --name=abl_b --size=1024KB --type-guid=3D3E3AD2-8FF3-4975-A7E7-0E8A10B69F0D --filename=abl.elf
---partition --name=ddr_a --size=1024KB --type-guid=20A0C19C-286A-42FA-9CE7-F64C3226A794
---partition --name=ddr_b --size=1024KB --type-guid=325DEF02-1305-44A3-AA8D-AC82FEBE220E
---partition --name=ssd --size=8KB --type-guid=2C86E742-745E-4FDD-BFD8-B6A7AC638772
---partition --name=imagefv_a --size=2048KB --type-guid=17911177-C9E6-4372-933C-804B678E666F --filename=imagefv.elf
---partition --name=imagefv_b --size=2048KB --type-guid=920CFC3D-7285-4A47-9C1C-4A87590E0687 --filename=imagefv.elf
---partition --name=uefisecapp_a --size=2048KB --type-guid=BE8A7E08-1B7A-4CAE-993A-D5B7FB55B3C2 --filename=uefi_sec.mbn
---partition --name=uefisecapp_b --size=2048KB --type-guid=538CBDBA-D4A4-4438-A466-D7B356FAC165 --filename=uefi_sec.mbn
---partition --name=persist --size=32768KB --type-guid=6C95E238-E343-4BA8-B489-8681ED22AD0B
---partition --name=misc --size=1024KB --type-guid=82ACC91F-357C-4A68-9C8F-689E1B1A23A1
---partition --name=misc_boot --size=1024KB --type-guid=F4EEE7D9-AB97-4297-954B-1B8AF9C14B19 --filename=zeros_33sectors.bin
---partition --name=keystore --size=512KB --type-guid=DE7D4029-0F5B-41C8-AE7E-F6C023A02B33
---partition --name=devcfg_a --size=128KB --type-guid=F65D4B16-343D-4E25-AAFC-BE99B6556A6D --filename=devcfg.mbn
---partition --name=devcfg_b --size=128KB --type-guid=169534E7-7809-4240-9763-0BA5DC37B5FF --filename=devcfg.mbn
---partition --name=featenabler_a --size=128KB --type-guid=741813D2-8C87-4465-8C69-032C771CCCE7 --filename=featenabler.mbn
---partition --name=featenabler_b --size=128KB --type-guid=77036CD4-03D5-42BB-8ED1-37E5A88BAA34 --filename=featenabler.mbn
---partition --name=qupfw_a --size=64KB --type-guid=21d1219f-2ed1-4ab4-930a-41a16ae75f7f --filename=qupv3fw.elf
---partition --name=qupfw_b --size=64KB --type-guid=169534E7-7809-4240-9763-0BA5DC37B5FF --filename=qupv3fw.elf
---partition --name=frp --size=512KB --type-guid=91B72D4D-71E0-4CBF-9B8E-236381CFF17A
---partition --name=rawdump --size=131072KB --type-guid=66C9B323-F7FC-48B6-BF96-6F32E335A428
---partition --name=devinfo --size=4KB --type-guid=65ADDCF4-0C5C-4D9A-AC2D-D90B5CBFCD03
---partition --name=dip --size=1024KB --type-guid=4114B077-005D-4E12-AC8C-B493BDA684FB
---partition --name=apdp_a --size=256KB --type-guid=E6E98DA2-E22A-4D12-AB33-169E7DEAA507 --filename=zeros_33sectors.bin
---partition --name=apdp_b --size=256KB --type-guid=110F198D-8174-4193-9AF1-5DA94CDC59C9 --filename=zeros_33sectors.bin
---partition --name=spunvm --size=8192KB --type-guid=e42e2b4c-33b0-429b-b1ef-d341c547022c
---partition --name=splash --size=33424KB --type-guid=AD99F201-DC71-4E30-9630-E19EEF553D1B
---partition --name=limits --size=4KB --type-guid=10A0C19C-516A-5444-5CE3-664C3226A794
---partition --name=toolsfv --size=1024KB --type-guid=97745ABA-135A-44C3-9ADC-05616173C24C
---partition --name=logfs --size=8192KB --type-guid=BC0330EB-3410-4951-A617-03898DBE3372
---partition --name=cateloader --size=2048KB --type-guid=AA9A5C4C-4F1F-7D3A-014A-22BD33BF7191
---partition --name=logdump --size=65536KB --type-guid=5AF80809-AABB-4943-9168-CDFC38742598
---partition --name=storsec --size=128KB --type-guid=02DB45FE-AD1B-4CB6-AECC-0042C637DEFA --filename=storsec.mbn
---partition --name=multiimgoem_a --size=32KB --type-guid=E126A436-757E-42D0-8D19-0F362F7A62B8 --filename=multi_image.mbn
---partition --name=multiimgoem_b --size=32KB --type-guid=3E3E3ECD-C512-4F95-9144-6063826A8970 --filename=multi_image.mbn
---partition --name=multiimgqti_a --size=32KB --type-guid=846C6F05-EB46-4C0A-A1A3-3648EF3F9D0E
---partition --name=multiimgqti_b --size=32KB --type-guid=D30C8B21-DDD9-45B6-8DE0-3165D34395C9
---partition --name=secdata --size=25KB --type-guid=76cfc7ef-039d-4e2c-b81e-4dd8c2cb2a93
---partition --name=catefv --size=512KB --type-guid=80c23c26-c3f9-4a19-bb38-1e457daceb09
---partition --name=catecontentfv --size=1024KB --type-guid=e12d830b-7f62-4f0b-b48a-8178c5bf3ac1
---partition --name=uefivarstore --size=512KB --type-guid=165BD6BC-9250-4AC8-95A7-A93F4A440066
---partition --name=modemst1 --size=2048KB --type-guid=EBBEADAF-22C9-E33B-8F5D-0E81686A68CB
---partition --name=modemst2 --size=2048KB --type-guid=0A288B1F-22C9-E33B-8F5D-0E81686A68CB
---partition --name=fsg --size=2048KB --type-guid=638FF8E2-22C9-E33B-8F5D-0E81686A68CB
---partition --name=fsc --size=128KB --type-guid=57B90A16-22C9-E33B-8F5D-0E81686A68CB
---partition --name=SYSFW_VERSION --size=4KB --type-guid=3C44F88B-1878-4C29-B122-EE78766442A7
---partition --name=efi --size=524288KB --type-guid=C12A7328-F81F-11D2-BA4B-00A0C93EC93B --filename=efi.bin
---partition --name=rootfs --size=10460284KB --type-guid=B921B045-1DF0-41C3-AF44-4C6F280D3FAE --filename=rootfs.img
+%include ../emmc-16GB/partitions.conf
 --partition --name=userdata --size=2145728KB --type-guid=B921B045-1DF0-41C3-AF44-4C6F280D3FAE --filename=userdata.img
diff --git a/platforms/qrb2210-unoq/emmc-16GB/partitions.conf b/platforms/qrb2210-unoq/emmc-16GB/partitions.conf
index fa68fb1..7c9add4 100644
--- a/platforms/qrb2210-unoq/emmc-16GB/partitions.conf
+++ b/platforms/qrb2210-unoq/emmc-16GB/partitions.conf
@@ -1,5 +1,7 @@
 # Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause-Clear
+#
+# eMMC 16GB partition layout for UnoQ (base variant).
 
 # select disk type emmc | nand | ufs Mandatory
 # disk size in bytes Mandatory
diff --git a/tests/integration/check-include-multidisk b/tests/integration/check-include-multidisk
new file mode 100755
index 0000000..a375e42
--- /dev/null
+++ b/tests/integration/check-include-multidisk
@@ -0,0 +1,163 @@
+#!/bin/sh
+# Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# Test %include directive and multi-disk support in gen_partition.py
+
+set -eu
+
+TOPDIR="$(cd "$(dirname "$0")/../.." && pwd)"
+GEN="${TOPDIR}/gen_partition.py"
+TMPDIR="$(mktemp -d)"
+trap 'rm -rf "${TMPDIR}"' EXIT
+
+errors=0
+fail() { echo "FAIL: $1" >&2; errors=$((errors + 1)); }
+pass() { echo "PASS: $1"; }
+
+##########################################################################
+# Test 1: basic %include resolves correctly
+##########################################################################
+cat > "${TMPDIR}/disk.conf.inc" <<'EOF'
+--disk --type=emmc --size=1073741824 --sector-size-in-bytes=512
+EOF
+cat > "${TMPDIR}/parts.conf.inc" <<'EOF'
+--partition --name=boot --size=4096KB --type-guid=20117F86-E985-4357-B9EE-374BC1D8487D
+EOF
+cat > "${TMPDIR}/main.conf" <<'EOF'
+%include disk.conf.inc
+%include parts.conf.inc
+EOF
+
+"${GEN}" -i "${TMPDIR}/main.conf" -o "${TMPDIR}/out1.xml" 2>&1
+if grep -q 'label="boot"' "${TMPDIR}/out1.xml"; then
+    pass "basic %include"
+else
+    fail "basic %include: partition not found in output"
+fi
+
+##########################################################################
+# Test 2: nested %include
+##########################################################################
+mkdir -p "${TMPDIR}/sub"
+cat > "${TMPDIR}/sub/nested.conf.inc" <<'EOF'
+--partition --name=rootfs --size=8192KB --type-guid=B921B045-1DF0-41C3-AF44-4C6F280D3FAE
+EOF
+cat > "${TMPDIR}/outer.conf.inc" <<'EOF'
+%include sub/nested.conf.inc
+EOF
+cat > "${TMPDIR}/nest.conf" <<'EOF'
+%include disk.conf.inc
+%include outer.conf.inc
+EOF
+
+"${GEN}" -i "${TMPDIR}/nest.conf" -o "${TMPDIR}/out2.xml" 2>&1
+if grep -q 'label="rootfs"' "${TMPDIR}/out2.xml"; then
+    pass "nested %include"
+else
+    fail "nested %include: partition not found in output"
+fi
+
+##########################################################################
+# Test 3: circular %include detection
+##########################################################################
+cat > "${TMPDIR}/a.conf" <<EOF
+%include b.conf
+EOF
+cat > "${TMPDIR}/b.conf" <<EOF
+--disk --type=emmc --size=1073741824 --sector-size-in-bytes=512
+%include a.conf
+EOF
+
+if "${GEN}" -i "${TMPDIR}/a.conf" -o "${TMPDIR}/circular.xml" 2>&1; then
+    fail "circular %include: should have failed"
+else
+    pass "circular %include detected"
+fi
+
+##########################################################################
+# Test 4: multi-disk generates indexed output files
+##########################################################################
+cat > "${TMPDIR}/multi.conf" <<'EOF'
+--disk --type=spinor --size=67108864 --sector-size-in-bytes=4096
+--partition --name=xbl --size=1024KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98
+--disk --type=nvme --size=68719476736 --sector-size-in-bytes=512
+--partition --name=efi --size=524288KB --type-guid=C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+EOF
+
+"${GEN}" -i "${TMPDIR}/multi.conf" -o "${TMPDIR}/multi-out.xml" 2>&1
+if [ -f "${TMPDIR}/multi-out0.xml" ] && \
+   [ -f "${TMPDIR}/multi-out1.xml" ]; then
+    pass "multi-disk indexed output files"
+else
+    fail "multi-disk: expected multi-out0.xml and multi-out1.xml"
+fi
+
+if grep -q 'label="xbl"' "${TMPDIR}/multi-out0.xml" && \
+   grep -q 'label="efi"' "${TMPDIR}/multi-out1.xml"; then
+    pass "multi-disk partition placement"
+else
+    fail "multi-disk: partitions in wrong XML"
+fi
+
+##########################################################################
+# Test 5: single-disk with -o writes directly (no index)
+##########################################################################
+cat > "${TMPDIR}/single.conf" <<'EOF'
+--disk --type=ufs --size=76841669632 --sector-size-in-bytes=4096
+--partition --name=boot --size=4096KB --type-guid=20117F86-E985-4357-B9EE-374BC1D8487D
+EOF
+
+"${GEN}" -i "${TMPDIR}/single.conf" -o "${TMPDIR}/single-out.xml" 2>&1
+if [ -f "${TMPDIR}/single-out.xml" ]; then
+    pass "single-disk -o mode"
+else
+    fail "single-disk -o: partitions.xml not written"
+fi
+
+##########################################################################
+# Test 6: missing %include file gives an error
+##########################################################################
+cat > "${TMPDIR}/missing.conf" <<'EOF'
+%include nonexistent.conf.inc
+EOF
+
+if "${GEN}" -i "${TMPDIR}/missing.conf" -o "${TMPDIR}/missing.xml" 2>&1; then
+    fail "missing %include: should have failed"
+else
+    pass "missing %include detected"
+fi
+
+##########################################################################
+# Test 7: %include with multi-disk
+##########################################################################
+cat > "${TMPDIR}/spinor.conf.inc" <<'EOF'
+--disk --type=spinor --size=67108864 --sector-size-in-bytes=4096
+--partition --name=fw --size=1024KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98
+EOF
+cat > "${TMPDIR}/nvme.conf.inc" <<'EOF'
+--disk --type=nvme --size=68719476736 --sector-size-in-bytes=512
+--partition --name=efi --size=524288KB --type-guid=C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+EOF
+cat > "${TMPDIR}/combo.conf" <<'EOF'
+%include spinor.conf.inc
+%include nvme.conf.inc
+EOF
+
+"${GEN}" -i "${TMPDIR}/combo.conf" -o "${TMPDIR}/combo.xml" 2>&1
+if [ -f "${TMPDIR}/combo0.xml" ] && \
+   [ -f "${TMPDIR}/combo1.xml" ]; then
+    pass "%include with multi-disk"
+else
+    fail "%include with multi-disk: expected combo0.xml and combo1.xml"
+fi
+
+##########################################################################
+# Summary
+##########################################################################
+if [ "${errors}" -ne 0 ]; then
+    echo "${errors} test(s) failed" >&2
+    exit 1
+fi
+echo "All tests passed"
+exit 0
diff --git a/tests/integration/check-missing-files b/tests/integration/check-missing-files
index 2319a77..3bc3fcc 100755
--- a/tests/integration/check-missing-files
+++ b/tests/integration/check-missing-files
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: BSD-3-Clause-Clear
 
 # Takes rawprogram*.xml and contents.xml files as arguments, collects the
-# filenames referenced, and checks if any gpt_* or zeros_* file is missing
+# filenames referenced, and checks if any gpt_* or zeros_* file is missing and
+# if the filenames are known
 
 set -eu
 
@@ -14,15 +15,36 @@ for xml in "$@"; do
     rawprogram_filenames="$(
         sed -En 's:.*filename="([^"]+)".*:\1:p' "${xml}"
     )"
+    # for contents.xml, extract file_path/file_name pairs as relative paths
     contents_filenames="$(
-        sed -En 's:.*<file_name>([^<]+)</file_name>.*:\1:p' "${xml}"
+        python3 -c "
+import xml.etree.ElementTree as ET, sys
+tree = ET.parse(sys.argv[1])
+for el in tree.iter():
+    fn = el.find('file_name')
+    fp = el.find('file_path')
+    if fn is not None and fn.text:
+        # construct relative path by combining file_path and file_name, but only
+        # if file_path is non-empty and not '.'
+        path = fp.text.rstrip('/') if fp is not None and fp.text and fp.text != '.' else ''
+        print(path + '/' + fn.text if path else fn.text)
+" "${xml}" 2>/dev/null
     )"
     for file in $(
         echo ${rawprogram_filenames} ${contents_filenames} | sort -u
         ); do
-        case "${file}" in
-          # expected files that should be generated by ptool
+        # for matching known filenames, use the basename (strip subdir from
+        # contents.xml file_path); for checking file existence, use the
+        # full relative path
+        basename="${file##*/}"
+        case "${basename}" in
+          # expected files that should be generated by ptool: test if present
           gpt_*|zeros_*|patch*.xml|rawprogram*.xml)
+            # except we don't generate SAIL programming files at the moment, so
+            # don't test if these are present
+            if [ "${file%/*}" = "./sail_nor" ]; then
+                continue
+            fi
             if ! [ -r "${dir}/${file}" ]; then
                 errors=yes
                 echo "Missing ${file} referenced in ${xml}" >&2