rearrange includes to try and fix build issues.

(Logical change 1.6)
1 file changed