Include the Autoconf generated headers always first

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

28 files changed, 203 insertions, 152 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index a86d5bba4f5..60249593b82 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -10703,7 +10703,7 @@ uptex.ch: tie$(EXEEXT) uptex.web $(uptex_ch_srcs)
 	$(tie) -c uptex.ch uptex.web $(uptex_ch_srcs)
 upbibtex.c upbibtex.h: upbibtex-web2c
 	@$(web2c) upbibtex
-upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines
+upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines web2c/cvtbib.sed
 	@$(web2c) upbibtex
 upbibtex.p: tangle$(EXEEXT) upbibtex.web uptexdir/upbibtex.ch
 	$(up_tangle) upbibtex upbibtex
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 5e028f44dad..902311fd377 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* alephbis.c: Include "alephd.h" before system headers.
+
 2013-04-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* alephextra.h, eover.ch: 0.0-rc4 ---> 0.1 for TL 2013.
diff --git a/Build/source/texk/web2c/alephdir/alephbis.c b/Build/source/texk/web2c/alephdir/alephbis.c
index d26f5d262e1..8366cf5c97b 100644
--- a/Build/source/texk/web2c/alephdir/alephbis.c
+++ b/Build/source/texk/web2c/alephdir/alephbis.c
@@ -23,11 +23,11 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define EXTERN extern
+#include "alephd.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include "alephd.h"
 #undef read
 
 #if 1
diff --git a/Build/source/texk/web2c/ctiedir/ChangeLog b/Build/source/texk/web2c/ctiedir/ChangeLog
index ec8f665963c..4c5001aafe5 100644
--- a/Build/source/texk/web2c/ctiedir/ChangeLog
+++ b/Build/source/texk/web2c/ctiedir/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ctie-k.ch: Include <stdio.h> after <kpathsea/kpathsea.h>.
+	Drop unused string variable 'file_open_mode'.
+
 2012-05-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* ctie-k.ch: Use binary mode for output files.
diff --git a/Build/source/texk/web2c/ctiedir/ctie-k.ch b/Build/source/texk/web2c/ctiedir/ctie-k.ch
index eb4cb2de0ca..b527aa373ea 100644
--- a/Build/source/texk/web2c/ctiedir/ctie-k.ch
+++ b/Build/source/texk/web2c/ctiedir/ctie-k.ch
@@ -111,6 +111,13 @@ extern char *strerror();
 the \.{kpathsea} headers do the right thing.
 @z
 
+@x l.173 The kpathsea include files must be first.
+#include <stdio.h>
+@y
+#include <kpathsea/kpathsea.h>
+#include <stdio.h>
+@z
+
 @x l.176 And this.
 @ And we need dynamic memory allocation.
 This should cause no trouble in any \CEE/ program.
@@ -479,14 +486,5 @@ module number.
 @^system dependencies@>
 @y
 @* System-dependent changes.
-We modify the program to use the \.{kpathsea} library.
-We need to include the headers first.
-
-@<Global \&{\#include}s@>=
-#include <kpathsea/kpathsea.h>
-
-@ A global variable for the file read mode.
-
-@<Global variables@>=
-string file_open_mode;
+There are no additional changes.
 @z
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 6330c2ab590..6381461e929 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -15,10 +15,10 @@
 #line 471 "cwebdir/common.w"
 
 #line 175 "cwebdir/comm-w2c.ch"
-#include <stdlib.h>  
 #define CWEB
 #include "cpascal.h"
 #include <kpathsea/kpathsea.h>  
+#include <stdlib.h>  
 #include "help.h"
 
 /*:22*/
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index 5ab5421e329..7c6055be850 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* comm-w2c.ch, ctang-w2c.ch, cweav-w2c.ch: Include system
+	headers after <kpathsea/kpathsea.h>.
+
 2012-09-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* common.w, ctangle.w, cweave.w: copy the original ones in
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index e068951b946..a6e80e3ae38 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -172,10 +172,10 @@ Section 22.
 @x l.472
 #include <stdlib.h> /* declaration of |getenv| and |exit| */
 @y
-#include <stdlib.h> /* declaration of |getenv| and |exit| */
 #define CWEB
 #include "cpascal.h"
 #include <kpathsea/kpathsea.h> /* include every \Kpathsea/ header */
+#include <stdlib.h> /* declaration of |getenv| and |exit| */
 #include "help.h"
 
 @ The \.{ctangle} and \.{cweave} programs from the original \.{CWEB}
diff --git a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
index c519ce2d676..e1f507a5206 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
@@ -118,8 +118,8 @@ Section 6.
 @x common.h l.36
 #include <stdio.h>
 @y
-#include <stdio.h>
 #include <kpathsea/kpathsea.h>
+#include <stdio.h>
 @z
 
 Section 9.
diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
index 462d15ee298..4c3249eea90 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
@@ -144,8 +144,8 @@ Section 6.
 @x common.h l.36
 #include <stdio.h>
 @y
-#include <stdio.h>
 #include <kpathsea/kpathsea.h>
+#include <stdio.h>
 @z
 
 Section 9.
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 3e7d32dcf31..f701505055a 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -2,6 +2,8 @@
 
 	* pngout.w: Replace index() => strchr().
 
+	* mp.w: Include <stdio.h> after <w2c/config.h>.
+
 2013-06-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* lmplib.c: Replace '<../lua52/lua.h>' => '<lua.h>'.
diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index c35f547a1a2..11b607fc2bb 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -140,9 +140,9 @@ typedef struct MP_instance {
 #endif
 
 @ @c
-#include <stdio.h>
 #define KPATHSEA_DEBUG_H 1
 #include <w2c/config.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/Build/source/texk/web2c/otps/ChangeLog b/Build/source/texk/web2c/otps/ChangeLog
index eec93db3da8..a91a459943c 100644
--- a/Build/source/texk/web2c/otps/ChangeLog
+++ b/Build/source/texk/web2c/otps/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* otp-lexer.l: First #include <w2c/config.h> via "routines.h".
+
 2012-11-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/web2c/otps/otp-lexer.c b/Build/source/texk/web2c/otps/otp-lexer.c
index 89bbac4a440..2e2f916ca61 100644
--- a/Build/source/texk/web2c/otps/otp-lexer.c
+++ b/Build/source/texk/web2c/otps/otp-lexer.c
@@ -1,5 +1,11 @@
+#line 29 "otp-lexer.l"
+#include "routines.h"
+#include "yystype.h"
+#include "otp-parser.h"
+
+
 
-#line 3 "otp-lexer.c"
+#line 9 "otp-lexer.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -599,15 +605,13 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 */
-#line 29 "otp-lexer.l"
-#include "routines.h"
-#include "yystype.h"
-#include "otp-parser.h"
+
+#line 35 "otp-lexer.l"
 #define YY_NO_UNPUT
 #define OTP_MAXCODE 0xFFFF
 int line_number = 1;
 extern YYSTYPE yylval;
-#line 611 "otp-lexer.c"
+#line 615 "otp-lexer.c"
 
 #define INITIAL 0
 
@@ -789,9 +793,9 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 45 "otp-lexer.l"
+#line 48 "otp-lexer.l"
 
-#line 795 "otp-lexer.c"
+#line 799 "otp-lexer.c"
 
 	if ( !(yy_init) )
 		{
@@ -895,24 +899,24 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 46 "otp-lexer.l"
+#line 49 "otp-lexer.l"
 {}
 	YY_BREAK
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 47 "otp-lexer.l"
+#line 50 "otp-lexer.l"
 { line_number++;}
 	YY_BREAK
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 48 "otp-lexer.l"
+#line 51 "otp-lexer.l"
 { line_number++;}
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 49 "otp-lexer.l"
+#line 52 "otp-lexer.l"
 {
 		int i, j;
 		yylval.yint=0;
@@ -936,7 +940,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 69 "otp-lexer.l"
+#line 72 "otp-lexer.l"
 {
 		int i, j;
 		yylval.yint=0;
@@ -954,7 +958,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 83 "otp-lexer.l"
+#line 86 "otp-lexer.l"
 {
 		int i, j;
 		yylval.yint=0;
@@ -972,7 +976,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 97 "otp-lexer.l"
+#line 100 "otp-lexer.l"
 {
 		yylval.yint=yytext[1]; 
 		return(NUMBER);
@@ -980,13 +984,13 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 101 "otp-lexer.l"
+#line 104 "otp-lexer.l"
 { yylval.ystring=xstrdup(yytext); return(ID); }
 	YY_BREAK
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 102 "otp-lexer.l"
+#line 105 "otp-lexer.l"
 {
 		int i, j, last;
 		char *newtext;
@@ -1006,85 +1010,85 @@ YY_RULE_SETUP
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 118 "otp-lexer.l"
+#line 121 "otp-lexer.l"
 return(RIGHTARROW);
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 119 "otp-lexer.l"
+#line 122 "otp-lexer.l"
 return(LEFTARROW);
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 120 "otp-lexer.l"
+#line 123 "otp-lexer.l"
 return(INPUT);
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 121 "otp-lexer.l"
+#line 124 "otp-lexer.l"
 return(OUTPUT);
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 122 "otp-lexer.l"
+#line 125 "otp-lexer.l"
 return(ALIASES);
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 123 "otp-lexer.l"
+#line 126 "otp-lexer.l"
 return(STATES);
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 124 "otp-lexer.l"
+#line 127 "otp-lexer.l"
 return(TABLES);
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 125 "otp-lexer.l"
+#line 128 "otp-lexer.l"
 return(EXPRESSIONS);
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 126 "otp-lexer.l"
+#line 129 "otp-lexer.l"
 return(PUSH);
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 127 "otp-lexer.l"
+#line 130 "otp-lexer.l"
 return(POP);
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 128 "otp-lexer.l"
+#line 131 "otp-lexer.l"
 return(DIV);
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 129 "otp-lexer.l"
+#line 132 "otp-lexer.l"
 return(MOD);
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 130 "otp-lexer.l"
+#line 133 "otp-lexer.l"
 return(BEG);
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 131 "otp-lexer.l"
+#line 134 "otp-lexer.l"
 return(END);
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 132 "otp-lexer.l"
+#line 135 "otp-lexer.l"
 return(yytext[0]);
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 134 "otp-lexer.l"
+#line 137 "otp-lexer.l"
 ECHO;
 	YY_BREAK
-#line 1088 "otp-lexer.c"
+#line 1092 "otp-lexer.c"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
@@ -2064,7 +2068,8 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 134 "otp-lexer.l"
+#line 137 "otp-lexer.l"
+
 
 
 
diff --git a/Build/source/texk/web2c/otps/otp-lexer.l b/Build/source/texk/web2c/otps/otp-lexer.l
index 8f6048d321c..6f4905c5f95 100644
--- a/Build/source/texk/web2c/otps/otp-lexer.l
+++ b/Build/source/texk/web2c/otps/otp-lexer.l
@@ -25,10 +25,13 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
 
 %option never-interactive
 
-%{
+%top{
 #include "routines.h"
 #include "yystype.h"
 #include "otp-parser.h"
+}
+
+%{
 #define YY_NO_UNPUT
 #define OTP_MAXCODE 0xFFFF
 int line_number = 1;
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 833969d1d65..43f0722c75b 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,6 +1,7 @@
 2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* pdftosrc.cc: First #include <w2c/config.h> (for LFS).
+	* mapfile.c: First #include <w2c/config.h> via "ptexlib.h".
+	* pdftosrc.cc: First #include <w2c/config.h>.
 
 2013-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c
index 1cc630ed695..d02c11cd753 100644
--- a/Build/source/texk/web2c/pdftexdir/mapfile.c
+++ b/Build/source/texk/web2c/pdftexdir/mapfile.c
@@ -1,5 +1,5 @@
 /* mapfile.c: handling of map files/lines
-Copyright 1996-2012 Han The Thanh, <thanh@pdftex.org>
+Copyright 1996-2013 Han The Thanh, <thanh@pdftex.org>
 
 This file is part of pdfTeX.
 
@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <math.h>
 #include "ptexlib.h"
 #include <kpathsea/c-auto.h>
 #include <kpathsea/c-memstr.h>
+#include <math.h>
 #include <string.h>
 
 #define FM_BUF_SIZE     1024
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index b08858d3921..faeb71a0ad1 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/uptex.am: upbibtex-web2c also depends on web2c/cvtbib.sed.
+
 2013-06-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kanji.h: Avoid redefinition of KANJI.
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index aca0991bbc8..4c99f54aa7d 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -102,7 +102,7 @@ upbibtex_LDADD = $(uptex_ldadd)
 upbibtex_DEPENDENCIES = $(uptex_dependencies)
 upbibtex.c upbibtex.h: upbibtex-web2c
 	@$(web2c) upbibtex
-upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines
+upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines web2c/cvtbib.sed
 	@$(web2c) upbibtex
 upbibtex.p: tangle$(EXEEXT) upbibtex.web uptexdir/upbibtex.ch
 	$(up_tangle) upbibtex upbibtex
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 1a656177e85..c57ccf7bab7 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* cvtbib.sed: Generate bibtex.c to first #include "cpascal.h".
+	* makecpool.c: Generate tex-pool.c to first #include "texd.h".
+	* web2c-lexer.l: First #include <w2c/config.h> via "web2c.h".
+
 2013-06-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* main.c: Drop variable 'error' (set but not used).
diff --git a/Build/source/texk/web2c/web2c/cvtbib.sed b/Build/source/texk/web2c/web2c/cvtbib.sed
index 037a158e835..0878ad8abc1 100644
--- a/Build/source/texk/web2c/web2c/cvtbib.sed
+++ b/Build/source/texk/web2c/web2c/cvtbib.sed
@@ -1,4 +1,7 @@
-1i\
+/#include "cpascal.h"/a\
+\#include \<setjmp.h\> \
+jmp_buf jmp9998, jmp32; int lab31=0;
+/#include "u*ptexdir\/kanji.h"/a\
 \#include \<setjmp.h\> \
 jmp_buf jmp9998, jmp32; int lab31=0;
 s/goto lab31 ; */{lab31=1; return;}/
diff --git a/Build/source/texk/web2c/web2c/makecpool.c b/Build/source/texk/web2c/web2c/makecpool.c
index 74d936c33f7..bf401c3ee72 100644
--- a/Build/source/texk/web2c/web2c/makecpool.c
+++ b/Build/source/texk/web2c/web2c/makecpool.c
@@ -46,10 +46,10 @@ int main(int argc, char *argv[])
            " *   %s %s\n"
            " */\n"
            "\n"
-           "#include <stdio.h>\n"
-           "#include <string.h>\n"
            "#define EXTERN extern\n"
            "#include \"%sd.h\"\n"
+           "#include <stdio.h>\n"
+           "#include <string.h>\n"
            "\n"
            "static const char *poolfilearr[] = {\n", argv[0], argv[1], argv[1]);
     while (fgets(data, 1024, fh)) {
diff --git a/Build/source/texk/web2c/web2c/web2c-lexer.c b/Build/source/texk/web2c/web2c/web2c-lexer.c
index 39ea325d90f..00d1dff0bc0 100644
--- a/Build/source/texk/web2c/web2c/web2c-lexer.c
+++ b/Build/source/texk/web2c/web2c/web2c-lexer.c
@@ -1,5 +1,12 @@
+#line 4 "web2c-lexer.l"
+/* web2c-lexer.l -- lexical analysis for Tangle output.  Public domain. */
+
+#include "web2c.h"
+#include "web2c-parser.h"
 
-#line 3 "web2c-lexer.c"
+
+
+#line 10 "web2c-lexer.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -720,12 +727,8 @@ static int yy_prev_more_offset = 0;
 char yytext[YYLMAX];
 char *yytext_ptr;
 #line 1 "web2c-lexer.l"
-#line 4 "web2c-lexer.l"
-/* web2c-lexer.l -- lexical analysis for Tangle output.  Public domain. */
-
-#include "web2c.h"
-#include "web2c-parser.h"
 
+#line 11 "web2c-lexer.l"
 /* Hack to make it possible to compile the generated code with C++
    Required if you use flex. */
 #ifdef __cplusplus
@@ -752,7 +755,7 @@ yywrap (void)
   return 1;
 }
 #define YY_SKIP_YYWRAP /* not that it matters */
-#line 756 "web2c-lexer.c"
+#line 759 "web2c-lexer.c"
 
 #define INITIAL 0
 
@@ -934,9 +937,9 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 51 "web2c-lexer.l"
+#line 53 "web2c-lexer.l"
 
-#line 940 "web2c-lexer.c"
+#line 943 "web2c-lexer.c"
 
 	if ( !(yy_init) )
 		{
@@ -1041,17 +1044,17 @@ do_action:	/* This label is used only to access EOF actions. */
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 52 "web2c-lexer.l"
+#line 54 "web2c-lexer.l"
 ;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 53 "web2c-lexer.l"
+#line 55 "web2c-lexer.l"
 { while (webinput() != '}'); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 55 "web2c-lexer.l"
+#line 57 "web2c-lexer.l"
 {
 		    register int c;
 		    putc('#', out);
@@ -1062,7 +1065,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 63 "web2c-lexer.l"
+#line 65 "web2c-lexer.l"
 {register int c;
 		 register char *cp=conditional;
 		 new_line();
@@ -1078,7 +1081,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 76 "web2c-lexer.l"
+#line 78 "web2c-lexer.l"
 {register int c;
 		 new_line();
 		 fputs("#endif /* ", out);
@@ -1093,7 +1096,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 88 "web2c-lexer.l"
+#line 90 "web2c-lexer.l"
 {register int c;
 		 register char *cp=conditional;
 		 new_line();
@@ -1109,7 +1112,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 101 "web2c-lexer.l"
+#line 103 "web2c-lexer.l"
 {register int c;
 		 new_line();
 		 fputs("#endif /* not ", out);
@@ -1125,205 +1128,205 @@ YY_RULE_SETUP
 case 8:
 /* rule 8 can match eol */
 YY_RULE_SETUP
-#line 114 "web2c-lexer.l"
+#line 116 "web2c-lexer.l"
 ;
 	YY_BREAK
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 116 "web2c-lexer.l"
+#line 118 "web2c-lexer.l"
 ;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 118 "web2c-lexer.l"
+#line 120 "web2c-lexer.l"
 return last_tok=define_tok;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 119 "web2c-lexer.l"
+#line 121 "web2c-lexer.l"
 return last_tok=field_tok;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 120 "web2c-lexer.l"
+#line 122 "web2c-lexer.l"
 return last_tok=and_tok;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 121 "web2c-lexer.l"
+#line 123 "web2c-lexer.l"
 return last_tok=array_tok;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 122 "web2c-lexer.l"
+#line 124 "web2c-lexer.l"
 return last_tok=begin_tok;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 123 "web2c-lexer.l"
+#line 125 "web2c-lexer.l"
 return last_tok=case_tok;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 124 "web2c-lexer.l"
+#line 126 "web2c-lexer.l"
 return last_tok=const_tok;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 125 "web2c-lexer.l"
+#line 127 "web2c-lexer.l"
 return last_tok=div_tok;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 126 "web2c-lexer.l"
+#line 128 "web2c-lexer.l"
 return last_tok=break_tok;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 127 "web2c-lexer.l"
+#line 129 "web2c-lexer.l"
 return last_tok=do_tok;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 128 "web2c-lexer.l"
+#line 130 "web2c-lexer.l"
 return last_tok=downto_tok;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 129 "web2c-lexer.l"
+#line 131 "web2c-lexer.l"
 return last_tok=else_tok;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 130 "web2c-lexer.l"
+#line 132 "web2c-lexer.l"
 return last_tok=end_tok;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 131 "web2c-lexer.l"
+#line 133 "web2c-lexer.l"
 return last_tok=file_tok;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 132 "web2c-lexer.l"
+#line 134 "web2c-lexer.l"
 return last_tok=for_tok;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 133 "web2c-lexer.l"
+#line 135 "web2c-lexer.l"
 return last_tok=function_tok;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 134 "web2c-lexer.l"
+#line 136 "web2c-lexer.l"
 return last_tok=goto_tok;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 135 "web2c-lexer.l"
+#line 137 "web2c-lexer.l"
 return last_tok=if_tok;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 136 "web2c-lexer.l"
+#line 138 "web2c-lexer.l"
 return last_tok=label_tok;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 137 "web2c-lexer.l"
+#line 139 "web2c-lexer.l"
 return last_tok=mod_tok;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 138 "web2c-lexer.l"
+#line 140 "web2c-lexer.l"
 return last_tok=noreturn_tok;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 139 "web2c-lexer.l"
+#line 141 "web2c-lexer.l"
 return last_tok=not_tok;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 140 "web2c-lexer.l"
+#line 142 "web2c-lexer.l"
 return last_tok=of_tok;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 141 "web2c-lexer.l"
+#line 143 "web2c-lexer.l"
 return last_tok=or_tok;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 142 "web2c-lexer.l"
+#line 144 "web2c-lexer.l"
 return last_tok=procedure_tok;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 143 "web2c-lexer.l"
+#line 145 "web2c-lexer.l"
 return last_tok=program_tok;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 144 "web2c-lexer.l"
+#line 146 "web2c-lexer.l"
 return last_tok=record_tok;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 145 "web2c-lexer.l"
+#line 147 "web2c-lexer.l"
 return last_tok=repeat_tok;
 	YY_BREAK
 case 38:
 /* rule 38 can match eol */
 YY_RULE_SETUP
-#line 146 "web2c-lexer.l"
+#line 148 "web2c-lexer.l"
 return last_tok=hhb0_tok;
 	YY_BREAK
 case 39:
 /* rule 39 can match eol */
 YY_RULE_SETUP
-#line 147 "web2c-lexer.l"
+#line 149 "web2c-lexer.l"
 return last_tok=hhb1_tok;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 148 "web2c-lexer.l"
+#line 150 "web2c-lexer.l"
 return last_tok=then_tok;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 149 "web2c-lexer.l"
+#line 151 "web2c-lexer.l"
 return last_tok=to_tok;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 150 "web2c-lexer.l"
+#line 152 "web2c-lexer.l"
 return last_tok=type_tok;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 151 "web2c-lexer.l"
+#line 153 "web2c-lexer.l"
 return last_tok=until_tok;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 152 "web2c-lexer.l"
+#line 154 "web2c-lexer.l"
 return last_tok=var_tok;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 153 "web2c-lexer.l"
+#line 155 "web2c-lexer.l"
 return last_tok=while_tok;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 154 "web2c-lexer.l"
+#line 156 "web2c-lexer.l"
 return last_tok=others_tok;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 156 "web2c-lexer.l"
+#line 158 "web2c-lexer.l"
 {
 		  sprintf (temp, "%s%s", negbuf, yytext);
 		  negbuf[0] = '\0';
@@ -1332,7 +1335,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 162 "web2c-lexer.l"
+#line 164 "web2c-lexer.l"
 {
 		  sprintf (temp, "%s%s", negbuf, yytext);
 		  negbuf[0] = '\0';
@@ -1342,18 +1345,18 @@ YY_RULE_SETUP
 case 49:
 /* rule 49 can match eol */
 YY_RULE_SETUP
-#line 168 "web2c-lexer.l"
+#line 170 "web2c-lexer.l"
 return last_tok=single_char_tok;
 	YY_BREAK
 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
-#line 170 "web2c-lexer.l"
+#line 172 "web2c-lexer.l"
 return last_tok=string_literal_tok;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 172 "web2c-lexer.l"
+#line 174 "web2c-lexer.l"
 { if ((last_tok>=undef_id_tok &&
 		      last_tok<=field_id_tok) ||
 		      last_tok==i_num_tok ||
@@ -1365,7 +1368,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 181 "web2c-lexer.l"
+#line 183 "web2c-lexer.l"
 { if ((last_tok>=undef_id_tok &&
 		      last_tok<=field_id_tok) ||
 		      last_tok==i_num_tok ||
@@ -1386,102 +1389,102 @@ YY_RULE_SETUP
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 199 "web2c-lexer.l"
+#line 201 "web2c-lexer.l"
 return last_tok='*';
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 200 "web2c-lexer.l"
+#line 202 "web2c-lexer.l"
 return last_tok='/';
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 201 "web2c-lexer.l"
+#line 203 "web2c-lexer.l"
 return last_tok='=';
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 202 "web2c-lexer.l"
+#line 204 "web2c-lexer.l"
 return last_tok=not_eq_tok;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 203 "web2c-lexer.l"
+#line 205 "web2c-lexer.l"
 return last_tok='<';
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 204 "web2c-lexer.l"
+#line 206 "web2c-lexer.l"
 return last_tok='>';
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 205 "web2c-lexer.l"
+#line 207 "web2c-lexer.l"
 return last_tok=less_eq_tok;
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 206 "web2c-lexer.l"
+#line 208 "web2c-lexer.l"
 return last_tok=great_eq_tok;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 207 "web2c-lexer.l"
+#line 209 "web2c-lexer.l"
 return last_tok='(';
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 208 "web2c-lexer.l"
+#line 210 "web2c-lexer.l"
 return last_tok=')';
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 209 "web2c-lexer.l"
+#line 211 "web2c-lexer.l"
 return last_tok='[';
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 210 "web2c-lexer.l"
+#line 212 "web2c-lexer.l"
 return last_tok=']';
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 211 "web2c-lexer.l"
+#line 213 "web2c-lexer.l"
 return last_tok=assign_tok;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 212 "web2c-lexer.l"
+#line 214 "web2c-lexer.l"
 return last_tok=two_dots_tok;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 213 "web2c-lexer.l"
+#line 215 "web2c-lexer.l"
 return last_tok='.';
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 214 "web2c-lexer.l"
+#line 216 "web2c-lexer.l"
 return last_tok=',';
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 215 "web2c-lexer.l"
+#line 217 "web2c-lexer.l"
 return last_tok=';';
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 216 "web2c-lexer.l"
+#line 218 "web2c-lexer.l"
 return last_tok=':';
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 217 "web2c-lexer.l"
+#line 219 "web2c-lexer.l"
 return last_tok='^';
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 219 "web2c-lexer.l"
+#line 221 "web2c-lexer.l"
 { strcpy (last_id, yytext);
 		  l_s = search_table (last_id);
 		  return
@@ -1490,16 +1493,16 @@ YY_RULE_SETUP
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 226 "web2c-lexer.l"
+#line 228 "web2c-lexer.l"
 { /* Any bizarre token will do.  */
 		  return last_tok = two_dots_tok; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 228 "web2c-lexer.l"
+#line 230 "web2c-lexer.l"
 ECHO;
 	YY_BREAK
-#line 1503 "web2c-lexer.c"
+#line 1506 "web2c-lexer.c"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
@@ -2479,7 +2482,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 228 "web2c-lexer.l"
+#line 230 "web2c-lexer.l"
 
 
 /* Some helper routines.  Defining these here means we don't have references
@@ -2578,3 +2581,4 @@ yyerror (const_string s)
   /* Avoid silly warnings.  */
   return 0;
 }
+
diff --git a/Build/source/texk/web2c/web2c/web2c-lexer.l b/Build/source/texk/web2c/web2c/web2c-lexer.l
index 585f31501c1..4568b6e41c2 100644
--- a/Build/source/texk/web2c/web2c/web2c-lexer.l
+++ b/Build/source/texk/web2c/web2c/web2c-lexer.l
@@ -1,11 +1,13 @@
 %option never-interactive
 
-%{
+%top{
 /* web2c-lexer.l -- lexical analysis for Tangle output.  Public domain. */
 
 #include "web2c.h"
 #include "web2c-parser.h"
+}
 
+%{
 /* Hack to make it possible to compile the generated code with C++
    Required if you use flex. */
 #ifdef __cplusplus
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 5ea1ca2046d..6214af6775e 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* XeTeXFontInst.h: Include "XeTeXFontMgr.h" before <stdio.h>.
+	* XeTeX_ext.h: Include <w2c/c-auto.h> before <unicode/utypes.h>.
+	* pdfimage.cpp: Include "XeTeX_ext.h" before "pdfimage.h".
+
 2013-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* pdfimage.cpp [MINGW]: Include kpathsea/mingw32.h (via
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h
index be2759ffd49..119f42808a9 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h
@@ -43,14 +43,13 @@ authorization from the copyright holders.
 #ifndef __XeTeXFontInst_H
 #define __XeTeXFontInst_H
 
+#include "XeTeXFontMgr.h"
+
 #include <stdio.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_TRUETYPE_TABLES_H
 
-#include "XeTeXFontMgr.h"
-#include "XeTeX_ext.h"
-
 #define MATH_TAG HB_TAG('M','A','T','H')
 
 // create specific subclasses for each supported platform
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
index d5cb931c692..c6e0b953d2d 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
@@ -35,8 +35,8 @@ authorization from the copyright holders.
 #ifndef __XETEXEXT_H
 #define __XETEXEXT_H
 
-#include <unicode/utypes.h>
 #include <w2c/c-auto.h>  /* needed for SIZEOF_LONG and NO_DUMP_SHARE */
+#include <unicode/utypes.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/Build/source/texk/web2c/xetexdir/pdfimage.cpp b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
index 8eb32a63a92..8b7bc40d167 100644
--- a/Build/source/texk/web2c/xetexdir/pdfimage.cpp
+++ b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
@@ -30,10 +30,10 @@ use or other dealings in this Software without prior written
 authorization from the copyright holders.
 \****************************************************************************/
 
-#include "pdfimage.h"
-
 #include "XeTeX_ext.h"
 
+#include "pdfimage.h"
+
 #include "PDFDoc.h"
 #include "Catalog.h"
 #include "Page.h"