diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7b83382d8c..0623757898f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-01  Neil Booth  <neil@daikokuya.co.uk>
+
+	* config/arm/arm.c (arm_pr_long_calls, arm_pr_no_long_calls,
+	arm_pr_long_calls_off): Use struct.
+	* config/h8300/h8300.c (h8300_pr-interrupt, h8300_pr_saveall)
+	: Similarly.
+	Don't include cpplib.h.
+	* config/sh/sh.c (sh_pr_interrupt, sh_pr_trapa,
+	sh_pr_nosave_low_regs): Similarly.
+
 2003-01-01  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/h8300/h8300.c: Include cpplib.h.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index c4326bac5c1..04cdec7fe1e 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -2004,21 +2004,21 @@ static arm_pragma_enum arm_pragma_long_calls = OFF;
 
 void
 arm_pr_long_calls (pfile)
-     cpp_reader * pfile ATTRIBUTE_UNUSED;
+     struct cpp_reader * pfile ATTRIBUTE_UNUSED;
 {
   arm_pragma_long_calls = LONG;
 }
 
 void
 arm_pr_no_long_calls (pfile)
-     cpp_reader * pfile ATTRIBUTE_UNUSED;
+     struct cpp_reader * pfile ATTRIBUTE_UNUSED;
 {
   arm_pragma_long_calls = SHORT;
 }
 
 void
 arm_pr_long_calls_off (pfile)
-     cpp_reader * pfile ATTRIBUTE_UNUSED;
+     struct cpp_reader * pfile ATTRIBUTE_UNUSED;
 {
   arm_pragma_long_calls = OFF;
 }
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index 1c8fbf8ffab..0e1545e4a65 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -40,7 +40,6 @@ Boston, MA 02111-1307, USA.  */
 #include "function.h"
 #include "toplev.h"
 #include "c-pragma.h"
-#include "cpplib.h"
 #include "tm_p.h"
 #include "ggc.h"
 #include "target.h"
@@ -1077,14 +1076,14 @@ bit_memory_operand (op, mode)
 
 void
 h8300_pr_interrupt (pfile)
-     cpp_reader *pfile ATTRIBUTE_UNUSED;
+     struct cpp_reader *pfile ATTRIBUTE_UNUSED;
 {
   interrupt_handler = 1;
 }
 
 void
 h8300_pr_saveall (pfile)
-     cpp_reader *pfile ATTRIBUTE_UNUSED;
+     struct cpp_reader *pfile ATTRIBUTE_UNUSED;
 {
   pragma_saveall = 1;
 }
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 261f3247af5..d2644edbd77 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -5721,21 +5721,21 @@ initial_elimination_offset (from, to)
 
 void
 sh_pr_interrupt (pfile)
-     cpp_reader *pfile ATTRIBUTE_UNUSED;
+     struct cpp_reader *pfile ATTRIBUTE_UNUSED;
 {
   pragma_interrupt = 1;
 }
 
 void
 sh_pr_trapa (pfile)
-     cpp_reader *pfile ATTRIBUTE_UNUSED;
+     struct cpp_reader *pfile ATTRIBUTE_UNUSED;
 {
   pragma_interrupt = pragma_trapa = 1;
 }
 
 void
 sh_pr_nosave_low_regs (pfile)
-     cpp_reader *pfile ATTRIBUTE_UNUSED;
+     struct cpp_reader *pfile ATTRIBUTE_UNUSED;
 {
   pragma_nosave_low_regs = 1;
 }