Fix up include paths