2249 windows dep workaround 2

Split dependencies for Windows and non-Windows.