Move includes to implementation file where possible