Update Structural - Composite to use vendor/cii20 new/free and list.h