Fixed a few additional header paths.