moved trans2.h and nterr.h into includes.h with all our other includes