diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 26195583c8..be86d42a17 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -126,13 +126,13 @@ automation_streamview.cc
 automation_time_axis.cc
 axis_view.cc
 bundle_manager.cc
+canvas-flag.cc
 canvas-note-event.cc
 canvas-note.cc
-canvas-flag.cc
 canvas-program-change.cc
-canvas-sysex.cc
 canvas-simpleline.c
 canvas-simplerect.c
+canvas-sysex.cc
 canvas-waveview.c
 control_point.cc
 control_point_dialog.cc
@@ -170,8 +170,8 @@ engine_dialog.cc
 enums.cc
 export_channel_selector.cc
 export_dialog.cc
-export_filename_selector.cc
 export_file_notebook.cc
+export_filename_selector.cc
 export_format_dialog.cc
 export_format_selector.cc
 export_preset_selector.cc
@@ -179,7 +179,6 @@ export_timespan_selector.cc
 fft.cc
 fft_graph.cc
 fft_result.cc
-plugin_eq_gui.cc
 gain_meter.cc
 generic_pluginui.cc
 ghostregion.cc
@@ -211,6 +210,7 @@ panner2d.cc
 panner_ui.cc
 piano_roll_header.cc
 playlist_selector.cc
+plugin_eq_gui.cc
 plugin_selector.cc
 plugin_ui.cc
 port_group.cc
@@ -227,6 +227,7 @@ public_editor.cc
 region_gain_line.cc
 region_selection.cc
 region_view.cc
+return_ui.cc
 rhythm_ferret.cc
 route_params_ui.cc
 route_processor_selection.cc
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 56df15b846..e404672a21 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -198,7 +198,7 @@ def build(bld):
 		splash.cc
 		startup.cc
 		streamview.cc
-                strip_silence_dialog.cc
+		strip_silence_dialog.cc
 		tape_region_view.cc
 		tempo_dialog.cc
 		tempo_lines.cc
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index fbef1651de..6fe6a2ae36 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -58,7 +58,9 @@ buffer.cc
 buffer_set.cc
 bundle.cc
 chan_count.cc
+chan_mapping.cc
 configuration.cc
+control_outputs.cc
 control_protocol_manager.cc
 control_protocol_search_path.cc
 crossfade.cc
@@ -85,8 +87,8 @@ export_profile_manager.cc
 export_status.cc
 export_timespan.cc
 export_utilities.cc
-filename_extensions.cc
 file_source.cc
+filename_extensions.cc
 filesystem_paths.cc
 filter.cc
 find_session.cc
@@ -134,6 +136,7 @@ recent_sessions.cc
 region.cc
 region_factory.cc
 resampled_source.cc
+return.cc
 reverse.cc
 route.cc
 route_group.cc