Merge pull request #4268 from RosettaCommons/roccomoretti/option_include_removal_rebase
Reduce transitive inclusion of option system in headers.
It looks like option system headers contribute a not insignificant amount to compilation time of just the headers. Generally speaking, though, there really should be very few reasons for an hh file to include an options system header. Go through and clear out as many of them as possible. (By rearranging code in some cases.)