Update includes

Now that the includes are in a separate directory, the old paths
don't work.