Move includes to main EDD file