dpaa2_mc_acpi.o build failure with ACPI_DEBUG option? (sources are back as of 2022-11-06, unfortunately)

--- dpaa2_mc_acpi.o ---
/usr/main-src/sys/dev/dpaa2/dpaa2_mc_acpi.c:186:2: error: implicit declaration of function 'AcpiUtTrace' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
        ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
        ^
/usr/main-src/sys/contrib/dev/acpica/include/acoutput.h:480:5: note: expanded from macro 'ACPI_FUNCTION_TRACE'
    AcpiUtTrace (ACPI_DEBUG_PARAMETERS)
    ^
/usr/main-src/sys/dev/dpaa2/dpaa2_mc_acpi.c:186:2: error: use of undeclared identifier '_AcpiModuleName'
/usr/main-src/sys/contrib/dev/acpica/include/acoutput.h:480:18: note: expanded from macro 'ACPI_FUNCTION_TRACE'
    AcpiUtTrace (ACPI_DEBUG_PARAMETERS)
                 ^
/usr/main-src/sys/contrib/dev/acpica/include/acoutput.h:402:39: note: expanded from macro 'ACPI_DEBUG_PARAMETERS'
    __LINE__, ACPI_GET_FUNCTION_NAME, _AcpiModuleName, _COMPONENT
                                      ^
/usr/main-src/sys/dev/dpaa2/dpaa2_mc_acpi.c:186:2: error: use of undeclared identifier '_COMPONENT'
/usr/main-src/sys/contrib/dev/acpica/include/acoutput.h:480:18: note: expanded from macro 'ACPI_FUNCTION_TRACE'
    AcpiUtTrace (ACPI_DEBUG_PARAMETERS)
                 ^
/usr/main-src/sys/contrib/dev/acpica/include/acoutput.h:402:56: note: expanded from macro 'ACPI_DEBUG_PARAMETERS'
    __LINE__, ACPI_GET_FUNCTION_NAME, _AcpiModuleName, _COMPONENT
                                                       ^

But this is for source that is somewhat over a month old:

# ~/fbsd-based-on-what-commit.sh -C /usr/main-src/
f83db6441a2f (HEAD -> main, freebsd/main, freebsd/HEAD) sctp: minor changes due to upstreaming of Glebs recent changes
branch: main
merge-base: f83db6441a2f4f925a169c7ddf844589cb73c9b5
merge-base: CommitDate: 2022-11-06 22:06:40 +0000
n259064 (--first-parent --count for merge-base)


===
Mark Millard
marklmi at yahoo.com