diff --git a/gdb/energize.c b/gdb/energize.c
index 6c8fdc4f7a..88b442eaf7 100644
--- a/gdb/energize.c
+++ b/gdb/energize.c
@@ -260,7 +260,7 @@ send_stack_info()
 {
   struct pclist *pclist = 0, *pli, *opli;
   static struct pclist *old_pclist;
-  FRAME frame;
+  struct frame_info *frame;
   int height, similar;
 
   if (stack_info_valid)
diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index 21b2be3d20..291476d7d6 100644
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -243,13 +243,7 @@ gdb_loc (clientData, interp, argc, argv)
 
   if (argc == 1)
     {
-      struct frame_info *frame;
-      struct symbol *func;
-
-      frame = get_frame_info (selected_frame);
-
-      pc = frame ? frame->pc : stop_pc;
-
+      pc = selected_frame ? selected_frame->pc : stop_pc;
       sal = find_pc_line (pc, 0);
     }
   else if (argc == 2)
diff --git a/gdb/gould-pinsn.c b/gdb/gould-pinsn.c
index 876b875806..5c89f27fd7 100644
--- a/gdb/gould-pinsn.c
+++ b/gdb/gould-pinsn.c
@@ -220,12 +220,12 @@ findarg(frame)
  *    1.) stored in the code function header xA(Br1).
  *    2.) must be careful of recurssion.
  */
-FRAME_ADDR
+CORE_ADDR
 findframe(thisframe)
-    FRAME thisframe;
+    struct frame_info *thisframe;
 {
-    register FRAME_ADDR pointer;
-    FRAME_ADDR framechain();
+    register CORE_ADDR pointer;
+    CORE_ADDR framechain();
 #if 0    
     struct frame_info *frame;
 
@@ -258,7 +258,7 @@ findframe(thisframe)
  * Gdb front-end and internal framechain routine.
  * Go back up stack one level.  Tricky...
  */
-FRAME_ADDR
+CORE_ADDR
 framechain(frame)
     register struct frame_info *frame;
 {