[FIX] autogen: Fix circular dependency..

Signed-off-by: Ikey Doherty <ikey@evolve-os.com>