Move common includes to common
Minor code rearrangement