diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61707ffd4a3..1f643a2d1c5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct  8 21:59:47 1998  Dave Brolley  <brolley@cygnus.com>
+
+	* emit-rtl.c (init_emit_once): Call INIT_EXPANDERS.
+
 Thu Oct  8 22:03:45 1998  David Edelsohn  <edelsohn@mhpcc.edu>
 
 	* rs6000.h (RTX_COSTS): Add PROCESSOR_PPC604e cases.
@@ -9,6 +13,9 @@ Thu Oct  8 17:00:18 1998  Richard Henderson  <rth@cygnus.com>
 
 Thu Oct  8 17:15:04 1998  Jeffrey A Law  (law@cygnus.com)
 
+	* cpplib.h: Protect from multiple inclusions.
+	* cpplib.c: Fix minor formatting problems.
+
 	* i386/xm-cygwin32.h: Only define POSIX if it is not already defined.
 
 	* jump.c (jump_optimize): Revert accidental patch.
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 874a1759a50..da2f54a97f0 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -6511,7 +6511,7 @@ cpp_handle_option (pfile, argc, argv)
     case 't':
       if (!strcmp (argv[i], "-traditional")) {
 	opts->traditional = 1;
-        opts->cplusplus_comments = 0;
+	opts->cplusplus_comments = 0;
       } else if (!strcmp (argv[i], "-trigraphs")) {
 	if (!opts->chill)
 	  opts->no_trigraphs = 0;
@@ -6816,7 +6816,7 @@ cpp_handle_option (pfile, argc, argv)
 	opts->out_fname = "";
 	break;
       }	/* else fall through into error */
-      
+
     default:
       return i;
     }
diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index ad69646d4fe..12b111b7a4e 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -19,6 +19,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  In other words, you are welcome to use, share and improve this program.
  You are forbidden to forbid anyone else to use, share and improve
  what you give them.   Help stamp out software-hoarding!  */
+#ifndef __GCC_CPPLIB__
+#define __GCC_CPPLIB__
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -686,3 +688,5 @@ extern void cpp_print_containing_files PROTO ((cpp_reader *));
 #ifdef __cplusplus
 }
 #endif
+#endif /* __GCC_CPPLIB__ */
+
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index e6e0e609e54..d8f36af4e23 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -3565,6 +3565,14 @@ init_emit_once (line_numbers)
 #ifdef PIC_OFFSET_TABLE_REGNUM
   pic_offset_table_rtx = gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM);
 #endif
+
+#ifdef INIT_EXPANDERS
+  /* This is to initialize save_machine_status and restore_machine_status before
+     the first call to push_function_context_to.  This is needed by the Chill
+     front end which calls push_function_context_to before the first cal to
+     init_function_start.  */
+  INIT_EXPANDERS;
+#endif
 }
 
 /* Query and clear/ restore no_line_numbers.  This is used by the