Merge cleanup
Fix Win32 linkage for dependent projects