Reduce dependencies between headers.