Fix include guards, spacing and alignment issues