Replace inadequate header include guards