diff --git a/src/host/host_parser.c b/src/host/host_parser.c
index 605eb7af26..f2789ba760 100644
--- a/src/host/host_parser.c
+++ b/src/host/host_parser.c
@@ -161,15 +161,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -533,7 +525,7 @@ char *host_text;
 #define YY_USER_ACTION  llocp->first_line = host_lineno; 				\
                         llocp->first_column = llocp->last_column;	\
                         llocp->last_column += host_leng;
-#line 537 "host_parser.c"
+#line 529 "host_parser.c"
 
 #define INITIAL 0
 
@@ -612,12 +604,7 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -722,7 +709,7 @@ YY_DECL
 
    /* --- Tokens --- */
 
-#line 726 "host_parser.c"
+#line 713 "host_parser.c"
 
 	if ( !(yy_init) )
 		{
@@ -865,7 +852,7 @@ YY_RULE_SETUP
 #line 66 "host_parser.l"
 ECHO;
 	YY_BREAK
-#line 869 "host_parser.c"
+#line 856 "host_parser.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1591,8 +1578,8 @@ YY_BUFFER_STATE host__scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to host_lex() will
  * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
diff --git a/src/template/template_parser.c b/src/template/template_parser.c
index 597adf0e61..27a5fcd488 100644
--- a/src/template/template_parser.c
+++ b/src/template/template_parser.c
@@ -161,15 +161,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -559,7 +551,7 @@ char *template_text;
                         llocp->first_column = llocp->last_column;	\
                         llocp->last_column += template_leng;
 
-#line 563 "template_parser.c"
+#line 555 "template_parser.c"
 
 #define INITIAL 0
 #define VALUE 1
@@ -639,12 +631,7 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -751,7 +738,7 @@ YY_DECL
  /* ------------------------------------------------------------------------- */
  /* Comments (lines with an starting #), and empty lines                      */
  /* ------------------------------------------------------------------------- */
-#line 755 "template_parser.c"
+#line 742 "template_parser.c"
 
 	if ( !(yy_init) )
 		{
@@ -927,7 +914,7 @@ YY_RULE_SETUP
 #line 85 "template_parser.l"
 ECHO;
 	YY_BREAK
-#line 931 "template_parser.c"
+#line 918 "template_parser.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(VALUE):
 	yyterminate();
@@ -1654,8 +1641,8 @@ YY_BUFFER_STATE template__scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to template_lex() will
  * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
diff --git a/src/template/template_syntax.cc b/src/template/template_syntax.cc
index 4b61b2d9d7..bb533cc40f 100644
--- a/src/template/template_syntax.cc
+++ b/src/template/template_syntax.cc
@@ -105,6 +105,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 #include "template_syntax.h"
 #include "Template.h"
 
@@ -147,13 +148,13 @@ static string& unescape (string &str);
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 51 "template_syntax.y"
+#line 52 "template_syntax.y"
 {
     char * val_str;
     void * val_attr;
 }
 /* Line 187 of yacc.c.  */
-#line 157 "template_syntax.cc"
+#line 158 "template_syntax.cc"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -178,7 +179,7 @@ typedef struct YYLTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 182 "template_syntax.cc"
+#line 183 "template_syntax.cc"
 
 #ifdef short
 # undef short
@@ -465,7 +466,7 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    71,    71,    72,    75,    88,   102,   116,   132
+       0,    72,    72,    73,    76,    89,   103,   117,   133
 };
 #endif
 
@@ -1403,7 +1404,7 @@ yyreduce:
   switch (yyn)
     {
         case 4:
-#line 76 "template_syntax.y"
+#line 77 "template_syntax.y"
     {
                 Attribute * pattr;
                 string      name((yyvsp[(1) - (3)].val_str));
@@ -1419,7 +1420,7 @@ yyreduce:
     break;
 
   case 5:
-#line 89 "template_syntax.y"
+#line 90 "template_syntax.y"
     {
                 Attribute * pattr;
                 string      name((yyvsp[(1) - (5)].val_str));
@@ -1436,7 +1437,7 @@ yyreduce:
     break;
 
   case 6:
-#line 103 "template_syntax.y"
+#line 104 "template_syntax.y"
     {
                 Attribute * pattr;
                 string      name((yyvsp[(1) - (2)].val_str));
@@ -1451,7 +1452,7 @@ yyreduce:
     break;
 
   case 7:
-#line 117 "template_syntax.y"
+#line 118 "template_syntax.y"
     {
                 map<string,string>* vattr;
                 string              name((yyvsp[(1) - (3)].val_str));
@@ -1470,7 +1471,7 @@ yyreduce:
     break;
 
   case 8:
-#line 133 "template_syntax.y"
+#line 134 "template_syntax.y"
     {
                 string               name((yyvsp[(3) - (5)].val_str));
                 string               value((yyvsp[(5) - (5)].val_str));
@@ -1490,7 +1491,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 1494 "template_syntax.cc"
+#line 1495 "template_syntax.cc"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1710,7 +1711,7 @@ yyreturn:
 }
 
 
-#line 149 "template_syntax.y"
+#line 150 "template_syntax.y"
 
 
 string& unescape (string &str)
diff --git a/src/template/template_syntax.h b/src/template/template_syntax.h
index 31a9415e59..a2aeba6e7d 100644
--- a/src/template/template_syntax.h
+++ b/src/template/template_syntax.h
@@ -62,7 +62,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 51 "template_syntax.y"
+#line 52 "template_syntax.y"
 {
     char * val_str;
     void * val_attr;
diff --git a/src/template/template_syntax.y b/src/template/template_syntax.y
index a5b065c3df..3a38741d3d 100644
--- a/src/template/template_syntax.y
+++ b/src/template/template_syntax.y
@@ -23,6 +23,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 #include "template_syntax.h"
 #include "Template.h"
 
diff --git a/src/vm/vm_var_parser.c b/src/vm/vm_var_parser.c
index d8d2bcd1e4..66a2cd18f8 100644
--- a/src/vm/vm_var_parser.c
+++ b/src/vm/vm_var_parser.c
@@ -161,15 +161,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -542,7 +534,7 @@ char *vm_var_text;
                         llocp->first_column = llocp->last_column;	\
                         llocp->last_column += vm_var_leng;
 
-#line 546 "vm_var_parser.c"
+#line 538 "vm_var_parser.c"
 
 #define INITIAL 0
 #define VAR 1
@@ -622,12 +614,7 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -739,7 +726,7 @@ YY_DECL
  /*   $NUM.CONTEXT_VARIABLE                                                   */
  /* ------------------------------------------------------------------------- */
 
-#line 743 "vm_var_parser.c"
+#line 730 "vm_var_parser.c"
 
 	if ( !(yy_init) )
 		{
@@ -911,7 +898,7 @@ YY_RULE_SETUP
 #line 80 "vm_var_parser.l"
 ECHO;
 	YY_BREAK
-#line 915 "vm_var_parser.c"
+#line 902 "vm_var_parser.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1637,8 +1624,8 @@ YY_BUFFER_STATE vm_var__scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to vm_var_lex() will
  * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */