some switching around of includes because of some changes in itemdomain