diff --git a/src/alloc.c b/src/alloc.c
index 2310f63ddac18ef0c08ff6360e9f92ee51c172cc..e89981c45457a81b86d4e40f5333117eefa09283 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4048,7 +4048,7 @@ Garbage collection happens automatically if you cons more than
   register int i;
   int message_p;
   Lisp_Object total[8];
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
 
   /* Can't GC if pure storage overflowed because we can't determine
      if something is a pure object or not.  */
diff --git a/src/emacs.c b/src/emacs.c
index 5920c0709c1709bb2b7a6cf8469e611d9fadc0d8..7065b69e2f7a6726c44f7a9d8b3ba9b90de06a31 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2057,7 +2057,7 @@ You must run Emacs in batch mode in order to dump it.  */)
   extern char my_edata[];
   Lisp_Object tem;
   Lisp_Object symbol;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
 
   check_pure_size ();
 
diff --git a/src/fileio.c b/src/fileio.c
index 08764855a7ecf2ceefd6601fb2d33b818d5050c8..dd3872ecbf01748ef47ae03ea7776591673d72f1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3588,7 +3588,7 @@ actually used.  */)
   int inserted = 0;
   register int how_much;
   register int unprocessed;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   Lisp_Object handler, val, insval, orig_filename;
   Lisp_Object p;
diff --git a/src/frame.c b/src/frame.c
index 323e8e4e83ef90395dc7f73c9391e2689f19a009..9c3ac13e3b9170ff4844ec3c69e9debcf3fa9091 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2162,7 +2162,7 @@ enabled such bindings for that variable with `make-variable-frame-local'.  */)
 {
   FRAME_PTR f;
   register Lisp_Object tail, prop, val;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
 
   /* Bind this to t to inhibit initialization of the default face from
      X resources in face-set-after-frame-default.  If we don't inhibit
diff --git a/src/keyboard.c b/src/keyboard.c
index 19a3423f238b2f0701a3fee0e37b04fb4f326ac0..2c75e1cd87b149c62883829cd7249afe68e885df 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2090,7 +2090,7 @@ show_help_echo (help, window, object, pos, ok_to_overwrite_keystroke_echo)
 	{
 	  if (STRINGP (help))
 	    {
-	      int count = BINDING_STACK_SIZE ();
+	      int count = SPECPDL_INDEX ();
 
 	      if (!help_echo_showing_p)
 		Vpre_help_message = current_message ();
@@ -4204,7 +4204,7 @@ timer_check (do_it_now)
 	  if (NILP (vector[0]))
 	    {
 	      int was_locked = single_kboard;
-	      int count = BINDING_STACK_SIZE ();
+	      int count = SPECPDL_INDEX ();
 	      Lisp_Object old_deactivate_mark = Vdeactivate_mark;
 
 	      /* Mark the timer as triggered to prevent problems if the lisp
@@ -9517,7 +9517,7 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
 	  Lisp_Object binding;
 	  char *newmessage;
 	  int message_p = push_message ();
-	  int count = BINDING_STACK_SIZE ();
+	  int count = SPECPDL_INDEX ();
 
 	  record_unwind_protect (push_message_unwind, Qnil);
 	  binding = Fkey_description (bindings);
diff --git a/src/macfns.c b/src/macfns.c
index 86ca78425fa71daefacded095b2a13754e46b26d..4366854ff1eb48ca10b9ea3481aa43cfe756f5b9 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -3825,7 +3825,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   int minibuffer_only = 0;
   long window_prompting = 0;
   int width, height;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   Lisp_Object display;
   struct mac_display_info *dpyinfo = NULL;
@@ -9750,7 +9750,7 @@ Value is t is tooltip was open, nil otherwise.  */)
   GCPRO2 (frame, timer);
   tip_frame = tip_timer = deleted = Qnil;
   
-  count = BINDING_STACK_SIZE ();
+  count = SPECPDL_INDEX ();
   specbind (Qinhibit_redisplay, Qt);
   specbind (Qinhibit_quit, Qt);
   
diff --git a/src/minibuf.c b/src/minibuf.c
index 87fc6f8ce4afb081845da8e11726c0e5283c81b1..3886d31bc22cbffedffb71db35af8d1278d78292 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -565,7 +565,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
 
   /* Erase the buffer.  */
   {
-    int count1 = BINDING_STACK_SIZE ();
+    int count1 = SPECPDL_INDEX ();
     specbind (Qinhibit_read_only, Qt);
     specbind (Qinhibit_modification_hooks, Qt);
     Ferase_buffer ();
diff --git a/src/undo.c b/src/undo.c
index bf0c9f5b669b86d99d10257ce9a45117f9694013..714c3022d9678dbb38d74f8dfd2323cae3c2bf8a 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -399,7 +399,7 @@ Return what remains of the list.  */)
 {
   struct gcpro gcpro1, gcpro2;
   Lisp_Object next;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   register int arg;
   
 #if 0  /* This is a good feature, but would make undo-start
diff --git a/src/w32fns.c b/src/w32fns.c
index 0b94cd26df7c56d2a29e4084a0bf20e6108158c3..fc3d67fef07e6b5f056fed27adb4c04c47da2465 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5498,7 +5498,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   int minibuffer_only = 0;
   long window_prompting = 0;
   int width, height;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   Lisp_Object display;
   struct w32_display_info *dpyinfo = NULL;
@@ -13657,7 +13657,7 @@ x_create_tip_frame (dpyinfo, parms, text)
   Lisp_Object name;
   long window_prompting = 0;
   int width, height;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3;
   struct kboard *kb;
   int face_change_count_before = face_change_count;
@@ -13997,7 +13997,7 @@ Text larger than the specified size is clipped.  */)
   int i, width, height;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   int old_windows_or_buffers_changed = windows_or_buffers_changed;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   
   specbind (Qinhibit_redisplay, Qt);
 
@@ -14228,7 +14228,7 @@ Value is t if tooltip was open, nil otherwise.  */)
   GCPRO2 (frame, timer);
   tip_frame = tip_timer = deleted = Qnil;
   
-  count = BINDING_STACK_SIZE ();
+  count = SPECPDL_INDEX ();
   specbind (Qinhibit_redisplay, Qt);
   specbind (Qinhibit_quit, Qt);
   
diff --git a/src/window.c b/src/window.c
index 143a018d6ef1289c585a382de1a88720c597a5ad..7bfa8e3290a36e11e6d0f1a38557b6c2acbd7bd8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4398,7 +4398,7 @@ scroll_command (n, direction)
      Lisp_Object n;
      int direction;
 {
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
 
   xassert (abs (direction) == 1);
 
@@ -4512,7 +4512,7 @@ showing that buffer, popping the buffer up if necessary.  */)
 {
   Lisp_Object window;
   struct window *w;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
 
   window = Fother_window_for_scrolling ();
   w = XWINDOW (window);
diff --git a/src/xdisp.c b/src/xdisp.c
index 64d2d1bdc7e7eaf822aae9e2c0c212069d995b4b..524bb42bab246a2b8d5ba613065715539ed307dd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1328,7 +1328,7 @@ safe_eval (sexpr)
     val = Qnil;
   else
     {
-      int count = BINDING_STACK_SIZE ();
+      int count = SPECPDL_INDEX ();
       struct gcpro gcpro1;
 
       GCPRO1 (sexpr);
@@ -1360,7 +1360,7 @@ safe_call (nargs, args)
     val = Qnil;
   else
     {
-      int count = BINDING_STACK_SIZE ();
+      int count = SPECPDL_INDEX ();
       struct gcpro gcpro1;
 
       GCPRO1 (args[0]);
@@ -2241,7 +2241,7 @@ handle_fontified_prop (it)
 	  prop = Fget_char_property (pos, Qfontified, Qnil),
 	  NILP (prop)))
     {
-      int count = BINDING_STACK_SIZE ();
+      int count = SPECPDL_INDEX ();
       Lisp_Object val;
 
       val = Vfontification_functions;
@@ -2864,7 +2864,7 @@ handle_single_display_prop (it, prop, object, position,
 
   if (!NILP (form) && !EQ (form, Qt))
     {
-      int count = BINDING_STACK_SIZE ();
+      int count = SPECPDL_INDEX ();
       struct gcpro gcpro1;
 
       /* Bind `object' to the object having the `display' property, a
@@ -2935,7 +2935,7 @@ handle_single_display_prop (it, prop, object, position,
 	      /* Evaluate IT->font_height with `height' bound to the
 		 current specified height to get the new height.  */
 	      Lisp_Object value;
-	      int count = BINDING_STACK_SIZE ();
+	      int count = SPECPDL_INDEX ();
 
 	      specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
 	      value = safe_eval (it->font_height);
@@ -6271,7 +6271,7 @@ with_echo_area_buffer (w, which, fn, a1, a2, a3, a4)
 {
   Lisp_Object buffer;
   int this_one, the_other, clear_buffer_p, rc;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
 
   /* If buffers aren't live, make new ones.  */
   ensure_echo_area_buffers ();
@@ -6446,7 +6446,7 @@ setup_echo_area_for_printing (multibyte_p)
 
       if (Z > BEG)
 	{
-	  int count = BINDING_STACK_SIZE ();
+	  int count = SPECPDL_INDEX ();
 	  specbind (Qinhibit_read_only, Qt);
 	  del_range (BEG, Z);
 	  unbind_to (count, Qnil);
@@ -7126,7 +7126,7 @@ echo_area_display (update_frame_p)
 	      /* Must update other windows.  Likewise as in other
 		 cases, don't let this update be interrupted by
 		 pending input.  */
-	      int count = BINDING_STACK_SIZE ();
+	      int count = SPECPDL_INDEX ();
 	      specbind (Qredisplay_dont_pause, Qt);
 	      windows_or_buffers_changed = 1;
 	      redisplay_internal (0);
@@ -7359,7 +7359,7 @@ prepare_menu_bars ()
   if (all_windows)
     {
       Lisp_Object tail, frame;
-      int count = BINDING_STACK_SIZE ();
+      int count = SPECPDL_INDEX ();
 
       record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
 
@@ -7477,7 +7477,7 @@ update_menu_bar (f, save_match_data)
 	      != !NILP (w->region_showing)))
 	{
 	  struct buffer *prev = current_buffer;
-	  int count = BINDING_STACK_SIZE ();
+	  int count = SPECPDL_INDEX ();
 
 	  specbind (Qinhibit_menubar_update, Qt);
 
@@ -7571,7 +7571,7 @@ update_tool_bar (f, save_match_data)
 	      != !NILP (w->region_showing)))
 	{
 	  struct buffer *prev = current_buffer;
-	  int count = BINDING_STACK_SIZE ();
+	  int count = SPECPDL_INDEX ();
 
 	  /* Set current_buffer to the buffer of the selected
 	     window of the frame, so that we get the right local
@@ -8504,7 +8504,7 @@ redisplay_internal (preserve_echo_area)
 
   /* Record a function that resets redisplaying_p to its old value
      when we leave this function.  */
-  count = BINDING_STACK_SIZE ();
+  count = SPECPDL_INDEX ();
   record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
   ++redisplaying_p;
 
@@ -10090,7 +10090,7 @@ redisplay_window (window, just_this_one_p)
   /* Record it now because it's overwritten.  */
   int current_matrix_up_to_date_p = 0;
   int temp_scroll_step = 0;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   int rc;
   int centering_position;
 
diff --git a/src/xfaces.c b/src/xfaces.c
index fbac43205eb32ffe979a5bdd15bc5c71f69a66f5..2f6a4497590e99fc704c04a2e35cdcaff7181bff 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6304,7 +6304,7 @@ try_alternative_families (f, family, registry, fonts)
       /* Try scalable fonts before giving up.  */
       if (nfonts == 0 && NILP (Vscalable_fonts_allowed))
 	{
-	  int count = BINDING_STACK_SIZE ();
+	  int count = SPECPDL_INDEX ();
 	  specbind (Qscalable_fonts_allowed, Qt);
 	  nfonts = try_alternative_families (f, family, registry, fonts);
 	  unbind_to (count, Qnil);
@@ -6450,7 +6450,7 @@ realize_basic_faces (f)
      struct frame *f;
 {
   int success_p = 0;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
 
   /* Block input here so that we won't be surprised by an X expose
      event, for instance, without having the faces set up.  */
diff --git a/src/xfns.c b/src/xfns.c
index 757a562320eda73ba1565024f2325642ee8aa1ec..912a2ceeb05ffd1d60547e15152ba422e2d57195 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4299,7 +4299,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   int minibuffer_only = 0;
   long window_prompting = 0;
   int width, height;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   Lisp_Object display;
   struct x_display_info *dpyinfo = NULL;
@@ -10932,7 +10932,7 @@ x_create_tip_frame (dpyinfo, parms, text)
   Lisp_Object name;
   long window_prompting = 0;
   int width, height;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3;
   struct kboard *kb;
   int face_change_count_before = face_change_count;
@@ -11323,7 +11323,7 @@ Text larger than the specified size is clipped.  */)
   int i, width, height;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   int old_windows_or_buffers_changed = windows_or_buffers_changed;
-  int count = BINDING_STACK_SIZE ();
+  int count = SPECPDL_INDEX ();
   
   specbind (Qinhibit_redisplay, Qt);
 
@@ -11516,7 +11516,7 @@ Value is t if tooltip was open, nil otherwise.  */)
   GCPRO2 (frame, timer);
   tip_frame = tip_timer = deleted = Qnil;
   
-  count = BINDING_STACK_SIZE ();
+  count = SPECPDL_INDEX ();
   specbind (Qinhibit_redisplay, Qt);
   specbind (Qinhibit_quit, Qt);
   
diff --git a/src/xselect.c b/src/xselect.c
index efeaf89efa5bd350f123fd56eac526487dd97254..2da3eddfc9196ca3c1b81ed079581d98b9febc27 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -786,7 +786,7 @@ x_handle_selection_request (event)
     }
 
   x_selection_current_request = event;
-  count = BINDING_STACK_SIZE ();
+  count = SPECPDL_INDEX ();
   selection_request_dpyinfo = dpyinfo;
   record_unwind_protect (x_selection_request_lisp_error, Qnil);