diff --git a/src/screen.c b/src/screen.c
index 306308b..a609076 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3397,7 +3397,7 @@
 #ifdef FEAT_MBYTE
 	    prev_ptr = ptr;
 #endif
-	    mb_ptr_adv(ptr);
+	    MB_PTR_ADV(ptr);
 	}
 
 	/* When:
@@ -4554,7 +4554,7 @@
 		 * Found last space before word: check for line break.
 		 */
 		if (wp->w_p_lbr && c0 == c
-				      && vim_isbreak(c) && !vim_isbreak(*ptr))
+				      && VIM_ISBREAK(c) && !VIM_ISBREAK(*ptr))
 		{
 # ifdef FEAT_MBYTE
 		    int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0;
@@ -6408,7 +6408,7 @@
     {
 	s += skip_status_match_char(xp, s);
 	len += ptr2cells(s);
-	mb_ptr_adv(s);
+	MB_PTR_ADV(s);
     }
 
     return len;
@@ -10469,7 +10469,7 @@
 		    while (len > room)
 		    {
 			len -= ptr2cells(p);
-			mb_ptr_adv(p);
+			MB_PTR_ADV(p);
 		    }
 		else
 #endif