[cvs-nhc98] patch applied (york-compiler98): Fix up imports so that the Yhc side builds with the Flags changes