Reorder includes to not fail on win64