Add braces around initialisation of subobjects, add Makefile.win