Convert to VS2010, fix source analysis