Merge pull request #1919 from CEED/jeremy/weak-fix-2Fix Weak Symbols on MacOS
build - simplify includes to reduce duplication