More cleanups, including removing the runtime/cpp include dir prefix