cogl: Unconditionally include cogl-config.h

2018-05-18 16:43:02 +02:00 · 2018-05-18 16:43:02 +02:00 · 0163a0b0cd
commit 0163a0b0cd
parent 12171e413b
109 changed files with 0 additions and 219 deletions
--- a/cogl/cogl-pango/cogl-pango-display-list.c
+++ b/cogl/cogl-pango/cogl-pango-display-list.c
@ -26,9 +26,7 @@
 * SOFTWARE.
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <glib.h>
 #include <string.h>
--- a/cogl/cogl-pango/cogl-pango-fontmap.c
+++ b/cogl/cogl-pango/cogl-pango-fontmap.c
@ -34,9 +34,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 /* This is needed to get the Pango headers to export stuff needed to
   subclass */
--- a/cogl/cogl-pango/cogl-pango-glyph-cache.c
+++ b/cogl/cogl-pango/cogl-pango-glyph-cache.c
@ -26,9 +26,7 @@
 * SOFTWARE.
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <glib.h>

--- a/cogl/cogl-pango/cogl-pango-pipeline-cache.c
+++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
@ -31,9 +31,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <glib.h>
 #include "cogl-pango-pipeline-cache.h"
--- a/cogl/cogl-pango/cogl-pango-render.c
+++ b/cogl/cogl-pango/cogl-pango-render.c
@ -33,9 +33,7 @@
 *   Matthew Allum  <mallum@openedhand.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #ifndef PANGO_ENABLE_BACKEND
 #define PANGO_ENABLE_BACKEND 1
--- a/cogl/cogl-path/cogl-path-enum-types.c.in
+++ b/cogl/cogl-path/cogl-path-enum-types.c.in
@ -1,7 +1,5 @@
 /*** BEGIN file-header ***/
-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 /* We need to undefine this so that we will be sure to include
 * cogl-path.h instead of cogl2-path.h when we include the framebuffer
--- a/cogl/cogl/cogl-atlas-texture.c
+++ b/cogl/cogl/cogl-atlas-texture.c
@ -31,9 +31,7 @@
 *  Neil Roberts   <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-debug.h"
 #include "cogl-util.h"
--- a/cogl/cogl/cogl-atlas.c
+++ b/cogl/cogl/cogl-atlas.c
@ -29,9 +29,7 @@
 *  Neil Roberts   <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-atlas.h"
 #include "cogl-rectangle-map.h"
--- a/cogl/cogl/cogl-attribute-buffer.c
+++ b/cogl/cogl/cogl-attribute-buffer.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-object-private.h"
 #include "cogl-attribute-buffer.h"
--- a/cogl/cogl/cogl-attribute.c
+++ b/cogl/cogl/cogl-attribute.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-context-private.h"
--- a/cogl/cogl/cogl-bitmap-conversion.c
+++ b/cogl/cogl/cogl-bitmap-conversion.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-private.h"
 #include "cogl-bitmap-private.h"
--- a/cogl/cogl/cogl-bitmap-pixbuf.c
+++ b/cogl/cogl/cogl-bitmap-pixbuf.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-bitmap-private.h"
--- a/cogl/cogl/cogl-bitmap.c
+++ b/cogl/cogl/cogl-bitmap.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-debug.h"
--- a/cogl/cogl/cogl-blend-string.c
+++ b/cogl/cogl/cogl-blend-string.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <stdlib.h>
 #include <string.h>
--- a/cogl/cogl/cogl-blit.c
+++ b/cogl/cogl/cogl-blit.c
@ -29,9 +29,7 @@
 *  Neil Roberts   <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-boxed-value.c
+++ b/cogl/cogl/cogl-boxed-value.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-buffer.c
+++ b/cogl/cogl/cogl-buffer.c
@ -37,9 +37,7 @@
 * Pixel Buffers API.
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <stdio.h>
 #include <string.h>
--- a/cogl/cogl/cogl-clip-stack.c
+++ b/cogl/cogl/cogl-clip-stack.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>
 #include <math.h>
--- a/cogl/cogl/cogl-color.c
+++ b/cogl/cogl/cogl-color.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-config.c
+++ b/cogl/cogl/cogl-config.c
@ -30,9 +30,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-debug.h"
 #include "cogl-config-private.h"
--- a/cogl/cogl/cogl-context.c
+++ b/cogl/cogl/cogl-context.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-object.h"
 #include "cogl-private.h"
--- a/cogl/cogl/cogl-debug.c
+++ b/cogl/cogl/cogl-debug.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <stdlib.h>

--- a/cogl/cogl/cogl-depth-state.c
+++ b/cogl/cogl/cogl-depth-state.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-depth-state-private.h"
--- a/cogl/cogl/cogl-display.c
+++ b/cogl/cogl/cogl-display.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-error.c
+++ b/cogl/cogl/cogl-error.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-types.h"
 #include "cogl-util.h"
--- a/cogl/cogl/cogl-euler.c
+++ b/cogl/cogl/cogl-euler.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <cogl-util.h>
 #include <cogl-euler.h>
--- a/cogl/cogl/cogl-feature-private.c
+++ b/cogl/cogl/cogl-feature-private.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-fence.c
+++ b/cogl/cogl/cogl-fence.c
@ -27,9 +27,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-fence.h"
 #include "cogl-fence-private.h"
--- a/cogl/cogl/cogl-frame-info.c
+++ b/cogl/cogl/cogl-frame-info.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-frame-info-private.h"
 #include "cogl-gtype-private.h"
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-gles2-context.c
+++ b/cogl/cogl/cogl-gles2-context.c
@ -33,9 +33,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-glib-source.c
+++ b/cogl/cogl/cogl-glib-source.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-glib-source.h"
 #include "cogl-poll.h"
--- a/cogl/cogl/cogl-glsl-shader.c
+++ b/cogl/cogl/cogl-glsl-shader.c
@ -32,9 +32,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-util-gl-private.h"
--- a/cogl/cogl/cogl-gpu-info.c
+++ b/cogl/cogl/cogl-gpu-info.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>
 #include <errno.h>
--- a/cogl/cogl/cogl-index-buffer.c
+++ b/cogl/cogl/cogl-index-buffer.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-object-private.h"
 #include "cogl-indices.h"
--- a/cogl/cogl/cogl-indices.c
+++ b/cogl/cogl/cogl-indices.c
@ -32,9 +32,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-object-private.h"
--- a/cogl/cogl/cogl-journal.c
+++ b/cogl/cogl/cogl-journal.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-debug.h"
 #include "cogl-context-private.h"
--- a/cogl/cogl/cogl-list.c
+++ b/cogl/cogl/cogl-list.c
@ -23,9 +23,7 @@

 /* This list implementation is based on the Wayland source code */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <stdlib.h>
 #include <string.h>
--- a/cogl/cogl/cogl-magazine.c
+++ b/cogl/cogl/cogl-magazine.c
@ -51,9 +51,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-memory-stack-private.h"
 #include "cogl-magazine-private.h"
--- a/cogl/cogl/cogl-matrix-stack.c
+++ b/cogl/cogl/cogl-matrix-stack.c
@ -31,9 +31,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-util-gl-private.h"
--- a/cogl/cogl/cogl-matrix.c
+++ b/cogl/cogl/cogl-matrix.c
@ -69,9 +69,7 @@
 *   the inverse of the identity matrix)
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <cogl-util.h>
 #include <cogl-debug.h>
--- a/cogl/cogl/cogl-memory-stack.c
+++ b/cogl/cogl/cogl-memory-stack.c
@ -54,9 +54,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-memory-stack-private.h"
 #include "cogl-list.h"
--- a/cogl/cogl/cogl-meta-texture.c
+++ b/cogl/cogl/cogl-meta-texture.c
@ -30,9 +30,7 @@
 *  Robert Bragg   <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-texture.h"
 #include "cogl-matrix.h"
--- a/cogl/cogl/cogl-node.c
+++ b/cogl/cogl/cogl-node.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-node-private.h"
--- a/cogl/cogl/cogl-object.c
+++ b/cogl/cogl/cogl-object.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <glib.h>
 #include <string.h>
--- a/cogl/cogl/cogl-onscreen-template.c
+++ b/cogl/cogl/cogl-onscreen-template.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-object.h"

--- a/cogl/cogl/cogl-onscreen.c
+++ b/cogl/cogl/cogl-onscreen.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-onscreen-private.h"
--- a/cogl/cogl/cogl-output.c
+++ b/cogl/cogl/cogl-output.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-output-private.h"
 #include "cogl-gtype-private.h"
--- a/cogl/cogl/cogl-pipeline-cache.c
+++ b/cogl/cogl/cogl-pipeline-cache.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <test-fixtures/test-unit.h>

--- a/cogl/cogl/cogl-pipeline-debug.c
+++ b/cogl/cogl/cogl-pipeline-debug.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-pipeline-private.h"
--- a/cogl/cogl/cogl-pipeline-hash-table.c
+++ b/cogl/cogl/cogl-pipeline-hash-table.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-pipeline-private.h"
--- a/cogl/cogl/cogl-pipeline-layer-state.c
+++ b/cogl/cogl/cogl-pipeline-layer-state.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-pipeline-private.h"
--- a/cogl/cogl/cogl-pipeline-layer.c
+++ b/cogl/cogl/cogl-pipeline-layer.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-context-private.h"
--- a/cogl/cogl/cogl-pipeline-snippet.c
+++ b/cogl/cogl/cogl-pipeline-snippet.c
@ -31,9 +31,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-pipeline-state.c
+++ b/cogl/cogl/cogl-pipeline-state.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-color-private.h"
--- a/cogl/cogl/cogl-pipeline.c
+++ b/cogl/cogl/cogl-pipeline.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-debug.h"
 #include "cogl-context-private.h"
--- a/cogl/cogl/cogl-pixel-buffer.c
+++ b/cogl/cogl/cogl-pixel-buffer.c
@ -37,9 +37,7 @@
 * Pixel Buffers API.
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <stdio.h>
 #include <string.h>
--- a/cogl/cogl/cogl-point-in-poly.c
+++ b/cogl/cogl/cogl-point-in-poly.c
@ -34,9 +34,7 @@
 * http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-point-in-poly-private.h"
--- a/cogl/cogl/cogl-poll.c
+++ b/cogl/cogl/cogl-poll.c
@ -30,9 +30,7 @@
 *  Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-poll.h"
 #include "cogl-poll-private.h"
--- a/cogl/cogl/cogl-primitive-texture.c
+++ b/cogl/cogl/cogl-primitive-texture.c
@ -30,9 +30,7 @@
 *  Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-primitive-texture.h"
 #include "cogl-texture-private.h"
--- a/cogl/cogl/cogl-primitive.c
+++ b/cogl/cogl/cogl-primitive.c
@ -31,9 +31,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-object-private.h"
--- a/cogl/cogl/cogl-primitives.c
+++ b/cogl/cogl/cogl-primitives.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-debug.h"
 #include "cogl-context-private.h"
--- a/cogl/cogl/cogl-profile.c
+++ b/cogl/cogl/cogl-profile.c
@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #ifdef COGL_ENABLE_PROFILE

--- a/cogl/cogl/cogl-quaternion.c
+++ b/cogl/cogl/cogl-quaternion.c
@ -39,9 +39,7 @@
 * 3D Maths Primer for Graphics and Game Development ISBN-10: 1556229119
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <cogl-util.h>
 #include <cogl-quaternion.h>
--- a/cogl/cogl/cogl-rectangle-map.c
+++ b/cogl/cogl/cogl-rectangle-map.c
@ -31,9 +31,7 @@
 *  Neil Roberts   <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <glib.h>

--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <stdlib.h>
 #include <string.h>
--- a/cogl/cogl/cogl-sampler-cache.c
+++ b/cogl/cogl/cogl-sampler-cache.c
@ -30,9 +30,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-sampler-cache-private.h"
 #include "cogl-context-private.h"
--- a/cogl/cogl/cogl-snippet.c
+++ b/cogl/cogl/cogl-snippet.c
@ -31,9 +31,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-types.h"
 #include "cogl-snippet-private.h"
--- a/cogl/cogl/cogl-spans.c
+++ b/cogl/cogl/cogl-spans.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "math.h"

--- a/cogl/cogl/cogl-sub-texture.c
+++ b/cogl/cogl/cogl-sub-texture.c
@ -31,9 +31,7 @@
 *  Neil Roberts   <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-texture-private.h"
--- a/cogl/cogl/cogl-swap-chain.c
+++ b/cogl/cogl/cogl-swap-chain.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-object.h"

--- a/cogl/cogl/cogl-texture-2d-sliced.c
+++ b/cogl/cogl/cogl-texture-2d-sliced.c
@ -33,9 +33,7 @@
 *  Robert Bragg   <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-debug.h"
 #include "cogl-private.h"
--- a/cogl/cogl/cogl-texture-2d.c
+++ b/cogl/cogl/cogl-texture-2d.c
@ -31,9 +31,7 @@
 *  Neil Roberts   <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-private.h"
 #include "cogl-util.h"
--- a/cogl/cogl/cogl-texture-3d.c
+++ b/cogl/cogl/cogl-texture-3d.c
@ -29,9 +29,7 @@
 *  Neil Roberts   <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-private.h"
 #include "cogl-util.h"
--- a/cogl/cogl/cogl-texture-rectangle.c
+++ b/cogl/cogl/cogl-texture-rectangle.c
@ -31,9 +31,7 @@
 *  Neil Roberts   <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-private.h"
 #include "cogl-util.h"
--- a/cogl/cogl/cogl-texture.c
+++ b/cogl/cogl/cogl-texture.c
@ -34,9 +34,7 @@
 *  Robert Bragg   <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-util.h"
 #include "cogl-bitmap.h"
--- a/cogl/cogl/cogl-util.c
+++ b/cogl/cogl/cogl-util.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/cogl-vector.c
+++ b/cogl/cogl/cogl-vector.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <cogl-util.h>
 #include <cogl-vector.h>
--- a/cogl/cogl/cogl-xlib-renderer.c
+++ b/cogl/cogl/cogl-xlib-renderer.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-xlib-renderer.h"
 #include "cogl-util.h"
--- a/cogl/cogl/cogl-xlib.c
+++ b/cogl/cogl/cogl-xlib.c
@ -30,9 +30,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <cogl-xlib.h>

--- a/cogl/cogl/deprecated/cogl-clutter.c
+++ b/cogl/cogl/deprecated/cogl-clutter.c
@ -29,9 +29,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <glib.h>
 #include <string.h>
--- a/cogl/cogl/deprecated/cogl-material-compat.c
+++ b/cogl/cogl/deprecated/cogl-material-compat.c
@ -29,9 +29,7 @@
 *  Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <cogl-material-compat.h>
 #include <cogl-pipeline.h>
--- a/cogl/cogl/deprecated/cogl-program.c
+++ b/cogl/cogl/deprecated/cogl-program.c
@ -28,10 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif
-

 #include "cogl-util.h"
 #include "cogl-util-gl-private.h"
--- a/cogl/cogl/deprecated/cogl-shader.c
+++ b/cogl/cogl/deprecated/cogl-shader.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-shader-private.h"
 #include "cogl-util-gl-private.h"
--- a/cogl/cogl/deprecated/cogl-vertex-buffer.c
+++ b/cogl/cogl/deprecated/cogl-vertex-buffer.c
@ -95,9 +95,7 @@
 *   "MVert", "MFace" and "MEdge" primitives.
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <stdio.h>
 #include <string.h>
--- a/cogl/cogl/driver/gl/cogl-attribute-gl.c
+++ b/cogl/cogl/driver/gl/cogl-attribute-gl.c
@ -32,9 +32,7 @@
 *  Robert Bragg   <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/driver/gl/cogl-buffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-buffer-gl.c
@ -32,9 +32,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-buffer-gl-private.h"
--- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
+++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
@ -32,9 +32,7 @@
 *  Robert Bragg   <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-util-gl-private.h"
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-context-private.h"
 #include "cogl-util-gl-private.h"
--- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
@ -32,9 +32,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
@ -31,9 +31,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
@ -31,9 +31,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/driver/gl/cogl-texture-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-gl.c
@ -27,9 +27,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <strings.h>

--- a/cogl/cogl/driver/gl/cogl-util-gl.c
+++ b/cogl/cogl/driver/gl/cogl-util-gl.c
@ -30,9 +30,7 @@
 *  Robert Bragg   <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-types.h"
 #include "cogl-context-private.h"
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
@ -33,9 +33,7 @@
 *  Robert Bragg   <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-private.h"
 #include "cogl-util.h"
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include <string.h>

--- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
@ -33,9 +33,7 @@
 *  Robert Bragg   <robert@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-private.h"
 #include "cogl-util.h"
--- a/cogl/cogl/driver/nop/cogl-attribute-nop.c
+++ b/cogl/cogl/driver/nop/cogl-attribute-nop.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-types.h"
 #include "cogl-framebuffer.h"
--- a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
+++ b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "cogl-config.h"
-#endif

 #include "cogl-clip-stack.h"
 #include "cogl-clip-stack-nop-private.h"
--- a/Show more
+++ b/Show more