Merge pull request #3298 from RosettaCommons/sergey/f2 Fixing an inclusion-order related problem and removing `/usr/include` and `/usr/local/include` from our default include paths