i.MX6 Vivante Videonode plugin not skipped in -no-opengl builds

imx6/qsgvivantevideomaterial.cpp and imx6/qsgvivantevideonode.cpp contain the following includes:

#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
...
The other includes below reference "qopengl.h" (QtBase GUI) which ends up in line 121:
...
#else // non-ES2 platforms

1. if defined(Q_OS_MAC)
2. include <OpenGL/gl.h>
3. if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
4. define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
5. include <OpenGL/gl3.h>
6. endif
7. include <OpenGL/glext.h>
8. else
9. define GL_GLEXT_LEGACY // Prevents GL/gl.h from #including system glext.h
10. include <GL/gl.h>
11. include <QtGui/qopenglext.h> <<<<<
12. endif // Q_OS_MAC
    #endif // QT_OPENGL_ES_2

At this point various typedef conflict happen (e.g. typedef khronos_ssize_t GLsizeiptr) and the QtMultimedia build cannot succeed.