[vc12] blah, i wasn't obeying my own notes about order of includes!