This is a kludge; gcc changes suggest headers and includes
need to be reworked.
Authored by: lloydwood 2021-12-21
Parent: [r184]
Child: [r186]