diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 730497ea38..e201c2f659 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jan 21 09:29:01 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h (translate_to_native_sym_flags), bfd-in.h (bfd_ec),
+	oasys.c (oasys_write_sections): Rename
+	bfd_error_nonrepresentable_section to nonrepresentable_section.
+	None of the other bfd error names start with "bfd_error".
+	Remove errors symbol_not_found and no_relocation_info, which seem
+	to be unused.
+	* bfd-in2.h: Regenerated.
+
 Fri Jan 21 01:11:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* bfd.c (bfd_get_gp_size): Added support for ELF.
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 03665907a4..41107193da 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -1331,14 +1331,14 @@ DEFUN(translate_to_native_sym_flags,(sym_pointer, cache_ptr, abfd),
   else if (bfd_get_output_section(cache_ptr) == NULL) {
     /* Protect the bfd_is_com_section call.
        This case occurs, e.g., for the *DEBUG* section of a COFF file.  */
-    bfd_error = bfd_error_nonrepresentable_section;
+    bfd_error = nonrepresentable_section;
     return false;
   }
   else if (bfd_is_com_section (bfd_get_output_section (cache_ptr))) {
     sym_pointer->e_type[0] = (N_UNDF | N_EXT);
   }
   else {
-    bfd_error = bfd_error_nonrepresentable_section;
+    bfd_error = nonrepresentable_section;
     return false;
   }
 
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 3bc3f42eb3..7505210291 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -307,14 +307,12 @@ typedef enum bfd_error
   invalid_operation,
   no_memory,
   no_symbols,
-  no_relocation_info,
   no_more_archived_files,
   malformed_archive,
-  symbol_not_found,
   file_not_recognized,
   file_ambiguously_recognized,
   no_contents,
-  bfd_error_nonrepresentable_section,
+  nonrepresentable_section,
   no_debug_section,
   bad_value,
   file_truncated,
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 2e91a1d8db..465ce32ab1 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -307,14 +307,12 @@ typedef enum bfd_error
   invalid_operation,
   no_memory,
   no_symbols,
-  no_relocation_info,
   no_more_archived_files,
   malformed_archive,
-  symbol_not_found,
   file_not_recognized,
   file_ambiguously_recognized,
   no_contents,
-  bfd_error_nonrepresentable_section,
+  nonrepresentable_section,
   no_debug_section,
   bad_value,
   file_truncated,