Reinstate default built-in rules
Update header dependencies