Windows dll dependency improvements