Adding "extra" includes, required in some instances.