Just some clean up to require includes