Bug 853209 - Fix Windows compile errors. r=bholley, a=bustage
CLOSED TREE