Index: libgfortran/runtime/environ.c
===================================================================
--- libgfortran/runtime/environ.c	(revision 127895)
+++ libgfortran/runtime/environ.c	(working copy)
@@ -461,17 +461,18 @@ show_signal (variable * v)
 
 
 static variable variable_table[] = {
-  {"GFORTRAN_STDIN_UNIT", 5, &options.stdin_unit, init_integer, show_integer,
+  {"GFORTRAN_STDIN_UNIT", GFC_STDIN_UNIT_NUMBER, &options.stdin_unit,
+   init_integer, show_integer,
    "Unit number that will be preconnected to standard input\n"
    "(No preconnection if negative)", 0},
 
-  {"GFORTRAN_STDOUT_UNIT", 6, &options.stdout_unit, init_integer,
-   show_integer,
+  {"GFORTRAN_STDOUT_UNIT", GFC_STDOUT_UNIT_NUMBER, &options.stdout_unit,
+   init_integer, show_integer,
    "Unit number that will be preconnected to standard output\n"
    "(No preconnection if negative)", 0},
 
-  {"GFORTRAN_STDERR_UNIT", 0, &options.stderr_unit, init_integer,
-   show_integer,
+  {"GFORTRAN_STDERR_UNIT", GFC_STDERR_UNIT_NUMBER, &options.stderr_unit,
+   init_integer, show_integer,
    "Unit number that will be preconnected to standard error\n"
    "(No preconnection if negative)", 0},
 
@@ -623,7 +624,7 @@ show_variables (void)
   st_printf ("\nRuntime error codes:");
   st_printf ("\n--------------------\n");
 
-  for (n = ERROR_FIRST + 1; n < ERROR_LAST; n++)
+  for (n = LIBERROR_FIRST + 1; n < LIBERROR_LAST; n++)
     if (n < 0 || n > 9)
       st_printf ("%d  %s\n", n, translate_error (n));
     else
@@ -882,19 +883,19 @@ do_parse (void)
   switch (tok)
     {
     case NATIVE:
-      endian = CONVERT_NATIVE;
+      endian = GFC_CONVERT_NATIVE;
       break;
 
     case SWAP:
-      endian = CONVERT_SWAP;
+      endian = GFC_CONVERT_SWAP;
       break;
 
     case BIG:
-      endian = CONVERT_BIG;
+      endian = GFC_CONVERT_BIG;
       break;
 
     case LITTLE:
-      endian = CONVERT_LITTLE;
+      endian = GFC_CONVERT_LITTLE;
       break;
 
     case INTEGER:
@@ -949,25 +950,25 @@ do_parse (void)
 	case NATIVE:
 	  if (next_token () != ':')
 	    goto error;
-	  endian = CONVERT_NATIVE;
+	  endian = GFC_CONVERT_NATIVE;
 	  break;
 
 	case SWAP:
 	  if (next_token () != ':')
 	    goto error;
-	  endian = CONVERT_SWAP;
+	  endian = GFC_CONVERT_SWAP;
 	  break;
 
 	case LITTLE:
 	  if (next_token () != ':')
 	    goto error;
-	  endian = CONVERT_LITTLE;
+	  endian = GFC_CONVERT_LITTLE;
 	  break;
 
 	case BIG:
 	  if (next_token () != ':')
 	    goto error;
-	  endian = CONVERT_BIG;
+	  endian = GFC_CONVERT_BIG;
 	  break;
 
 	case INTEGER:
@@ -1035,7 +1036,7 @@ do_parse (void)
  end:
   return 0;
  error:
-  def = CONVERT_NONE;
+  def = GFC_CONVERT_NONE;
   return -1;
 }
 
@@ -1043,7 +1044,7 @@ void init_unformatted (variable * v)
 {
   char *val;
   val = getenv (v->name);
-  def = CONVERT_NONE;
+  def = GFC_CONVERT_NONE;
   n_elist = 0;
 
   if (val == NULL)
Index: libgfortran/runtime/string.c
===================================================================
--- libgfortran/runtime/string.c	(revision 127895)
+++ libgfortran/runtime/string.c	(working copy)
@@ -124,7 +124,7 @@ find_option (st_parameter_common *cmp, c
     if (compare0 (s1, s1_len, opts->name))
       return opts->value;
 
-  generate_error (cmp, ERROR_BAD_OPTION, error_message);
+  generate_error (cmp, LIBERROR_BAD_OPTION, error_message);
 
   return -1;
 }
Index: libgfortran/runtime/error.c
===================================================================
--- libgfortran/runtime/error.c	(revision 127895)
+++ libgfortran/runtime/error.c	(working copy)
@@ -313,83 +313,83 @@ translate_error (int code)
 
   switch (code)
     {
-    case ERROR_EOR:
+    case LIBERROR_EOR:
       p = "End of record";
       break;
 
-    case ERROR_END:
+    case LIBERROR_END:
       p = "End of file";
       break;
 
-    case ERROR_OK:
+    case LIBERROR_OK:
       p = "Successful return";
       break;
 
-    case ERROR_OS:
+    case LIBERROR_OS:
       p = "Operating system error";
       break;
 
-    case ERROR_BAD_OPTION:
+    case LIBERROR_BAD_OPTION:
       p = "Bad statement option";
       break;
 
-    case ERROR_MISSING_OPTION:
+    case LIBERROR_MISSING_OPTION:
       p = "Missing statement option";
       break;
 
-    case ERROR_OPTION_CONFLICT:
+    case LIBERROR_OPTION_CONFLICT:
       p = "Conflicting statement options";
       break;
 
-    case ERROR_ALREADY_OPEN:
+    case LIBERROR_ALREADY_OPEN:
       p = "File already opened in another unit";
       break;
 
-    case ERROR_BAD_UNIT:
+    case LIBERROR_BAD_UNIT:
       p = "Unattached unit";
       break;
 
-    case ERROR_FORMAT:
+    case LIBERROR_FORMAT:
       p = "FORMAT error";
       break;
 
-    case ERROR_BAD_ACTION:
+    case LIBERROR_BAD_ACTION:
       p = "Incorrect ACTION specified";
       break;
 
-    case ERROR_ENDFILE:
+    case LIBERROR_ENDFILE:
       p = "Read past ENDFILE record";
       break;
 
-    case ERROR_BAD_US:
+    case LIBERROR_BAD_US:
       p = "Corrupt unformatted sequential file";
       break;
 
-    case ERROR_READ_VALUE:
+    case LIBERROR_READ_VALUE:
       p = "Bad value during read";
       break;
 
-    case ERROR_READ_OVERFLOW:
+    case LIBERROR_READ_OVERFLOW:
       p = "Numeric overflow on read";
       break;
 
-    case ERROR_INTERNAL:
+    case LIBERROR_INTERNAL:
       p = "Internal error in run-time library";
       break;
 
-    case ERROR_INTERNAL_UNIT:
+    case LIBERROR_INTERNAL_UNIT:
       p = "Internal unit I/O error";
       break;
 
-    case ERROR_DIRECT_EOR:
+    case LIBERROR_DIRECT_EOR:
       p = "Write exceeds length of DIRECT access record";
       break;
 
-    case ERROR_SHORT_RECORD:
+    case LIBERROR_SHORT_RECORD:
       p = "I/O past end of record on unformatted file";
       break;
 
-    case ERROR_CORRUPT_FILE:
+    case LIBERROR_CORRUPT_FILE:
       p = "Unformatted file structure has been corrupted";
       break;
 
@@ -415,11 +415,11 @@ generate_error (st_parameter_common *cmp
 {
   /* Set the error status.  */
   if ((cmp->flags & IOPARM_HAS_IOSTAT))
-    *cmp->iostat = (family == ERROR_OS) ? errno : family;
+    *cmp->iostat = (family == LIBERROR_OS) ? errno : family;
 
   if (message == NULL)
     message =
-      (family == ERROR_OS) ? get_oserror () : translate_error (family);
+      (family == LIBERROR_OS) ? get_oserror () : translate_error (family);
 
   if (cmp->flags & IOPARM_HAS_IOMSG)
     cf_strcpy (cmp->iomsg, cmp->iomsg_len, message);
@@ -428,13 +428,13 @@ generate_error (st_parameter_common *cmp
   cmp->flags &= ~IOPARM_LIBRETURN_MASK;
   switch (family)
     {
-    case ERROR_EOR:
+    case LIBERROR_EOR:
       cmp->flags |= IOPARM_LIBRETURN_EOR;
       if ((cmp->flags & IOPARM_EOR))
 	return;
       break;
 
-    case ERROR_END:
+    case LIBERROR_END:
       cmp->flags |= IOPARM_LIBRETURN_END;
       if ((cmp->flags & IOPARM_END))
 	return;
Index: libgfortran/libgfortran_frontend.h
===================================================================
--- libgfortran/libgfortran_frontend.h	(revision 0)
+++ libgfortran/libgfortran_frontend.h	(revision 0)
@@ -0,0 +1,116 @@
+/* Declarations common to the front-end and the library.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of the GNU Fortran runtime library (libgfortran).
+
+Libgfortran is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+Libgfortran is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with libgfor; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, if you link this library with other files,
+   some of which are compiled with GCC, to produce an executable,
+   this library does not by itself cause the resulting executable
+   to be covered by the GNU General Public License.
+   This exception does not however invalidate any other reasons why
+   the executable file might be covered by the GNU General Public License.  */
+
+
+/* Flags to specify which standard/extension contains a feature.
+   Note that no features were obsoleted nor deleted in F2003.  */
+#define GFC_STD_LEGACY	(1<<6)	/* Backward compatibility.  */
+#define GFC_STD_GNU	(1<<5)	/* GNU Fortran extension.  */
+#define GFC_STD_F2003	(1<<4)	/* New in F2003.  */
+#define GFC_STD_F95	(1<<3)	/* New in F95.  */
+#define GFC_STD_F95_DEL	(1<<2)	/* Deleted in F95.  */
+#define GFC_STD_F95_OBS	(1<<1)	/* Obsolescent in F95.  */
+#define GFC_STD_F77	(1<<0)	/* Included in F77, but not deleted or
+				   obsolescent in later standards.  */
+
+
+/* Bitmasks for the various FPE that can be enabled.  */
+#define GFC_FPE_INVALID    (1<<0)
+#define GFC_FPE_DENORMAL   (1<<1)
+#define GFC_FPE_ZERO       (1<<2)
+#define GFC_FPE_OVERFLOW   (1<<3)
+#define GFC_FPE_UNDERFLOW  (1<<4)
+#define GFC_FPE_PRECISION  (1<<5)
+
+
+/* Possible values for the CONVERT I/O specifier.  */
+typedef enum
+{
+  GFC_CONVERT_NONE = -1,
+  GFC_CONVERT_NATIVE = 0,
+  GFC_CONVERT_SWAP,
+  GFC_CONVERT_BIG,
+  GFC_CONVERT_LITTLE
+}
+unit_convert;
+
+
+/* Runtime errors.  */
+typedef enum
+{
+  LIBERROR_FIRST = -3,		/* Marker for the first error.  */
+  LIBERROR_EOR = -2,		/* End of record, must be negative.  */
+  LIBERROR_END = -1,		/* End of file, must be negative.  */
+  LIBERROR_OK = 0,		/* Indicates success, must be zero.  */
+  LIBERROR_OS = 5000,		/* OS error, more info in errno.  */
+  LIBERROR_OPTION_CONFLICT,
+  LIBERROR_BAD_OPTION,
+  LIBERROR_MISSING_OPTION,
+  LIBERROR_ALREADY_OPEN,
+  LIBERROR_BAD_UNIT,
+  LIBERROR_FORMAT,
+  LIBERROR_BAD_ACTION,
+  LIBERROR_ENDFILE,
+  LIBERROR_BAD_US,
+  LIBERROR_READ_VALUE,
+  LIBERROR_READ_OVERFLOW,
+  LIBERROR_INTERNAL,
+  LIBERROR_INTERNAL_UNIT,
+  LIBERROR_ALLOCATION,
+  LIBERROR_DIRECT_EOR,
+  LIBERROR_SHORT_RECORD,
+  LIBERROR_CORRUPT_FILE,
+  LIBERROR_LAST			/* Not a real error, the last error # + 1.  */
+}
+libgfortran_error_codes;
+
+
+/* Default unit number for preconnected standard input and output.  */
+#define GFC_STDIN_UNIT_NUMBER 5
+#define GFC_STDOUT_UNIT_NUMBER 6
+#define GFC_STDERR_UNIT_NUMBER 0
+
+
+#define GFC_MAX_DIMENSIONS 7
+
+#define GFC_DTYPE_RANK_MASK 0x07
+#define GFC_DTYPE_TYPE_SHIFT 3
+#define GFC_DTYPE_TYPE_MASK 0x38
+#define GFC_DTYPE_SIZE_SHIFT 6
+
+enum
+{
+  GFC_DTYPE_UNKNOWN = 0,
+  GFC_DTYPE_INTEGER,
+  /* TODO: recognize logical types.  */
+  GFC_DTYPE_LOGICAL,
+  GFC_DTYPE_REAL,
+  GFC_DTYPE_COMPLEX,
+  GFC_DTYPE_DERIVED,
+  GFC_DTYPE_CHARACTER
+};
+
Index: libgfortran/libgfortran.h
===================================================================
--- libgfortran/libgfortran.h	(revision 127897)
+++ libgfortran/libgfortran.h	(working copy)
@@ -37,16 +37,14 @@ Boston, MA 02110-1301, USA.  */
 #include <float.h>
 #include <stdarg.h>
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846264338327
-#endif
-
 #if HAVE_COMPLEX_H
 # include <complex.h>
 #else
 #define complex __complex__
 #endif
 
+#include "libgfortran_frontend.h"
+
 #include "config.h"
 #include "c99_protos.h"
 
@@ -276,9 +274,6 @@ internal_proto(l8_to_l4_offset);
 #define GFC_REAL_16_RADIX FLT_RADIX
 #endif
 
-#ifndef GFC_MAX_DIMENSIONS
-#define GFC_MAX_DIMENSIONS 7
-#endif
 
 typedef struct descriptor_dimension
 {
@@ -330,25 +325,6 @@ typedef GFC_ARRAY_DESCRIPTOR (GFC_MAX_DI
 typedef GFC_ARRAY_DESCRIPTOR (GFC_MAX_DIMENSIONS, GFC_LOGICAL_16) gfc_array_l16;
 #endif
 
-#define GFC_DTYPE_RANK_MASK 0x07
-#define GFC_DTYPE_TYPE_SHIFT 3
-#define GFC_DTYPE_TYPE_MASK 0x38
-#define GFC_DTYPE_SIZE_SHIFT 6
-
-/* added for f03.  --Rickett, 02.28.06 */
-#define GFC_NUM_RANK_BITS 3
-
-enum
-{
-  GFC_DTYPE_UNKNOWN = 0,
-  GFC_DTYPE_INTEGER,
-  /* TODO: recognize logical types.  */
-  GFC_DTYPE_LOGICAL,
-  GFC_DTYPE_REAL,
-  GFC_DTYPE_COMPLEX,
-  GFC_DTYPE_DERIVED,
-  GFC_DTYPE_CHARACTER
-};
 
 #define GFC_DESCRIPTOR_RANK(desc) ((desc)->dtype & GFC_DTYPE_RANK_MASK)
 #define GFC_DESCRIPTOR_TYPE(desc) (((desc)->dtype & GFC_DTYPE_TYPE_MASK) \
@@ -423,60 +399,6 @@ typedef struct
 }
 st_option;
 
-/* Runtime errors.  The EOR and EOF errors are required to be negative.
-   These codes must be kept sychronized with their equivalents in
-   gcc/fortran/gfortran.h .  */
-
-typedef enum
-{
-  ERROR_FIRST = -3,		/* Marker for the first error.  */
-  ERROR_EOR = -2,
-  ERROR_END = -1,
-  ERROR_OK = 0,			/* Indicates success, must be zero.  */
-  ERROR_OS = 5000,		/* Operating system error, more info in errno.  */
-  ERROR_OPTION_CONFLICT,
-  ERROR_BAD_OPTION,
-  ERROR_MISSING_OPTION,
-  ERROR_ALREADY_OPEN,
-  ERROR_BAD_UNIT,
-  ERROR_FORMAT,
-  ERROR_BAD_ACTION,
-  ERROR_ENDFILE,
-  ERROR_BAD_US,
-  ERROR_READ_VALUE,
-  ERROR_READ_OVERFLOW,
-  ERROR_INTERNAL,
-  ERROR_INTERNAL_UNIT,
-  ERROR_ALLOCATION,		/* Keep in sync with value used in
-				   gcc/fortran/trans.c
-				   (gfc_allocate_array_with_status).  */
-  ERROR_DIRECT_EOR,
-  ERROR_SHORT_RECORD,
-  ERROR_CORRUPT_FILE,
-  ERROR_LAST			/* Not a real error, the last error # + 1.  */
-}
-error_codes;
-
-
-/* Flags to specify which standard/extension contains a feature.
-   Keep them in sync with their counterparts in gcc/fortran/gfortran.h.  */
-#define GFC_STD_LEGACY          (1<<6) /* Backward compatibility.  */
-#define GFC_STD_GNU             (1<<5)    /* GNU Fortran extension.  */
-#define GFC_STD_F2003           (1<<4)    /* New in F2003.  */
-/* Note that no features were obsoleted nor deleted in F2003.  */
-#define GFC_STD_F95             (1<<3)    /* New in F95.  */
-#define GFC_STD_F95_DEL         (1<<2)    /* Deleted in F95.  */
-#define GFC_STD_F95_OBS         (1<<1)    /* Obsoleted in F95.  */
-#define GFC_STD_F77             (1<<0)    /* Up to and including F77.  */
-
-/* Bitmasks for the various FPE that can be enabled.
-   Keep them in sync with their counterparts in gcc/fortran/gfortran.h.  */
-#define GFC_FPE_INVALID    (1<<0)
-#define GFC_FPE_DENORMAL   (1<<1)
-#define GFC_FPE_ZERO       (1<<2)
-#define GFC_FPE_OVERFLOW   (1<<3)
-#define GFC_FPE_UNDERFLOW  (1<<4)
-#define GFC_FPE_PRECISION  (1<<5)
 
 /* This is returned by notification_std to know if, given the flags
    that were given (-std=, -pedantic) we should issue an error, a warning
@@ -505,8 +427,8 @@ iexport_data_proto(filename);
 #define gfc_alloca(x)  __builtin_alloca(x)
 
 
-/* Various I/O stuff also used in other parts of the library.  */
-
+/* Directory for creating temporary files.  Only used when none of the
+   following environment variables exist: GFORTRAN_TMPDIR, TMP and TEMP.  */
 #define DEFAULT_TEMPDIR "/tmp"
 
 /* The default value of record length for preconnected units is defined
@@ -514,9 +436,6 @@ iexport_data_proto(filename);
    Default value is 1 Gb.  */
 #define DEFAULT_RECL 1073741824
 
-typedef enum
-{ CONVERT_NONE=-1, CONVERT_NATIVE, CONVERT_SWAP, CONVERT_BIG, CONVERT_LITTLE }
-unit_convert;
 
 #define CHARACTER2(name) \
               gfc_charlen_type name ## _len; \
Index: libgfortran/io/file_pos.c
===================================================================
--- libgfortran/io/file_pos.c	(revision 127895)
+++ libgfortran/io/file_pos.c	(working copy)
@@ -92,7 +92,7 @@ formatted_backspace (st_parameter_filepo
   return;
 
  io_error:
-  generate_error (&fpp->common, ERROR_OS, NULL);
+  generate_error (&fpp->common, LIBERROR_OS, NULL);
 }
 
 
@@ -124,8 +124,8 @@ unformatted_backspace (st_parameter_file
       if (p == NULL || length_read != length)
 	goto io_error;
 
-      /* Only CONVERT_NATIVE and CONVERT_SWAP are valid here.  */
-      if (u->flags.convert == CONVERT_NATIVE)
+      /* Only GFC_CONVERT_NATIVE and GFC_CONVERT_SWAP are valid here.  */
+      if (u->flags.convert == GFC_CONVERT_NATIVE)
 	{
 	  switch (length)
 	    {
@@ -180,7 +180,7 @@ unformatted_backspace (st_parameter_file
   return;
 
  io_error:
-  generate_error (&fpp->common, ERROR_OS, NULL);
+  generate_error (&fpp->common, LIBERROR_OS, NULL);
 }
 
 
@@ -197,7 +197,7 @@ st_backspace (st_parameter_filepos *fpp)
   u = find_unit (fpp->common.unit);
   if (u == NULL)
     {
-      generate_error (&fpp->common, ERROR_BAD_UNIT, NULL);
+      generate_error (&fpp->common, LIBERROR_BAD_UNIT, NULL);
       goto done;
     }
 
@@ -298,7 +298,7 @@ st_rewind (st_parameter_filepos *fpp)
   if (u != NULL)
     {
       if (u->flags.access == ACCESS_DIRECT)
-	generate_error (&fpp->common, ERROR_BAD_OPTION,
+	generate_error (&fpp->common, LIBERROR_BAD_OPTION,
 			"Cannot REWIND a file opened for DIRECT access");
       else
 	{
@@ -314,7 +314,7 @@ st_rewind (st_parameter_filepos *fpp)
 	  u->last_record = 0;
 
 	  if (file_position (u->s) != 0 && sseek (u->s, 0) == FAILURE)
-	    generate_error (&fpp->common, ERROR_OS, NULL);
+	    generate_error (&fpp->common, LIBERROR_OS, NULL);
 
 	  /* Handle special files like /dev/null differently.  */
 	  if (!is_special (u->s))
@@ -361,7 +361,7 @@ st_flush (st_parameter_filepos *fpp)
     }
   else
     /* FLUSH on unconnected unit is illegal: F95 std., 9.3.5. */ 
-    generate_error (&fpp->common, ERROR_BAD_OPTION,
+    generate_error (&fpp->common, LIBERROR_BAD_OPTION,
 			"Specified UNIT in FLUSH is not connected");
 
   library_end ();
Index: libgfortran/io/open.c
===================================================================
--- libgfortran/io/open.c	(revision 127895)
+++ libgfortran/io/open.c	(working copy)
@@ -102,10 +102,10 @@ static const st_option pad_opt[] =
 
 static const st_option convert_opt[] =
 {
-  { "native", CONVERT_NATIVE},
-  { "swap", CONVERT_SWAP},
-  { "big_endian", CONVERT_BIG},
-  { "little_endian", CONVERT_LITTLE},
+  { "native", GFC_CONVERT_NATIVE},
+  { "swap", GFC_CONVERT_SWAP},
+  { "big_endian", GFC_CONVERT_BIG},
+  { "little_endian", GFC_CONVERT_LITTLE},
   { NULL, 0}
 };
 
@@ -133,24 +133,24 @@ edit_modes (st_parameter_open *opp, gfc_
 
   if (flags->status != STATUS_UNSPECIFIED && flags->status != STATUS_OLD && 
       u->flags.status != flags->status)
-    generate_error (&opp->common, ERROR_BAD_OPTION,
+    generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		    "Cannot change STATUS parameter in OPEN statement");
 
   if (flags->access != ACCESS_UNSPECIFIED && u->flags.access != flags->access)
-    generate_error (&opp->common, ERROR_BAD_OPTION,
+    generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		    "Cannot change ACCESS parameter in OPEN statement");
 
   if (flags->form != FORM_UNSPECIFIED && u->flags.form != flags->form)
-    generate_error (&opp->common, ERROR_BAD_OPTION,
+    generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		    "Cannot change FORM parameter in OPEN statement");
 
   if ((opp->common.flags & IOPARM_OPEN_HAS_RECL_IN)
       && opp->recl_in != u->recl)
-    generate_error (&opp->common, ERROR_BAD_OPTION,
+    generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		    "Cannot change RECL parameter in OPEN statement");
 
   if (flags->action != ACTION_UNSPECIFIED && u->flags.action != flags->action)
-    generate_error (&opp->common, ERROR_BAD_OPTION,
+    generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		    "Cannot change ACTION parameter in OPEN statement");
 
   /* Status must be OLD if present.  */
@@ -162,24 +162,24 @@ edit_modes (st_parameter_open *opp, gfc_
 	notify_std (&opp->common, GFC_STD_GNU,
 		    "OPEN statement must have a STATUS of OLD or UNKNOWN");
       else
-	generate_error (&opp->common, ERROR_BAD_OPTION,
+	generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		    "OPEN statement must have a STATUS of OLD or UNKNOWN");
     }
 
   if (u->flags.form == FORM_UNFORMATTED)
     {
       if (flags->delim != DELIM_UNSPECIFIED)
-	generate_error (&opp->common, ERROR_OPTION_CONFLICT,
+	generate_error (&opp->common, LIBERROR_OPTION_CONFLICT,
 			"DELIM parameter conflicts with UNFORMATTED form in "
 			"OPEN statement");
 
       if (flags->blank != BLANK_UNSPECIFIED)
-	generate_error (&opp->common, ERROR_OPTION_CONFLICT,
+	generate_error (&opp->common, LIBERROR_OPTION_CONFLICT,
 			"BLANK parameter conflicts with UNFORMATTED form in "
 			"OPEN statement");
 
       if (flags->pad != PAD_UNSPECIFIED)
-	generate_error (&opp->common, ERROR_OPTION_CONFLICT,
+	generate_error (&opp->common, LIBERROR_OPTION_CONFLICT,
 			"PAD parameter conflicts with UNFORMATTED form in "
 			"OPEN statement");
     }
@@ -224,7 +224,7 @@ edit_modes (st_parameter_open *opp, gfc_
       break;
 
     seek_error:
-      generate_error (&opp->common, ERROR_OS, NULL);
+      generate_error (&opp->common, LIBERROR_OS, NULL);
       break;
     }
 
@@ -259,7 +259,7 @@ new_unit (st_parameter_open *opp, gfc_un
     {
       if (flags->form == FORM_UNFORMATTED)
 	{
-	  generate_error (&opp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&opp->common, LIBERROR_OPTION_CONFLICT,
 			  "DELIM parameter conflicts with UNFORMATTED form in "
 			  "OPEN statement");
 	  goto fail;
@@ -272,7 +272,7 @@ new_unit (st_parameter_open *opp, gfc_un
     {
       if (flags->form == FORM_UNFORMATTED)
 	{
-	  generate_error (&opp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&opp->common, LIBERROR_OPTION_CONFLICT,
 			  "BLANK parameter conflicts with UNFORMATTED form in "
 			  "OPEN statement");
 	  goto fail;
@@ -285,7 +285,7 @@ new_unit (st_parameter_open *opp, gfc_un
     {
       if (flags->form == FORM_UNFORMATTED)
 	{
-	  generate_error (&opp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&opp->common, LIBERROR_OPTION_CONFLICT,
 			  "PAD parameter conflicts with UNFORMATTED form in "
 			  "OPEN statement");
 	  goto fail;
@@ -294,7 +294,7 @@ new_unit (st_parameter_open *opp, gfc_un
 
   if (flags->position != POSITION_ASIS && flags->access == ACCESS_DIRECT)
    {
-     generate_error (&opp->common, ERROR_OPTION_CONFLICT,
+     generate_error (&opp->common, LIBERROR_OPTION_CONFLICT,
                      "ACCESS parameter conflicts with SEQUENTIAL access in "
                      "OPEN statement");
      goto fail;
@@ -312,14 +312,14 @@ new_unit (st_parameter_open *opp, gfc_un
   if (flags->access == ACCESS_DIRECT
       && (opp->common.flags & IOPARM_OPEN_HAS_RECL_IN) == 0)
     {
-      generate_error (&opp->common, ERROR_MISSING_OPTION,
+      generate_error (&opp->common, LIBERROR_MISSING_OPTION,
 		      "Missing RECL parameter in OPEN statement");
       goto fail;
     }
 
   if ((opp->common.flags & IOPARM_OPEN_HAS_RECL_IN) && opp->recl_in <= 0)
     {
-      generate_error (&opp->common, ERROR_BAD_OPTION,
+      generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		      "RECL parameter is non-positive in OPEN statement");
       goto fail;
     }
@@ -333,7 +333,7 @@ new_unit (st_parameter_open *opp, gfc_un
 	  break;
 	}
 
-      generate_error (&opp->common, ERROR_BAD_OPTION,
+      generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		      "FILE parameter must not be present in OPEN statement");
       goto fail;
 
@@ -369,7 +369,7 @@ new_unit (st_parameter_open *opp, gfc_un
       && (options.stderr_unit < 0 || u2->unit_number != options.stderr_unit))
     {
       unlock_unit (u2);
-      generate_error (&opp->common, ERROR_ALREADY_OPEN, NULL);
+      generate_error (&opp->common, LIBERROR_ALREADY_OPEN, NULL);
       goto cleanup;
     }
 
@@ -408,7 +408,7 @@ new_unit (st_parameter_open *opp, gfc_un
 	  msg = NULL;
 	}
 
-      generate_error (&opp->common, ERROR_OS, msg);
+      generate_error (&opp->common, LIBERROR_OS, msg);
       goto cleanup;
     }
 
@@ -434,7 +434,7 @@ new_unit (st_parameter_open *opp, gfc_un
   if (flags->position == POSITION_APPEND)
     {
       if (sseek (u->s, file_length (u->s)) == FAILURE)
-	generate_error (&opp->common, ERROR_OS, NULL);
+	generate_error (&opp->common, LIBERROR_OS, NULL);
       u->endfile = AT_ENDFILE;
     }
 
@@ -547,7 +547,7 @@ already_open (st_parameter_open *opp, gf
       if (sclose (u->s) == FAILURE)
 	{
 	  unlock_unit (u);
-	  generate_error (&opp->common, ERROR_OS,
+	  generate_error (&opp->common, LIBERROR_OS,
 			  "Error closing file in OPEN statement");
 	  return;
 	}
@@ -627,7 +627,7 @@ st_open (st_parameter_open *opp)
 
   conv = get_unformatted_convert (opp->common.unit);
 
-  if (conv == CONVERT_NONE)
+  if (conv == GFC_CONVERT_NONE)
     {
       /* Nothing has been set by environment variable, check the convert tag.  */
       if (cf & IOPARM_OPEN_HAS_CONVERT)
@@ -642,16 +642,16 @@ st_open (st_parameter_open *opp)
      and 1 on big-endian machines.  */
   switch (conv)
     {
-    case CONVERT_NATIVE:
-    case CONVERT_SWAP:
+    case GFC_CONVERT_NATIVE:
+    case GFC_CONVERT_SWAP:
       break;
       
-    case CONVERT_BIG:
-      conv = l8_to_l4_offset ? CONVERT_NATIVE : CONVERT_SWAP;
+    case GFC_CONVERT_BIG:
+      conv = l8_to_l4_offset ? GFC_CONVERT_NATIVE : GFC_CONVERT_SWAP;
       break;
       
-    case CONVERT_LITTLE:
-      conv = l8_to_l4_offset ? CONVERT_SWAP : CONVERT_NATIVE;
+    case GFC_CONVERT_LITTLE:
+      conv = l8_to_l4_offset ? GFC_CONVERT_SWAP : GFC_CONVERT_NATIVE;
       break;
       
     default:
@@ -662,19 +662,19 @@ st_open (st_parameter_open *opp)
   flags.convert = conv;
 
   if (opp->common.unit < 0)
-    generate_error (&opp->common, ERROR_BAD_OPTION,
+    generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		    "Bad unit number in OPEN statement");
 
   if (flags.position != POSITION_UNSPECIFIED
       && flags.access == ACCESS_DIRECT)
-    generate_error (&opp->common, ERROR_BAD_OPTION,
+    generate_error (&opp->common, LIBERROR_BAD_OPTION,
 		    "Cannot use POSITION with direct access files");
 
   if (flags.access == ACCESS_APPEND)
     {
       if (flags.position != POSITION_UNSPECIFIED
 	  && flags.position != POSITION_APPEND)
-	generate_error (&opp->common, ERROR_BAD_OPTION,
+	generate_error (&opp->common, LIBERROR_BAD_OPTION,
 			"Conflicting ACCESS and POSITION flags in"
 			" OPEN statement");
 
Index: libgfortran/io/close.c
===================================================================
--- libgfortran/io/close.c	(revision 127895)
+++ libgfortran/io/close.c	(working copy)
@@ -75,7 +75,7 @@ st_close (st_parameter_close *clp)
       if (u->flags.status == STATUS_SCRATCH)
 	{
 	  if (status == CLOSE_KEEP)
-	    generate_error (&clp->common, ERROR_BAD_OPTION,
+	    generate_error (&clp->common, LIBERROR_BAD_OPTION,
 			    "Can't KEEP a scratch file on CLOSE");
 #if !HAVE_UNLINK_OPEN_FILE
 	  path = (char *) gfc_alloca (u->file_len + 1);
Index: libgfortran/io/list_read.c
===================================================================
--- libgfortran/io/list_read.c	(revision 127895)
+++ libgfortran/io/list_read.c	(working copy)
@@ -209,7 +209,7 @@ next_char (st_parameter_dt *dtp)
 	     check for NULL here is cautionary.  */
 	  if (p == NULL)
 	    {
-	      generate_error (&dtp->common, ERROR_INTERNAL_UNIT, NULL);
+	      generate_error (&dtp->common, LIBERROR_INTERNAL_UNIT, NULL);
 	      return '\0';
 	    }
 
@@ -230,7 +230,7 @@ next_char (st_parameter_dt *dtp)
     {
       if (p == NULL)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return '\0';
 	}
       if (length == 0)
@@ -467,7 +467,7 @@ convert_integer (st_parameter_dt *dtp, i
 	  sprintf (message, "Zero repeat count in item %d of list input",
 		   dtp->u.p.item_count);
 
-	  generate_error (&dtp->common, ERROR_READ_VALUE, message);
+	  generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
 	  m = 1;
 	}
     }
@@ -484,7 +484,7 @@ convert_integer (st_parameter_dt *dtp, i
 	     dtp->u.p.item_count);
 
   free_saved (dtp);
-  generate_error (&dtp->common, ERROR_READ_VALUE, message);
+  generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
 
   return 1;
 }
@@ -531,7 +531,7 @@ parse_repeat (st_parameter_dt *dtp)
 		       "Repeat count overflow in item %d of list input",
 		       dtp->u.p.item_count);
 
-	      generate_error (&dtp->common, ERROR_READ_VALUE, message);
+	      generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
 	      return 1;
 	    }
 
@@ -544,7 +544,7 @@ parse_repeat (st_parameter_dt *dtp)
 		       "Zero repeat count in item %d of list input",
 		       dtp->u.p.item_count);
 
-	      generate_error (&dtp->common, ERROR_READ_VALUE, message);
+	      generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
 	      return 1;
 	    }
 
@@ -565,7 +565,7 @@ parse_repeat (st_parameter_dt *dtp)
   free_saved (dtp);
   sprintf (message, "Bad repeat count in item %d of list input",
 	   dtp->u.p.item_count);
-  generate_error (&dtp->common, ERROR_READ_VALUE, message);
+  generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
   return 1;
 }
 
@@ -710,7 +710,7 @@ read_logical (st_parameter_dt *dtp, int 
   free_saved (dtp);
   sprintf (message, "Bad logical value while reading item %d",
 	      dtp->u.p.item_count);
-  generate_error (&dtp->common, ERROR_READ_VALUE, message);
+  generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
   return;
 
  logical_done:
@@ -842,7 +842,7 @@ read_integer (st_parameter_dt *dtp, int 
   free_saved (dtp);
   sprintf (message, "Bad integer for item %d in list input",
 	      dtp->u.p.item_count);
-  generate_error (&dtp->common, ERROR_READ_VALUE, message);
+  generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
 
   return;
 
@@ -1006,7 +1006,7 @@ read_character (st_parameter_dt *dtp, in
       free_saved (dtp);
       sprintf (message, "Invalid string input in item %d",
 		  dtp->u.p.item_count);
-      generate_error (&dtp->common, ERROR_READ_VALUE, message);
+      generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
     }
 }
 
@@ -1125,7 +1125,7 @@ parse_real (st_parameter_dt *dtp, void *
   free_saved (dtp);
   sprintf (message, "Bad floating point number for item %d",
 	      dtp->u.p.item_count);
-  generate_error (&dtp->common, ERROR_READ_VALUE, message);
+  generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
 
   return 1;
 }
@@ -1208,7 +1208,7 @@ eol_2:
   free_saved (dtp);
   sprintf (message, "Bad complex value in item %d of list input",
 	      dtp->u.p.item_count);
-  generate_error (&dtp->common, ERROR_READ_VALUE, message);
+  generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
 }
 
 
@@ -1423,7 +1423,7 @@ read_real (st_parameter_dt *dtp, int len
   free_saved (dtp);
   sprintf (message, "Bad real number in item %d of list input",
 	      dtp->u.p.item_count);
-  generate_error (&dtp->common, ERROR_READ_VALUE, message);
+  generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
 }
 
 
@@ -1441,7 +1441,7 @@ check_type (st_parameter_dt *dtp, bt typ
 		  type_name (dtp->u.p.saved_type), type_name (type),
 		  dtp->u.p.item_count);
 
-      generate_error (&dtp->common, ERROR_READ_VALUE, message);
+      generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
       return 1;
     }
 
@@ -1454,7 +1454,7 @@ check_type (st_parameter_dt *dtp, bt typ
 		  "Read kind %d %s where kind %d is required for item %d",
 		  dtp->u.p.saved_length, type_name (dtp->u.p.saved_type), len,
 		  dtp->u.p.item_count);
-      generate_error (&dtp->common, ERROR_READ_VALUE, message);
+      generate_error (&dtp->common, LIBERROR_READ_VALUE, message);
       return 1;
     }
 
@@ -1480,7 +1480,7 @@ list_formatted_read_scalar (st_parameter
   dtp->u.p.eof_jump = &eof_jump;
   if (setjmp (eof_jump))
     {
-      generate_error (&dtp->common, ERROR_END, NULL);
+      generate_error (&dtp->common, LIBERROR_END, NULL);
       goto cleanup;
     }
 
@@ -2552,7 +2552,7 @@ namelist_read (st_parameter_dt *dtp)
   if (setjmp (eof_jump))
     {
       dtp->u.p.eof_jump = NULL;
-      generate_error (&dtp->common, ERROR_END, NULL);
+      generate_error (&dtp->common, LIBERROR_END, NULL);
       return;
     }
 
@@ -2636,6 +2636,6 @@ nml_err_ret:
   dtp->u.p.eof_jump = NULL;
   free_saved (dtp);
   free_line (dtp);
-  generate_error (&dtp->common, ERROR_READ_VALUE, nml_err_msg);
+  generate_error (&dtp->common, LIBERROR_READ_VALUE, nml_err_msg);
   return;
 }
Index: libgfortran/io/read.c
===================================================================
--- libgfortran/io/read.c	(revision 127895)
+++ libgfortran/io/read.c	(working copy)
@@ -179,7 +179,7 @@ convert_real (st_parameter_dt *dtp, void
 
   if (errno == EINVAL)
     {
-      generate_error (&dtp->common, ERROR_READ_VALUE,
+      generate_error (&dtp->common, LIBERROR_READ_VALUE,
 		      "Error during floating point read");
       return 1;
     }
@@ -227,7 +227,7 @@ read_l (st_parameter_dt *dtp, const fnod
       break;
     default:
     bad:
-      generate_error (&dtp->common, ERROR_READ_VALUE,
+      generate_error (&dtp->common, LIBERROR_READ_VALUE,
 		      "Bad value on logical read");
       break;
     }
@@ -397,12 +397,12 @@ read_decimal (st_parameter_dt *dtp, cons
   return;
 
  bad:
-  generate_error (&dtp->common, ERROR_READ_VALUE,
+  generate_error (&dtp->common, LIBERROR_READ_VALUE,
 		  "Bad value during integer read");
   return;
 
  overflow:
-  generate_error (&dtp->common, ERROR_READ_OVERFLOW,
+  generate_error (&dtp->common, LIBERROR_READ_OVERFLOW,
 		  "Value overflowed during integer read");
   return;
 }
@@ -541,12 +541,12 @@ read_radix (st_parameter_dt *dtp, const 
   return;
 
  bad:
-  generate_error (&dtp->common, ERROR_READ_VALUE,
+  generate_error (&dtp->common, LIBERROR_READ_VALUE,
 		  "Bad value during integer read");
   return;
 
  overflow:
-  generate_error (&dtp->common, ERROR_READ_OVERFLOW,
+  generate_error (&dtp->common, LIBERROR_READ_OVERFLOW,
 		  "Value overflowed during integer read");
   return;
 }
@@ -661,7 +661,7 @@ read_f (st_parameter_dt *dtp, const fnod
   goto done;
 
  bad_float:
-  generate_error (&dtp->common, ERROR_READ_VALUE,
+  generate_error (&dtp->common, LIBERROR_READ_VALUE,
 		  "Bad value during floating point read");
   return;
 
Index: libgfortran/io/inquire.c
===================================================================
--- libgfortran/io/inquire.c	(revision 127895)
+++ libgfortran/io/inquire.c	(working copy)
@@ -304,11 +304,11 @@ inquire_via_unit (st_parameter_inquire *
 	switch (u->flags.convert)
 	  {
 	    /*  l8_to_l4_offset is 0 for little-endian, 1 for big-endian.  */
-	  case CONVERT_NATIVE:
+	  case GFC_CONVERT_NATIVE:
 	    p = l8_to_l4_offset ? "BIG_ENDIAN" : "LITTLE_ENDIAN";
 	    break;
 
-	  case CONVERT_SWAP:
+	  case GFC_CONVERT_SWAP:
 	    p = l8_to_l4_offset ? "LITTLE_ENDIAN" : "BIG_ENDIAN";
 	    break;
 
Index: libgfortran/io/unit.c
===================================================================
--- libgfortran/io/unit.c	(revision 127895)
+++ libgfortran/io/unit.c	(working copy)
@@ -377,7 +377,7 @@ get_internal_unit (st_parameter_dt *dtp)
   iunit = get_mem (sizeof (gfc_unit));
   if (iunit == NULL)
     {
-      generate_error (&dtp->common, ERROR_INTERNAL_UNIT, NULL);
+      generate_error (&dtp->common, LIBERROR_INTERNAL_UNIT, NULL);
       return NULL;
     }
 
Index: libgfortran/io/transfer.c
===================================================================
--- libgfortran/io/transfer.c	(revision 127895)
+++ libgfortran/io/transfer.c	(working copy)
@@ -187,7 +187,7 @@ read_sf (st_parameter_dt *dtp, int *leng
 	{
 	  if (no_error)
 	    break;
-	  generate_error (&dtp->common, ERROR_END, NULL);
+	  generate_error (&dtp->common, LIBERROR_END, NULL);
 	  return NULL;
 	}
 
@@ -220,7 +220,7 @@ read_sf (st_parameter_dt *dtp, int *leng
 	    {
 	      if (no_error)
 		break;
-	      generate_error (&dtp->common, ERROR_EOR, NULL);
+	      generate_error (&dtp->common, LIBERROR_EOR, NULL);
 	      return NULL;
 	    }
 
@@ -277,7 +277,7 @@ read_block (st_parameter_dt *dtp, int *l
       if (sseek (dtp->u.p.current_unit->s,
 		 dtp->u.p.current_unit->strm_pos - 1) == FAILURE)
 	{
-	  generate_error (&dtp->common, ERROR_END, NULL);
+	  generate_error (&dtp->common, LIBERROR_END, NULL);
 	  return NULL;
 	}
     }
@@ -295,7 +295,7 @@ read_block (st_parameter_dt *dtp, int *l
 	      if (dtp->u.p.current_unit->flags.pad == PAD_NO)
 		{
 		  /* Not enough data left.  */
-		  generate_error (&dtp->common, ERROR_EOR, NULL);
+		  generate_error (&dtp->common, LIBERROR_EOR, NULL);
 		  return NULL;
 		}
 	    }
@@ -303,7 +303,7 @@ read_block (st_parameter_dt *dtp, int *l
 	  if (dtp->u.p.current_unit->bytes_left == 0)
 	    {
 	      dtp->u.p.current_unit->endfile = AT_ENDFILE;
-	      generate_error (&dtp->common, ERROR_END, NULL);
+	      generate_error (&dtp->common, LIBERROR_END, NULL);
 	      return NULL;
 	    }
 
@@ -334,7 +334,7 @@ read_block (st_parameter_dt *dtp, int *l
 	*length = nread;
       else
 	{
-	  generate_error (&dtp->common, ERROR_EOR, NULL);
+	  generate_error (&dtp->common, LIBERROR_EOR, NULL);
 	  source = NULL;
 	}
     }
@@ -362,7 +362,7 @@ read_block_direct (st_parameter_dt *dtp,
       if (sseek (dtp->u.p.current_unit->s,
 		 dtp->u.p.current_unit->strm_pos - 1) == FAILURE)
 	{
-	  generate_error (&dtp->common, ERROR_END, NULL);
+	  generate_error (&dtp->common, LIBERROR_END, NULL);
 	  return;
 	}
 
@@ -370,7 +370,7 @@ read_block_direct (st_parameter_dt *dtp,
       have_read_record = to_read_record;
       if (sread (dtp->u.p.current_unit->s, buf, &have_read_record) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return;
 	}
 
@@ -380,7 +380,7 @@ read_block_direct (st_parameter_dt *dtp,
 	{
 	  /* Short read,  e.g. if we hit EOF.  For stream files,
 	   we have to set the end-of-file condition.  */
-	  generate_error (&dtp->common, ERROR_END, NULL);
+	  generate_error (&dtp->common, LIBERROR_END, NULL);
 	  return;
 	}
       return;
@@ -405,7 +405,7 @@ read_block_direct (st_parameter_dt *dtp,
 
       if (sread (dtp->u.p.current_unit->s, buf, &to_read_record) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return;
 	}
 
@@ -419,7 +419,7 @@ read_block_direct (st_parameter_dt *dtp,
 
       if (short_record)
 	{
-	  generate_error (&dtp->common, ERROR_SHORT_RECORD, NULL);
+	  generate_error (&dtp->common, LIBERROR_SHORT_RECORD, NULL);
 	  return;
 	}
       return;
@@ -431,7 +431,7 @@ read_block_direct (st_parameter_dt *dtp,
 
   if (dtp->u.p.current_unit->endfile == AT_ENDFILE)
     {
-      generate_error (&dtp->common, ERROR_END, NULL);
+      generate_error (&dtp->common, LIBERROR_END, NULL);
       return;
     }
 
@@ -470,7 +470,7 @@ read_block_direct (st_parameter_dt *dtp,
       if (sread (dtp->u.p.current_unit->s, buf + have_read_record,
 		 &have_read_subrecord) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return;
 	}
 
@@ -484,7 +484,7 @@ read_block_direct (st_parameter_dt *dtp,
 	     marker would still be present.  */
 
 	  *nbytes = have_read_record;
-	  generate_error (&dtp->common, ERROR_CORRUPT_FILE, NULL);
+	  generate_error (&dtp->common, LIBERROR_CORRUPT_FILE, NULL);
 	  return;
 	}
 
@@ -502,7 +502,7 @@ read_block_direct (st_parameter_dt *dtp,
 
 	      dtp->u.p.current_unit->current_record = 0;
 	      next_record_r_unf (dtp, 0);
-	      generate_error (&dtp->common, ERROR_SHORT_RECORD, NULL);
+	      generate_error (&dtp->common, LIBERROR_SHORT_RECORD, NULL);
 	      return;
 	    }
 	}
@@ -516,7 +516,7 @@ read_block_direct (st_parameter_dt *dtp,
   dtp->u.p.current_unit->bytes_left -= have_read_record;
   if (short_record)
     {
-      generate_error (&dtp->common, ERROR_SHORT_RECORD, NULL);
+      generate_error (&dtp->common, LIBERROR_SHORT_RECORD, NULL);
       return;
     }
   return;
@@ -538,7 +538,7 @@ write_block (st_parameter_dt *dtp, int l
       if (sseek (dtp->u.p.current_unit->s,
 		 dtp->u.p.current_unit->strm_pos - 1) == FAILURE)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return NULL;
 	}
     }
@@ -554,7 +554,7 @@ write_block (st_parameter_dt *dtp, int l
 	    dtp->u.p.current_unit->bytes_left = dtp->u.p.current_unit->recl;
 	  else
 	    {
-	      generate_error (&dtp->common, ERROR_EOR, NULL);
+	      generate_error (&dtp->common, LIBERROR_EOR, NULL);
 	      return NULL;
 	    }
 	}
@@ -566,12 +566,12 @@ write_block (st_parameter_dt *dtp, int l
 
   if (dest == NULL)
     {
-      generate_error (&dtp->common, ERROR_END, NULL);
+      generate_error (&dtp->common, LIBERROR_END, NULL);
       return NULL;
     }
 
   if (is_internal_unit (dtp) && dtp->u.p.current_unit->endfile == AT_ENDFILE)
-    generate_error (&dtp->common, ERROR_END, NULL);
+    generate_error (&dtp->common, LIBERROR_END, NULL);
 
   if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
     dtp->u.p.size_used += (gfc_offset) length;
@@ -601,13 +601,13 @@ write_buf (st_parameter_dt *dtp, void *b
       if (sseek (dtp->u.p.current_unit->s,
 		 dtp->u.p.current_unit->strm_pos - 1) == FAILURE)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return FAILURE;
 	}
 
       if (swrite (dtp->u.p.current_unit->s, buf, &nbytes) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return FAILURE;
 	}
 
@@ -622,13 +622,13 @@ write_buf (st_parameter_dt *dtp, void *b
     {
       if (dtp->u.p.current_unit->bytes_left < (gfc_offset) nbytes)
 	{
-	  generate_error (&dtp->common, ERROR_DIRECT_EOR, NULL);
+	  generate_error (&dtp->common, LIBERROR_DIRECT_EOR, NULL);
 	  return FAILURE;
 	}
 
       if (swrite (dtp->u.p.current_unit->s, buf, &nbytes) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return FAILURE;
 	}
 
@@ -667,7 +667,7 @@ write_buf (st_parameter_dt *dtp, void *b
       if (swrite (dtp->u.p.current_unit->s, buf + have_written,
 		  &to_write_subrecord) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OS, NULL);
+	  generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  return FAILURE;
 	}
 
@@ -684,7 +684,7 @@ write_buf (st_parameter_dt *dtp, void *b
   dtp->u.p.current_unit->bytes_left -= have_written;
   if (short_record)
     {
-      generate_error (&dtp->common, ERROR_SHORT_RECORD, NULL);
+      generate_error (&dtp->common, LIBERROR_SHORT_RECORD, NULL);
       return FAILURE;
     }
   return SUCCESS;
@@ -701,7 +701,7 @@ unformatted_read (st_parameter_dt *dtp, 
   size_t i, sz;
 
   /* Currently, character implies size=1.  */
-  if (dtp->u.p.current_unit->flags.convert == CONVERT_NATIVE
+  if (dtp->u.p.current_unit->flags.convert == GFC_CONVERT_NATIVE
       || size == 1 || type == BT_CHARACTER)
     {
       sz = size * nelems;
@@ -743,7 +743,7 @@ unformatted_write (st_parameter_dt *dtp,
 		   void *source, int kind __attribute__((unused)),
 		   size_t size, size_t nelems)
 {
-  if (dtp->u.p.current_unit->flags.convert == CONVERT_NATIVE ||
+  if (dtp->u.p.current_unit->flags.convert == GFC_CONVERT_NATIVE ||
       size == 1 || type == BT_CHARACTER)
     {
       size *= nelems;
@@ -918,7 +918,7 @@ formatted_transfer_scalar (st_parameter_
 	{
 	  /* No data descriptors left.  */
 	  if (n > 0)
-	    generate_error (&dtp->common, ERROR_FORMAT,
+	    generate_error (&dtp->common, LIBERROR_FORMAT,
 		"Insufficient data descriptors in format after reversion");
 	  return;
 	}
@@ -1566,12 +1566,12 @@ us_read (st_parameter_dt *dtp, int conti
 
   if (p == NULL || n != nr)
     {
-      generate_error (&dtp->common, ERROR_BAD_US, NULL);
+      generate_error (&dtp->common, LIBERROR_BAD_US, NULL);
       return;
     }
 
-  /* Only CONVERT_NATIVE and CONVERT_SWAP are valid here.  */
-  if (dtp->u.p.current_unit->flags.convert == CONVERT_NATIVE)
+  /* Only GFC_CONVERT_NATIVE and GFC_CONVERT_SWAP are valid here.  */
+  if (dtp->u.p.current_unit->flags.convert == GFC_CONVERT_NATIVE)
     {
       switch (nr)
 	{
@@ -1641,7 +1641,7 @@ us_write (st_parameter_dt *dtp, int cont
     nbytes = compile_options.record_marker ;
 
   if (swrite (dtp->u.p.current_unit->s, &dummy, &nbytes) != 0)
-    generate_error (&dtp->common, ERROR_OS, NULL);
+    generate_error (&dtp->common, LIBERROR_OS, NULL);
 
   /* For sequential unformatted, if RECL= was not specified in the OPEN
      we write until we have more bytes than can fit in the subrecord
@@ -1723,7 +1723,7 @@ data_transfer_init (st_parameter_dt *dtp
      {
        close_unit (dtp->u.p.current_unit);
        dtp->u.p.current_unit = NULL;
-       generate_error (&dtp->common, ERROR_BAD_OPTION,
+       generate_error (&dtp->common, LIBERROR_BAD_OPTION,
 		       "Bad unit number in OPEN statement");
        return;
      }
@@ -1745,23 +1745,23 @@ data_transfer_init (st_parameter_dt *dtp
 
      conv = get_unformatted_convert (dtp->common.unit);
 
-     if (conv == CONVERT_NONE)
+     if (conv == GFC_CONVERT_NONE)
        conv = compile_options.convert;
 
      /* We use l8_to_l4_offset, which is 0 on little-endian machines
 	and 1 on big-endian machines.  */
      switch (conv)
        {
-       case CONVERT_NATIVE:
-       case CONVERT_SWAP:
+       case GFC_CONVERT_NATIVE:
+       case GFC_CONVERT_SWAP:
 	 break;
 	 
-       case CONVERT_BIG:
-	 conv = l8_to_l4_offset ? CONVERT_NATIVE : CONVERT_SWAP;
+       case GFC_CONVERT_BIG:
+	 conv = l8_to_l4_offset ? GFC_CONVERT_NATIVE : GFC_CONVERT_SWAP;
 	 break;
       
-       case CONVERT_LITTLE:
-	 conv = l8_to_l4_offset ? CONVERT_SWAP : CONVERT_NATIVE;
+       case GFC_CONVERT_LITTLE:
+	 conv = l8_to_l4_offset ? GFC_CONVERT_SWAP : GFC_CONVERT_NATIVE;
 	 break;
 	 
        default:
@@ -1784,14 +1784,14 @@ data_transfer_init (st_parameter_dt *dtp
 
   if (read_flag && dtp->u.p.current_unit->flags.action == ACTION_WRITE)
     {
-      generate_error (&dtp->common, ERROR_BAD_ACTION,
+      generate_error (&dtp->common, LIBERROR_BAD_ACTION,
 		      "Cannot read from file opened for WRITE");
       return;
     }
 
   if (!read_flag && dtp->u.p.current_unit->flags.action == ACTION_READ)
     {
-      generate_error (&dtp->common, ERROR_BAD_ACTION,
+      generate_error (&dtp->common, LIBERROR_BAD_ACTION,
 		      "Cannot write to file opened for READ");
       return;
     }
@@ -1807,7 +1807,7 @@ data_transfer_init (st_parameter_dt *dtp
       && (cf & (IOPARM_DT_HAS_FORMAT | IOPARM_DT_LIST_FORMAT))
 	 != 0)
     {
-      generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+      generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 		      "Format present for UNFORMATTED data transfer");
       return;
     }
@@ -1815,20 +1815,20 @@ data_transfer_init (st_parameter_dt *dtp
   if ((cf & IOPARM_DT_HAS_NAMELIST_NAME) != 0 && dtp->u.p.ionml != NULL)
      {
 	if ((cf & IOPARM_DT_HAS_FORMAT) != 0)
-	   generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+	   generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 		    "A format cannot be specified with a namelist");
      }
   else if (dtp->u.p.current_unit->flags.form == FORM_FORMATTED &&
 	   !(cf & (IOPARM_DT_HAS_FORMAT | IOPARM_DT_LIST_FORMAT)))
     {
-      generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+      generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 		      "Missing format for FORMATTED data transfer");
     }
 
   if (is_internal_unit (dtp)
       && dtp->u.p.current_unit->flags.form == FORM_UNFORMATTED)
     {
-      generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+      generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 		      "Internal file cannot be accessed by UNFORMATTED "
 		      "data transfer");
       return;
@@ -1839,7 +1839,7 @@ data_transfer_init (st_parameter_dt *dtp
   if (dtp->u.p.current_unit->flags.access == ACCESS_DIRECT
       && (cf & IOPARM_DT_HAS_REC) == 0)
     {
-      generate_error (&dtp->common, ERROR_MISSING_OPTION,
+      generate_error (&dtp->common, LIBERROR_MISSING_OPTION,
 		      "Direct access data transfer requires record number");
       return;
     }
@@ -1847,7 +1847,7 @@ data_transfer_init (st_parameter_dt *dtp
   if (dtp->u.p.current_unit->flags.access == ACCESS_SEQUENTIAL
       && (cf & IOPARM_DT_HAS_REC) != 0)
     {
-      generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+      generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 		      "Record number not allowed for sequential access data transfer");
       return;
     }
@@ -1863,14 +1863,14 @@ data_transfer_init (st_parameter_dt *dtp
     {
       if (dtp->u.p.current_unit->flags.access == ACCESS_DIRECT)
 	{
-	  generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 			  "ADVANCE specification conflicts with sequential access");
 	  return;
 	}
 
       if (is_internal_unit (dtp))
 	{
-	  generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 			  "ADVANCE specification conflicts with internal file");
 	  return;
 	}
@@ -1878,7 +1878,7 @@ data_transfer_init (st_parameter_dt *dtp
       if ((cf & (IOPARM_DT_HAS_FORMAT | IOPARM_DT_LIST_FORMAT))
 	  != IOPARM_DT_HAS_FORMAT)
 	{
-	  generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 			  "ADVANCE specification requires an explicit format");
 	  return;
 	}
@@ -1888,7 +1888,7 @@ data_transfer_init (st_parameter_dt *dtp
     {
       if ((cf & IOPARM_EOR) != 0 && dtp->u.p.advance_status != ADVANCE_NO)
 	{
-	  generate_error (&dtp->common, ERROR_MISSING_OPTION,
+	  generate_error (&dtp->common, LIBERROR_MISSING_OPTION,
 			  "EOR specification requires an ADVANCE specification "
 			  "of NO");
 	  return;
@@ -1896,7 +1896,7 @@ data_transfer_init (st_parameter_dt *dtp
 
       if ((cf & IOPARM_DT_HAS_SIZE) != 0 && dtp->u.p.advance_status != ADVANCE_NO)
 	{
-	  generate_error (&dtp->common, ERROR_MISSING_OPTION,
+	  generate_error (&dtp->common, LIBERROR_MISSING_OPTION,
 			  "SIZE specification requires an ADVANCE specification of NO");
 	  return;
 	}
@@ -1905,21 +1905,21 @@ data_transfer_init (st_parameter_dt *dtp
     {				/* Write constraints.  */
       if ((cf & IOPARM_END) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 			  "END specification cannot appear in a write statement");
 	  return;
 	}
 
       if ((cf & IOPARM_EOR) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 			  "EOR specification cannot appear in a write statement");
 	  return;
 	}
 
       if ((cf & IOPARM_DT_HAS_SIZE) != 0)
 	{
-	  generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
+	  generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT,
 			  "SIZE specification cannot appear in a write statement");
 	  return;
 	}
@@ -1933,14 +1933,14 @@ data_transfer_init (st_parameter_dt *dtp
     {
       if (dtp->rec <= 0)
 	{
-	  generate_error (&dtp->common, ERROR_BAD_OPTION,
+	  generate_error (&dtp->common, LIBERROR_BAD_OPTION,
 			  "Record number must be positive");
 	  return;
 	}
 
       if (dtp->rec >= dtp->u.p.current_unit->maxrec)
 	{
-	  generate_error (&dtp->common, ERROR_BAD_OPTION,
+	  generate_error (&dtp->common, LIBERROR_BAD_OPTION,
 			  "Record number too large");
 	  return;
 	}
@@ -1958,7 +1958,7 @@ data_transfer_init (st_parameter_dt *dtp
       if (dtp->u.p.mode == READING && (dtp->rec -1)
 	  * dtp->u.p.current_unit->recl >= file_length (dtp->u.p.current_unit->s))
 	{
-	  generate_error (&dtp->common, ERROR_BAD_OPTION,
+	  generate_error (&dtp->common, LIBERROR_BAD_OPTION,
 			  "Non-existing record number");
 	  return;
 	}
@@ -1969,7 +1969,7 @@ data_transfer_init (st_parameter_dt *dtp
 	  if (sseek (dtp->u.p.current_unit->s, (gfc_offset) (dtp->rec - 1)
 		     * dtp->u.p.current_unit->recl) == FAILURE)
 	    {
-	      generate_error (&dtp->common, ERROR_OS, NULL);
+	      generate_error (&dtp->common, LIBERROR_OS, NULL);
 	      return;
 	    }
 	}
@@ -2035,7 +2035,7 @@ data_transfer_init (st_parameter_dt *dtp
     {
       if (dtp->u.p.current_unit->read_bad && !is_stream_io (dtp))
 	{
-	  generate_error (&dtp->common, ERROR_BAD_OPTION,
+	  generate_error (&dtp->common, LIBERROR_BAD_OPTION,
 			  "Cannot READ after a nonadvancing WRITE");
 	  return;
 	}
@@ -2137,7 +2137,7 @@ skip_record (st_parameter_dt *dtp, size_
       /* Direct access files do not generate END conditions,
 	 only I/O errors.  */
       if (sseek (dtp->u.p.current_unit->s, new) == FAILURE)
-	generate_error (&dtp->common, ERROR_OS, NULL);
+	generate_error (&dtp->common, LIBERROR_OS, NULL);
     }
   else
     {			/* Seek by reading data.  */
@@ -2150,7 +2150,7 @@ skip_record (st_parameter_dt *dtp, size_
 	  p = salloc_r (dtp->u.p.current_unit->s, &rlength);
 	  if (p == NULL)
 	    {
-	      generate_error (&dtp->common, ERROR_OS, NULL);
+	      generate_error (&dtp->common, LIBERROR_OS, NULL);
 	      return;
 	    }
 
@@ -2233,7 +2233,7 @@ next_record_r (st_parameter_dt *dtp)
 	      record = record * dtp->u.p.current_unit->recl;
 	      if (sseek (dtp->u.p.current_unit->s, record) == FAILURE)
 		{
-		  generate_error (&dtp->common, ERROR_INTERNAL_UNIT, NULL);
+		  generate_error (&dtp->common, LIBERROR_INTERNAL_UNIT, NULL);
 		  break;
 		}
 	      dtp->u.p.current_unit->bytes_left = dtp->u.p.current_unit->recl;
@@ -2254,7 +2254,7 @@ next_record_r (st_parameter_dt *dtp)
 
 	  if (p == NULL)
 	    {
-	      generate_error (&dtp->common, ERROR_OS, NULL);
+	      generate_error (&dtp->common, LIBERROR_OS, NULL);
 	      break;
 	    }
 
@@ -2298,8 +2298,8 @@ write_us_marker (st_parameter_dt *dtp, c
   else
     len = compile_options.record_marker;
 
-  /* Only CONVERT_NATIVE and CONVERT_SWAP are valid here.  */
-  if (dtp->u.p.current_unit->flags.convert == CONVERT_NATIVE)
+  /* Only GFC_CONVERT_NATIVE and GFC_CONVERT_SWAP are valid here.  */
+  if (dtp->u.p.current_unit->flags.convert == GFC_CONVERT_NATIVE)
     {
       switch (len)
 	{
@@ -2395,7 +2395,7 @@ next_record_w_unf (st_parameter_dt *dtp,
   return;
 
  io_error:
-  generate_error (&dtp->common, ERROR_OS, NULL);
+  generate_error (&dtp->common, LIBERROR_OS, NULL);
   return;
 
 }
@@ -2463,7 +2463,7 @@ next_record_w (st_parameter_dt *dtp, int
 
 	      if (sset (dtp->u.p.current_unit->s, ' ', length) == FAILURE)
 		{
-		  generate_error (&dtp->common, ERROR_END, NULL);
+		  generate_error (&dtp->common, LIBERROR_END, NULL);
 		  return;
 		}
 
@@ -2478,7 +2478,7 @@ next_record_w (st_parameter_dt *dtp, int
 
 	      if (sseek (dtp->u.p.current_unit->s, record) == FAILURE)
 		{
-		  generate_error (&dtp->common, ERROR_INTERNAL_UNIT, NULL);
+		  generate_error (&dtp->common, LIBERROR_INTERNAL_UNIT, NULL);
 		  return;
 		}
 
@@ -2507,7 +2507,7 @@ next_record_w (st_parameter_dt *dtp, int
 
 	      if (sset (dtp->u.p.current_unit->s, ' ', length) == FAILURE)
 		{
-		  generate_error (&dtp->common, ERROR_END, NULL);
+		  generate_error (&dtp->common, LIBERROR_END, NULL);
 		  return;
 		}
 	    }
@@ -2544,7 +2544,7 @@ next_record_w (st_parameter_dt *dtp, int
       break;
 
     io_error:
-      generate_error (&dtp->common, ERROR_OS, NULL);
+      generate_error (&dtp->common, LIBERROR_OS, NULL);
       break;
     }
 }
@@ -2605,7 +2605,7 @@ finalize_transfer (st_parameter_dt *dtp)
 
   if (dtp->u.p.eor_condition)
     {
-      generate_error (&dtp->common, ERROR_EOR, NULL);
+      generate_error (&dtp->common, LIBERROR_EOR, NULL);
       return;
     }
 
@@ -2628,7 +2628,7 @@ finalize_transfer (st_parameter_dt *dtp)
   dtp->u.p.eof_jump = &eof_jump;
   if (setjmp (eof_jump))
     {
-      generate_error (&dtp->common, ERROR_END, NULL);
+      generate_error (&dtp->common, LIBERROR_END, NULL);
       return;
     }
 
@@ -2758,14 +2758,14 @@ st_read (st_parameter_dt *dtp)
       case AT_ENDFILE:
 	if (!is_internal_unit (dtp))
 	  {
-	    generate_error (&dtp->common, ERROR_END, NULL);
+	    generate_error (&dtp->common, LIBERROR_END, NULL);
 	    dtp->u.p.current_unit->endfile = AFTER_ENDFILE;
 	    dtp->u.p.current_unit->current_record = 0;
 	  }
 	break;
 
       case AFTER_ENDFILE:
-	generate_error (&dtp->common, ERROR_ENDFILE, NULL);
+	generate_error (&dtp->common, LIBERROR_ENDFILE, NULL);
 	dtp->u.p.current_unit->current_record = 0;
 	break;
       }
@@ -2827,7 +2827,7 @@ st_write_done (st_parameter_dt *dtp)
 	  {
 	    flush (dtp->u.p.current_unit->s);
 	    if (struncate (dtp->u.p.current_unit->s) == FAILURE)
-	      generate_error (&dtp->common, ERROR_OS, NULL);
+	      generate_error (&dtp->common, LIBERROR_OS, NULL);
 	  }
 	dtp->u.p.current_unit->endfile = AT_ENDFILE;
 	break;
Index: libgfortran/io/format.c
===================================================================
--- libgfortran/io/format.c	(revision 127895)
+++ libgfortran/io/format.c	(working copy)
@@ -944,7 +944,7 @@ format_error (st_parameter_dt *dtp, cons
   *p++ = '^';
   *p = '\0';
 
-  generate_error (&dtp->common, ERROR_FORMAT, buffer);
+  generate_error (&dtp->common, LIBERROR_FORMAT, buffer);
 }
 
 
Index: gcc/fortran/iso-fortran-env.def
===================================================================
--- gcc/fortran/iso-fortran-env.def	(revision 127903)
+++ gcc/fortran/iso-fortran-env.def	(working copy)
@@ -26,11 +26,11 @@ along with GCC; see the file COPYING3.  
 
 NAMED_INTCST (ISOFORTRANENV_CHARACTER_STORAGE_SIZE, "character_storage_size", \
               gfc_character_storage_size)
-NAMED_INTCST (ISOFORTRANENV_ERROR_UNIT, "error_unit", 0)
+NAMED_INTCST (ISOFORTRANENV_ERROR_UNIT, "error_unit", GFC_STDERR_UNIT_NUMBER)
 NAMED_INTCST (ISOFORTRANENV_FILE_STORAGE_SIZE, "file_storage_size", 8)
-NAMED_INTCST (ISOFORTRANENV_INPUT_UNIT, "input_unit", 5)
-NAMED_INTCST (ISOFORTRANENV_IOSTAT_END, "iostat_end", -1)
-NAMED_INTCST (ISOFORTRANENV_IOSTAT_EOR, "iostat_eor", -2)
+NAMED_INTCST (ISOFORTRANENV_INPUT_UNIT, "input_unit", GFC_STDIN_UNIT_NUMBER)
+NAMED_INTCST (ISOFORTRANENV_IOSTAT_END, "iostat_end", LIBERROR_END)
+NAMED_INTCST (ISOFORTRANENV_IOSTAT_EOR, "iostat_eor", LIBERROR_EOR)
 NAMED_INTCST (ISOFORTRANENV_NUMERIC_STORAGE_SIZE, "numeric_storage_size", \
               gfc_numeric_storage_size)
-NAMED_INTCST (ISOFORTRANENV_OUTPUT_UNIT, "output_unit", 6)
+NAMED_INTCST (ISOFORTRANENV_OUTPUT_UNIT, "output_unit", GFC_STDOUT_UNIT_NUMBER)
Index: gcc/fortran/gfortran.h
===================================================================
--- gcc/fortran/gfortran.h	(revision 127903)
+++ gcc/fortran/gfortran.h	(working copy)
@@ -28,6 +28,11 @@ along with GCC; see the file COPYING3.  
    multiple header files.  Besides, Microsoft's winnt.h was 250k last
    time I looked, so by comparison this is perfectly reasonable.  */
 
+/* Declarations common to the front-end and library are put in
+   libgfortran/libgfortran_frontend.h  */
+#include "../../libgfortran/libgfortran_frontend.h"
+
+
 #include "system.h"
 #include "intl.h"
 #include "coretypes.h"
@@ -57,7 +62,6 @@ char *alloca ();
 #define GFC_MAX_SYMBOL_LEN 63   /* Must be at least 63 for F2003.  */
 #define GFC_MAX_BINDING_LABEL_LEN 126 /* (2 * GFC_MAX_SYMBOL_LEN) */
 #define GFC_MAX_LINE 132	/* Characters beyond this are not seen.  */
-#define GFC_MAX_DIMENSIONS 7	/* Maximum dimensions in an array.  */
 #define GFC_LETTERS 26		/* Number of letters in the alphabet.  */
 
 #define MAX_SUBRECORD_LENGTH 2147483639   /* 2**31-9 */
@@ -96,33 +100,6 @@ typedef struct
 mstring;
 
 
-/* Flags to specify which standard/extension contains a feature.  */
-#define GFC_STD_LEGACY		(1<<6) /* Backward compatibility.  */
-#define GFC_STD_GNU		(1<<5)    /* GNU Fortran extension.  */
-#define GFC_STD_F2003		(1<<4)    /* New in F2003.  */
-/* Note that no additional features were deleted or made obsolescent
-   in F2003.  */
-#define GFC_STD_F95		(1<<3)    /* New in F95.  */
-#define GFC_STD_F95_DEL		(1<<2)    /* Deleted in F95.  */
-#define GFC_STD_F95_OBS		(1<<1)    /* Obsolescent in F95.  */
-#define GFC_STD_F77		(1<<0)    /* Included in F77, but not
-					     deleted or obsolescent in
-					     later standards.  */
-
-/* Bitmasks for the various FPE that can be enabled.  */
-#define GFC_FPE_INVALID    (1<<0)
-#define GFC_FPE_DENORMAL   (1<<1)
-#define GFC_FPE_ZERO       (1<<2)
-#define GFC_FPE_OVERFLOW   (1<<3)
-#define GFC_FPE_UNDERFLOW  (1<<4)
-#define GFC_FPE_PRECISION  (1<<5)
-
-/* Keep this in sync with libgfortran/io/io.h ! */
-
-typedef enum
-  { CONVERT_NATIVE=0, CONVERT_SWAP, CONVERT_BIG, CONVERT_LITTLE }
-options_convert;
-
 
 /*************************** Enums *****************************/
 
@@ -532,38 +509,6 @@ enum gfc_isym_id
 };
 typedef enum gfc_isym_id gfc_isym_id;
 
-/* Runtime errors.  The EOR and EOF errors are required to be negative.
-   These codes must be kept synchronized with their equivalents in
-   libgfortran/libgfortran.h .  */
-
-typedef enum
-{
-  IOERROR_FIRST = -3,		/* Marker for the first error.  */
-  IOERROR_EOR = -2,
-  IOERROR_END = -1,
-  IOERROR_OK = 0,			/* Indicates success, must be zero.  */
-  IOERROR_OS = 5000,		/* Operating system error, more info in errno.  */
-  IOERROR_OPTION_CONFLICT,
-  IOERROR_BAD_OPTION,
-  IOERROR_MISSING_OPTION,
-  IOERROR_ALREADY_OPEN,
-  IOERROR_BAD_UNIT,
-  IOERROR_FORMAT,
-  IOERROR_BAD_ACTION,
-  IOERROR_ENDFILE,
-  IOERROR_BAD_US,
-  IOERROR_READ_VALUE,
-  IOERROR_READ_OVERFLOW,
-  IOERROR_INTERNAL,
-  IOERROR_INTERNAL_UNIT,
-  IOERROR_ALLOCATION,
-  IOERROR_DIRECT_EOR,
-  IOERROR_SHORT_RECORD,
-  IOERROR_CORRUPT_FILE,
-  IOERROR_LAST			/* Not a real error, the last error # + 1.  */
-}
-ioerror_codes;
-
 
 /************************* Structures *****************************/
 
Index: gcc/fortran/trans.c
===================================================================
--- gcc/fortran/trans.c	(revision 127903)
+++ gcc/fortran/trans.c	(working copy)
@@ -473,11 +473,6 @@ gfc_call_malloc (stmtblock_t * block, tr
   return res;
 }
 
-/* The status variable of allocate statement is set to ERROR_ALLOCATION 
-   when the allocation wasn't successful. This value needs to be kept in
-   sync with libgfortran/libgfortran.h.  */
-#define ERROR_ALLOCATION 5014
-
 /* Allocate memory, using an optional status argument.
  
    This function follows the following pseudo-code:
@@ -495,7 +490,7 @@ gfc_call_malloc (stmtblock_t * block, tr
       {
         if (stat)
         {
-          *stat = ERROR_ALLOCATION;
+          *stat = LIBERROR_ALLOCATION;
           newmem = NULL;
         }
         else
@@ -508,7 +503,7 @@ gfc_call_malloc (stmtblock_t * block, tr
         if (newmem == NULL)
         {
           if (stat)
-            *stat = ERROR_ALLOCATION;
+            *stat = LIBERROR_ALLOCATION;
           else
             runtime_error ("Out of memory");
         }
@@ -558,7 +553,7 @@ gfc_allocate_with_status (stmtblock_t * 
       gfc_start_block (&set_status_block);
       gfc_add_modify_expr (&set_status_block,
 			   build1 (INDIRECT_REF, status_type, status),
-			   build_int_cst (status_type, ERROR_ALLOCATION));
+			   build_int_cst (status_type, LIBERROR_ALLOCATION));
       gfc_add_modify_expr (&set_status_block, res,
 			   build_int_cst (pvoid_type_node, 0));
 
@@ -589,7 +584,7 @@ gfc_allocate_with_status (stmtblock_t * 
 			  build_int_cst (status_type, 0));
       tmp2 = fold_build2 (MODIFY_EXPR, status_type,
 			  build1 (INDIRECT_REF, status_type, status),
-			  build_int_cst (status_type, ERROR_ALLOCATION));
+			  build_int_cst (status_type, LIBERROR_ALLOCATION));
       tmp = fold_build3 (COND_EXPR, void_type_node, cond, tmp,
 			 tmp2);
     }
@@ -627,7 +622,7 @@ gfc_allocate_with_status (stmtblock_t * 
 	{
 	  free (mem);
 	  mem = allocate (size, stat);
-	  *stat = ERROR_ALLOCATION;
+	  *stat = LIBERROR_ALLOCATION;
 	  return mem;
 	}
 	else
@@ -675,7 +670,7 @@ gfc_allocate_array_with_status (stmtbloc
 
       gfc_add_modify_expr (&set_status_block,
 			   build1 (INDIRECT_REF, status_type, status),
-			   build_int_cst (status_type, ERROR_ALLOCATION));
+			   build_int_cst (status_type, LIBERROR_ALLOCATION));
 
       tmp = fold_build2 (EQ_EXPR, boolean_type_node, status,
 			 build_int_cst (status_type, 0));
Index: gcc/fortran/trans-types.h
===================================================================
--- gcc/fortran/trans-types.h	(revision 127903)
+++ gcc/fortran/trans-types.h	(working copy)
@@ -24,22 +24,6 @@ along with GCC; see the file COPYING3.  
 #ifndef GFC_BACKEND_H
 #define GFC_BACKEND_H
 
-#define GFC_DTYPE_RANK_MASK 0x07
-#define GFC_DTYPE_TYPE_SHIFT 3
-#define GFC_DTYPE_TYPE_MASK 0x38
-#define GFC_DTYPE_SIZE_SHIFT 6
-
-enum
-{
-  GFC_DTYPE_UNKNOWN = 0,
-  GFC_DTYPE_INTEGER,
-  GFC_DTYPE_LOGICAL,
-  GFC_DTYPE_REAL,
-  GFC_DTYPE_COMPLEX,
-  GFC_DTYPE_DERIVED,
-  GFC_DTYPE_CHARACTER
-};
-
 extern GTY(()) tree gfc_array_index_type;
 extern GTY(()) tree gfc_array_range_type;
 extern GTY(()) tree gfc_character1_type_node;
Index: gcc/fortran/trans-decl.c
===================================================================
--- gcc/fortran/trans-decl.c	(revision 127903)
+++ gcc/fortran/trans-decl.c	(working copy)
@@ -3212,7 +3212,7 @@ gfc_generate_function_code (gfc_namespac
   /* If this is the main program and an -fconvert option was provided,
      add a call to set_convert.  */
 
-  if (sym->attr.is_main_program && gfc_option.convert != CONVERT_NATIVE)
+  if (sym->attr.is_main_program && gfc_option.convert != GFC_CONVERT_NATIVE)
     {
       tmp = build_call_expr (gfor_fndecl_set_convert, 1,
 			     build_int_cst (integer_type_node,
Index: gcc/fortran/trans-io.c
===================================================================
--- gcc/fortran/trans-io.c	(revision 127903)
+++ gcc/fortran/trans-io.c	(working copy)
@@ -457,18 +457,15 @@ set_parameter_value (stmtblock_t *block,
   if (type == IOPARM_common_unit && e->ts.kind != 4)
     {
       tree cond, max;
-      ioerror_codes bad_unit;
       int i;
 
-      bad_unit = IOERROR_BAD_UNIT;
-
       /* Don't evaluate the UNIT number multiple times.  */
       se.expr = gfc_evaluate_now (se.expr, &se.pre);
 
       /* UNIT numbers should be nonnegative.  */
       cond = fold_build2 (LT_EXPR, boolean_type_node, se.expr,
 			  build_int_cst (TREE_TYPE (se.expr),0));
-      gfc_trans_io_runtime_check (cond, var, bad_unit,
+      gfc_trans_io_runtime_check (cond, var, LIBERROR_BAD_UNIT,
 			       "Negative unit number in I/O statement",
 			       &se.pre);
     
@@ -477,7 +474,7 @@ set_parameter_value (stmtblock_t *block,
       max = gfc_conv_mpz_to_tree (gfc_integer_kinds[i].huge, 4);
       cond = fold_build2 (GT_EXPR, boolean_type_node, se.expr,
 			  fold_convert (TREE_TYPE (se.expr), max));
-      gfc_trans_io_runtime_check (cond, var, bad_unit,
+      gfc_trans_io_runtime_check (cond, var, LIBERROR_BAD_UNIT,
 			       "Unit number in I/O statement too large",
 			       &se.pre);
 
@@ -519,14 +516,10 @@ set_parameter_ref (stmtblock_t *block, s
       addr = convert (TREE_TYPE (p->field), build_fold_addr_expr (se.expr));
 
       /* If this is for the iostat variable initialize the
-	 user variable to IOERROR_OK which is zero.  */
+	 user variable to LIBERROR_OK which is zero.  */
       if (type == IOPARM_common_iostat)
-	{
-	  ioerror_codes ok;
-	  ok = IOERROR_OK;
-          gfc_add_modify_expr (block, se.expr,
-			       build_int_cst (TREE_TYPE (se.expr), ok));
-	}
+	gfc_add_modify_expr (block, se.expr,
+			     build_int_cst (TREE_TYPE (se.expr), LIBERROR_OK));
     }
   else
     {
@@ -537,14 +530,10 @@ set_parameter_ref (stmtblock_t *block, s
 				    st_parameter_field[type].name);
 
       /* If this is for the iostat variable, initialize the
-	 user variable to IOERROR_OK which is zero.  */
+	 user variable to LIBERROR_OK which is zero.  */
       if (type == IOPARM_common_iostat)
-	{
-	  ioerror_codes ok;
-	  ok = IOERROR_OK;
-          gfc_add_modify_expr (block, tmpvar,
-			       build_int_cst (TREE_TYPE (tmpvar), ok));
-	}
+	gfc_add_modify_expr (block, tmpvar,
+			     build_int_cst (TREE_TYPE (tmpvar), LIBERROR_OK));
 
       addr = build_fold_addr_expr (tmpvar);
 	/* After the I/O operation, we set the variable from the temporary.  */
Index: gcc/fortran/trans-intrinsic.c
===================================================================
--- gcc/fortran/trans-intrinsic.c	(revision 127903)
+++ gcc/fortran/trans-intrinsic.c	(working copy)
@@ -3928,11 +3928,11 @@ gfc_conv_intrinsic_function (gfc_se * se
       break;
 
     case GFC_ISYM_IS_IOSTAT_END:
-      gfc_conv_has_intvalue (se, expr, -1);
+      gfc_conv_has_intvalue (se, expr, LIBERROR_END);
       break;
 
     case GFC_ISYM_IS_IOSTAT_EOR:
-      gfc_conv_has_intvalue (se, expr, -2);
+      gfc_conv_has_intvalue (se, expr, LIBERROR_EOR);
       break;
 
     case GFC_ISYM_ISNAN:
Index: gcc/fortran/options.c
===================================================================
--- gcc/fortran/options.c	(revision 127903)
+++ gcc/fortran/options.c	(working copy)
@@ -62,7 +62,7 @@ gfc_init_options (unsigned int argc ATTR
   gfc_option.max_continue_free = 39;
   gfc_option.max_identifier_length = GFC_MAX_SYMBOL_LEN;
   gfc_option.max_subrecord_length = 0;
-  gfc_option.convert = CONVERT_NATIVE;
+  gfc_option.convert = GFC_CONVERT_NATIVE;
   gfc_option.record_marker = 0;
   gfc_option.verbose = 0;
 
@@ -704,19 +704,19 @@ gfc_handle_option (size_t scode, const c
       break;
 
     case OPT_fconvert_little_endian:
-      gfc_option.convert = CONVERT_LITTLE;
+      gfc_option.convert = GFC_CONVERT_LITTLE;
       break;
 
     case OPT_fconvert_big_endian:
-      gfc_option.convert = CONVERT_BIG;
+      gfc_option.convert = GFC_CONVERT_BIG;
       break;
 
     case OPT_fconvert_native:
-      gfc_option.convert = CONVERT_NATIVE;
+      gfc_option.convert = GFC_CONVERT_NATIVE;
       break;
 
     case OPT_fconvert_swap:
-      gfc_option.convert = CONVERT_SWAP;
+      gfc_option.convert = GFC_CONVERT_SWAP;
       break;
 
     case OPT_frecord_marker_4: