Clean up use of which files we include - file is recursive