Move includes to header