diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a5c8380a767..fe1a7463266 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-13  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+        * fix-header.c (read_scan_file): Use cpp_get_callbacks and
+        cpp_get_options rather than dereferencing pfile and using
+        CPP_OPTION.
+        * scan-decls.c (scan_decls): Use return value of
+        cpp_pop_buffer rather than CPP_BUFFER.
+	
 2001-01-13  Neil Booth  <neil@daikokuya.demon.co.uk>
 
         * cppinit.c (cpp_handle_option): help_only is now part of the
diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index 11b11412181..522434f6ce3 100644
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -613,6 +613,8 @@ read_scan_file (in_fname, argc, argv)
      char **argv;
 {
   cpp_reader* scan_in;
+  cpp_callbacks *cb;
+  cpp_options *options;
   struct fn_decl *fn;
   int i;
   register struct symbol_list *cur_symbols;
@@ -620,12 +622,15 @@ read_scan_file (in_fname, argc, argv)
   obstack_init (&scan_file_obstack); 
 
   scan_in = cpp_create_reader (CLK_GNUC89);
-  scan_in->cb.file_change = cb_file_change;
+  cb = cpp_get_callbacks (scan_in);
+  cb->file_change = cb_file_change;
 
   /* We are going to be scanning a header file out of its proper context,
      so ignore warnings and errors.  */
-  CPP_OPTION (scan_in, inhibit_warnings) = 1;
-  CPP_OPTION (scan_in, inhibit_errors) = 1;
+  options = cpp_get_options (pfile);
+  options->inhibit_warnings = 1;
+  options->inhibit_errors = 1;
+
   i = cpp_handle_options (scan_in, argc, argv);
   if (i < argc && ! CPP_FATAL_ERRORS (scan_in))
     cpp_fatal (scan_in, "Invalid option `%s'", argv[i]);
diff --git a/gcc/scan-decls.c b/gcc/scan-decls.c
index cd92cdd8aa5..55f10abb8d6 100644
--- a/gcc/scan-decls.c
+++ b/gcc/scan-decls.c
@@ -113,8 +113,7 @@ scan_decls (pfile, argc, argv)
     }
   if (token.type == CPP_EOF)
     {
-      cpp_pop_buffer (pfile);
-      if (CPP_BUFFER (pfile) == NULL)
+      if (cpp_pop_buffer (pfile) == 0)
 	return 0;
 
       goto new_statement;
@@ -149,8 +148,7 @@ scan_decls (pfile, argc, argv)
 	  goto new_statement;
 	  
 	case CPP_EOF:
-	  cpp_pop_buffer (pfile);
-	  if (CPP_BUFFER (pfile) == NULL)
+	  if (cpp_pop_buffer (pfile) == 0)
 	    return 0;
 	  break;