minimal fix for windows compilation
fix includes for MSVC
avoid {} initialization
Fix indentation/spacing.