diff --git a/libinterp/corefcn/oct-tex-parser.in.yy b/libinterp/corefcn/oct-tex-
parser.in.yy
--- a/libinterp/corefcn/oct-tex-parser.in.yy
+++ b/libinterp/corefcn/oct-tex-parser.in.yy
@@ -33,7 +33,7 @@

 extern int octave_tex_lex (YYSTYPE *, void *);
 static void yyerror (text_parser_tex& parser, const char *s);
-
+#define yylex octave_tex_lex
 #define scanner parser.get_scanner ()
 #define yyalloc octave_tex_yyalloc

diff --git a/libinterp/octave.cc b/libinterp/octave.cc
--- a/libinterp/octave.cc
+++ b/libinterp/octave.cc
@@ -59,16 +59,16 @@
     m_all_args[0] = "";
   }

-  cmdline_options::cmdline_options (int argc, char **argv)
+  cmdline_options::cmdline_options (int argc, char **v_argv)
   {
     // Save raw program arguments.
-    m_all_args = string_vector (argv, argc);
+    m_all_args = string_vector (v_argv, argc);

     while (true)
       {
         int long_idx;

-        int optc = octave_getopt_long_wrapper (argc, argv, short_opts,
+        int optc = octave_getopt_long_wrapper (argc, v_argv, short_opts,
                                                long_opts, &long_idx);

         if (optc < 0)
@@ -241,7 +241,7 @@
         octave_print_terse_usage_and_exit ();
       }

-    m_remaining_args = string_vector (argv+octave_optind_wrapper (),
+    m_remaining_args = string_vector (v_argv+octave_optind_wrapper (),
                                       argc-octave_optind_wrapper ());
   }

@@ -300,8 +300,8 @@

   application *application::instance = 0;

-  application::application (int argc, char **argv)
-    : m_options (argc, argv)
+  application::application (int argc, char **v_argv)
+    : m_options (argc, v_argv)
   {
     init ();
   }
diff --git a/libinterp/octave.h b/libinterp/octave.h
--- a/libinterp/octave.h
+++ b/libinterp/octave.h
@@ -186,7 +186,7 @@

     application (const cmdline_options& opts = cmdline_options ());

-    application (int argc, char **argv);
+    application (int argc, char **v_argv);

     virtual ~application (void);

@@ -287,8 +287,8 @@
       : application (opts)
     { }

-    cli_application (int argc, char **argv)
-      : application (argc, argv)
+    cli_application (int v_argc, char **v_argv)
+      : application (v_argc, v_argv)
     { }

     ~cli_application (void) { }
@@ -312,8 +312,8 @@
       : application (opts)
     { }

-    embedded_application (int argc, char **argv)
-      : application (argc, argv)
+    embedded_application (int v_argc, char **v_argv)
+      : application (v_argc, v_argv)
     { }

     ~embedded_application (void) { }
diff --git a/liboctave/cruft/misc/quit.h b/liboctave/cruft/misc/quit.h
--- a/liboctave/cruft/misc/quit.h
+++ b/liboctave/cruft/misc/quit.h
@@ -104,14 +104,23 @@
 octave_exit_exception
 {
 public:
+  octave_exit_exception()
+  {
+    m_exit_status = 0;
+    m_safe_to_return = false;
+  }

-  octave_exit_exception (int exit_status = 0, bool safe_to_return = false)
-    : m_exit_status (exit_status), m_safe_to_return (safe_to_return)
-  { }
+  explicit octave_exit_exception (int v_exit_status , bool v_safe_to_return)
+  {
+    m_exit_status = v_exit_status;
+    m_safe_to_return = v_safe_to_return;
+  }

   octave_exit_exception (const octave_exit_exception& ex)
-    : m_exit_status (ex.m_exit_status), m_safe_to_return (ex.m_safe_to_return)
-  { }
+  {
+    m_exit_status = ex.m_exit_status;
+    m_safe_to_return = ex.m_safe_to_return;
+  }

   octave_exit_exception& operator = (octave_exit_exception& ex)
   {