FIXME: Fixed header inclusion, note that this is relpath sensitive...