rearrange includes a bit for less redundancy between windows and linux versions.