diff --git dataobj/environment.cc dataobj/environment.cc
index 97747f223..520fd6441 100644
--- dataobj/environment.cc
+++ dataobj/environment.cc
@@ -504,7 +504,7 @@ void env_t::rdwr(loadsave_t *file)
 	if (file->is_version_atleast(121, 1)) {
 		file->rdwr_long(sound_distance_scaling);
 	}
-	
+
 	// server settings are not saved, since they are server specific
 	// and could be different on different servers on the same computers
 }
diff --git dataobj/environment.h dataobj/environment.h
index 4716bf451..dc3b3ea4e 100644
--- dataobj/environment.h
+++ dataobj/environment.h
@@ -289,7 +289,7 @@ public:
 	static uint32 cursor_overlay_color_rgb;
 	static PIXVAL cursor_overlay_color;
 
-	static sint8 show_money_message; 
+	static sint8 show_money_message;
 
 	/// color used for solid background draw
 	static uint32 background_color_rgb;
diff --git dataobj/powernet.cc dataobj/powernet.cc
index fa6903e68..5227a719d 100644
--- dataobj/powernet.cc
+++ dataobj/powernet.cc
@@ -95,7 +95,7 @@ void powernet_t::step(uint32 delta_t)
 
 	// compute normalized demand
 	norm_demand = compute_norm_sd(demand, supply);
-	norm_supply = compute_norm_sd(supply, demand);	
+	norm_supply = compute_norm_sd(supply, demand);
 }
 
 /**
diff --git descriptor/reader/pedestrian_reader.cc descriptor/reader/pedestrian_reader.cc
index a2dc28ea3..94188b96b 100644
--- descriptor/reader/pedestrian_reader.cc
+++ descriptor/reader/pedestrian_reader.cc
@@ -58,7 +58,7 @@ obj_desc_t * pedestrian_reader_t::read_node(FILE *fp, obj_node_info_t &node)
 	// always there and never retire
 	desc->intro_date = 1;
 	desc->retire_date = 0xFFFEu;
-	
+
 	if(version == 0) {
 		// old, nonversion node
 		desc->distribution_weight = v;
diff --git display/simview.cc display/simview.cc
index 065ffe1b4..fd2e697fa 100644
--- display/simview.cc
+++ display/simview.cc
@@ -320,7 +320,7 @@ void main_view_t::display(bool force_dirty)
 					}
 				}
 				break;
-			
+
 			case 1:
 				// show message of active player
 				int x = welt->get_active_player_nr();
diff --git display/viewport.cc display/viewport.cc
index e08d39e7a..2a7227056 100644
--- display/viewport.cc
+++ display/viewport.cc
@@ -301,7 +301,7 @@ void viewport_t::rotate90( sint16 y_size )
 
 
 viewport_t::viewport_t( karte_t *world, const koord ij_off , sint16 x_off , sint16 y_off )
-	: prepared_rect() 
+	: prepared_rect()
 {
 	this->world = world;
 	assert(world);
diff --git gui/components/gui_combobox.cc gui/components/gui_combobox.cc
index 3ea7498f0..857c63a2d 100644
--- gui/components/gui_combobox.cc
+++ gui/components/gui_combobox.cc
@@ -159,7 +159,7 @@ DBG_MESSAGE("event","HOWDY!");
 				int old_selection = droplist.get_selection();
 				if(  droplist.infowin_event(&ev2)  ) {
 					if(  droplist.get_selection() !=  old_selection  ) {
-						// close box will anyway call 
+						// close box will anyway call
 						if( !IS_LEFTRELEASE( ev ) ) {
 							// in case of LEFTRELEASE, close_box will call it again
 							call_listeners( droplist.get_selection() );
diff --git gui/components/gui_scrolled_list.cc gui/components/gui_scrolled_list.cc
index d8ed761fc..9a32efdff 100644
--- gui/components/gui_scrolled_list.cc
+++ gui/components/gui_scrolled_list.cc
@@ -95,7 +95,7 @@ void gui_scrolled_list_t::set_selection(int s)
 		return;
 	}
 	gui_component_t* new_focus = item_list[s];
-	
+
 	// reset selected status
 	FOR(vector_tpl<gui_component_t*>, v, item_list) {
 		scrollitem_t* item = dynamic_cast<scrollitem_t*>(v);
diff --git gui/components/gui_scrolled_list.h gui/components/gui_scrolled_list.h
index e62c59170..79658090c 100644
--- gui/components/gui_scrolled_list.h
+++ gui/components/gui_scrolled_list.h
@@ -96,7 +96,7 @@ private:
 	bool maximize;	// true if to expand to bottom right corner
 
 	item_compare_func compare;
-	
+
 	bool multiple_selection; // true when multiple selection is enabled.
 	void calc_selection(scrollitem_t*, scrollitem_t*, event_t);
 
@@ -121,10 +121,10 @@ public:
 	void set_selection(int s);
 	sint32 get_selection() const;
 	vector_tpl<sint32> get_selections() const;
-	
+
 	scrollitem_t* get_selected_item() const;
 	sint32 get_count() const { return item_list.get_count(); }
-	
+
 	void enable_multiple_selection() { multiple_selection = true; }
 
 	/*  when rebuilding a list, be sure to call recalculate the slider
diff --git gui/display_settings.cc gui/display_settings.cc
index 75d76c882..ce2ea1492 100644
--- gui/display_settings.cc
+++ gui/display_settings.cc
@@ -409,7 +409,7 @@ bool traffic_settings_t::action_triggered( gui_action_creator_t *comp, value_t v
 	if( &follow_mode == comp ) {
 		env_t::follow_convoi_underground = v.i;
 	}
-		
+
 	if( &money_booking == comp ) {
 		env_t::show_money_message = v.i;
 	}
diff --git gui/enlarge_map_frame_t.h gui/enlarge_map_frame_t.h
index 29b3c3068..d090a88c0 100644
--- gui/enlarge_map_frame_t.h
+++ gui/enlarge_map_frame_t.h
@@ -38,7 +38,7 @@ private:
 		inp_number_of_towns,
 		inp_town_size;
 
-	/* 
+	/*
 	 * Label to display current map seed number.
 	 */
 	gui_label_buf_t	map_number_label;
diff --git gui/halt_list_stats.cc gui/halt_list_stats.cc
index 2d6fd4153..9125418cc 100644
--- gui/halt_list_stats.cc
+++ gui/halt_list_stats.cc
@@ -57,7 +57,7 @@ halt_list_stats_t::halt_list_stats_t(halthandle_t h)
 	gotopos.set_typ(button_t::posbutton_automatic);
 	gotopos.set_targetpos3d(halt->get_basis_pos3d());
 	add_component(&gotopos);
-	
+
 	add_component(&indicator);
 	indicator.set_max_size(scr_size(D_INDICATOR_WIDTH,D_INDICATOR_HEIGHT));
 
diff --git gui/sound_frame.cc gui/sound_frame.cc
index 3c1523cd8..e9a74ddc6 100644
--- gui/sound_frame.cc
+++ gui/sound_frame.cc
@@ -63,12 +63,12 @@ sound_frame_t::sound_frame_t()
 
 		new_component<gui_label_t>( "Sound range:" );
 
-		sound_range.set_value( env_t::sound_distance_scaling); 
+		sound_range.set_value( env_t::sound_distance_scaling);
 		sound_range.set_limits( 1, 32 );
 		sound_range.add_listener(this);
 //		sound_range.set_tooltip( "Lower values mean more local sounds" )
 		add_component(&sound_range);
-		
+
 		for( int i = 0; i < MAX_SOUND_TYPES; i++ ) {
 			new_component<gui_label_t>( specific_volume_names[i] );
 
diff --git gui/sound_frame.h gui/sound_frame.h
index 14fdc83d0..2449e8b7e 100644
--- gui/sound_frame.h
+++ gui/sound_frame.h
@@ -36,7 +36,7 @@ public:
     sound_frame_t();
 
 	virtual ~sound_frame_t();
-		
+
 	// used for updating the song title
 	void draw(scr_coord pos, scr_size size) OVERRIDE;
 
diff --git gui/vehiclelist_frame.cc gui/vehiclelist_frame.cc
index 342f56a48..8270fb5b9 100644
--- gui/vehiclelist_frame.cc
+++ gui/vehiclelist_frame.cc
@@ -97,7 +97,7 @@ vehiclelist_stats_t::vehiclelist_stats_t(const vehicle_desc_t *v)
 	int text2w, text2h;
 	display_calc_proportional_multiline_string_len_width( text2w, text2h, part2, part2.len() );
 	col2_width = text2w;
-	
+
 	height = max( height, max( text1h, text2h ) + LINESPACE );
 }
 
diff --git obj/bruecke.cc obj/bruecke.cc
index 75369c620..a6bffecd6 100644
--- obj/bruecke.cc
+++ obj/bruecke.cc
@@ -66,7 +66,7 @@ void bruecke_t::calc_image()
 			}
 			weg0->set_image( display_image );
 
-			// must always set both offsets, because after roation the xoffset contains the yoffset 
+			// must always set both offsets, because after roation the xoffset contains the yoffset
 			weg0->set_yoff( -gr->get_weg_yoff() );
 			weg0->set_xoff( 0 );
 
diff --git obj/wolke.cc obj/wolke.cc
index 3719177fd..01b4dcedb 100644
--- obj/wolke.cc
+++ obj/wolke.cc
@@ -133,13 +133,13 @@ sync_result wolke_t::sync_step(uint32 delta_t)
 
 
 #ifdef MULTI_THREAD
-void wolke_t::display_after( int xpos, int ypos, const sint8 extra_param ) const 
+void wolke_t::display_after( int xpos, int ypos, const sint8 extra_param ) const
 #else
 void wolke_t::display_after( int xpos, int ypos, bool extra_param ) const
 #endif
-{ 
+{
 	sint16 extra_offset = tile_raster_scale_y( base_y_off - (((long)insta_zeit * uplift * OBJECT_OFFSET_STEPS) >> 16), get_current_tile_raster_width() );
-	obj_t::display_after( xpos, ypos + extra_offset, extra_param ); 
+	obj_t::display_after( xpos, ypos + extra_offset, extra_param );
 }
 
 
diff --git obj/wolke.h obj/wolke.h
index 982d8d8b6..3fe1ad25a 100644
--- obj/wolke.h
+++ obj/wolke.h
@@ -25,7 +25,7 @@ private:
 
 	uint16 insta_zeit;	// clouds vanish when insta_zeit>2500 => maximum 5 images ...
 	sint16 base_y_off;	// since sint8 may overflow wiht larger pak sizes
-	uint16 lifetime;	// since factories generate other smoke than 
+	uint16 lifetime;	// since factories generate other smoke than
 	uint16 uplift;
 	uint8 cloud_nr;
 
diff --git unicode.h unicode.h
index 457d62216..45b1fdcdd 100644
--- unicode.h
+++ unicode.h
@@ -29,7 +29,7 @@ public:
 	// Constructs a UTF-8 decoder for the given C string.
 	utf8_decoder_t(utf8 const *str);
 
-	/** 
+	/**
 	 * Decodes a Unicode code point from the byte sequence pointed to by buff.
 	 * On return buff has been advanced to point at the beginning of the next Unicode code point.
 	 * Does not respect NUL terminator character, care should be taken to detect the emmited UNICODE_NUL when decoding C strings to avoid buffer over run errors.
@@ -37,7 +37,7 @@ public:
 	 */
 	static utf32 decode(utf8 const *&buff);
 
-	/** 
+	/**
 	 * Decodes a Unicode code point from the byte sequence pointed to by buff.
 	 * On return len contains the length of the Unicode character in bytes.
 	 * Does not respect NUL terminator character, care should be taken to detect the emmited UNICODE_NUL when decoding C strings to avoid buffer over run errors.