Fix additional issues stemming from mac/linux header differences.