cleanups. and restore accidentally deleted old system-gl.h