util/gl: Rename piglit-util-gl-common.h

There are no longer any source files in tests/util that are specific to
a particular OpenGL API. In other words, all OpenGL utility sources in
tests/util are now "common" and shared by all OpenGL APIs. So remove the
'common' in filename 'piglit-util-gl-common.h'.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

109 files changed, 109 insertions, 109 deletions

diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c
index 332bf16c8..1e155364f 100644
--- a/tests/general/array-stride.c
+++ b/tests/general/array-stride.c
@@ -27,7 +27,7 @@
  * June 14, 2011
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/attribs.c b/tests/general/attribs.c
index 3185c2416..3f021425b 100644
--- a/tests/general/attribs.c
+++ b/tests/general/attribs.c
@@ -30,7 +30,7 @@
  * tested here.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c
index ddb140cfe..e9589f39b 100644
--- a/tests/general/bgra-sec-color-pointer.c
+++ b/tests/general/bgra-sec-color-pointer.c
@@ -30,7 +30,7 @@
  * with alpha blending.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c
index fc39cede0..96fee867d 100644
--- a/tests/general/bgra-vert-attrib-pointer.c
+++ b/tests/general/bgra-vert-attrib-pointer.c
@@ -29,7 +29,7 @@
  * two quads are drawn without blending and two are drawn with alpha blending.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c
index ca5c0eaa2..c9da53440 100644
--- a/tests/general/blendminmax.c
+++ b/tests/general/blendminmax.c
@@ -32,7 +32,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c
index a7ca3679e..78d427163 100644
--- a/tests/general/blendsquare.c
+++ b/tests/general/blendsquare.c
@@ -32,7 +32,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/clear-accum.c b/tests/general/clear-accum.c
index eddfdd362..a8ac6bd35 100644
--- a/tests/general/clear-accum.c
+++ b/tests/general/clear-accum.c
@@ -30,7 +30,7 @@
  * Tests that clear accum buffer
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c
index 552df7218..ab230e446 100644
--- a/tests/general/clear-varray-2.0.c
+++ b/tests/general/clear-varray-2.0.c
@@ -32,7 +32,7 @@
  * fd.o bug #21638
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/clipflat.c b/tests/general/clipflat.c
index 03a069c42..91e410e3a 100644
--- a/tests/general/clipflat.c
+++ b/tests/general/clipflat.c
@@ -39,7 +39,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
diff --git a/tests/general/copy-pixels.c b/tests/general/copy-pixels.c
index 1b3c52810..aff369db2 100644
--- a/tests/general/copy-pixels.c
+++ b/tests/general/copy-pixels.c
@@ -29,7 +29,7 @@
  * Author: Anuj Phogat
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 #define IMAGE_WIDTH 16
 #define IMAGE_HEIGHT 16
diff --git a/tests/general/copypixels-draw-sync.c b/tests/general/copypixels-draw-sync.c
index b31dc23bc..50c353d3d 100644
--- a/tests/general/copypixels-draw-sync.c
+++ b/tests/general/copypixels-draw-sync.c
@@ -29,7 +29,7 @@
  * syncing on the i965 driver.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/copypixels-sync.c b/tests/general/copypixels-sync.c
index d36256902..d3441411b 100644
--- a/tests/general/copypixels-sync.c
+++ b/tests/general/copypixels-sync.c
@@ -28,7 +28,7 @@
  * blit ring IRQ handling on the i965 driver.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/degenerate-prims.c b/tests/general/degenerate-prims.c
index 53e8d5f26..749ee406c 100644
--- a/tests/general/degenerate-prims.c
+++ b/tests/general/degenerate-prims.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c
index b3d3e2f34..dd9300022 100644
--- a/tests/general/depth-clamp-range.c
+++ b/tests/general/depth-clamp-range.c
@@ -30,7 +30,7 @@
  * and properly uses the min/max selection.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c
index 782ee13a5..27b76960e 100644
--- a/tests/general/depth_clamp.c
+++ b/tests/general/depth_clamp.c
@@ -34,7 +34,7 @@
  * the same operations against the far plane.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c
index 20d1bd881..5441cadbd 100644
--- a/tests/general/depthfunc.c
+++ b/tests/general/depthfunc.c
@@ -30,7 +30,7 @@
  * Tests that glDepthFunc()'s various modes all work correctly.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c
index e0c7d3485..e382401e8 100644
--- a/tests/general/depthrange-clear.c
+++ b/tests/general/depthrange-clear.c
@@ -31,7 +31,7 @@
  * Caught a regression in the intel driver with the metaops clear code.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c
index 6e76ee69b..4fd45c33d 100644
--- a/tests/general/dlist-clear.c
+++ b/tests/general/dlist-clear.c
@@ -32,7 +32,7 @@
  * with the new metaops clear code.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/dlist-color-material.c b/tests/general/dlist-color-material.c
index 005442c1f..3c323750e 100644
--- a/tests/general/dlist-color-material.c
+++ b/tests/general/dlist-color-material.c
@@ -33,7 +33,7 @@
 
 
 #include <assert.h>
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c
index 3d09de257..51de0a3ad 100644
--- a/tests/general/dlist-fdo3129-01.c
+++ b/tests/general/dlist-fdo3129-01.c
@@ -28,7 +28,7 @@
  * This test is based on a test case posted to fdo bug #3129 by David Reveman.
  * Once upon a time, this triggered an assertion failure in Mesa.
  */
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c
index 2ef3ebf86..fff8eccaa 100644
--- a/tests/general/dlist-fdo3129-02.c
+++ b/tests/general/dlist-fdo3129-02.c
@@ -28,7 +28,7 @@
  * This test is based on a test case posted to fdo bug #3129 by Nicolai Hähnle.
  * Once upon a time, this triggered an assertion failure in Mesa.
  */
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c
index 8cda8bd2a..59f062a00 100644
--- a/tests/general/dlist-fdo31590.c
+++ b/tests/general/dlist-fdo31590.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 static const char *TestName = "dlist-fdo31590";
 
diff --git a/tests/general/draw-arrays-colormaterial.c b/tests/general/draw-arrays-colormaterial.c
index a1c3dc297..e18401127 100644
--- a/tests/general/draw-arrays-colormaterial.c
+++ b/tests/general/draw-arrays-colormaterial.c
@@ -30,7 +30,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c
index a0c0eead0..4148bfafe 100644
--- a/tests/general/draw-batch.c
+++ b/tests/general/draw-batch.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c
index b76af72c6..5a76fbea0 100644
--- a/tests/general/draw-copypixels-sync.c
+++ b/tests/general/draw-copypixels-sync.c
@@ -28,7 +28,7 @@
  * stresses render to blitter syncing on the i965 driver.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c
index 0e4537824..6611b18c1 100644
--- a/tests/general/draw-elements-vs-inputs.c
+++ b/tests/general/draw-elements-vs-inputs.c
@@ -37,7 +37,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c
index d31d0dc32..0f712c70c 100644
--- a/tests/general/draw-elements.c
+++ b/tests/general/draw-elements.c
@@ -29,7 +29,7 @@
  * elements formats.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/draw-pixel-with-texture.c b/tests/general/draw-pixel-with-texture.c
index b28dc591a..c03131ebf 100644
--- a/tests/general/draw-pixel-with-texture.c
+++ b/tests/general/draw-pixel-with-texture.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c
index c1a2d38dc..46bacfaa6 100644
--- a/tests/general/draw-pixels.c
+++ b/tests/general/draw-pixels.c
@@ -30,7 +30,7 @@
  * author: Anuj Phogat
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 /* Data conversions as used in mesa */
 /** Convert GLubyte in [0,255] to GLfloat in [0.0,1.0] */
diff --git a/tests/general/draw-sync.c b/tests/general/draw-sync.c
index 641e6223f..1178586ef 100644
--- a/tests/general/draw-sync.c
+++ b/tests/general/draw-sync.c
@@ -28,7 +28,7 @@
  * ring IRQ handling on the i965 driver.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c
index 176a07611..37f1dc5a2 100644
--- a/tests/general/draw-vertices-half-float.c
+++ b/tests/general/draw-vertices-half-float.c
@@ -29,7 +29,7 @@
  * This one is for half float vertices.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c
index a7933b0b7..cd48816c7 100644
--- a/tests/general/draw-vertices.c
+++ b/tests/general/draw-vertices.c
@@ -29,7 +29,7 @@
  * but tests for various vertex formats are provided too.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/drawpix-z.c b/tests/general/drawpix-z.c
index 0d789eae6..1cb01f559 100644
--- a/tests/general/drawpix-z.c
+++ b/tests/general/drawpix-z.c
@@ -34,7 +34,7 @@
  * visible.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/early-z.c b/tests/general/early-z.c
index 9f4b611cf..ec6790073 100644
--- a/tests/general/early-z.c
+++ b/tests/general/early-z.c
@@ -27,7 +27,7 @@
  * Test for bugs with early depth testing and early depth update.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c
index 69b36efc0..3e396ba98 100644
--- a/tests/general/fog-modes.c
+++ b/tests/general/fog-modes.c
@@ -26,7 +26,7 @@
  * Tests that the three fog modes work with fog enabled using the depth value.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 #if defined(_WIN32)
 #undef near
diff --git a/tests/general/fragment-center.c b/tests/general/fragment-center.c
index 1b15242ce..841abd118 100644
--- a/tests/general/fragment-center.c
+++ b/tests/general/fragment-center.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c
index 3cf50a622..acae0f000 100644
--- a/tests/general/framebuffer-srgb.c
+++ b/tests/general/framebuffer-srgb.c
@@ -32,7 +32,7 @@
  * the API acts correctly in that case.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/getactiveattrib.c b/tests/general/getactiveattrib.c
index a1075b1d6..81c665743 100644
--- a/tests/general/getactiveattrib.c
+++ b/tests/general/getactiveattrib.c
@@ -29,7 +29,7 @@
  * \author Ian Romanick
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/geterror-inside-begin.c b/tests/general/geterror-inside-begin.c
index f51819d5a..1d59a2336 100644
--- a/tests/general/geterror-inside-begin.c
+++ b/tests/general/geterror-inside-begin.c
@@ -33,7 +33,7 @@
  * @author Vinson Lee <vlee@vmware.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/geterror-invalid-enum.c b/tests/general/geterror-invalid-enum.c
index 1f3aa184e..143c7c420 100644
--- a/tests/general/geterror-invalid-enum.c
+++ b/tests/general/geterror-invalid-enum.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/gl30basic.c b/tests/general/gl30basic.c
index a842a96f5..2207787bb 100644
--- a/tests/general/gl30basic.c
+++ b/tests/general/gl30basic.c
@@ -31,7 +31,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/glinfo.c b/tests/general/glinfo.c
index b60ae6d4d..a2bc5fd5e 100644
--- a/tests/general/glinfo.c
+++ b/tests/general/glinfo.c
@@ -36,7 +36,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
diff --git a/tests/general/hiz.c b/tests/general/hiz.c
index 10fa53ce2..6bdeeff98 100644
--- a/tests/general/hiz.c
+++ b/tests/general/hiz.c
@@ -30,7 +30,7 @@
  * Tests that two overlapping triangles are rendered correctly.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/infinite-spot-light.c b/tests/general/infinite-spot-light.c
index a2b27577e..5b475e625 100644
--- a/tests/general/infinite-spot-light.c
+++ b/tests/general/infinite-spot-light.c
@@ -39,7 +39,7 @@
  *      infinite light is met. This is somehow not permitted by glSpec.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index 965760093..78a22d634 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -32,7 +32,7 @@
  * Test glIsBuffer()
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c
index dd35a677a..c0fd7c10a 100644
--- a/tests/general/line-aa-width.c
+++ b/tests/general/line-aa-width.c
@@ -36,7 +36,7 @@
  * ugly.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/line-flat-clip-color.c b/tests/general/line-flat-clip-color.c
index eb771dc0f..e290a5dc0 100644
--- a/tests/general/line-flat-clip-color.c
+++ b/tests/general/line-flat-clip-color.c
@@ -29,7 +29,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c
index 4e81585cd..ba0924e63 100644
--- a/tests/general/linestipple.c
+++ b/tests/general/linestipple.c
@@ -26,7 +26,7 @@
  * Test basic line stippling functionality.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/longprim.c b/tests/general/longprim.c
index b4344f2fb..57bfcbe3c 100644
--- a/tests/general/longprim.c
+++ b/tests/general/longprim.c
@@ -28,7 +28,7 @@
  * Brian Paul
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/masked-clear.c b/tests/general/masked-clear.c
index 21fe944f1..e205fa961 100644
--- a/tests/general/masked-clear.c
+++ b/tests/general/masked-clear.c
@@ -31,7 +31,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
diff --git a/tests/general/object_purgeable-api-pbo.c b/tests/general/object_purgeable-api-pbo.c
index 86ce3f563..0a44203ca 100644
--- a/tests/general/object_purgeable-api-pbo.c
+++ b/tests/general/object_purgeable-api-pbo.c
@@ -29,7 +29,7 @@
  * Simple test of the API for GL_APPLE_object_purgeable with GL_ARB_pixel_buffer_object.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 #include "object_purgeable.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
diff --git a/tests/general/object_purgeable-api-texture.c b/tests/general/object_purgeable-api-texture.c
index 4edeff388..280378707 100644
--- a/tests/general/object_purgeable-api-texture.c
+++ b/tests/general/object_purgeable-api-texture.c
@@ -29,7 +29,7 @@
  * Simple test of the API for GL_APPLE_object_purgeable with texture object.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 #include "object_purgeable.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
diff --git a/tests/general/object_purgeable-api-vbo.c b/tests/general/object_purgeable-api-vbo.c
index 6d6b6759a..fcb5d4d98 100644
--- a/tests/general/object_purgeable-api-vbo.c
+++ b/tests/general/object_purgeable-api-vbo.c
@@ -29,7 +29,7 @@
  * Simple test of the API for GL_APPLE_object_purgeable with GL_ARB_vertex_buffer_object.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 #include "object_purgeable.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
diff --git a/tests/general/object_purgeable.c b/tests/general/object_purgeable.c
index 8783f8d16..06ba50ce9 100644
--- a/tests/general/object_purgeable.c
+++ b/tests/general/object_purgeable.c
@@ -25,7 +25,7 @@
  *    Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 #include "object_purgeable.h"
 
 #define FAIL_ON_ERROR(string)						\
diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c
index a755facc6..f315387dd 100644
--- a/tests/general/occlusion-query-discard.c
+++ b/tests/general/occlusion-query-discard.c
@@ -31,7 +31,7 @@
  * Simple test for GL_ARB_occlusion_query with a discard statement in GLSL.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c
index 459fe407a..cfe6e27c1 100644
--- a/tests/general/oes-read-format.c
+++ b/tests/general/oes-read-format.c
@@ -31,7 +31,7 @@
  * for ReadPixels.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c
index 9efaf09ef..90bbaf1e4 100644
--- a/tests/general/pbo-drawpixels.c
+++ b/tests/general/pbo-drawpixels.c
@@ -31,7 +31,7 @@
  * Caught a bug with the Intel driver with the metaops drawpixels code.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c
index 123b05fb1..99b4b3b09 100644
--- a/tests/general/pbo-read-argb8888.c
+++ b/tests/general/pbo-read-argb8888.c
@@ -32,7 +32,7 @@
  * This test should hit the blit-based readpixels in the intel driver.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/pbo-readpixels-small.c b/tests/general/pbo-readpixels-small.c
index 900a92917..9fec2a078 100644
--- a/tests/general/pbo-readpixels-small.c
+++ b/tests/general/pbo-readpixels-small.c
@@ -36,7 +36,7 @@
  * https://bugs.freedesktop.org/show_bug.cgi?id=25921
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c
index f3e0c8341..b04e1d9c7 100644
--- a/tests/general/pbo-teximage-tiling-2.c
+++ b/tests/general/pbo-teximage-tiling-2.c
@@ -32,7 +32,7 @@
  * be on Intel.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c
index b9bef0375..a95f25b45 100644
--- a/tests/general/pbo-teximage-tiling.c
+++ b/tests/general/pbo-teximage-tiling.c
@@ -32,7 +32,7 @@
  * be on Intel.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/pbo-teximage.c b/tests/general/pbo-teximage.c
index ebd9d9ebb..73394db31 100644
--- a/tests/general/pbo-teximage.c
+++ b/tests/general/pbo-teximage.c
@@ -30,7 +30,7 @@
  * Tests that using a PBO as the unpack buffer for glTexImage works correctly.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/point-line-no-cull.c b/tests/general/point-line-no-cull.c
index 5a13a5571..511e38767 100644
--- a/tests/general/point-line-no-cull.c
+++ b/tests/general/point-line-no-cull.c
@@ -30,7 +30,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/polygon-mode-offset.c b/tests/general/polygon-mode-offset.c
index 3832df201..df53d0513 100644
--- a/tests/general/polygon-mode-offset.c
+++ b/tests/general/polygon-mode-offset.c
@@ -31,7 +31,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c
index dffb10e01..15a006498 100644
--- a/tests/general/polygon-mode.c
+++ b/tests/general/polygon-mode.c
@@ -28,7 +28,7 @@
  * April 2011
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/polygon-offset.c b/tests/general/polygon-offset.c
index da3a0697d..95d4b0dde 100644
--- a/tests/general/polygon-offset.c
+++ b/tests/general/polygon-offset.c
@@ -24,7 +24,7 @@
  *    Keith Packard <keithp@keithp.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/pos-array.c b/tests/general/pos-array.c
index ebc2eaf44..a3776a311 100644
--- a/tests/general/pos-array.c
+++ b/tests/general/pos-array.c
@@ -30,7 +30,7 @@
  * May 2011
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/primitive-restart-draw-mode.c b/tests/general/primitive-restart-draw-mode.c
index 722a44088..cca89e385 100644
--- a/tests/general/primitive-restart-draw-mode.c
+++ b/tests/general/primitive-restart-draw-mode.c
@@ -53,7 +53,7 @@
  * GL_POINTS.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 
 #define NUM_VERTICES 8
diff --git a/tests/general/primitive-restart.c b/tests/general/primitive-restart.c
index 0674c1145..ce3db8f02 100644
--- a/tests/general/primitive-restart.c
+++ b/tests/general/primitive-restart.c
@@ -31,7 +31,7 @@
  *    Brian Paul
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/provoking-vertex.c b/tests/general/provoking-vertex.c
index 6227f2d7b..523b6b469 100644
--- a/tests/general/provoking-vertex.c
+++ b/tests/general/provoking-vertex.c
@@ -31,7 +31,7 @@
 * Second tri using GL_LAST_VERTEX_CONVENTION_EXT.
 */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/push-pop-texture-state.c b/tests/general/push-pop-texture-state.c
index 360b71c56..6ff089374 100644
--- a/tests/general/push-pop-texture-state.c
+++ b/tests/general/push-pop-texture-state.c
@@ -5,7 +5,7 @@
  * https://bugs.freedesktop.org/show_bug.cgi?id=9833
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/quad-invariance.c b/tests/general/quad-invariance.c
index ce7e48cbb..b5741d043 100644
--- a/tests/general/quad-invariance.c
+++ b/tests/general/quad-invariance.c
@@ -36,7 +36,7 @@
  * test is only a warning.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/read-front.c b/tests/general/read-front.c
index 5208d0442..04d8337cc 100644
--- a/tests/general/read-front.c
+++ b/tests/general/read-front.c
@@ -35,7 +35,7 @@
  * used as a draw buffer.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/readpix-z.c b/tests/general/readpix-z.c
index 92179069c..eb523af5e 100644
--- a/tests/general/readpix-z.c
+++ b/tests/general/readpix-z.c
@@ -27,7 +27,7 @@
  * June 2012
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
index 1453ced17..28ecfaf55 100644
--- a/tests/general/roundmode-getintegerv.c
+++ b/tests/general/roundmode-getintegerv.c
@@ -39,7 +39,7 @@
  *      coordinate."
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 #include <fenv.h>
 
diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
index 0643647da..9284f4354 100644
--- a/tests/general/roundmode-pixelstore.c
+++ b/tests/general/roundmode-pixelstore.c
@@ -36,7 +36,7 @@
  *      the passed value is rounded to the nearest integer."
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 #include <fenv.h>
 
diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c
index d9978367e..0a8e7560c 100644
--- a/tests/general/scissor-bitmap.c
+++ b/tests/general/scissor-bitmap.c
@@ -31,7 +31,7 @@
  * it's to window boundaries or glScissor.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c
index c94f86e45..5ec0495f7 100644
--- a/tests/general/scissor-clear.c
+++ b/tests/general/scissor-clear.c
@@ -30,7 +30,7 @@
  * Tests that glScissor properly affects glClear(GL_COLOR_BUFFER_BIT)().
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c
index 206cfb3c5..1f43f42bc 100644
--- a/tests/general/scissor-copypixels.c
+++ b/tests/general/scissor-copypixels.c
@@ -30,7 +30,7 @@
  * Tests that glScissor properly affects glCopyPixels().
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c
index dfb354f86..983227090 100644
--- a/tests/general/scissor-depth-clear.c
+++ b/tests/general/scissor-depth-clear.c
@@ -30,7 +30,7 @@
  * Tests that glScissor properly affects glClear(GL_DEPTH_BUFFER_BIT).
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c
index 24eb68d6d..17eb232b6 100644
--- a/tests/general/scissor-many.c
+++ b/tests/general/scissor-many.c
@@ -33,7 +33,7 @@
  * driver, where each scissor state is in a separate BO.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c
index 6aae87100..c9b953b63 100644
--- a/tests/general/scissor-offscreen.c
+++ b/tests/general/scissor-offscreen.c
@@ -34,7 +34,7 @@
  * Bug #27643
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/scissor-polygon.c b/tests/general/scissor-polygon.c
index b252f7637..8ba3bbc87 100644
--- a/tests/general/scissor-polygon.c
+++ b/tests/general/scissor-polygon.c
@@ -29,7 +29,7 @@
  * Feb 2013
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c
index 183e0befa..fb1230938 100644
--- a/tests/general/scissor-stencil-clear.c
+++ b/tests/general/scissor-stencil-clear.c
@@ -30,7 +30,7 @@
  * Tests that glScissor properly affects glClear of the stencil buffer.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/select.c b/tests/general/select.c
index 288c3ff1b..879a1e9c1 100644
--- a/tests/general/select.c
+++ b/tests/general/select.c
@@ -31,7 +31,7 @@
  *
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c
index 0161fd276..e04ec9ec5 100644
--- a/tests/general/stencil-drawpixels.c
+++ b/tests/general/stencil-drawpixels.c
@@ -30,7 +30,7 @@
  * Tests that glDrawPixels(GL_STENCIL) minimally works.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c
index 00f9d016b..654b14b40 100644
--- a/tests/general/stencil-twoside.c
+++ b/tests/general/stencil-twoside.c
@@ -33,7 +33,7 @@
  * final color.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 static int use20syntax = 1;
 
diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c
index b0f9c2d3f..dc0b1f1a8 100644
--- a/tests/general/stencil-wrap.c
+++ b/tests/general/stencil-wrap.c
@@ -32,7 +32,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/sync_api.c b/tests/general/sync_api.c
index af08cdf34..09b4f0b5f 100644
--- a/tests/general/sync_api.c
+++ b/tests/general/sync_api.c
@@ -29,7 +29,7 @@
  * Simple test of the API for GL_ARB_sync.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/texgen.c b/tests/general/texgen.c
index cb3471003..0fb359aa0 100644
--- a/tests/general/texgen.c
+++ b/tests/general/texgen.c
@@ -26,7 +26,7 @@
  * Test a number of basic TexGen functions.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index 8c9cf9560..d0cbbb3d1 100644
--- a/tests/general/texunits.c
+++ b/tests/general/texunits.c
@@ -28,7 +28,7 @@
  * texture coord units, image units, combined units, etc.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c
index 44b6a6571..08c8d17b0 100644
--- a/tests/general/timer_query.c
+++ b/tests/general/timer_query.c
@@ -31,7 +31,7 @@
  * Simple test for GL_EXT_timer_query.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/triangle-guardband-viewport.c b/tests/general/triangle-guardband-viewport.c
index 1f921914e..9e99254f9 100644
--- a/tests/general/triangle-guardband-viewport.c
+++ b/tests/general/triangle-guardband-viewport.c
@@ -30,7 +30,7 @@
  * not honor this requirement.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/triangle-rasterization-overdraw.cpp b/tests/general/triangle-rasterization-overdraw.cpp
index c2e567328..39303030c 100644
--- a/tests/general/triangle-rasterization-overdraw.cpp
+++ b/tests/general/triangle-rasterization-overdraw.cpp
@@ -41,7 +41,7 @@
  *               around a circle that contains the entire window, thus going off screen.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 #include "mersenne.hpp"
 
 #include <time.h>
diff --git a/tests/general/triangle-rasterization.cpp b/tests/general/triangle-rasterization.cpp
index bd20af2c9..0d99ef126 100644
--- a/tests/general/triangle-rasterization.cpp
+++ b/tests/general/triangle-rasterization.cpp
@@ -35,7 +35,7 @@
  *   2. Randomised triangle drawing to attempt to test all possible triangles
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 #include "mersenne.hpp"
 
 #include <time.h>
diff --git a/tests/general/two-sided-lighting-separate-specular.c b/tests/general/two-sided-lighting-separate-specular.c
index c95b5527e..8e1414e80 100644
--- a/tests/general/two-sided-lighting-separate-specular.c
+++ b/tests/general/two-sided-lighting-separate-specular.c
@@ -32,7 +32,7 @@
  * Oct 2011
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/two-sided-lighting.c b/tests/general/two-sided-lighting.c
index 0a4b3ca05..84fde3ab2 100644
--- a/tests/general/two-sided-lighting.c
+++ b/tests/general/two-sided-lighting.c
@@ -32,7 +32,7 @@
  * Oct 2011
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c
index d4748c062..df055ff45 100644
--- a/tests/general/user-clip.c
+++ b/tests/general/user-clip.c
@@ -27,7 +27,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 #define BOX_SIZE   32
 
diff --git a/tests/general/vao-01.c b/tests/general/vao-01.c
index 290a9bc35..e11199945 100644
--- a/tests/general/vao-01.c
+++ b/tests/general/vao-01.c
@@ -36,7 +36,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/vao-02.c b/tests/general/vao-02.c
index 72b72693f..136be1d8d 100644
--- a/tests/general/vao-02.c
+++ b/tests/general/vao-02.c
@@ -36,7 +36,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c
index 6ab2ab69a..4b2106de1 100644
--- a/tests/general/vao-element-array-buffer.c
+++ b/tests/general/vao-element-array-buffer.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/varray-disabled.c b/tests/general/varray-disabled.c
index 152cdc4e1..44fb47171 100644
--- a/tests/general/varray-disabled.c
+++ b/tests/general/varray-disabled.c
@@ -34,7 +34,7 @@
  * http://bugs.freedesktop.org/show_bug.cgi?id=19911
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/vbo-bufferdata.c b/tests/general/vbo-bufferdata.c
index 33f63f2c8..d3a390616 100644
--- a/tests/general/vbo-bufferdata.c
+++ b/tests/general/vbo-bufferdata.c
@@ -25,7 +25,7 @@
  *    Marek Olšák <maraeo@gmail.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c
index c49909c6b..cb36d7277 100644
--- a/tests/general/vbo-map-remap.c
+++ b/tests/general/vbo-map-remap.c
@@ -24,7 +24,7 @@
  *    Ben Holmes <shranzel@hotmail.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/vbo-map-unsync.c b/tests/general/vbo-map-unsync.c
index bda25a7dc..b2e9ca414 100644
--- a/tests/general/vbo-map-unsync.c
+++ b/tests/general/vbo-map-unsync.c
@@ -29,7 +29,7 @@
  */
 
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
diff --git a/tests/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c
index 18f4cb61c..f99bf6cef 100644
--- a/tests/general/vbo-subdata-sync.c
+++ b/tests/general/vbo-subdata-sync.c
@@ -30,7 +30,7 @@
  * Test for synchronizing behavior of glBufferSubDataARB, bug #23857.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c
index 329e6df92..5c395133a 100644
--- a/tests/general/vbo-subdata-zero.c
+++ b/tests/general/vbo-subdata-zero.c
@@ -24,7 +24,7 @@
  *    Ben Holmes <shranzel@hotmail.com>
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/vs-point_size-zero.c b/tests/general/vs-point_size-zero.c
index 0b47aedf5..99ba94abf 100644
--- a/tests/general/vs-point_size-zero.c
+++ b/tests/general/vs-point_size-zero.c
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
diff --git a/tests/general/windowoverlap.c b/tests/general/windowoverlap.c
index 6b08a75fd..19d1aaa1b 100644
--- a/tests/general/windowoverlap.c
+++ b/tests/general/windowoverlap.c
@@ -30,7 +30,7 @@
  * This test was prompted by http://bugs.freedesktop.org/show_bug.cgi?id=16123
  */
 
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
 
 static const int MainWidth = 128, MainHeight = 128;
 static const int SubX = 32, SubY = 32;