Change include order back and rename interface variables to rsrcinterface.