1213 includes fix / test