--- a/src/oct-parse.yy	Fri Mar 19 13:00:06 2010 +0100
+++ b/src/oct-parse.yy	Sat Mar 20 11:01:04 2010 -0400
@@ -33,16 +33,9 @@
 #include <config.h>
 #endif
 
-#if defined (GNULIB_NAMESPACE)
-#undef GNULIB_NAMESPACE
-#endif
-
 #include <cassert>
 #include <cstdio>
-
-#ifdef YYBYACC
 #include <cstdlib>
-#endif
 
 #include <iostream>
 #include <map>
@@ -83,6 +76,15 @@
 #include "utils.h"
 #include "variables.h"
 
+#if defined (GNULIB_NAMESPACE)
+// Calls to the following functions appear in the generated output from
+// Bison without the namespace tag.  Redefine them so we will use them
+// via the gnulib namespace.
+#define fclose GNULIB_NAMESPACE::fclose
+#define fprintf GNULIB_NAMESPACE::fprintf
+#define malloc GNULIB_NAMESPACE::malloc
+#endif
+
 // The current input line number.
 int input_line_number = 1;