std-ize: convert all boost shared/weak ptr includes to <memory>

Also fix stdint.h -> cstdint and alphabetically order std includes

gtk2_ardour/audio_streamview.h

@@ -22,11 +22,11 @@
 #ifndef __ardour_audio_streamview_h__
 #define __ardour_audio_streamview_h__
 
-#include <list>
-#include <map>
 #include <cmath>
+#include <list>
+#include <memory>
+#include <map>
 
-#include <boost/weak_ptr.hpp>
 
 #include "ardour/location.h"
 #include "point_selection.h"

gtk2_ardour/automation_controller.h

@@ -29,7 +29,7 @@
 #undef NO
 #endif
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <gtkmm/alignment.h>
 

gtk2_ardour/automation_time_axis.h

@@ -27,11 +27,10 @@
 #define __ardour_gtk_automation_time_axis_h__
 
 #include <list>
+#include <memory>
 #include <string>
 #include <utility>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/types.h"
 #include "ardour/automatable.h"
 #include "ardour/automation_list.h"

gtk2_ardour/axis_provider.h

@@ -20,7 +20,7 @@
 #ifndef __gtk2_ardour_axis_provider_h__
 #define __gtk2_ardour_axis_provider_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace ARDOUR {
 	class Stripable;

gtk2_ardour/beatbox_gui.h

@@ -20,8 +20,8 @@
 #ifndef __gtk2_ardour_beatbox_gui_h__
 #define __gtk2_ardour_beatbox_gui_h__
 
+#include <memory>
 #include <string>
-#include <boost/shared_ptr.hpp>
 
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/togglebutton.h>

gtk2_ardour/control_slave_ui.h

@@ -20,9 +20,8 @@
 #ifndef __gtk2_ardour_control_slave_ui_h__
 #define __gtk2_ardour_control_slave_ui_h__
 
-#include <stdint.h>
-
-#include <boost/shared_ptr.hpp>
+#include <cstdint>
+#include <memory>
 
 #include <gtkmm/box.h>
 #include <gtkmm/checkmenuitem.h>

gtk2_ardour/cursor_context.h

@@ -19,7 +19,8 @@
 #ifndef __ardour_gtk_cursor_context_h__
 #define __ardour_gtk_cursor_context_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <gdkmm/cursor.h>
 
 class Editor;

gtk2_ardour/export_channel_selector.h

@@ -24,6 +24,7 @@
 #define __export_channel_selector_h__
 
 #include <list>
+#include <memory>
 
 #include "ardour/export_profile_manager.h"
 
@@ -32,7 +33,7 @@
 #endif
 
 #include <sigc++/signal.h>
-#include <boost/shared_ptr.hpp>
+
 
 #include <gtkmm/alignment.h>
 #include <gtkmm/box.h>

gtk2_ardour/export_format_selector.h

@@ -21,9 +21,10 @@
 #ifndef __export_format_selector_h__
 #define __export_format_selector_h__
 
+#include <memory>
 #include <string>
+
 #include <sigc++/signal.h>
-#include <boost/shared_ptr.hpp>
 
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>

gtk2_ardour/export_timespan_selector.h

@@ -24,16 +24,16 @@
 #ifndef __export_timespan_selector_h__
 #define __export_timespan_selector_h__
 
-#include "audio_clock.h"
-
 #include <ctime>
 #include <list>
+#include <memory>
+
+#include "audio_clock.h"
 
 #ifdef interface
 #undef interface
 #endif
 
-#include <boost/shared_ptr.hpp>
 
 #include <gtkmm/box.h>
 #include <gtkmm/checkbutton.h>

gtk2_ardour/io_button.h

@@ -21,8 +21,8 @@
 #define _gtkardour_io_button_h_
 
 #include <list>
+#include <memory>
 
-#include <boost/shared_ptr.hpp>
 #include <gtkmm/menu.h>
 
 #include "ardour/data_type.h"

gtk2_ardour/midi_export_dialog.h

@@ -20,7 +20,7 @@
 #ifndef __gtk2_ardour_midi_export_dialog_h__
 #define __gtk2_ardour_midi_export_dialog_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <gtkmm/filechooserwidget.h>
 

gtk2_ardour/mono_panner.h

@@ -21,9 +21,9 @@
 #ifndef __gtk_ardour_mono_panner_h__
 #define __gtk_ardour_mono_panner_h__
 
-#include "pbd/signals.h"
+#include <memory>
 
-#include <boost/shared_ptr.hpp>
+#include "pbd/signals.h"
 
 #include "widgets/binding_proxy.h"
 

gtk2_ardour/note_base.h

@@ -21,7 +21,7 @@
 #ifndef __gtk_ardour_note_base_h__
 #define __gtk_ardour_note_base_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "temporal/beats.h"
 #include "canvas/types.h"

gtk2_ardour/note_player.h

@@ -20,8 +20,9 @@
 #ifndef __gtk2_ardour_note_player_h__
 #define __gtk2_ardour_note_player_h__
 
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
+
 #include <sigc++/trackable.h>
 
 #include "evoral/Note.h"

gtk2_ardour/panner_interface.h

@@ -20,7 +20,8 @@
 #ifndef __gtk_ardour_panner_interface_h__
 #define __gtk_ardour_panner_interface_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/label.h>
 #include "gtkmm2ext/persistent_tooltip.h"

gtk2_ardour/playlist_selection.h

@@ -21,7 +21,7 @@
 #define __ardour_gtk_playlist_selection_h__
 
 #include <list>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace ARDOUR {
 	class Playlist;

gtk2_ardour/playlist_selector.h

@@ -21,7 +21,7 @@
 #ifndef __ardour_playlist_selector_h__
 #define __ardour_playlist_selector_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>

gtk2_ardour/plugin_dspload_window.h

@@ -19,7 +19,7 @@
 #ifndef __ardour_plugin_dspload_window_h__
 #define __ardour_plugin_dspload_window_h__
 
-#include <boost/weak_ptr.hpp>
+#include <memory>
 
 #include <gtkmm/box.h>
 #include <gtkmm/scrolledwindow.h>

gtk2_ardour/port_group.cc

@@ -20,8 +20,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <memory>
 #include <cstring>
-#include <boost/shared_ptr.hpp>
+
 #include <boost/algorithm/string.hpp>
 
 #include "midi++/mmc.h"

gtk2_ardour/port_group.h

@@ -21,10 +21,11 @@
 #ifndef  __gtk_ardour_port_group_h__
 #define  __gtk_ardour_port_group_h__
 
-#include <vector>
-#include <string>
+#include <memory>
 #include <set>
-#include <boost/shared_ptr.hpp>
+#include <string>
+#include <vector>
+
 #include "pbd/signals.h"
 
 #include <gtkmm/widget.h>

gtk2_ardour/port_matrix.h

@@ -22,13 +22,14 @@
 #define __gtk_ardour_port_matrix_h__
 
 #include <list>
+#include <memory>
+
 #include <gtkmm/box.h>
 #include <gtkmm/scrollbar.h>
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/notebook.h>
-#include <boost/shared_ptr.hpp>
 
 #include "ardour/bundle.h"
 #include "ardour/types.h"

gtk2_ardour/port_matrix_column_labels.h

@@ -19,7 +19,8 @@
 #ifndef __port_matrix_column_labels_h__
 #define __port_matrix_column_labels_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include "port_matrix_labels.h"
 
 namespace ARDOUR {

gtk2_ardour/port_matrix_component.h

@@ -19,9 +19,10 @@
 #ifndef __gtk_ardour_port_matrix_component_h__
 #define __gtk_ardour_port_matrix_component_h__
 
-#include <stdint.h>
+#include <cstdint>
+#include <memory>
+
 #include <gtkmm/eventbox.h>
-#include <boost/shared_ptr.hpp>
 
 class PortMatrix;
 class PortMatrixBody;

gtk2_ardour/port_matrix_grid.h

@@ -19,9 +19,10 @@
 #ifndef  __gtk_ardour_port_matrix_grid_h__
 #define  __gtk_ardour_port_matrix_grid_h__
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <boost/shared_ptr.hpp>
+
 #include "ardour/types.h"
 #include "port_matrix_component.h"
 #include "port_matrix_types.h"

gtk2_ardour/port_matrix_row_labels.cc

@@ -20,11 +20,15 @@
  */
 
 #include <iostream>
-#include <boost/weak_ptr.hpp>
+#include <memory>
+
 #include <cairo.h>
 
 #include "gtkmm2ext/keyboard.h"
+
 #include "ardour/bundle.h"
+
+#include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/colors.h"
 
 #include "port_matrix_row_labels.h"

gtk2_ardour/port_matrix_row_labels.h

@@ -19,7 +19,8 @@
 #ifndef __port_matrix_row_labels_h__
 #define __port_matrix_row_labels_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <gdkmm/color.h>
 #include "port_matrix_labels.h"
 

gtk2_ardour/recorder_ui.h

@@ -19,8 +19,8 @@
 #ifndef __gtk_ardour_recorder_ui_h__
 #define __gtk_ardour_recorder_ui_h__
 
-#include <boost/shared_ptr.hpp>
 #include <list>
+#include <memory>
 #include <vector>
 
 #include <gtkmm/alignment.h>

gtk2_ardour/route_sorter.h

@@ -20,7 +20,8 @@
 #ifndef __gtk2_ardour_route_sorter_h__
 #define __gtk2_ardour_route_sorter_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <stdint.h>
 #include <vector>
 

gtk2_ardour/selection.h

@@ -25,8 +25,9 @@
 #ifndef __ardour_gtk_selection_h__
 #define __ardour_gtk_selection_h__
 
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
+
 #include <boost/noncopyable.hpp>
 
 #include <sigc++/signal.h>

gtk2_ardour/session_import_dialog.h

@@ -24,9 +24,9 @@
 
 #include <string>
 #include <list>
+#include <memory>
 #include <utility>
 
-#include <boost/shared_ptr.hpp>
 
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>

gtk2_ardour/session_metadata_dialog.h

@@ -23,6 +23,8 @@
 #ifndef __session_metadata_dialog_h__
 #define __session_metadata_dialog_h__
 
+#include <memory>
+
 #include "ardour_dialog.h"
 
 #ifdef interface
@@ -41,8 +43,6 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeview.h>
 
-#include <boost/shared_ptr.hpp>
-
 #include <string>
 #include <list>
 

gtk2_ardour/stripable_colorpicker.h

@@ -19,7 +19,8 @@
 #ifndef __gtkardour_stripable_colorpicker_h__
 #define __gtkardour_stripable_colorpicker_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <gtkmm/colorbutton.h>
 #include <gtkmm/colorselection.h>
 

gtk2_ardour/stripable_treemodel.h

@@ -19,12 +19,10 @@
 #ifndef __gtk2_ardour_stripable_treemodel_h__
 #define __gtk2_ardour_stripable_treemodel_h__
 
+#include <cstdint>
+#include <memory>
 #include <set>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <stdint.h>
-
 #include <gtkmm/treemodel.h>
 
 namespace ARDOUR {

gtk2_ardour/vca_master_strip.h

@@ -21,7 +21,7 @@
 #ifndef __ardour_vca_master_strip__
 #define __ardour_vca_master_strip__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <gtkmm/box.h>
 #include <gtkmm/colorselection.h>

gtk2_ardour/wscript

@@ -485,10 +485,6 @@ def configure(conf):
     conf.write_config_header('gtk2ardour-version.h')
     conf.env['define_key'] = bak
 
-    # Boost headers
-    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
-    autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
-
 def _doPyp(infileName, deps = False):
     outStr = ''
     out = []

libs/ardour/ardour/analyser.h

@@ -20,7 +20,7 @@
 #ifndef __ardour_analyser_h__
 #define __ardour_analyser_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "ardour/libardour_visibility.h"
 #include "pbd/pthread_utils.h"

libs/ardour/ardour/analysis_graph.h

@@ -22,9 +22,9 @@
 #define __ardour_analysis_graph_h__
 
 #include <map>
+#include <memory>
 #include <set>
 #include <cstring>
-#include <boost/shared_ptr.hpp>
 
 #include "ardour/audioregion.h"
 #include "ardour/audioplaylist.h"

libs/ardour/ardour/audio_playlist_importer.h

@@ -22,9 +22,8 @@
 #define __ardour_audio_playlist_importer_h__
 
 #include <list>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
+x
 #include "pbd/xml++.h"
 #include "pbd/id.h"
 

libs/ardour/ardour/audio_playlist_source.h

@@ -20,10 +20,9 @@
 #ifndef __ardour_audio_playlist_source_h__
 #define __ardour_audio_playlist_source_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/ardour.h"
 #include "ardour/audiosource.h"
 #include "ardour/playlist_source.h"

libs/ardour/ardour/audio_region_importer.h

@@ -22,9 +22,9 @@
 
 #include <list>
 #include <map>
+#include <memory>
 #include <utility>
 
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/xml++.h"
 #include "pbd/id.h"

libs/ardour/ardour/audio_unit.h

@@ -22,14 +22,13 @@
 #ifndef __ardour_audio_unit_h__
 #define __ardour_audio_unit_h__
 
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-
+#include <cstdint>
 #include <list>
+#include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
-#include <map>
 
 #include "pbd/g_atomic_compat.h"
 #include "ardour/plugin.h"
@@ -38,7 +37,6 @@
 #include <AudioUnit/AudioUnitProperties.h>
 #include "AUParamInfo.h"
 
-#include <boost/shared_ptr.hpp>
 
 class CAComponent;
 class CAAudioUnit;

libs/ardour/ardour/audiosource.h

@@ -23,9 +23,9 @@
 #ifndef __ardour_audio_source_h__
 #define __ardour_audio_source_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <boost/shared_array.hpp>
-#include <boost/enable_shared_from_this.hpp>
 
 #include <time.h>
 

libs/ardour/ardour/automatable.h

@@ -23,10 +23,10 @@
 #define __ardour_automatable_h__
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/rcu.h"
 #include "pbd/signals.h"

libs/ardour/ardour/automation_control.h

@@ -24,11 +24,10 @@
 #define __ardour_automation_control_h__
 
 #include <map>
+#include <memory>
 
 #include <glibmm/threads.h>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/controllable.h"
 
 #include "evoral/types.h"

libs/ardour/ardour/automation_watch.h

@@ -20,8 +20,9 @@
 #ifndef __ardour_automation_watch_h__
 #define __ardour_automation_watch_h__
 
+#include <memory>
 #include <set>
-#include <boost/shared_ptr.hpp>
+
 #include <sigc++/signal.h>
 
 #include "pbd/pthread_utils.h"

libs/ardour/ardour/auv2_scan.h

@@ -19,9 +19,9 @@
 #ifndef _ardour_auv2_scan_h_
 #define _ardour_auv2_scan_h_
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/xml++.h"
 

libs/ardour/ardour/bundle.h

@@ -22,10 +22,11 @@
 #ifndef __ardour_bundle_h__
 #define __ardour_bundle_h__
 
+#include <memory>
 #include <string>
 #include <vector>
+
 #include <glibmm/threads.h>
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/signals.h"
 

libs/ardour/ardour/control_group.h

@@ -20,11 +20,9 @@
 #define __libardour_control_group_h__
 
 #include <map>
+#include <memory>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-
 #include <glibmm/threads.h>
 
 #include "pbd/controllable.h"

libs/ardour/ardour/delayline.h

@@ -19,7 +19,8 @@
 #ifndef __ardour_delayline_h__
 #define __ardour_delayline_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <boost/shared_array.hpp>
 
 #include "ardour/types.h"

libs/ardour/ardour/element_import_handler.h

@@ -20,11 +20,10 @@
 #ifndef __ardour_element_import_handler_h__
 #define __ardour_element_import_handler_h__
 
-#include <string>
 #include <list>
+#include <memory>
 #include <set>
-
-#include <boost/shared_ptr.hpp>
+#include <string>
 
 #include "ardour/libardour_visibility.h"
 #include "pbd/libpbd_visibility.h"

libs/ardour/ardour/export_analysis.h

@@ -21,10 +21,10 @@
 
 #include <cstring>
 #include <map>
+#include <memory>
 #include <set>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
 
 #include "ardour/types.h"
 

libs/ardour/ardour/export_channel.h

@@ -24,10 +24,10 @@
 #define __ardour_export_channel_h__
 
 #include <list>
+#include <memory>
 #include <set>
 
 #include <boost/scoped_array.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/ringbuffer.h"
 #include "pbd/signals.h"

libs/ardour/ardour/export_filename.h

@@ -21,8 +21,7 @@
 #ifndef __ardour_export_filename_h__
 #define __ardour_export_filename_h__
 
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 #include <string>
 
 #include <ardour/export_pointers.h>

libs/ardour/ardour/export_format_base.h

@@ -22,11 +22,10 @@
 #ifndef __ardour_export_format_base_h__
 #define __ardour_export_format_base_h__
 
+#include <memory>
 #include <set>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include <sndfile.h>
 #include <samplerate.h>
 

libs/ardour/ardour/export_format_manager.h

@@ -24,10 +24,9 @@
 #define __ardour_export_format_manager_h__
 
 #include <list>
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/signals.h"
 
 #include "ardour/export_formats.h"

libs/ardour/ardour/export_formats.h

@@ -22,8 +22,8 @@
 #ifndef __ardour_export_formats_h__
 #define __ardour_export_formats_h__
 
-#include <boost/weak_ptr.hpp>
 #include <list>
+#include <memory>
 
 #include "pbd/failed_constructor.h"
 #include "pbd/signals.h"

libs/ardour/ardour/export_handler.h

@@ -25,9 +25,9 @@
 #define __ardour_export_handler_h__
 
 #include <map>
+#include <memory>
 
 #include <boost/operators.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/gstdio_compat.h"
 

libs/ardour/ardour/export_pointers.h

@@ -20,9 +20,9 @@
 #ifndef __ardour_export_pointers_h__
 #define __ardour_export_pointers_h__
 
+#include <memory>
+
 #include <boost/operators.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 
 #include "ardour/libardour_visibility.h"
 #include "ardour/comparable_shared_ptr.h"

libs/ardour/ardour/export_profile_manager.h

@@ -26,12 +26,11 @@
 
 #include <list>
 #include <map>
+#include <memory>
 #include <stdexcept>
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/file_utils.h"
 #include "pbd/uuid.h"
 #include "pbd/xml++.h"

libs/ardour/ardour/export_timespan.h

@@ -23,10 +23,9 @@
 #ifndef __ardour_export_timespan_h__
 #define __ardour_export_timespan_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 

libs/ardour/ardour/gain_control.h

@@ -20,10 +20,9 @@
 #ifndef __ardour_gain_control_h__
 #define __ardour_gain_control_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/controllable.h"
 
 #include "evoral/Parameter.h"

libs/ardour/ardour/graph.h

@@ -24,11 +24,11 @@
 #define __ardour_graph_h__
 
 #include <list>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/g_atomic_compat.h"
 #include "pbd/mpmc_queue.h"

libs/ardour/ardour/graphnode.h

@@ -23,10 +23,9 @@
 
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/g_atomic_compat.h"
 #include "pbd/rcu.h"
 

libs/ardour/ardour/instrument_info.h

@@ -19,11 +19,10 @@
 #ifndef __ardour_instrument_info_h__
 #define __ardour_instrument_info_h__
 
+#include <memory>
 #include <stdint.h>
 #include <string>
 
-#include <boost/weak_ptr.hpp>
-
 #include "pbd/signals.h"
 
 #include "evoral/Parameter.h"

libs/ardour/ardour/io_processor.h

@@ -22,8 +22,8 @@
 #ifndef __ardour_redirect_h__
 #define __ardour_redirect_h__
 
+#include <memory>
 #include <string>
-#include <boost/shared_ptr.hpp>
 
 #include <glibmm/threads.h>
 

libs/ardour/ardour/io_vector.h

@@ -19,8 +19,9 @@
 #ifndef __ardour_io_vector_h__
 #define __ardour_io_vector_h__
 
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
+
 #include "ardour/io.h"
 
 namespace ARDOUR {

libs/ardour/ardour/location_importer.h

@@ -20,11 +20,11 @@
 #ifndef __ardour_location_importer_h__
 #define __ardour_location_importer_h__
 
+#include <memory>
+
 #include "ardour/element_importer.h"
 #include "ardour/element_import_handler.h"
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/xml++.h"
 
 namespace ARDOUR {

libs/ardour/ardour/lua_api.h

@@ -19,9 +19,10 @@
 #ifndef _ardour_lua_api_h_
 #define _ardour_lua_api_h_
 
+#include <memory>
 #include <string>
+
 #include <lo/lo.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <rubberband/RubberBandStretcher.h>
 #include <vamp-hostsdk/Plugin.h>

libs/ardour/ardour/luascripting.h

@@ -17,9 +17,10 @@
  */
 #ifndef _ardour_luascripting_h_
 #define _ardour_luascripting_h_
+
+#include <memory>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
 #include <glibmm/threads.h>
 
 #include "pbd/signals.h"

libs/ardour/ardour/monitor_control.h

@@ -19,9 +19,9 @@
 #ifndef __ardour_monitor_control_h__
 #define __ardour_monitor_control_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/dynamic_bitset.hpp>
 
 #include "ardour/slavable_automation_control.h"

libs/ardour/ardour/monitor_port.h

@@ -19,7 +19,7 @@
 #ifndef _ardour_monitor_port_h_
 #define _ardour_monitor_port_h_
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <set>
 
 #include "zita-resampler/vmresampler.h"

libs/ardour/ardour/mute_control.h

@@ -20,10 +20,9 @@
 #ifndef __ardour_mute_control_h__
 #define __ardour_mute_control_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/slavable_automation_control.h"
 
 #include "ardour/mute_master.h"

libs/ardour/ardour/muteable.h

@@ -19,7 +19,7 @@
 #ifndef __ardour_muteable_h__
 #define __ardour_muteable_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "pbd/signals.h"
 

libs/ardour/ardour/pan_controllable.h

@@ -20,10 +20,9 @@
 #ifndef __libardour_pan_controllable_h__
 #define __libardour_pan_controllable_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "evoral/Parameter.h"
 
 #include "ardour/automation_control.h"

libs/ardour/ardour/pannable.h

@@ -20,10 +20,9 @@
 #ifndef __libardour_pannable_h__
 #define __libardour_pannable_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/stateful.h"
 #include "evoral/Parameter.h"
 

libs/ardour/ardour/phase_control.h

@@ -19,9 +19,9 @@
 #ifndef __ardour_phase_control_h__
 #define __ardour_phase_control_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/dynamic_bitset.hpp>
 
 #include "ardour/slavable_automation_control.h"

libs/ardour/ardour/playlist.h

@@ -27,9 +27,9 @@
 #ifndef __ardour_playlist_h__
 #define __ardour_playlist_h__
 
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
+
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 #include <list>
 #include <map>

libs/ardour/ardour/playlist_source.h

@@ -19,10 +19,9 @@
 #ifndef __ardour_playlist_source_h__
 #define __ardour_playlist_source_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/ardour.h"
 #include "ardour/source.h"
 

libs/ardour/ardour/plugin.h

@@ -23,8 +23,7 @@
 #ifndef __ardour_plugin_h__
 #define __ardour_plugin_h__
 
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 #include <set>
 #include <string>
 

libs/ardour/ardour/plugin_insert.h

@@ -24,11 +24,9 @@
 #ifndef __ardour_plugin_insert_h__
 #define __ardour_plugin_insert_h__
 
-#include <vector>
+#include <memory>
 #include <string>
-
-#include <boost/weak_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
+#include <vector>
 
 #include "pbd/stack_allocator.h"
 #include "pbd/timing.h"

libs/ardour/ardour/port_engine_shared.h

@@ -21,11 +21,11 @@
 #define _libardour_port_engine_shared_h_
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/natsort.h"
 #include "pbd/rcu.h"

libs/ardour/ardour/port_manager.h

@@ -20,15 +20,13 @@
 #ifndef __libardour_port_manager_h__
 #define __libardour_port_manager_h__
 
+#include <cstdint>
 #include <exception>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
-#include <stdint.h>
-
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/natsort.h"
 #include "pbd/rcu.h"
 #include "pbd/ringbuffer.h"

libs/ardour/ardour/readonly_control.h

@@ -19,7 +19,7 @@
 #ifndef __ardour_readonly_control_h__
 #define __ardour_readonly_control_h__
 
-#include <boost/weak_ptr.hpp>
+#include <memory>
 
 #include "pbd/destructible.h"
 

libs/ardour/ardour/record_enable_control.h

@@ -19,9 +19,9 @@
 #ifndef __ardour_record_enable_control_h__
 #define __ardour_record_enable_control_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/dynamic_bitset.hpp>
 
 #include "ardour/slavable_automation_control.h"

libs/ardour/ardour/record_safe_control.h

@@ -19,10 +19,9 @@
 #ifndef __ardour_record_safe_control_h__
 #define __ardour_record_safe_control_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/slavable_automation_control.h"
 #include "ardour/recordable.h"
 

libs/ardour/ardour/region.h

@@ -24,9 +24,9 @@
 #ifndef __ardour_region_h__
 #define __ardour_region_h__
 
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
+
 #include <boost/utility.hpp>
 
 #include "temporal/timeline.h"

libs/ardour/ardour/route.h

@@ -28,12 +28,10 @@
 #include <cstring>
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <glibmm/threads.h>
 #include "pbd/fastlog.h"
 #include "pbd/xml++.h"

libs/ardour/ardour/selection.h

@@ -20,12 +20,10 @@
 #ifndef __ardour_selection_h__
 #define __ardour_selection_h__
 
+#include <memory>
 #include <set>
 #include <vector>
 
-#include <boost/weak_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/stateful.h"
 
 #include "ardour/presentation_info.h"

libs/ardour/ardour/session.h

@@ -39,6 +39,7 @@
 #include <exception>
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
@@ -47,7 +48,6 @@
 
 #include <boost/dynamic_bitset.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
 
 #include <glibmm/threads.h>

libs/ardour/ardour/session_event.h

@@ -23,9 +23,9 @@
 #define __ardour_session_event_h__
 
 #include <list>
+#include <memory>
+
 #include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 
 #include "pbd/pool.h"
 #include "pbd/ringbuffer.h"

libs/ardour/ardour/session_playlists.h

@@ -21,11 +21,13 @@
 #ifndef __ardour_session_playlists_h__
 #define __ardour_session_playlists_h__
 
+#include <memory>
 #include <set>
 #include <vector>
 #include <string>
+
 #include <glibmm/threads.h>
-#include <boost/shared_ptr.hpp>
+
 #include <boost/function.hpp>
 
 #include "pbd/signals.h"

libs/ardour/ardour/slavable.h

@@ -20,11 +20,11 @@
 #ifndef __ardour_slavable_h__
 #define __ardour_slavable_h__
 
+#include <memory>
 #include <set>
 #include <string>
 #include <stdint.h>
 
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/signals.h"
 

libs/ardour/ardour/sndfileimportable.h

@@ -21,7 +21,8 @@
 #ifndef __ardour_sndfile_importable_source_h__
 #define __ardour_sndfile_importable_source_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <sndfile.h>
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"

libs/ardour/ardour/solo_control.h

@@ -19,10 +19,9 @@
 #ifndef __ardour_solo_control_h__
 #define __ardour_solo_control_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/slavable_automation_control.h"
 #include "ardour/libardour_visibility.h"
 

libs/ardour/ardour/solo_isolate_control.h

@@ -19,10 +19,9 @@
 #ifndef __ardour_solo_isolate_control_h__
 #define __ardour_solo_isolate_control_h__
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/slavable_automation_control.h"
 #include "ardour/libardour_visibility.h"
 

libs/ardour/ardour/source.h

@@ -23,13 +23,12 @@
 #ifndef __ardour_source_h__
 #define __ardour_source_h__
 
+#include <memory>
 #include <string>
 #include <set>
 
 #include <glibmm/threads.h>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/utility.hpp>
 
 #include "pbd/statefuldestructible.h"

libs/ardour/ardour/source_factory.h

@@ -20,7 +20,7 @@
 #ifndef __ardour_source_factory_h__
 #define __ardour_source_factory_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <stdint.h>
 #include <string>
 

libs/ardour/ardour/stripable.h

@@ -22,12 +22,12 @@
 #ifndef __libardour_stripable_h__
 #define __libardour_stripable_h__
 
-#include <stdint.h>
-
+#include <cstdint>
+#include <memory>
 #include <string>
+
 #include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
+
 
 #include "pbd/signals.h"
 

libs/ardour/ardour/tempo_map_importer.h

@@ -20,7 +20,7 @@
 #ifndef __ardour_tempo_map_importer_h__
 #define __ardour_tempo_map_importer_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "pbd/xml++.h"