Convert include to use new form