windows build fixes

make distcheck works again too