remove some NT2_DISPLAY in the middle of the code + fix a couple of includes