util: Move piglit-util to piglit-util-gl-common

Move piglit-util.* to piglit-util-gl-common.*

Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

102 files changed, 102 insertions, 102 deletions

diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c
index 10cf56717..84e730dcd 100644
--- a/tests/general/array-stride.c
+++ b/tests/general/array-stride.c
@@ -27,7 +27,7 @@
  * June 14, 2011
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c
index 5ae79dd17..f7b65fb93 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c
index cd3e9957d..f9e52f905 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c
index 325e4e4ff..a02beb6d6 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c
index f8931a167..8e23acf4e 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/clear-accum.c b/tests/general/clear-accum.c
index 1647067f2..58ebfba6c 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c
index d3c1e0a98..c6b8e7801 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     200 /*window_width*/,
diff --git a/tests/general/copy-pixels.c b/tests/general/copy-pixels.c
index 72df073e9..20767f92b 100644
--- a/tests/general/copy-pixels.c
+++ b/tests/general/copy-pixels.c
@@ -29,7 +29,7 @@
  * Author: Anuj Phogat
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 #define IMAGE_WIDTH 16
diff --git a/tests/general/copypixels-draw-sync.c b/tests/general/copypixels-draw-sync.c
index d811ef436..a75fd1649 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/copypixels-sync.c b/tests/general/copypixels-sync.c
index 6de7be05b..9df1a4cd8 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c
index 9cc37b78f..cd9a0920b 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     150 /*window_width*/,
diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c
index 9b602de13..bf80f942d 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c
index a433b212e..cbabf06cc 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c
index e9b6f4ae0..95f5ff50c 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c
index b65a00561..e07f2d1da 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/dlist-color-material.c b/tests/general/dlist-color-material.c
index 0e5bfaa6e..ae2bceef8 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c
index 3cbb382e1..4a7cb9547 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c
index cdfaab4d8..fece8269e 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c
index cd2b53ef4..7629b22ef 100644
--- a/tests/general/dlist-fdo31590.c
+++ b/tests/general/dlist-fdo31590.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 static const char *TestName = "dlist-fdo31590";
diff --git a/tests/general/draw-arrays-colormaterial.c b/tests/general/draw-arrays-colormaterial.c
index c2c9ce64c..86355d60d 100644
--- a/tests/general/draw-arrays-colormaterial.c
+++ b/tests/general/draw-arrays-colormaterial.c
@@ -30,7 +30,7 @@
  */
 
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c
index 2d9126ae4..87a097b60 100644
--- a/tests/general/draw-batch.c
+++ b/tests/general/draw-batch.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c
index a9ed1f8d2..d102a7610 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/draw-elements-base-vertex-bounds.c b/tests/general/draw-elements-base-vertex-bounds.c
index 572352f06..ba7e6805a 100644
--- a/tests/general/draw-elements-base-vertex-bounds.c
+++ b/tests/general/draw-elements-base-vertex-bounds.c
@@ -33,7 +33,7 @@
  * In Mesa Gallium 7.11 this causes a crash.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     300 /*window_width*/,
diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c
index 0a8cd27ba..bea22379e 100644
--- a/tests/general/draw-elements-base-vertex-neg.c
+++ b/tests/general/draw-elements-base-vertex-neg.c
@@ -24,7 +24,7 @@
  *    Marek Olšák <maraeo@gmail.com>
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     320 /*window_width*/,
diff --git a/tests/general/draw-elements-base-vertex.c b/tests/general/draw-elements-base-vertex.c
index 04a8af4ce..4695d08a5 100644
--- a/tests/general/draw-elements-base-vertex.c
+++ b/tests/general/draw-elements-base-vertex.c
@@ -30,7 +30,7 @@
  * index buffers.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     300 /*window_width*/,
diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c
index eb0e1af8a..3a837e4d5 100644
--- a/tests/general/draw-elements-vs-inputs.c
+++ b/tests/general/draw-elements-vs-inputs.c
@@ -37,7 +37,7 @@
  */
 
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     300 /*window_width*/,
diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c
index b26b4fc00..089a8a4cf 100644
--- a/tests/general/draw-elements.c
+++ b/tests/general/draw-elements.c
@@ -29,7 +29,7 @@
  * elements formats.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     320 /*window_width*/,
diff --git a/tests/general/draw-instanced-divisor.c b/tests/general/draw-instanced-divisor.c
index d7151c05e..3c37bb992 100644
--- a/tests/general/draw-instanced-divisor.c
+++ b/tests/general/draw-instanced-divisor.c
@@ -27,7 +27,7 @@
  * Tests GL_ARB_draw_instanced and GL_ARB_instanced_arrays
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     500 /*window_width*/,
diff --git a/tests/general/draw-instanced.c b/tests/general/draw-instanced.c
index 00ea4d6de..6ddbaaa21 100644
--- a/tests/general/draw-instanced.c
+++ b/tests/general/draw-instanced.c
@@ -27,7 +27,7 @@
  * Tests GL_ARB_draw_instanced
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     500 /*window_width*/,
diff --git a/tests/general/draw-pixel-with-texture.c b/tests/general/draw-pixel-with-texture.c
index 92e667823..c59517160 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c
index 8a6e3390c..6ee312953 100644
--- a/tests/general/draw-pixels.c
+++ b/tests/general/draw-pixels.c
@@ -30,7 +30,7 @@
  * author: Anuj Phogat
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.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 881fc2c89..42d6306bf 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c
index 95f7b9b88..04b03ea5f 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     320 /*window_width*/,
diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c
index b23d5f8f7..2f65c7875 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     320 /*window_width*/,
diff --git a/tests/general/drawpix-z.c b/tests/general/drawpix-z.c
index 3cc4096d6..53ec6b2a1 100644
--- a/tests/general/drawpix-z.c
+++ b/tests/general/drawpix-z.c
@@ -34,7 +34,7 @@
  * visible.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(200 /*window_width*/,
                     200 /*window_height*/,
diff --git a/tests/general/early-z.c b/tests/general/early-z.c
index e56c2f021..028d3b9f9 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c
index 35cdf4b5a..fcee94749 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 #if defined(_WIN32)
diff --git a/tests/general/fragment-center.c b/tests/general/fragment-center.c
index 16049dbfb..4d8c4947f 100644
--- a/tests/general/fragment-center.c
+++ b/tests/general/fragment-center.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     96 /*window_width*/,
diff --git a/tests/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c
index eca8b87e5..a47b0dd09 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/general/getactiveattrib.c b/tests/general/getactiveattrib.c
index fc92d5ade..2867d43e3 100644
--- a/tests/general/getactiveattrib.c
+++ b/tests/general/getactiveattrib.c
@@ -29,7 +29,7 @@
  * \author Ian Romanick
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/geterror-inside-begin.c b/tests/general/geterror-inside-begin.c
index cd9bcd2b7..bec42212d 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/geterror-invalid-enum.c b/tests/general/geterror-invalid-enum.c
index 9002d893d..82c2aae6a 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     10 /*window_width*/,
diff --git a/tests/general/gl30basic.c b/tests/general/gl30basic.c
index 6cc67d8fd..b58311940 100644
--- a/tests/general/gl30basic.c
+++ b/tests/general/gl30basic.c
@@ -31,7 +31,7 @@
  */
 
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/hiz.c b/tests/general/hiz.c
index 07d67a3f7..584f83287 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/infinite-spot-light.c b/tests/general/infinite-spot-light.c
index 278b54205..a08c5b96d 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index 5a95a22c6..45b3246b7 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -32,7 +32,7 @@
  * Test glIsBuffer()
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c
index 604783680..4f780ac0b 100644
--- a/tests/general/line-aa-width.c
+++ b/tests/general/line-aa-width.c
@@ -36,7 +36,7 @@
  * ugly.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     300 /*window_width*/,
diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c
index 36ec57aaa..96c87e978 100644
--- a/tests/general/linestipple.c
+++ b/tests/general/linestipple.c
@@ -26,7 +26,7 @@
  * Test basic line stippling functionality.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/general/longprim.c b/tests/general/longprim.c
index a2f21ed4a..e7c0e7ec8 100644
--- a/tests/general/longprim.c
+++ b/tests/general/longprim.c
@@ -28,7 +28,7 @@
  * Brian Paul
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/object_purgeable-api-pbo.c b/tests/general/object_purgeable-api-pbo.c
index cab51c22e..4132c595f 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.h"
+#include "piglit-util-gl-common.h"
 #include "object_purgeable.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/object_purgeable-api-texture.c b/tests/general/object_purgeable-api-texture.c
index 2e78a879b..52dcc5d32 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.h"
+#include "piglit-util-gl-common.h"
 #include "object_purgeable.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/object_purgeable-api-vbo.c b/tests/general/object_purgeable-api-vbo.c
index 4b8ba88c7..12d719f8b 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.h"
+#include "piglit-util-gl-common.h"
 #include "object_purgeable.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/object_purgeable.c b/tests/general/object_purgeable.c
index 1c53b594f..8783f8d16 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.h"
+#include "piglit-util-gl-common.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 b35fb64db..bc1cd1ad7 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     50 /*window_width*/,
diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c
index 8a4f7eafa..11b466e7b 100644
--- a/tests/general/occlusion_query.c
+++ b/tests/general/occlusion_query.c
@@ -29,7 +29,7 @@
  * Simple test for GL_ARB_occlusion_query.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     180 /*window_width*/,
diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c
index 660190a30..9b5495eb9 100644
--- a/tests/general/oes-read-format.c
+++ b/tests/general/oes-read-format.c
@@ -31,7 +31,7 @@
  * for ReadPixels.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c
index c60a2a0aa..84588e046 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c
index 1947c8628..9639c70cc 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/pbo-readpixels-small.c b/tests/general/pbo-readpixels-small.c
index 54ff1ce48..a4b008b93 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     2 /*window_width*/,
diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c
index 185e5f51d..0c37d8488 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c
index 6ab31d13f..b43f47e70 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/pbo-teximage.c b/tests/general/pbo-teximage.c
index 3fb840d33..7b2343ec8 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/point-line-no-cull.c b/tests/general/point-line-no-cull.c
index aa5254f6f..6c5b5dc6c 100644
--- a/tests/general/point-line-no-cull.c
+++ b/tests/general/point-line-no-cull.c
@@ -30,7 +30,7 @@
  */
 
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     120 /*window_width*/,
diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c
index 4eb515166..c0e6bfa39 100644
--- a/tests/general/polygon-mode.c
+++ b/tests/general/polygon-mode.c
@@ -28,7 +28,7 @@
  * April 2011
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     500 /*window_width*/,
diff --git a/tests/general/pos-array.c b/tests/general/pos-array.c
index 3c1616009..291d5b36d 100644
--- a/tests/general/pos-array.c
+++ b/tests/general/pos-array.c
@@ -30,7 +30,7 @@
  * May 2011
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/primitive-restart.c b/tests/general/primitive-restart.c
index cbeb882b8..8fa66b15f 100644
--- a/tests/general/primitive-restart.c
+++ b/tests/general/primitive-restart.c
@@ -31,7 +31,7 @@
  *    Brian Paul
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/provoking-vertex.c b/tests/general/provoking-vertex.c
index 07da8e0f6..cdd362a9c 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/quad-invariance.c b/tests/general/quad-invariance.c
index 9652c148d..06b818e6a 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/general/read-front.c b/tests/general/read-front.c
index 221042128..2e999baa7 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/readpix-z.c b/tests/general/readpix-z.c
index b7506b049..d190ed1a6 100644
--- a/tests/general/readpix-z.c
+++ b/tests/general/readpix-z.c
@@ -27,7 +27,7 @@
  * June 2012
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(200 /*window_width*/,
                     200 /*window_height*/,
diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
index 789d5403f..00c92d07b 100644
--- a/tests/general/roundmode-getintegerv.c
+++ b/tests/general/roundmode-getintegerv.c
@@ -39,7 +39,7 @@
  *      coordinate."
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 #include <fenv.h>
diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
index cbc173b94..1ed542ed4 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 #include <fenv.h>
diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c
index 94a739d85..01db475bd 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c
index c47bd9c2a..4a6fcd41b 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c
index 91af0f290..e21b9d44e 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c
index a153b9b1d..dd8aa50b3 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c
index 6ad4d63ce..5162e02a7 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c
index 5412bcbba..63d0fbeb9 100644
--- a/tests/general/scissor-offscreen.c
+++ b/tests/general/scissor-offscreen.c
@@ -34,7 +34,7 @@
  * Bug #27643
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     64 /*window_width*/,
diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c
index b3ca4b962..2ee6e3edd 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/select.c b/tests/general/select.c
index c913b3b4d..80f9c4432 100644
--- a/tests/general/select.c
+++ b/tests/general/select.c
@@ -31,7 +31,7 @@
  *
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c
index 33b16d444..beae4189c 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c
index 66f93c3a3..240e5ac28 100644
--- a/tests/general/stencil-twoside.c
+++ b/tests/general/stencil-twoside.c
@@ -33,7 +33,7 @@
  * final color.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 static int use20syntax = 1;
 
diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c
index 49c3950d3..e9c3040bf 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     550 /*window_width*/,
diff --git a/tests/general/sync_api.c b/tests/general/sync_api.c
index efb67e383..43a190ba6 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/texgen.c b/tests/general/texgen.c
index 88c640f20..020657f77 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index b056df807..01264c942 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c
index fc42cde59..726495289 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     180 /*window_width*/,
diff --git a/tests/general/triangle-rasterization-overdraw.cpp b/tests/general/triangle-rasterization-overdraw.cpp
index 073a426a5..2791a9e9a 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.h"
+#include "piglit-util-gl-common.h"
 #include "mersenne.hpp"
 
 #include <time.h>
diff --git a/tests/general/triangle-rasterization.cpp b/tests/general/triangle-rasterization.cpp
index fd9dae5d1..a59551a59 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.h"
+#include "piglit-util-gl-common.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 83a986f92..3aa386191 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
diff --git a/tests/general/two-sided-lighting.c b/tests/general/two-sided-lighting.c
index 2cc3eeb19..3c0673d34 100644
--- a/tests/general/two-sided-lighting.c
+++ b/tests/general/two-sided-lighting.c
@@ -32,7 +32,7 @@
  * Oct 2011
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c
index cbe4d17c7..b5d6266cc 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.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 #define BOX_SIZE   32
diff --git a/tests/general/vao-01.c b/tests/general/vao-01.c
index f0c40ba0f..40de19ac1 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/vao-02.c b/tests/general/vao-02.c
index 95c26b5d1..eb8d44ed4 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c
index 2f6724711..6e9f8c05a 100644
--- a/tests/general/vao-element-array-buffer.c
+++ b/tests/general/vao-element-array-buffer.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/varray-disabled.c b/tests/general/varray-disabled.c
index b5b403e7a..709c86ab7 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/general/vbo-bufferdata.c b/tests/general/vbo-bufferdata.c
index 0dba3df50..7d8bda154 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c
index 87e3350cc..870a4f2fa 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c
index af2788cdd..b8d3d0852 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c
index cb4787338..e8149558f 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
diff --git a/tests/general/vs-point_size-zero.c b/tests/general/vs-point_size-zero.c
index de8cc3709..c1f41754d 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.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/general/windowoverlap.c b/tests/general/windowoverlap.c
index e0a8f474b..b35e1861e 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.h"
+#include "piglit-util-gl-common.h"
 
 static const int MainWidth = 128, MainHeight = 128;
 static const int SubX = 32, SubY = 32;