diff --git a/libs/appleutility/CoreAudio/AudioUnits/AUPublic/AUCarbonViewBase/AUCarbonViewControl.cpp b/libs/appleutility/CoreAudio/AudioUnits/AUPublic/AUCarbonViewBase/AUCarbonViewControl.cpp
index c22c50c4a3..0867869140 100644
--- a/libs/appleutility/CoreAudio/AudioUnits/AUPublic/AUCarbonViewBase/AUCarbonViewControl.cpp
+++ b/libs/appleutility/CoreAudio/AudioUnits/AUPublic/AUCarbonViewBase/AUCarbonViewControl.cpp
@@ -327,6 +327,7 @@ bool	AUCarbonViewControl::HandleEvent(EventHandlerCallRef inHandlerRef, EventRef
 				case kEventControlSetFocusPart:	// tab
 					handled = !handled;		// fall through to next case
 					mLastControl = this;
+					/* fallthrough */
 				case kEventControlValueFieldChanged:
 					GetEventParameter(event, kEventParamDirectObject, typeControlRef, NULL, sizeof(ControlRef), NULL, &control);
 					verify(control == mControl);
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index fb2f9b9095..c146aa9757 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -354,7 +354,7 @@ Automatable::protect_automation ()
 			l->set_automation_state (Off);
 			break;
 		case Latch:
-			/* fall through */
+			/* fallthrough */
 		case Touch:
 			l->set_automation_state (Play);
 			break;
diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc
index 6f85656fc4..7d6d54e5d6 100644
--- a/libs/ardour/lua_api.cc
+++ b/libs/ardour/lua_api.cc
@@ -681,9 +681,9 @@ LuaTableRef::set (lua_State* L)
 					}
 					// invalid userdata -- fall through
 				}
-				/* fall through */
+				/* fallthrough */
 			case LUA_TFUNCTION: // no support -- we could... string.format("%q", string.dump(value, true))
-				/* fall through */
+				/* fallthrough */
 			case LUA_TTABLE: // no nested tables, sorry.
 			case LUA_TNIL:
 			default:
diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc
index 6a168e7dcf..0201c3e71d 100644
--- a/libs/ardour/session_playlists.cc
+++ b/libs/ardour/session_playlists.cc
@@ -429,7 +429,7 @@ SessionPlaylists::maybe_delete_unused (boost::function<int(boost::shared_ptr<Pla
 			// delete this and all later
 			delete_remaining = true;
 
-			/* fall through */
+			/* fallthrough */
 		case 1:
 			// delete this
 			playlists_tbd.push_back (*x);
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 1b9eeea59f..8b3e164884 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -2446,7 +2446,7 @@ retry:
 
 				case 3:
 					no_questions_about_missing_files = true;
-					/* fallthru */
+					/* fallthrough */
 
 				case -1:
 				default:
diff --git a/libs/backends/portaudio/winmmemidi_output_device.cc b/libs/backends/portaudio/winmmemidi_output_device.cc
index 2771a81490..8d699f25cc 100644
--- a/libs/backends/portaudio/winmmemidi_output_device.cc
+++ b/libs/backends/portaudio/winmmemidi_output_device.cc
@@ -432,10 +432,10 @@ WinMMEMidiOutputDevice::midi_output_thread ()
 		switch (h.size) {
 		case 3:
 			message |= (((DWORD)data[2]) << 16);
-		// Fallthrough on purpose.
+			/* fallthrough */
 		case 2:
 			message |= (((DWORD)data[1]) << 8);
-		// Fallthrough on purpose.
+			/* fallthrough */
 		case 1:
 			message |= (DWORD)data[0];
 			result = midiOutShortMsg (m_handle, message);
diff --git a/libs/clearlooks-newer/clearlooks_style.c b/libs/clearlooks-newer/clearlooks_style.c
index fb0ca33239..5556a933df 100644
--- a/libs/clearlooks-newer/clearlooks_style.c
+++ b/libs/clearlooks-newer/clearlooks_style.c
@@ -56,7 +56,7 @@ static ClearlooksStyleClass *clearlooks_style_class;
 static GtkStyleClass *clearlooks_parent_class;
 
 static void
-clearlooks_set_widget_parameters (GtkWidget      *widget,
+clearlooks_set_widget_parameters (GtkWidget            *widget,
                                   const GtkStyle       *style,
                                   GtkStateType          state_type,
                                   WidgetParameters     *params)
@@ -726,11 +726,13 @@ clearlooks_style_draw_box (DRAW_ARGS)
 				{
 					case GTK_PROGRESS_RIGHT_TO_LEFT:
 						tmp.x -= 1;
+						/* fallthrough */
 					case GTK_PROGRESS_LEFT_TO_RIGHT:
 						tmp.width += 1;
 						break;
 					case GTK_PROGRESS_BOTTOM_TO_TOP:
 						tmp.y -= 1;
+						/* fallthrough */
 					case GTK_PROGRESS_TOP_TO_BOTTOM:
 						tmp.height += 1;
 						break;
diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp
index 7ccb2bbc55..c4a2706992 100644
--- a/libs/evoral/src/Curve.cpp
+++ b/libs/evoral/src/Curve.cpp
@@ -322,7 +322,8 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen) const
 					// any discrete vector curves somewhere?
 					assert (0);
 				case ControlList::Curved:
-					// fallthrough, no 2 point spline
+					/* no 2 point spline */
+					/* fallthrough */
 				default: // Linear:
 					for (int i = 0; i < veclen; ++i) {
 						vec[i] = (lx * (m_num / m_den) + m_num * i * dx_num / (m_den * dx_den)) + c;
@@ -342,7 +343,8 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen) const
 					// any discrete vector curves somewhere?
 					assert (0);
 				case ControlList::Curved:
-					// fallthrough, no 2 point spline
+					/* no 2 point spline */
+					/* fallthrough */
 				default: // Linear:
 					vec[0] = interpolate_linear (lval, uval, fraction);
 					break;
@@ -441,7 +443,7 @@ Curve::multipoint_eval (double x) const
 					double x2 = x * x;
 					return ev->coeff[0] + (ev->coeff[1] * x) + (ev->coeff[2] * x2) + (ev->coeff[3] * x2 * x);
 				}
-				/* fall through */
+				/* fallthrough */
 			case ControlList::Linear:
 				return before->value + (vdelta * (tdelta / trange));
 		}
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index c28eb2afdd..1b51b6630a 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -400,7 +400,7 @@ Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* /*win*/)
 
 		case GDK_NOTIFY_VIRTUAL:
 			DEBUG_TRACE (DEBUG::Keyboard, "VIRTUAL crossing ... out\n");
-			/* fallthru */
+			/* fallthrough */
 
 		default:
 			DEBUG_TRACE (DEBUG::Keyboard, "REAL crossing ... out\n");
diff --git a/libs/midi++2/parser.cc b/libs/midi++2/parser.cc
index fa5e796ca7..1b08eea8c1 100644
--- a/libs/midi++2/parser.cc
+++ b/libs/midi++2/parser.cc
@@ -493,9 +493,10 @@ Parser::scanner (unsigned char inbyte)
 
 	case NEEDTWOBYTES:
 		/* wait for the second byte */
-		if (msgindex < 3)
+		if (msgindex < 3) {
 			return;
-		/*FALLTHRU*/
+		}
+		/* fallthrough */
 
 	case NEEDONEBYTE:
 		/* We've completed a 1 or 2 byte message. */
diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc
index 486412ded0..5e5cf498f7 100644
--- a/libs/surfaces/faderport8/faderport8.cc
+++ b/libs/surfaces/faderport8/faderport8.cc
@@ -959,7 +959,7 @@ FaderPort8::filter_stripables (StripableList& strips) const
 			break;
 		default:
 			assert (0);
-			// fall through
+			/* fallthrough */
 		case MixAll:
 			allow_master = true;
 			flt = &flt_all;
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index c75b5221a0..0926739ad3 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -1816,49 +1816,56 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc
 				} else {
 					linkid = argv[8]->i;
 				}
+				/* fallthrough */
 			case 8:
 				if (types[7] == 'f') {
 					linkset = (int) argv[7]->f;
 				} else {
 					linkset = argv[7]->i;
 				}
+				/* fallthrough */
 			case 7:
 				if (types[6] == 'f') {
 					port = (int) argv[6]->f;
 				} else {
 					port = argv[6]->i;
 				}
+				/* fallthrough */
 			case 6:
 				if (types[5] == 'f') {
 					pi_page = (int) argv[5]->f;
 				} else {
 					pi_page = argv[5]->i;
 				}
+				/* fallthrough */
 			case 5:
 				if (types[4] == 'f') {
 					se_page = (int) argv[4]->f;
 				} else {
 					se_page = argv[4]->i;
 				}
+				/* fallthrough */
 			case 4:
 				if (types[3] == 'f') {
 					fadermode = (int) argv[3]->f;
 				} else {
 					fadermode = argv[3]->i;
 				}
+				/* fallthrough */
 			case 3:
 				if (types[2] == 'f') {
 					feedback = (int) argv[2]->f;
 				} else {
 					feedback = argv[2]->i;
 				}
-				// [[fallthrough]]; old compiler doesn't like
+				/* fallthrough */
 			case 2:
 				if (types[1] == 'f') {
 					strip_types = (int) argv[1]->f;
 				} else {
 					strip_types = argv[1]->i;
 				}
+				/* fallthrough */
 			case 1:
 				if (types[0] == 'f') {
 					bank_size = (int) argv[0]->f;
diff --git a/libs/widgets/ardour_icon.cc b/libs/widgets/ardour_icon.cc
index 6307c3eaef..2f96b97470 100644
--- a/libs/widgets/ardour_icon.cc
+++ b/libs/widgets/ardour_icon.cc
@@ -1315,9 +1315,9 @@ ArdourWidgets::ArdourIcon::render (cairo_t *cr,
 			icon_transport_panic (cr, width, height);
 			break;
 		case TransportStart:
-			/* fall through */
+			/* fallthrough */
 		case TransportEnd:
-			/* fall through */
+			/* fallthrough */
 		case TransportRange:
 			icon_transport_ck (cr, icon, width, height);
 			break;
@@ -1352,9 +1352,9 @@ ArdourWidgets::ArdourIcon::render (cairo_t *cr,
 			icon_nudge_right (cr, width, height, fg_color);
 			break;
 		case ZoomIn:
-			/* fall through */
+			/* fallthrough */
 		case ZoomOut:
-			/* fall through */
+			/* fallthrough */
 		case ZoomFull:
 			icon_zoom (cr, icon, width, height, fg_color);
 			break;
diff --git a/session_utils/export.cc b/session_utils/export.cc
index ddd0166910..3bffc07f0e 100644
--- a/session_utils/export.cc
+++ b/session_utils/export.cc
@@ -274,7 +274,7 @@ int main (int argc, char* argv[])
 							settings._sample_format = ExportFormatBase::SF_Float;
 							break;
 						}
-						/* fall through */
+						/* fallthrough */
 					default:
 						fprintf(stderr, "Invalid Bit Depth\n");
 						break;
diff --git a/tools/luadevel/devel.cc b/tools/luadevel/devel.cc
index 7d0deecbcf..92539881ec 100644
--- a/tools/luadevel/devel.cc
+++ b/tools/luadevel/devel.cc
@@ -155,10 +155,11 @@ class LuaTableRef {
 							// invalid userdata -- fall through
 						}
 
-						/* fall through */
+						/* fallthrough */
 					case LUA_TFUNCTION: // no support -- we could... string.format("%q", string.dump(value, true))
 					case LUA_TTABLE: // no nested tables, sorry.
-					case LUA_TNIL: // fallthrough
+					case LUA_TNIL:
+						/* fallthrough */
 					default:
 						// invalid value
 						lua_pop (L, 2);