Finish off common.h reduction

Hi Tom,

I thought now (after rc1) might be a good time to do this series. Does that sound right to you?

Regards, Simon