FIXME resolved: ArrayOfCDI renamed to ChartDirectories.
Cleanup, removed unused header inclusion.