Fixes link errors due to an MS VC bug.  By Vlad Losev.
9 files changed