tidy - waveform_nacl_gl.h - put gl-ish stuff here