Updated for msdev export.