Moved some windows dependencies to the correct files.