Sort and update windows deps as per Linux's
Merge pull request #1248 from DataDog/leo/updatewindowsdeps

Sort and update windows deps as per Linux's
Merge remote-tracking branch 'upstream/master'
replaced tab with spaces