Win32 buildfix.
Somehow these weren't added to the project.
Merge remote-tracking branch 'upstream/master' into fps2