diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 65f612fa27..618ea23eb5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2004-04-03  Andrew Cagney  <cagney@redhat.com>
+
+	* config/pa/tm-hppah.h (FRAME_SAVED_PC_IN_SIGTRAMP)
+	(FRAME_FIND_SAVED_REGS_IN_SIGTRAMP)
+	(hppa32_hpux_frame_find_saved_regs_in_sigtramp)
+	(FRAME_BASE_BEFORE_SIGTRAMP)
+	(hppa32_hpux_frame_base_before_sigtramp)
+	(hppa32_hpux_frame_saved_pc_in_sigtramp): Delete.
+	* config/pa/tm-hppa64.h (hppa64_hpux_frame_saved_pc_in_sigtramp)
+	(hppa64_hpux_frame_find_saved_regs_in_sigtramp)
+	(FRAME_FIND_SAVED_REGS_IN_SIGTRAMP)
+	(FRAME_BASE_BEFORE_SIGTRAMP)
+	(hppa64_hpux_frame_base_before_sigtramp)
+	(FRAME_SAVED_PC_IN_SIGTRAMP): Delete.
+
 2004-04-03  Andrew Cagney  <cagney@redhat.com>
 
 	* PROBLEMS: Mention that GDB doesn't build on HP/UX 11.00.
diff --git a/gdb/config/pa/tm-hppa64.h b/gdb/config/pa/tm-hppa64.h
index 79fd15cea1..89c9993820 100644
--- a/gdb/config/pa/tm-hppa64.h
+++ b/gdb/config/pa/tm-hppa64.h
@@ -70,22 +70,4 @@ extern int hpread_adjust_stack_address (CORE_ADDR);
 #undef SR4EXPORT_LDIL_OFFSET
 #undef SR4EXPORT_LDO_OFFSET
 
-#undef FRAME_SAVED_PC_IN_SIGTRAMP
-extern void hppa64_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi,
-                                                    CORE_ADDR *tmp);
-#define FRAME_SAVED_PC_IN_SIGTRAMP(FRAME, TMP) \
-  hppa64_hpux_frame_saved_pc_in_sigtramp (FRAME, TMP)
-
-#undef FRAME_BASE_BEFORE_SIGTRAMP
-extern void hppa64_hpux_frame_base_before_sigtramp (struct frame_info *fi,
-                                                    CORE_ADDR *tmp);
-#define FRAME_BASE_BEFORE_SIGTRAMP(FRAME, TMP) \
-  hppa64_hpux_frame_base_before_sigtramp (FRAME, TMP)
-
-#undef FRAME_FIND_SAVED_REGS_IN_SIGTRAMP
-extern void hppa64_hpux_frame_find_saved_regs_in_sigtramp
-              (struct frame_info *fi, CORE_ADDR *fsr);
-#define FRAME_FIND_SAVED_REGS_IN_SIGTRAMP(FRAME, FSR) \
-  hppa64_hpux_frame_find_saved_regs_in_sigtramp (FRAME, FSR)
-
 /* jimb: omitted purify call support */
diff --git a/gdb/config/pa/tm-hppah.h b/gdb/config/pa/tm-hppah.h
index 0d0dde3b70..d330d46f1c 100644
--- a/gdb/config/pa/tm-hppah.h
+++ b/gdb/config/pa/tm-hppah.h
@@ -36,21 +36,6 @@ struct frame_info;
 #include "somsolib.h"
 #endif
 
-extern void hppa32_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi,
-                                                  CORE_ADDR *tmp);
-#define FRAME_SAVED_PC_IN_SIGTRAMP(FRAME, TMP) \
-  hppa32_hpux_frame_saved_pc_in_sigtramp (FRAME, TMP)
-
-extern void hppa32_hpux_frame_base_before_sigtramp (struct frame_info *fi,
-                                                  CORE_ADDR *tmp);
-#define FRAME_BASE_BEFORE_SIGTRAMP(FRAME, TMP) \
-  hppa32_hpux_frame_base_before_sigtramp (FRAME, TMP)
-
-extern void hppa32_hpux_frame_find_saved_regs_in_sigtramp
-              (struct frame_info *fi, CORE_ADDR *fsr);
-#define FRAME_FIND_SAVED_REGS_IN_SIGTRAMP(FRAME, FSR) \
-  hppa32_hpux_frame_find_saved_regs_in_sigtramp (FRAME, FSR)
-
 /* For HP-UX on PA-RISC we have an implementation
    for the exception handling target op (in hppa-tdep.c) */
 #define CHILD_ENABLE_EXCEPTION_CALLBACK