Fix files for MSVC to allow successful build after reorganisation