removed unused includes

Change-Id: If9f0eba8b2c0c1047f09c4dc612bcdb25319b005
Merge topic 'opengl2_glyph_fix' into master

c0b5f664 removed unused includes