diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2613cbdd39..2bec8695350 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-15  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* fix-header.c (read_scan_file): Update.
+
 Thu Nov 15 08:36:39 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* toplev.c (toplev_main): Don't start timing until after
diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index 5ee5d95cef8..68237fba2ff 100644
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -621,7 +621,7 @@ read_scan_file (in_fname, argc, argv)
 
   obstack_init (&scan_file_obstack); 
 
-  scan_in = cpp_create_reader (NULL, CLK_GNUC89);
+  scan_in = cpp_create_reader (CLK_GNUC89);
   cb = cpp_get_callbacks (scan_in);
   cb->file_change = cb_file_change;
 
@@ -638,9 +638,11 @@ read_scan_file (in_fname, argc, argv)
   if (CPP_FATAL_ERRORS (scan_in))
     exit (FATAL_EXIT_CODE);
 
-  if (! cpp_start_read (scan_in, in_fname))
+  if (! cpp_read_main_file (scan_in, in_fname, NULL))
     exit (FATAL_EXIT_CODE);
 
+  cpp_finish_options (scan_in);
+
   /* We are scanning a system header, so mark it as such.  */
   cpp_make_system_header (scan_in, 1, 0);