Clean up include code

Remove some circular imports