diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 939d8f5a7d2..2c03468dee4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-21 14:55 -0400  Zack Weinberg  <zack@rabi.columbia.edu>
+
+	* gen-protos.c: #undef abort after including system.h.  
+	Delete defns of fancy_abort and	fatal.
+	* fix-header.c: Delete defn of fancy_abort.
+
 Wed Apr 21 12:09:38 1999  Mumit Khan  <khan@xraylith.wisc.edu>
 
 	* cccp.c (simplify_filename): Always preserve leading double slash.
diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index 35942d25db6..dfde8e5c560 100644
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -367,16 +367,6 @@ xfree (ptr)
   free (ptr);
 }
 
-/* Avoid error if config defines abort as fancy_abort.
-   It's not worth "really" implementing this because ordinary
-   compiler users never run fix-header.  */
-
-void
-fancy_abort ()
-{
-  abort ();
-}
-
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free xfree
 struct obstack scan_file_obstack;
diff --git a/gcc/gen-protos.c b/gcc/gen-protos.c
index 08b7ea85ddc..10850353153 100644
--- a/gcc/gen-protos.c
+++ b/gcc/gen-protos.c
@@ -20,6 +20,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "scan.h"
 #include "cpplib.h"
 #include "cpphash.h"
+#undef abort
 
 int verbose = 0;
 char *progname;
@@ -182,21 +183,3 @@ main (argc, argv)
 
   return 0;
 }
-
-/* Avoid error if config defines abort as fancy_abort.
-   It's not worth "really" implementing this because ordinary
-   compiler users never run fix-header.  */
-
-void
-fancy_abort ()
-{
-  abort ();
-}
-
-void
-fatal (s)
-     char *s;
-{
-  fprintf (stderr, "%s: %s\n", "gen-protos", s);
-  exit (FATAL_EXIT_CODE);
-}