general: Fix up include structure to resolve errors when building without composites.