Now that the headers are in the same repo, we need to adjust all the includes of it and include paths.