Update for compatibility with Orchestra 2.1-1

[roopchansinghv]

Had to update the list of libraries supplied by Orchestra.

Also took the opportunity to clean up finding support libraries and headers.