Move includes to separate file