Make sure #include <config.h> is the first include in the file. (bug

2006-01-14  Behdad Esfahbod  <behdad@gnome.org>

        * */*.c, */*/*.c: Make sure #include <config.h> is the first include
        in the file. (bug #158870, based on patch by Luis Menina)

65 files changed, 85 insertions, 22 deletions

diff --git a/pango/break.c b/pango/break.c
index 4a7fcdef..aafa503f 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pango-break.h"
 #include "pango-modules.h"
 #include <string.h>
diff --git a/pango/ellipsize.c b/pango/ellipsize.c
index d81b9e76..d7d4a900 100644
--- a/pango/ellipsize.c
+++ b/pango/ellipsize.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <string.h>
 
 #include "pango-glyph-item-private.h"
diff --git a/pango/fonts.c b/pango/fonts.c
index fcd84fca..07392f50 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
diff --git a/pango/glyphstring.c b/pango/glyphstring.c
index 848f5233..59df32da 100644
--- a/pango/glyphstring.c
+++ b/pango/glyphstring.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <pango/pango-glyph.h>
 #include <pango/pango-font.h>
diff --git a/pango/mapping.c b/pango/mapping.c
index db66c7ec..3bbc623e 100644
--- a/pango/mapping.c
+++ b/pango/mapping.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 /* The initial implementation here is script independent,
  * but it might actually need to be virtualized into the
  * rendering modules. Otherwise, we probably will end up
diff --git a/pango/mini-fribidi/fribidi.c b/pango/mini-fribidi/fribidi.c
index e38dbad2..04fbc50a 100644
--- a/pango/mini-fribidi/fribidi.c
+++ b/pango/mini-fribidi/fribidi.c
@@ -21,12 +21,10 @@
  * <fwpg@sharif.edu>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include "fribidi.h"
 
 /* Redefine FRIBIDI_CHUNK_SIZE in config.h to override this. */
diff --git a/pango/mini-fribidi/fribidi_char_type.c b/pango/mini-fribidi/fribidi_char_type.c
index 83d570e1..dcf2d06e 100644
--- a/pango/mini-fribidi/fribidi_char_type.c
+++ b/pango/mini-fribidi/fribidi_char_type.c
@@ -19,9 +19,7 @@
  * For licensing issues, contact <fwpg@sharif.edu>. 
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "fribidi.h"
 
 #ifdef MEM_OPTIMIZED
diff --git a/pango/mini-fribidi/fribidi_types.c b/pango/mini-fribidi/fribidi_types.c
index 80c40f25..303c0d03 100644
--- a/pango/mini-fribidi/fribidi_types.c
+++ b/pango/mini-fribidi/fribidi_types.c
@@ -19,9 +19,7 @@
  * For licensing issues, contact <fwpg@sharif.edu>. 
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "fribidi.h"
 
 #ifdef DEBUG
diff --git a/pango/modules.c b/pango/modules.c
index b208a846..1222b770 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <string.h>
 #include <limits.h>
diff --git a/pango/opentype/disasm.c b/pango/opentype/disasm.c
index 15464f4b..50a07205 100644
--- a/pango/opentype/disasm.c
+++ b/pango/opentype/disasm.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include <glib.h>		/* For G_HAVE_ISO_VARARGS */
 #include <stdarg.h>
 
diff --git a/pango/opentype/ftglue.c b/pango/opentype/ftglue.c
index bf895ec3..b3fd5b2d 100644
--- a/pango/opentype/ftglue.c
+++ b/pango/opentype/ftglue.c
@@ -8,6 +8,7 @@
  * See ftglue.h for more information.
  */
 
+#include <config.h>
 #include "ftglue.h"
 
 #if 0
diff --git a/pango/opentype/ftxgdef.c b/pango/opentype/ftxgdef.c
index 702e29b9..8701b326 100644
--- a/pango/opentype/ftxgdef.c
+++ b/pango/opentype/ftxgdef.c
@@ -15,6 +15,7 @@
  *
  ******************************************************************/
 
+#include <config.h>
 #include "ftxopen.h"
 #include "ftxopenf.h"
 
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c
index 3ebb3023..69efd070 100644
--- a/pango/opentype/ftxgpos.c
+++ b/pango/opentype/ftxgpos.c
@@ -15,6 +15,8 @@
  *
  ******************************************************************/
 
+#include <config.h>
+
 /* XXX There is *a lot* of duplicated code (cf. formats 7 and 8), but
        I don't care currently.  I believe that it would be possible to
        save about 50% of TTO code by carefully designing the structures,
diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c
index 1e8afaa2..dac69aa2 100644
--- a/pango/opentype/ftxgsub.c
+++ b/pango/opentype/ftxgsub.c
@@ -15,6 +15,8 @@
  *
  ******************************************************************/
 
+#include <config.h>
+
 /* XXX There is *a lot* of duplicated code (cf. formats 5 and 6), but
        I don't care currently.  I believe that it would be possible to
        save about 50% of TTO code by carefully designing the structures,
diff --git a/pango/opentype/ftxopen.c b/pango/opentype/ftxopen.c
index c2f04850..e086bd19 100644
--- a/pango/opentype/ftxopen.c
+++ b/pango/opentype/ftxopen.c
@@ -15,6 +15,8 @@
  *
  ******************************************************************/
 
+#include <config.h>
+
 #include "ftxopen.h"
 #include "ftxopenf.h"
 
diff --git a/pango/opentype/otlbuffer.c b/pango/opentype/otlbuffer.c
index a53fc4b7..5578f8ee 100644
--- a/pango/opentype/otlbuffer.c
+++ b/pango/opentype/otlbuffer.c
@@ -11,6 +11,9 @@
  * this file you indicate that you have read the license and
  * understand and accept it fully.
  */
+
+#include <config.h>
+
 #include <otlbuffer.h>
 
 /* To get the gcc-3.3 strict-aliasing compatible versions
diff --git a/pango/opentype/ottest.c b/pango/opentype/ottest.c
index 6bf640be..d82c9a9b 100644
--- a/pango/opentype/ottest.c
+++ b/pango/opentype/ottest.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/pango/opentype/pango-ot-buffer.c b/pango/opentype/pango-ot-buffer.c
index 8d97aea0..f649ae62 100644
--- a/pango/opentype/pango-ot-buffer.c
+++ b/pango/opentype/pango-ot-buffer.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pango-ot-private.h"
 
 #define PANGO_SCALE_26_6 (PANGO_SCALE / (1<<6))
diff --git a/pango/opentype/pango-ot-info.c b/pango/opentype/pango-ot-info.c
index 87a2a4eb..1899bd02 100644
--- a/pango/opentype/pango-ot-info.c
+++ b/pango/opentype/pango-ot-info.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pango-ot-private.h"
 #include "../pango-utils.h"
 #include "ftglue.h"
diff --git a/pango/opentype/pango-ot-ruleset.c b/pango/opentype/pango-ot-ruleset.c
index b61a28e0..838d80e4 100644
--- a/pango/opentype/pango-ot-ruleset.c
+++ b/pango/opentype/pango-ot-ruleset.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include <pango/pango-ot.h>
 #include "pango-ot-private.h"
 #include "../pango-utils.h"
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index 6c851f1e..b89e5c6c 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <string.h>
 
 #include "pango-attributes.h"
diff --git a/pango/pango-color.c b/pango/pango-color.c
index 6628225b..172a759c 100644
--- a/pango/pango-color.c
+++ b/pango/pango-color.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/pango/pango-context.c b/pango/pango-context.c
index a2f6b757..e1b408f5 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c
index 615d152e..2aedea15 100644
--- a/pango/pango-coverage.c
+++ b/pango/pango-coverage.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <string.h>
 
 #include <pango/pango-coverage.h>
diff --git a/pango/pango-engine.c b/pango/pango-engine.c
index fac90bc1..7517679d 100644
--- a/pango/pango-engine.c
+++ b/pango/pango-engine.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pango-engine.h"
 #include "pango-engine-private.h"
 #include "pango-impl-utils.h"
diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c
index 1e5ae738..8a033566 100644
--- a/pango/pango-fontmap.c
+++ b/pango/pango-fontmap.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include "pango-fontmap.h"
 #include "pango-utils.h"
 #include <stdlib.h>
diff --git a/pango/pango-fontset.c b/pango/pango-fontset.c
index a62169a2..acf8fd52 100644
--- a/pango/pango-fontset.c
+++ b/pango/pango-fontset.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 /*
  * PangoFontset
  */
diff --git a/pango/pango-glyph-item.c b/pango/pango-glyph-item.c
index 73386dbb..17ffc788 100644
--- a/pango/pango-glyph-item.c
+++ b/pango/pango-glyph-item.c
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <string.h>
 
 #include "pango-glyph-item.h"
diff --git a/pango/pango-item.c b/pango/pango-item.c
index 26b4d356..6a1481dd 100644
--- a/pango/pango-item.c
+++ b/pango/pango-item.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <pango-attributes.h>
 #include <pango-item.h>
 #include <pango-utils.h>
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 1190dd27..c3e45171 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <pango/pango-glyph.h>		/* For pango_shape() */
 #include <pango/pango-break.h>
 #include <pango/pango-item.h>
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index a8c2996b..a5128f3e 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index bc6f3257..31e14077 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdlib.h>
 
 #include "pango-renderer.h"
diff --git a/pango/pango-script.c b/pango/pango-script.c
index 5e305953..d276e0f2 100644
--- a/pango/pango-script.c
+++ b/pango/pango-script.c
@@ -53,6 +53,8 @@
  * or other dealings in this Software without prior written authorization
  * of the copyright holder.
  */
+
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/pango/pango-tabs.c b/pango/pango-tabs.c
index 50073494..aedd9bce 100644
--- a/pango/pango-tabs.c
+++ b/pango/pango-tabs.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include "pango-tabs.h"
 #include "pango-utils.h"
 #include <string.h>
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 481a9d2d..4b3adc3d 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -19,13 +19,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <errno.h>
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include "config.h"
-
 #include "pango-font.h"
 #include "pango-utils.h"
 
diff --git a/pango/pangoatsui-fontmap.c b/pango/pangoatsui-fontmap.c
index 75c5a890..a547df91 100644
--- a/pango/pangoatsui-fontmap.c
+++ b/pango/pangoatsui-fontmap.c
@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pangoatsui-private.h"
 #include "pango-utils.h"
 
diff --git a/pango/pangoatsui.c b/pango/pangoatsui.c
index d58a7ac4..50da844d 100644
--- a/pango/pangoatsui.c
+++ b/pango/pangoatsui.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pangoatsui-private.h"
 
 G_DEFINE_TYPE (PangoATSUIFont, pango_atsui_font, PANGO_TYPE_FONT);
diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c
index 02b0d88b..016e68bb 100644
--- a/pango/pangocairo-atsuifont.c
+++ b/pango/pangocairo-atsuifont.c
@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pangoatsui-private.h"
 #include "pangocairo.h"
 #include "pangocairo-private.h"
diff --git a/pango/pangocairo-atsuifontmap.c b/pango/pangocairo-atsuifontmap.c
index 80cacbbc..617f3720 100644
--- a/pango/pangocairo-atsuifontmap.c
+++ b/pango/pangocairo-atsuifontmap.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pangoatsui-private.h"
 #include "pangocairo.h"
 #include "pangocairo-private.h"
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index c6aeabe5..5913ca91 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c
index 15752e2a..188990b0 100644
--- a/pango/pangocairo-fcfontmap.c
+++ b/pango/pangocairo-fcfontmap.c
@@ -18,6 +18,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include <config.h>
 #include <cairo-ft.h>
 
 #include "pangofc-fontmap.h"
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index 008fd1d5..259b45d9 100644
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pangocairo.h"
 #include "pangocairo-private.h"
 #include "pango-utils.h"
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c
index d3232222..9e40a1e9 100644
--- a/pango/pangocairo-fontmap.c
+++ b/pango/pangocairo-fontmap.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include "pangocairo.h"
 #include "pangocairo-private.h"
diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c
index 16c8054c..48b7ab78 100644
--- a/pango/pangocairo-render.c
+++ b/pango/pangocairo-render.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pangocairo-private.h"
 
 typedef struct _PangoCairoRendererClass PangoCairoRendererClass;
diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c
index e5d8dc0d..57bb16e3 100644
--- a/pango/pangocairo-win32font.c
+++ b/pango/pangocairo-win32font.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/pango/pangocairo-win32fontmap.c b/pango/pangocairo-win32fontmap.c
index 9449fda7..5dfa9482 100644
--- a/pango/pangocairo-win32fontmap.c
+++ b/pango/pangocairo-win32fontmap.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pangowin32-private.h"
 #include "pangocairo.h"
 #include "pangocairo-private.h"
diff --git a/pango/pangofc-decoder.c b/pango/pangofc-decoder.c
index a7db45cc..77757b37 100644
--- a/pango/pangofc-decoder.c
+++ b/pango/pangofc-decoder.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include "pangofc-decoder.h"
 
 G_DEFINE_ABSTRACT_TYPE (PangoFcDecoder, pango_fc_decoder, G_TYPE_OBJECT)
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 3eda0e5f..786df91c 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "pangofc-font.h"
 #include "pangofc-fontmap.h"
 #include "pangofc-private.h"
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 36c5a1e4..f80cfe74 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -22,6 +22,7 @@
 /* Size of fontset cache */
 #define FONTSET_CACHE_SIZE 16
 
+#include <config.h>
 #include <math.h>
 
 #include "pango-context.h"
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index de294eb6..3b04da82 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib.h>
 #include <stdio.h>
diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c
index 1ad03b09..2f40bd97 100644
--- a/pango/pangoft2-render.c
+++ b/pango/pangoft2-render.c
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <math.h>
 
 #include "pangoft2-private.h"
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index a77a5a32..71abb41c 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/pango/pangowin32-fontcache.c b/pango/pangowin32-fontcache.c
index 8b07f492..fae691e3 100644
--- a/pango/pangowin32-fontcache.c
+++ b/pango/pangowin32-fontcache.c
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdio.h>
 
 #include "pangowin32-private.h"
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 343b34ad..5ea88542 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index bd1908a9..843109bb 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/pango/pangox-fontcache.c b/pango/pangox-fontcache.c
index 2a3ecd05..90257be4 100644
--- a/pango/pangox-fontcache.c
+++ b/pango/pangox-fontcache.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include "pangox.h"
 
 /* Font cache
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index a899f356..016090e5 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/pango/pangox.c b/pango/pangox.c
index 3b03d77b..881c92a1 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -34,8 +35,6 @@
 
 #define PANGO_X_UNKNOWN_FLAG 0x10000000
 
-#include "config.h"
-
 #define PANGO_TYPE_X_FONT              (pango_x_font_get_type ())
 #define PANGO_X_FONT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_X_FONT, PangoXFont))
 #define PANGO_X_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_X_FONT, PangoXFontClass))
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 7fd35bf4..83fe2a54 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdlib.h>
 
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index c7af76a1..7a15e49b 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c
index c1825b31..b58212ce 100644
--- a/pango/pangoxft-render.c
+++ b/pango/pangoxft-render.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <math.h>
 
 #include "pangoxft-render.h"
diff --git a/pango/querymodules.c b/pango/querymodules.c
index cf69471f..65a91b89 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib.h>
 #include <gmodule.h>
diff --git a/pango/reorder-items.c b/pango/reorder-items.c
index 39320da0..1044fe55 100644
--- a/pango/reorder-items.c
+++ b/pango/reorder-items.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <pango/pango-glyph.h>
 
 /*
diff --git a/pango/shape.c b/pango/shape.c
index 5ea9564f..9a8b42e5 100644
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <pango/pango-glyph.h>
 #include <pango/pango-engine-private.h>
 
diff --git a/pango/testfonts.c b/pango/testfonts.c
index 133b9181..63f2a223 100644
--- a/pango/testfonts.c
+++ b/pango/testfonts.c
@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib.h>
 #include <stdlib.h>