ttfdump: Always first include <config.h>

git-svn-id: svn://tug.org/texlive/trunk@31053 c570f23f-e606-0410-a88d-b1316a301751

37 files changed, 154 insertions, 50 deletions

diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog
index 375d863f47b..830f911f30a 100644
--- a/Build/source/texk/ttfdump/ChangeLog
+++ b/Build/source/texk/ttfdump/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Include <config.h> first in all C files and never in headers.
+
 2013-04-03  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* src/ttfdump.c [KPATHSEA]: Recover #include <kpathsea/getopt.h>
diff --git a/Build/source/texk/ttfdump/configure b/Build/source/texk/ttfdump/configure
index ea137e20895..bcc137946c1 100755
--- a/Build/source/texk/ttfdump/configure
+++ b/Build/source/texk/ttfdump/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ttfdump for TeX Live 0.5.5.
+# Generated by GNU Autoconf 2.69 for ttfdump (TeX Live) 0.5.5.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -588,10 +588,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='ttfdump for TeX Live'
-PACKAGE_TARNAME='ttfdump-for-tex-live'
+PACKAGE_NAME='ttfdump (TeX Live)'
+PACKAGE_TARNAME='ttfdump--tex-live-'
 PACKAGE_VERSION='0.5.5'
-PACKAGE_STRING='ttfdump for TeX Live 0.5.5'
+PACKAGE_STRING='ttfdump (TeX Live) 0.5.5'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ttfdump for TeX Live 0.5.5 to adapt to many kinds of systems.
+\`configure' configures ttfdump (TeX Live) 0.5.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1374,7 +1374,7 @@ Fine tuning of the installation directories:
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
   --docdir=DIR            documentation root
-                          [DATAROOTDIR/doc/ttfdump-for-tex-live]
+                          [DATAROOTDIR/doc/ttfdump--tex-live-]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1396,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ttfdump for TeX Live 0.5.5:";;
+     short | recursive ) echo "Configuration of ttfdump (TeX Live) 0.5.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1513,7 +1513,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ttfdump for TeX Live configure 0.5.5
+ttfdump (TeX Live) configure 0.5.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2306,7 +2306,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ttfdump for TeX Live $as_me 0.5.5, which was
+It was created by ttfdump (TeX Live) $as_me 0.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7795,7 +7795,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='ttfdump-for-tex-live'
+ PACKAGE='ttfdump--tex-live-'
  VERSION='0.5.5'
 
 
@@ -13547,7 +13547,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-ttfdump for TeX Live config.lt 0.5.5
+ttfdump (TeX Live) config.lt 0.5.5
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15130,7 +15130,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ttfdump for TeX Live $as_me 0.5.5, which was
+This file was extended by ttfdump (TeX Live) $as_me 0.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15196,7 +15196,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ttfdump for TeX Live config.status 0.5.5
+ttfdump (TeX Live) config.status 0.5.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/ttfdump/configure.ac b/Build/source/texk/ttfdump/configure.ac
index 9fdde75bb89..da95a40d52b 100644
--- a/Build/source/texk/ttfdump/configure.ac
+++ b/Build/source/texk/ttfdump/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([ttfdump for TeX Live], [0.5.5], [tex-k@tug.org])
+AC_INIT([ttfdump (TeX Live)], [0.5.5], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([include/ttf.h])
 AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/ttfdump/include/ttf.h b/Build/source/texk/ttfdump/include/ttf.h
index 6ea1c1746e1..3f60105bc5c 100644
--- a/Build/source/texk/ttfdump/include/ttf.h
+++ b/Build/source/texk/ttfdump/include/ttf.h
@@ -7,7 +7,6 @@
 #define __TTF_H
 
 #include <stdio.h>
-#include "config.h"
 
 /* $Id: ttf.h,v 1.3 1998/07/06 06:07:01 werner Exp $ */
 
diff --git a/Build/source/texk/ttfdump/libttf/cmap.c b/Build/source/texk/ttfdump/libttf/cmap.c
index c3ae65f3b61..1d1a68fb530 100644
--- a/Build/source/texk/ttfdump/libttf/cmap.c
+++ b/Build/source/texk/ttfdump/libttf/cmap.c
@@ -41,9 +41,12 @@
  * Problem with Character Code vs. Byte Endianess.
  * 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/cvt.c b/Build/source/texk/ttfdump/libttf/cvt.c
index 2621a938e62..6af49920bfc 100644
--- a/Build/source/texk/ttfdump/libttf/cvt.c
+++ b/Build/source/texk/ttfdump/libttf/cvt.c
@@ -1,9 +1,12 @@
 /* cvt.c -- Control Value Table
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/disasm.c b/Build/source/texk/ttfdump/libttf/disasm.c
index e716ea72a04..8b26895ebb8 100644
--- a/Build/source/texk/ttfdump/libttf/disasm.c
+++ b/Build/source/texk/ttfdump/libttf/disasm.c
@@ -1,6 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/font.c b/Build/source/texk/ttfdump/libttf/font.c
index 5bf4c633b94..4aa74e34e99 100644
--- a/Build/source/texk/ttfdump/libttf/font.c
+++ b/Build/source/texk/ttfdump/libttf/font.c
@@ -1,10 +1,13 @@
 /* font.c -- general font init and clean up codes
  * Copyright (C) 1996 Li-Da Lho, All right reserved  
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 #include "protos.h"
diff --git a/Build/source/texk/ttfdump/libttf/fpgm.c b/Build/source/texk/ttfdump/libttf/fpgm.c
index 0eb35ea1c8f..99c5c3ca7ba 100644
--- a/Build/source/texk/ttfdump/libttf/fpgm.c
+++ b/Build/source/texk/ttfdump/libttf/fpgm.c
@@ -1,9 +1,12 @@
 /* fpgm.c -- Font Program
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/gasp.c b/Build/source/texk/ttfdump/libttf/gasp.c
index 34bf5111237..9f3aadc467b 100644
--- a/Build/source/texk/ttfdump/libttf/gasp.c
+++ b/Build/source/texk/ttfdump/libttf/gasp.c
@@ -1,9 +1,12 @@
 /* gasp.c -- Grid-fitting And Scan-conversion Procedure
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/gcache.c b/Build/source/texk/ttfdump/libttf/gcache.c
index 5666d040a42..b501530a1e1 100644
--- a/Build/source/texk/ttfdump/libttf/gcache.c
+++ b/Build/source/texk/ttfdump/libttf/gcache.c
@@ -76,10 +76,13 @@
  * It is not clear right now if it is wise to add tree balancing code. 
  * The overhaed introduced by BST seems minimal for 256 elements cache.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/glyf.c b/Build/source/texk/ttfdump/libttf/glyf.c
index ca922d0e07f..9ab63cab99e 100644
--- a/Build/source/texk/ttfdump/libttf/glyf.c
+++ b/Build/source/texk/ttfdump/libttf/glyf.c
@@ -1,10 +1,13 @@
 /* glyf.c -- Load and print Glyf outline data
  * Copyright (C) 1996 Li-Da Lho, All right reserved
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/gpos.c b/Build/source/texk/ttfdump/libttf/gpos.c
index 5ece428e110..bc01e29cf24 100644
--- a/Build/source/texk/ttfdump/libttf/gpos.c
+++ b/Build/source/texk/ttfdump/libttf/gpos.c
@@ -1,8 +1,11 @@
 /* gpos.c -- Glyph Positioning Table
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/gstate.c b/Build/source/texk/ttfdump/libttf/gstate.c
index d436bae3569..d8b7adcca79 100644
--- a/Build/source/texk/ttfdump/libttf/gstate.c
+++ b/Build/source/texk/ttfdump/libttf/gstate.c
@@ -1,8 +1,11 @@
 /* gstate.c -- manage graphics state
  * Copyright (C) 1996 Li-Da Lho, All right reserved.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/gsub.c b/Build/source/texk/ttfdump/libttf/gsub.c
index a0c8549bfc2..b0ca3ee5b54 100644
--- a/Build/source/texk/ttfdump/libttf/gsub.c
+++ b/Build/source/texk/ttfdump/libttf/gsub.c
@@ -1,8 +1,11 @@
 /* gsub.c -- Glyph Substitution Table
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/hdmx.c b/Build/source/texk/ttfdump/libttf/hdmx.c
index f4d7b0ef3a2..d91b98eb1b3 100644
--- a/Build/source/texk/ttfdump/libttf/hdmx.c
+++ b/Build/source/texk/ttfdump/libttf/hdmx.c
@@ -1,9 +1,12 @@
 /* hdmx.c -- Horizontal Device Metrics
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/head.c b/Build/source/texk/ttfdump/libttf/head.c
index eec89cc9b2c..bc07fc7baf1 100644
--- a/Build/source/texk/ttfdump/libttf/head.c
+++ b/Build/source/texk/ttfdump/libttf/head.c
@@ -1,9 +1,12 @@
 /* head.c -- Header Table
  * Copyright (C) 1996 Li-Da Lho, All right reserved
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/hhea.c b/Build/source/texk/ttfdump/libttf/hhea.c
index 3ec85c827d4..6d8d9caecf1 100644
--- a/Build/source/texk/ttfdump/libttf/hhea.c
+++ b/Build/source/texk/ttfdump/libttf/hhea.c
@@ -1,9 +1,12 @@
 /* hhea.c -- Horizontal header
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/hmtx.c b/Build/source/texk/ttfdump/libttf/hmtx.c
index 1dc40d06d8d..dfcd60670d7 100644
--- a/Build/source/texk/ttfdump/libttf/hmtx.c
+++ b/Build/source/texk/ttfdump/libttf/hmtx.c
@@ -1,9 +1,12 @@
 /* hmtx.c -- Horizontal Metrics Table
  * Copyright (C) 1997 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/kern.c b/Build/source/texk/ttfdump/libttf/kern.c
index 54104a0aba4..5ae636d9d44 100644
--- a/Build/source/texk/ttfdump/libttf/kern.c
+++ b/Build/source/texk/ttfdump/libttf/kern.c
@@ -1,9 +1,12 @@
 /* kern.c -- Kerning Table
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/loca.c b/Build/source/texk/ttfdump/libttf/loca.c
index 5342fbf20c3..0a170006389 100644
--- a/Build/source/texk/ttfdump/libttf/loca.c
+++ b/Build/source/texk/ttfdump/libttf/loca.c
@@ -1,6 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/ltsh.c b/Build/source/texk/ttfdump/libttf/ltsh.c
index a433c32a06a..45c6f86e559 100644
--- a/Build/source/texk/ttfdump/libttf/ltsh.c
+++ b/Build/source/texk/ttfdump/libttf/ltsh.c
@@ -1,9 +1,12 @@
 /* ltsh.c -- Linear Threshold table
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/maxp.c b/Build/source/texk/ttfdump/libttf/maxp.c
index 1b36fb2690b..1eadc12108a 100644
--- a/Build/source/texk/ttfdump/libttf/maxp.c
+++ b/Build/source/texk/ttfdump/libttf/maxp.c
@@ -1,6 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/name.c b/Build/source/texk/ttfdump/libttf/name.c
index 2ccc971c688..7f708b55c51 100644
--- a/Build/source/texk/ttfdump/libttf/name.c
+++ b/Build/source/texk/ttfdump/libttf/name.c
@@ -1,8 +1,11 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/os2.c b/Build/source/texk/ttfdump/libttf/os2.c
index e78e75811da..66701e3dc61 100644
--- a/Build/source/texk/ttfdump/libttf/os2.c
+++ b/Build/source/texk/ttfdump/libttf/os2.c
@@ -1,7 +1,10 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/otfcommon.c b/Build/source/texk/ttfdump/libttf/otfcommon.c
index 4642e73196a..55cb46c8ff7 100644
--- a/Build/source/texk/ttfdump/libttf/otfcommon.c
+++ b/Build/source/texk/ttfdump/libttf/otfcommon.c
@@ -1,8 +1,11 @@
 /* otfcommon.c -- OpenType Common Table Formats
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/pclt.c b/Build/source/texk/ttfdump/libttf/pclt.c
index b2108d43a45..02e562afc3c 100644
--- a/Build/source/texk/ttfdump/libttf/pclt.c
+++ b/Build/source/texk/ttfdump/libttf/pclt.c
@@ -1,9 +1,12 @@
 /* pclt.c -- PCL5 Table
  * Copyright (C) 1997 Li-Da Lho, All right reserved  
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/post.c b/Build/source/texk/ttfdump/libttf/post.c
index e1a54f5ed31..c28e6593b72 100644
--- a/Build/source/texk/ttfdump/libttf/post.c
+++ b/Build/source/texk/ttfdump/libttf/post.c
@@ -1,6 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/prep.c b/Build/source/texk/ttfdump/libttf/prep.c
index 03a123ea044..6408e9ef881 100644
--- a/Build/source/texk/ttfdump/libttf/prep.c
+++ b/Build/source/texk/ttfdump/libttf/prep.c
@@ -1,9 +1,12 @@
 /* prep.c -- Control Value Program
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/tabledir.c b/Build/source/texk/ttfdump/libttf/tabledir.c
index 390d43aa414..799736bce5e 100644
--- a/Build/source/texk/ttfdump/libttf/tabledir.c
+++ b/Build/source/texk/ttfdump/libttf/tabledir.c
@@ -2,10 +2,13 @@
  * Load the tables of the Table Directory of a True Type font file
  * Copyright (C) 1996 Li-Da Lho, All right reserved
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/ttc.c b/Build/source/texk/ttfdump/libttf/ttc.c
index afd66295f3a..e4625e540bc 100644
--- a/Build/source/texk/ttfdump/libttf/ttc.c
+++ b/Build/source/texk/ttfdump/libttf/ttc.c
@@ -1,11 +1,14 @@
 /* ttc.c -- True Type Collection Support 
  * Copyright (C) 1997 Li-Da Lho, All right reserved
  */ 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 #include "ttc.h"
diff --git a/Build/source/texk/ttfdump/libttf/ttfread.c b/Build/source/texk/ttfdump/libttf/ttfread.c
index a707113fffc..5947484e00b 100644
--- a/Build/source/texk/ttfdump/libttf/ttfread.c
+++ b/Build/source/texk/ttfdump/libttf/ttfread.c
@@ -3,6 +3,10 @@
  * swap byte order carefully for MSBFirst
  * presume that int is 32 bits
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 
 #if defined(__GNUC__) && defined(_IBMR2)
diff --git a/Build/source/texk/ttfdump/libttf/ttfutil.c b/Build/source/texk/ttfdump/libttf/ttfutil.c
index 30b1f6c5353..4c436f993c9 100644
--- a/Build/source/texk/ttfdump/libttf/ttfutil.c
+++ b/Build/source/texk/ttfdump/libttf/ttfutil.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/Build/source/texk/ttfdump/libttf/vdmx.c b/Build/source/texk/ttfdump/libttf/vdmx.c
index 2cfc0ef34e7..ed9139d7c11 100644
--- a/Build/source/texk/ttfdump/libttf/vdmx.c
+++ b/Build/source/texk/ttfdump/libttf/vdmx.c
@@ -1,9 +1,12 @@
 /* vdmx.c -- Vertical Device Metrics
  * Copyright (C) 1996 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/vhea.c b/Build/source/texk/ttfdump/libttf/vhea.c
index 374c2c1bef7..3a74c36adb0 100644
--- a/Build/source/texk/ttfdump/libttf/vhea.c
+++ b/Build/source/texk/ttfdump/libttf/vhea.c
@@ -1,9 +1,12 @@
 /* vhea.c -- Vertical Header Table
  * Copyright (C) 1997 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/libttf/vmtx.c b/Build/source/texk/ttfdump/libttf/vmtx.c
index d1dae4082a5..0cdc9edd147 100644
--- a/Build/source/texk/ttfdump/libttf/vmtx.c
+++ b/Build/source/texk/ttfdump/libttf/vmtx.c
@@ -1,9 +1,12 @@
 /* vmtx.c -- Vertical Metrics Table
  * Copyright (C) 1997 Li-Da Lho, All right reserved 
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
 #include "ttf.h"
 #include "ttfutil.h"
 
diff --git a/Build/source/texk/ttfdump/src/ttfdump.c b/Build/source/texk/ttfdump/src/ttfdump.c
index dc420b14c94..e374db745cb 100644
--- a/Build/source/texk/ttfdump/src/ttfdump.c
+++ b/Build/source/texk/ttfdump/src/ttfdump.c
@@ -1,6 +1,6 @@
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #if defined(KPATHSEA)
 /* including <kpathsea/kpathsea.h> would yield conflicting typedefs */
@@ -20,7 +20,10 @@
 #include <unistd.h>
 #endif
 
-#include "config.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "ttf.h"
 #include "ttfutil.h"
 #include "ttc.h"