solve a few include with schema cases