Moving header includes to be a per-setting option

Authored by thomasfischer on Oct 29 2019, 9:23 PM.