These are the changes I've made to 'master' in order to
get a successful Windows compilation (using Visual
Studio 2012). Please feel free to let me know if I've broken
anything, and I'll try to fix the issue. Alternatively, just
back out my changes).