Really, truly fixed linking issues on Windows