Rewrite proposal v2.0

Proposed rewriting for include compatibility for ZCS 8...