diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 65475e08ac..19a2a8b7d0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Wed Apr 14 17:12:51 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* xcoffread.c (record_include_{begin,end}): Change fatal to complain.
+
+Wed Apr 14 14:03:18 1993  Per Bothner  (bothner@cygnus.com)
+
+	* ch-exp.y:  Fix thinko that broke parsing of FALSE.
+
 Wed Apr 14 12:49:29 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* stabsread.c (read_member_functions): Initialize domain for stubbed
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index a8f9e7c0b5..a33ad99b6a 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -404,12 +404,17 @@ static void
 record_include_begin (cs)
 struct coff_symbol *cs;
 {
-  /* In xcoff, we assume include files cannot be nested (not in .c files
-     of course, but in corresponding .s files.) */
-
   if (inclDepth)
-    fatal ("xcoff internal: pending include file exists.");
+    {
+      /* In xcoff, we assume include files cannot be nested (not in .c files
+	 of course, but in corresponding .s files.).  */
 
+      /* 14 Apr 93: A user said he got this message, but said he'd deleted
+	 the test case.  I changed it from a fatal() to a complain()
+	 and changed the wording.  */
+      struct complaint msg = {"Nested C_BINCL symbols", 0, 0};
+      complain (&msg);
+    }
   ++inclDepth;
 
   /* allocate an include file, or make room for the new entry */
@@ -440,7 +445,10 @@ struct coff_symbol *cs;
   InclTable *pTbl;  
 
   if (inclDepth == 0)
-    fatal ("xcoff internal: Mismatch C_BINCL/C_EINCL pair found.");
+    {
+      struct complaint msg = {"Mismatched C_BINCL/C_EINCL pair", 0, 0};
+      complain (&msg);
+    }
 
   pTbl = &inclTable [inclIndx];
   pTbl->end = cs->c_value;