Index: bauer/hausbauer.cc
===================================================================
--- bauer/hausbauer.cc	(revision 8261)
+++ bauer/hausbauer.cc	(working copy)
@@ -183,7 +183,7 @@
 						elevated_foundation_desc = desc;
 						break;
 					}
-					/* no break */
+					/* FALLTHROUGH */
 
 				default:
 					// obsolete object, usually such pak set will not load properly anyway (old objects should be caught before!)
Index: bauer/wegbauer.cc
===================================================================
--- bauer/wegbauer.cc	(revision 8261)
+++ bauer/wegbauer.cc	(working copy)
@@ -1088,6 +1088,7 @@
 					}
 				}
 			}
+			/* FALLTHROUGH */
 
 			default:
 				if (way0->get_waytype()!=desc->get_wtyp()  ||  way1!=NULL) {
Index: dataobj/objlist.cc
===================================================================
--- dataobj/objlist.cc	(revision 8261)
+++ dataobj/objlist.cc	(working copy)
@@ -765,6 +765,7 @@
 				// some old offsets will be converted to new ones
 				case obj_t::old_fussgaenger:
 					typ = obj_t::pedestrian;
+					/* FALLTHROUGH */
 				case obj_t::pedestrian:
 				{
 					pedestrian_t* const pedestrian = new pedestrian_t(file);
@@ -782,6 +783,7 @@
 
 				case obj_t::old_verkehr:
 					typ = obj_t::road_user;
+					/* FALLTHROUGH */
 				case obj_t::road_user:
 				{
 					private_car_t* const car = new private_car_t(file);
@@ -798,11 +800,13 @@
 
 				case obj_t::old_monoraildepot:
 					typ = obj_t::monoraildepot;
+					/* FALLTHROUGH */
 				case obj_t::monoraildepot:
 					new_obj = new monoraildepot_t(file);
 					break;
 				case obj_t::old_tramdepot:
 					typ = obj_t::tramdepot;
+					/* FALLTHROUGH */
 				case obj_t::tramdepot:
 					new_obj = new tramdepot_t(file);
 					break;
@@ -814,6 +818,7 @@
 					break;
 				case obj_t::old_airdepot:
 					typ = obj_t::airdepot;
+					/* FALLTHROUGH */
 				case obj_t::airdepot:
 					new_obj = new airdepot_t(file);
 					break;
@@ -851,6 +856,7 @@
 				// check for pillars
 				case obj_t::old_pillar:
 					typ = obj_t::pillar;
+					/* FALLTHROUGH */
 				case obj_t::pillar:
 				{
 					pillar_t *p = new pillar_t(file);
@@ -932,6 +938,7 @@
 
 				case obj_t::old_roadsign:
 					typ = obj_t::roadsign;
+					/* FALLTHROUGH */
 				case obj_t::roadsign:
 				{
 					roadsign_t *rs = new roadsign_t(file);
Index: dataobj/scenario.cc
===================================================================
--- dataobj/scenario.cc	(revision 8261)
+++ dataobj/scenario.cc	(working copy)
@@ -274,6 +274,7 @@
 				eq = eq  &&  (hmin == other.hmin)  &&  (hmax == other.hmax);
 				eq = eq  &&  (pos_nw == other.pos_nw);
 				eq = eq  &&  (pos_se == other.pos_se);
+				/* FALLTHROUGH */
 			case forbid_tool:
 				eq = eq  &&  (toolnr == other.toolnr);
 				break;
Index: freight_list_sorter.cc
===================================================================
--- freight_list_sorter.cc	(revision 8261)
+++ freight_list_sorter.cc	(working copy)
@@ -39,6 +39,7 @@
 	switch (sortby) {
 		default:
 			dbg->error("freight_list_sorter::compare_ware()", "illegal sort mode!");
+			/* FALLTHROUGH */
 
 		case by_via_sum:
 		case by_amount: { // sort by ware amount
@@ -46,8 +47,8 @@
 			if(  order != 0  ) {
 				return order < 0;
 			}
-			/* FALLTHROUGH */
 		}
+		/* FALLTHROUGH */
 
 		case by_via: { // sort by via_destination name
 			halthandle_t const v1 = w1.get_zwischenziel();
@@ -62,8 +63,8 @@
 			else if(  v2.is_bound()  ) {
 				return true;
 			}
-			/* FALLTHROUGH */
 		}
+		/* FALLTHROUGH */
 
 		case by_name: { // sort by destination name
 			halthandle_t const d1 = w1.get_ziel();
@@ -80,11 +81,9 @@
 			else if(  d2.is_bound()  ) {
 				return true;
 			}
-			else {
-				return false;
-			}
 		}
 	}
+	return false;
 }
 
 
Index: gui/components/gui_button.cc
===================================================================
--- gui/components/gui_button.cc	(revision 8261)
+++ gui/components/gui_button.cc	(working copy)
@@ -118,6 +118,7 @@
 
 		case box:
 			text_color = SYSCOL_COLORED_BUTTON_TEXT;
+			/* FALLTHROUGH */
 		case roundbox:
 			set_size( scr_size(gui_theme_t::gui_button_size.w, max(D_BUTTON_HEIGHT,LINESPACE)) );
 			break;
Index: gui/components/gui_textinput.cc
===================================================================
--- gui/components/gui_textinput.cc	(revision 8261)
+++ gui/components/gui_textinput.cc	(working copy)
@@ -125,10 +125,12 @@
 						text_dirty = false;
 						call_listeners((long)1);
 					}
+					/* FALLTHROUGH */
 				case SIM_KEY_TAB:
 					// Knightly : focus is going to be lost -> reset cursor positions to select the whole text by default
 					head_cursor_pos = len;
 					tail_cursor_pos = 0;
+					/* FALLTHROUGH */
 				case SIM_KEY_ESCAPE:
 					return false;
 
Index: obj/baum.cc
===================================================================
--- obj/baum.cc	(revision 8261)
+++ obj/baum.cc	(working copy)
@@ -118,6 +118,7 @@
 						if(((groundobj_t *)obj)->get_desc()->can_build_trees_here()) {
 							break;
 						}
+						/* FALLTHROUGH */
 						// leave these (and all other empty)
 					default:
 						return 0;
@@ -160,6 +161,7 @@
 						if(((groundobj_t *)(gr->obj_bei(0)))->get_desc()->can_build_trees_here()) {
 							break;
 						}
+						/* FALLTHROUGH */
 						// leave these (and all other empty)
 					default:
 						return false;
Index: player/simplay.cc
===================================================================
--- player/simplay.cc	(revision 8261)
+++ player/simplay.cc	(working copy)
@@ -868,8 +868,8 @@
 						if(!aircraft->is_on_ground()) {
 							break;
 						}
-						// fall through !
 					}
+					/* FALLTHROUGH */
 					// all other are forbidden => no undo any more
 					default:
 						last_built.clear();
Index: simconvoi.cc
===================================================================
--- simconvoi.cc	(revision 8261)
+++ simconvoi.cc	(working copy)
@@ -1353,6 +1353,7 @@
 		// just waiting for action here
 		case INITIAL:
 			welt->sync.remove(this);
+			/* FALLTHROUGH */
 		case EDIT_SCHEDULE:
 		case NO_ROUTE:
 			wait_lock = max( wait_lock, 25000 );
Index: siminteraction.cc
===================================================================
--- siminteraction.cc	(revision 8261)
+++ siminteraction.cc	(working copy)
@@ -198,6 +198,7 @@
 					// Ignore Enter and Backspace but not Ctrl-H and Ctrl-M
 					break;
 				}
+				/* FALLTHROUGH */
 
 			default:
 				{
Index: simtool.cc
===================================================================
--- simtool.cc	(revision 8261)
+++ simtool.cc	(working copy)
@@ -7517,6 +7519,7 @@
 				other->set_name(p);
 				return false;
 			}
+			break;
 		}
 
 		case 'f':