I agree that including headers separately requires more manual book keeping when things are changing rapidly, but as our code crystallizes out into more stable units, I think that will be a smaller problem. Anyway, as there is no clear right or wrong, I wouldn't mind putting it to a vote. In smaller projects, it's mostly a form thing anyway.