change header file directories to match Online

Fixes for changes that @frankm recently pushed to Online without first properly testing against downstream dependent projects, and thus broke master builds.

Commit ported from !142 (merged) where @sesen kindly made the required changes.