Move includes to filters