diff --git a/src/buffer.c b/src/buffer.c
index b510bf9..a052e12 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5098,7 +5098,8 @@
 	 */
 	FOR_ALL_TAB_WINDOWS(tp, win)
 	    if (win->w_buffer == buf)
-		break;
+		goto win_found;
+win_found:
 	if (win != NULL && win->w_llist_ref != NULL)
 	    return _("[Location List]");
 	else
diff --git a/src/quickfix.c b/src/quickfix.c
index 5c3ae38..5f69a92 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -1610,10 +1610,11 @@
 		{
 		    goto_tabpage_win(tp, wp);
 		    usable_win = 1;
-		    break;
+		    goto win_found;
 		}
 	    }
 	}
+win_found:
 
 	/*
 	 * If there is only one window and it is the quickfix window, create a
diff --git a/src/screen.c b/src/screen.c
index 72e20ba..2ba06e2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7452,10 +7452,13 @@
 	{
 	    outofmem = TRUE;
 #ifdef FEAT_WINDOWS
-	    break;
+	    goto give_up;
 #endif
 	}
     }
+#ifdef FEAT_WINDOWS
+give_up:
+#endif
 
 #ifdef FEAT_MBYTE
     for (i = 0; i < p_mco; ++i)
diff --git a/src/version.c b/src/version.c
index 86b7fb2..1e5d6f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    117,
+/**/
     116,
 /**/
     115,