diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index 3bec6ef989..07524eb348 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/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"
diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h
index 0f87f02217..f39609e543 100644
--- a/gtk2_ardour/automation_controller.h
+++ b/gtk2_ardour/automation_controller.h
@@ -29,7 +29,7 @@
 #undef NO
 #endif
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <gtkmm/alignment.h>
 
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 5c681c7ea1..81fffb3485 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/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"
diff --git a/gtk2_ardour/axis_provider.h b/gtk2_ardour/axis_provider.h
index a1b0a8f0ff..56f4bf8d39 100644
--- a/gtk2_ardour/axis_provider.h
+++ b/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;
diff --git a/gtk2_ardour/beatbox_gui.h b/gtk2_ardour/beatbox_gui.h
index 2bcbb10f4e..4b8e1308b5 100644
--- a/gtk2_ardour/beatbox_gui.h
+++ b/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>
diff --git a/gtk2_ardour/control_slave_ui.h b/gtk2_ardour/control_slave_ui.h
index 67c1dd31eb..a0a4cf5244 100644
--- a/gtk2_ardour/control_slave_ui.h
+++ b/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>
diff --git a/gtk2_ardour/cursor_context.h b/gtk2_ardour/cursor_context.h
index ecce3aa86d..bfe6d91714 100644
--- a/gtk2_ardour/cursor_context.h
+++ b/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;
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index a8d528f388..54ec04f244 100644
--- a/gtk2_ardour/export_channel_selector.h
+++ b/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>
diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h
index ffdeb29498..c5c754e0db 100644
--- a/gtk2_ardour/export_format_selector.h
+++ b/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>
diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h
index d222c53e78..3c65bb2ea5 100644
--- a/gtk2_ardour/export_timespan_selector.h
+++ b/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>
diff --git a/gtk2_ardour/io_button.h b/gtk2_ardour/io_button.h
index 1bf7763cce..7d6466f3fb 100644
--- a/gtk2_ardour/io_button.h
+++ b/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"
diff --git a/gtk2_ardour/midi_export_dialog.h b/gtk2_ardour/midi_export_dialog.h
index cd0dc35f18..11c6fcc5eb 100644
--- a/gtk2_ardour/midi_export_dialog.h
+++ b/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>
 
diff --git a/gtk2_ardour/mono_panner.h b/gtk2_ardour/mono_panner.h
index e0f8cb27c8..981762a3a3 100644
--- a/gtk2_ardour/mono_panner.h
+++ b/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"
 
diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index c1fa77d256..5b26a0f69b 100644
--- a/gtk2_ardour/note_base.h
+++ b/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"
diff --git a/gtk2_ardour/note_player.h b/gtk2_ardour/note_player.h
index 03970c4706..7cc197933e 100644
--- a/gtk2_ardour/note_player.h
+++ b/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"
diff --git a/gtk2_ardour/panner_interface.h b/gtk2_ardour/panner_interface.h
index 787c8997c9..3056075d4e 100644
--- a/gtk2_ardour/panner_interface.h
+++ b/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"
diff --git a/gtk2_ardour/playlist_selection.h b/gtk2_ardour/playlist_selection.h
index 5ce177388e..d04103b524 100644
--- a/gtk2_ardour/playlist_selection.h
+++ b/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;
diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h
index ace536dd3d..8bfae58d9e 100644
--- a/gtk2_ardour/playlist_selector.h
+++ b/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>
diff --git a/gtk2_ardour/plugin_dspload_window.h b/gtk2_ardour/plugin_dspload_window.h
index d2850ca5f9..9334bab0bb 100644
--- a/gtk2_ardour/plugin_dspload_window.h
+++ b/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>
diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc
index 334e1fb7a2..4100c555d8 100644
--- a/gtk2_ardour/port_group.cc
+++ b/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"
diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h
index dcc722601e..5e813ccb8b 100644
--- a/gtk2_ardour/port_group.h
+++ b/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>
diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h
index 24f1a6961f..97b1797b74 100644
--- a/gtk2_ardour/port_matrix.h
+++ b/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"
diff --git a/gtk2_ardour/port_matrix_column_labels.h b/gtk2_ardour/port_matrix_column_labels.h
index 2e38714825..19b1b24ae5 100644
--- a/gtk2_ardour/port_matrix_column_labels.h
+++ b/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 {
diff --git a/gtk2_ardour/port_matrix_component.h b/gtk2_ardour/port_matrix_component.h
index 4286c1bf54..9ad1b999a0 100644
--- a/gtk2_ardour/port_matrix_component.h
+++ b/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;
diff --git a/gtk2_ardour/port_matrix_grid.h b/gtk2_ardour/port_matrix_grid.h
index e7d2d2f7a1..4d73f6a56a 100644
--- a/gtk2_ardour/port_matrix_grid.h
+++ b/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"
diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index 01b2dad759..a8528886d8 100644
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/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"
diff --git a/gtk2_ardour/port_matrix_row_labels.h b/gtk2_ardour/port_matrix_row_labels.h
index c1bfbb6e6a..4cd2876066 100644
--- a/gtk2_ardour/port_matrix_row_labels.h
+++ b/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"
 
diff --git a/gtk2_ardour/recorder_ui.h b/gtk2_ardour/recorder_ui.h
index 50d96badcc..a32de0a238 100644
--- a/gtk2_ardour/recorder_ui.h
+++ b/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>
diff --git a/gtk2_ardour/route_sorter.h b/gtk2_ardour/route_sorter.h
index 99c604ffd9..16f9261d52 100644
--- a/gtk2_ardour/route_sorter.h
+++ b/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>
 
diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index fce253547f..82a4156dd8 100644
--- a/gtk2_ardour/selection.h
+++ b/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>
diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index ad1ba90990..20db9240ba 100644
--- a/gtk2_ardour/session_import_dialog.h
+++ b/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>
diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h
index bb8790cf82..d92b59cb38 100644
--- a/gtk2_ardour/session_metadata_dialog.h
+++ b/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>
 
diff --git a/gtk2_ardour/stripable_colorpicker.h b/gtk2_ardour/stripable_colorpicker.h
index 9a3f99ff16..22acd77cdd 100644
--- a/gtk2_ardour/stripable_colorpicker.h
+++ b/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>
 
diff --git a/gtk2_ardour/stripable_treemodel.h b/gtk2_ardour/stripable_treemodel.h
index a61847eed1..c323932f18 100644
--- a/gtk2_ardour/stripable_treemodel.h
+++ b/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 {
diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 1d8fa33ce9..1c41e225e0 100644
--- a/gtk2_ardour/vca_master_strip.h
+++ b/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>
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 46d0333f41..3b6fdde0b6 100644
--- a/gtk2_ardour/wscript
+++ b/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 = []
diff --git a/libs/ardour/ardour/analyser.h b/libs/ardour/ardour/analyser.h
index 4b6313e791..8f175d3175 100644
--- a/libs/ardour/ardour/analyser.h
+++ b/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"
diff --git a/libs/ardour/ardour/analysis_graph.h b/libs/ardour/ardour/analysis_graph.h
index cac6e45b70..d4866e8648 100644
--- a/libs/ardour/ardour/analysis_graph.h
+++ b/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"
diff --git a/libs/ardour/ardour/audio_playlist_importer.h b/libs/ardour/ardour/audio_playlist_importer.h
index d98946581e..2f024cc48e 100644
--- a/libs/ardour/ardour/audio_playlist_importer.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/audio_playlist_source.h b/libs/ardour/ardour/audio_playlist_source.h
index 1bc3b39ac1..d5ea5ad4f9 100644
--- a/libs/ardour/ardour/audio_playlist_source.h
+++ b/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"
diff --git a/libs/ardour/ardour/audio_region_importer.h b/libs/ardour/ardour/audio_region_importer.h
index d466dd793f..865badb61f 100644
--- a/libs/ardour/ardour/audio_region_importer.h
+++ b/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"
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h
index 01ddfad0f1..b5e9ec8ecf 100644
--- a/libs/ardour/ardour/audio_unit.h
+++ b/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;
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index d880a45029..de1c612980 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/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>
 
diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 0fdcdd4d24..6ec84534fb 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/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"
diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index 7dbfa7aa71..b819fcbf7d 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/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"
diff --git a/libs/ardour/ardour/automation_watch.h b/libs/ardour/ardour/automation_watch.h
index 9be38b9d54..a6bad44148 100644
--- a/libs/ardour/ardour/automation_watch.h
+++ b/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"
diff --git a/libs/ardour/ardour/auv2_scan.h b/libs/ardour/ardour/auv2_scan.h
index 79b6c12eb8..97e7fcd5ab 100644
--- a/libs/ardour/ardour/auv2_scan.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h
index cf035133ea..f593186aba 100644
--- a/libs/ardour/ardour/bundle.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/control_group.h b/libs/ardour/ardour/control_group.h
index e77e184bd6..87a3f16906 100644
--- a/libs/ardour/ardour/control_group.h
+++ b/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"
diff --git a/libs/ardour/ardour/delayline.h b/libs/ardour/ardour/delayline.h
index abaaec4f53..825c3ee730 100644
--- a/libs/ardour/ardour/delayline.h
+++ b/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"
diff --git a/libs/ardour/ardour/element_import_handler.h b/libs/ardour/ardour/element_import_handler.h
index 98eda088a2..87886a9df9 100644
--- a/libs/ardour/ardour/element_import_handler.h
+++ b/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"
diff --git a/libs/ardour/ardour/export_analysis.h b/libs/ardour/ardour/export_analysis.h
index 86c8b8eda9..ea52f35f61 100644
--- a/libs/ardour/ardour/export_analysis.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h
index 835502e8a2..1ff375f2bc 100644
--- a/libs/ardour/ardour/export_channel.h
+++ b/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"
diff --git a/libs/ardour/ardour/export_filename.h b/libs/ardour/ardour/export_filename.h
index b547ffd0c6..ed75939e83 100644
--- a/libs/ardour/ardour/export_filename.h
+++ b/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>
diff --git a/libs/ardour/ardour/export_format_base.h b/libs/ardour/ardour/export_format_base.h
index f4537bd5f3..509e00b10b 100644
--- a/libs/ardour/ardour/export_format_base.h
+++ b/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>
 
diff --git a/libs/ardour/ardour/export_format_manager.h b/libs/ardour/ardour/export_format_manager.h
index da07ba5f90..cfc3e8fa7b 100644
--- a/libs/ardour/ardour/export_format_manager.h
+++ b/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"
diff --git a/libs/ardour/ardour/export_formats.h b/libs/ardour/ardour/export_formats.h
index 7a525f0c7e..22735d3214 100644
--- a/libs/ardour/ardour/export_formats.h
+++ b/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"
diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index f7f9818544..958f4e466b 100644
--- a/libs/ardour/ardour/export_handler.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/export_pointers.h b/libs/ardour/ardour/export_pointers.h
index 08979ea5bd..3d19bbbca9 100644
--- a/libs/ardour/ardour/export_pointers.h
+++ b/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"
diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h
index 1b2f08bced..038ecc78be 100644
--- a/libs/ardour/ardour/export_profile_manager.h
+++ b/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"
diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h
index c61e95b52a..5c301152a2 100644
--- a/libs/ardour/ardour/export_timespan.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/gain_control.h b/libs/ardour/ardour/gain_control.h
index 0b3e2fa5b2..5ad9b4cc57 100644
--- a/libs/ardour/ardour/gain_control.h
+++ b/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"
diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h
index f0c8ac502a..b99df69e7d 100644
--- a/libs/ardour/ardour/graph.h
+++ b/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"
diff --git a/libs/ardour/ardour/graphnode.h b/libs/ardour/ardour/graphnode.h
index 2457e3e2ba..abb7491e7d 100644
--- a/libs/ardour/ardour/graphnode.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/instrument_info.h b/libs/ardour/ardour/instrument_info.h
index a2a5e7f2db..93f22485bf 100644
--- a/libs/ardour/ardour/instrument_info.h
+++ b/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"
diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index c719c9b72a..75934a74f0 100644
--- a/libs/ardour/ardour/io_processor.h
+++ b/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>
 
diff --git a/libs/ardour/ardour/io_vector.h b/libs/ardour/ardour/io_vector.h
index c63023153e..6b4fc269df 100644
--- a/libs/ardour/ardour/io_vector.h
+++ b/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 {
diff --git a/libs/ardour/ardour/location_importer.h b/libs/ardour/ardour/location_importer.h
index b0873d350e..5b468d60e7 100644
--- a/libs/ardour/ardour/location_importer.h
+++ b/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 {
diff --git a/libs/ardour/ardour/lua_api.h b/libs/ardour/ardour/lua_api.h
index 33f79a7b02..c44b2fffa9 100644
--- a/libs/ardour/ardour/lua_api.h
+++ b/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>
diff --git a/libs/ardour/ardour/luascripting.h b/libs/ardour/ardour/luascripting.h
index 283c68df8d..402a6a360b 100644
--- a/libs/ardour/ardour/luascripting.h
+++ b/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"
diff --git a/libs/ardour/ardour/monitor_control.h b/libs/ardour/ardour/monitor_control.h
index 94078eef31..37f9aa13ac 100644
--- a/libs/ardour/ardour/monitor_control.h
+++ b/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"
diff --git a/libs/ardour/ardour/monitor_port.h b/libs/ardour/ardour/monitor_port.h
index f8166a4fab..51269c5828 100644
--- a/libs/ardour/ardour/monitor_port.h
+++ b/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"
diff --git a/libs/ardour/ardour/mute_control.h b/libs/ardour/ardour/mute_control.h
index 28839f7495..37950f08e3 100644
--- a/libs/ardour/ardour/mute_control.h
+++ b/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"
diff --git a/libs/ardour/ardour/muteable.h b/libs/ardour/ardour/muteable.h
index 64463abb59..ff071cc76d 100644
--- a/libs/ardour/ardour/muteable.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/pan_controllable.h b/libs/ardour/ardour/pan_controllable.h
index 407b750beb..75f4ee7736 100644
--- a/libs/ardour/ardour/pan_controllable.h
+++ b/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"
diff --git a/libs/ardour/ardour/pannable.h b/libs/ardour/ardour/pannable.h
index 6725b08f44..ee85e0f900 100644
--- a/libs/ardour/ardour/pannable.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/phase_control.h b/libs/ardour/ardour/phase_control.h
index af51e19693..59e9b6a28c 100644
--- a/libs/ardour/ardour/phase_control.h
+++ b/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"
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 6fc9a5c540..102c8dbd2c 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/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>
diff --git a/libs/ardour/ardour/playlist_source.h b/libs/ardour/ardour/playlist_source.h
index 2974dbdd35..5ef48c2b89 100644
--- a/libs/ardour/ardour/playlist_source.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 654211b3df..77b38dc9dc 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/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>
 
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 3893cbc57a..f3f3f3625c 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/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"
diff --git a/libs/ardour/ardour/port_engine_shared.h b/libs/ardour/ardour/port_engine_shared.h
index bf6be04bb0..5107c2a247 100644
--- a/libs/ardour/ardour/port_engine_shared.h
+++ b/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"
diff --git a/libs/ardour/ardour/port_manager.h b/libs/ardour/ardour/port_manager.h
index 0c83273ead..b29a42cd40 100644
--- a/libs/ardour/ardour/port_manager.h
+++ b/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"
diff --git a/libs/ardour/ardour/readonly_control.h b/libs/ardour/ardour/readonly_control.h
index 2c379e64d7..f5151232c6 100644
--- a/libs/ardour/ardour/readonly_control.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/record_enable_control.h b/libs/ardour/ardour/record_enable_control.h
index e15f464e22..18ec085944 100644
--- a/libs/ardour/ardour/record_enable_control.h
+++ b/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"
diff --git a/libs/ardour/ardour/record_safe_control.h b/libs/ardour/ardour/record_safe_control.h
index 7a88f53342..0c09d56c0e 100644
--- a/libs/ardour/ardour/record_safe_control.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 03cdf05ead..8b376015dc 100644
--- a/libs/ardour/ardour/region.h
+++ b/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"
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 51db82943c..1db5480261 100644
--- a/libs/ardour/ardour/route.h
+++ b/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"
diff --git a/libs/ardour/ardour/selection.h b/libs/ardour/ardour/selection.h
index d6bf4b3f1c..21fc87c9a1 100644
--- a/libs/ardour/ardour/selection.h
+++ b/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"
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index c4cd8657de..7e0fbb5999 100644
--- a/libs/ardour/ardour/session.h
+++ b/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>
diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h
index 6da44f7e72..271960ffb0 100644
--- a/libs/ardour/ardour/session_event.h
+++ b/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"
diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h
index 14f1c52554..46fb6f2380 100644
--- a/libs/ardour/ardour/session_playlists.h
+++ b/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"
diff --git a/libs/ardour/ardour/slavable.h b/libs/ardour/ardour/slavable.h
index 60cf770fd7..1c31b7d7cb 100644
--- a/libs/ardour/ardour/slavable.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h
index eaf23a60e1..b6d76c8dc7 100644
--- a/libs/ardour/ardour/sndfileimportable.h
+++ b/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"
diff --git a/libs/ardour/ardour/solo_control.h b/libs/ardour/ardour/solo_control.h
index 020c2c8c2c..1896186ac4 100644
--- a/libs/ardour/ardour/solo_control.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/solo_isolate_control.h b/libs/ardour/ardour/solo_isolate_control.h
index 812342274a..c410c8674b 100644
--- a/libs/ardour/ardour/solo_isolate_control.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index adaf0b9fa0..d42d92d6ec 100644
--- a/libs/ardour/ardour/source.h
+++ b/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"
diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index 5d4f69e648..0165a6df4b 100644
--- a/libs/ardour/ardour/source_factory.h
+++ b/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>
 
diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h
index 832300590e..ae17499ef6 100644
--- a/libs/ardour/ardour/stripable.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/tempo_map_importer.h b/libs/ardour/ardour/tempo_map_importer.h
index 8e3223c7e2..3a2d618184 100644
--- a/libs/ardour/ardour/tempo_map_importer.h
+++ b/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"
 
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 3087494bcf..42279b2244 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -22,7 +22,7 @@
 #ifndef __ardour_track_h__
 #define __ardour_track_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "pbd/enum_convert.h"
 
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index d90837f3de..3718df4ab8 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -32,13 +32,14 @@
 #define __ardour_types_h__
 
 #include <bitset>
+#include <cstdint>
 #include <istream>
-#include <vector>
 #include <map>
+#include <memory>
 #include <set>
-#include <boost/shared_ptr.hpp>
+#include <vector>
+
 #include <sys/types.h>
-#include <stdint.h>
 #include <pthread.h>
 
 #include <inttypes.h>
diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h
index 2645193a5d..394ac98401 100644
--- a/libs/ardour/ardour/vca.h
+++ b/libs/ardour/ardour/vca.h
@@ -21,9 +21,8 @@
 #ifndef __ardour_vca_h__
 #define __ardour_vca_h__
 
+#include <memory>
 #include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 
 #include <glibmm/threads.h>
 
diff --git a/libs/ardour/ardour/vca_manager.h b/libs/ardour/ardour/vca_manager.h
index 2b3235ee67..41b98b3ab8 100644
--- a/libs/ardour/ardour/vca_manager.h
+++ b/libs/ardour/ardour/vca_manager.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <list>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <glibmm/threads.h>
 
diff --git a/libs/ardour/ardour/vst2_scan.h b/libs/ardour/ardour/vst2_scan.h
index 9edcd13566..62b151bd30 100644
--- a/libs/ardour/ardour/vst2_scan.h
+++ b/libs/ardour/ardour/vst2_scan.h
@@ -19,9 +19,9 @@
 #ifndef _ardour_vst2_scan_h_
 #define _ardour_vst2_scan_h_
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/xml++.h"
 
diff --git a/libs/ardour/ardour/vst3_host.h b/libs/ardour/ardour/vst3_host.h
index af1b6f5531..5f58e50933 100644
--- a/libs/ardour/ardour/vst3_host.h
+++ b/libs/ardour/ardour/vst3_host.h
@@ -19,14 +19,14 @@
 #ifndef _ardour_vst3_host_h_
 #define _ardour_vst3_host_h_
 
+#include <cstdint>
 #include <map>
-#include <stdint.h>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include <glib.h>
 
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/g_atomic_compat.h"
 #include "ardour/libardour_visibility.h"
diff --git a/libs/ardour/ardour/vst3_module.h b/libs/ardour/ardour/vst3_module.h
index 579f24316b..173d263803 100644
--- a/libs/ardour/ardour/vst3_module.h
+++ b/libs/ardour/ardour/vst3_module.h
@@ -19,7 +19,7 @@
 #ifndef _ardour_vst3_module_h_
 #define _ardour_vst3_module_h_
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "ardour/libardour_visibility.h"
 
diff --git a/libs/ardour/ardour/vst3_scan.h b/libs/ardour/ardour/vst3_scan.h
index bcd197d0f6..9634887f34 100644
--- a/libs/ardour/ardour/vst3_scan.h
+++ b/libs/ardour/ardour/vst3_scan.h
@@ -19,9 +19,9 @@
 #ifndef _ardour_vst3_scan_h_
 #define _ardour_vst3_scan_h_
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/xml++.h"
 
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index e33d13d217..35f280d1d2 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -22,15 +22,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <cmath>
-#include <climits>
-#include <cfloat>
 #include <algorithm>
-
+#include <cfloat>
+#include <climits>
+#include <cmath>
+#include <memory>
 #include <set>
 
 #include <boost/scoped_array.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <glibmm/fileutils.h>
 #include <glibmm/threads.h>
diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index ce4d3c6a35..151a071744 100644
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <glibmm/fileutils.h>
 
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index aca9552e91..81f97cf69a 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -23,13 +23,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <string>
-#include <cmath>
-#include <cerrno>
 #include <cassert>
-#include <unistd.h>
-
-#include <boost/shared_ptr.hpp>
+#include <cerrno>
+#include <cmath>
+#include <cunistd>
+#include <memory>
+#include <string>
 
 #include <glibmm/main.h>
 
diff --git a/libs/ardour/test/audio_region_test.h b/libs/ardour/test/audio_region_test.h
index e9e72044e9..061e0a1720 100644
--- a/libs/ardour/test/audio_region_test.h
+++ b/libs/ardour/test/audio_region_test.h
@@ -16,7 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include "test_needing_session.h"
 
 namespace ARDOUR {
diff --git a/libs/ardour/test/lua_script_test.h b/libs/ardour/test/lua_script_test.h
index ab9d51f464..967755d9d1 100644
--- a/libs/ardour/test/lua_script_test.h
+++ b/libs/ardour/test/lua_script_test.h
@@ -1,4 +1,5 @@
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include "test_needing_session.h"
 
 class LuaScriptTest : public TestNeedingSession
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 9ad541c15f..d25014e79e 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -356,8 +356,6 @@ def configure(conf):
     conf.write_config_header('libardour-config.h', remove=False)
 
     # Boost headers
-    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
-    autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
     autowaf.check_header(conf, 'cxx', 'boost/scoped_ptr.hpp')
     autowaf.check_header(conf, 'cxx', 'boost/ptr_container/ptr_list.hpp')
 
diff --git a/libs/audiographer/audiographer/sink.h b/libs/audiographer/audiographer/sink.h
index da9e7350ee..d03579c974 100644
--- a/libs/audiographer/audiographer/sink.h
+++ b/libs/audiographer/audiographer/sink.h
@@ -1,7 +1,7 @@
 #ifndef AUDIOGRAPHER_SINK_H
 #define AUDIOGRAPHER_SINK_H
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "process_context.h"
 
diff --git a/libs/audiographer/audiographer/source.h b/libs/audiographer/audiographer/source.h
index 8196e4a25e..6c78b487e8 100644
--- a/libs/audiographer/audiographer/source.h
+++ b/libs/audiographer/audiographer/source.h
@@ -1,11 +1,11 @@
 #ifndef AUDIOGRAPHER_SOURCE_H
 #define AUDIOGRAPHER_SOURCE_H
 
+#include <memory>
+
 #include "types.h"
 #include "sink.h"
 
-#include <boost/shared_ptr.hpp>
-
 #include "audiographer/visibility.h"
 
 namespace AudioGrapher
diff --git a/libs/audiographer/tests/utils.h b/libs/audiographer/tests/utils.h
index 9d400f6977..1d2abec110 100644
--- a/libs/audiographer/tests/utils.h
+++ b/libs/audiographer/tests/utils.h
@@ -3,8 +3,9 @@
 
 // Includes we want almost always
 
+#include <memory>
+
 #include <cppunit/extensions/HelperMacros.h>
-#include <boost/shared_ptr.hpp>
 
 // includes used in this file
 
diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h
index 7385d19071..369a523725 100644
--- a/libs/backends/alsa/alsa_audiobackend.h
+++ b/libs/backends/alsa/alsa_audiobackend.h
@@ -20,15 +20,15 @@
 #ifndef __libbackend_alsa_audiobackend_h__
 #define __libbackend_alsa_audiobackend_h__
 
+#include <cstdint>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include <pthread.h>
-#include <stdint.h>
 
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/natsort.h"
 #include "pbd/rcu.h"
diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h
index 1c87e01c3a..a5060bb617 100644
--- a/libs/backends/coreaudio/coreaudio_backend.h
+++ b/libs/backends/coreaudio/coreaudio_backend.h
@@ -20,16 +20,15 @@
 #ifndef __libbackend_coreaudio_backend_h__
 #define __libbackend_coreaudio_backend_h__
 
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <set>
 #include <string>
 #include <vector>
-#include <map>
-#include <set>
 
-#include <stdint.h>
 #include <pthread.h>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/natsort.h"
 #include "ardour/audio_backend.h"
 #include "ardour/dsp_load_calculator.h"
diff --git a/libs/backends/coreaudio/coremidi_io.h b/libs/backends/coreaudio/coremidi_io.h
index ce51b98146..bd567aff40 100644
--- a/libs/backends/coreaudio/coremidi_io.h
+++ b/libs/backends/coreaudio/coremidi_io.h
@@ -27,10 +27,10 @@
 #include <AudioToolbox/AudioToolbox.h>
 
 #include <map>
+#include <memory>
 #include <vector>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
 #include "pbd/ringbuffer.h"
 
 namespace ARDOUR {
diff --git a/libs/backends/dummy/dummy_audiobackend.h b/libs/backends/dummy/dummy_audiobackend.h
index bc85a258c1..832ef2f07e 100644
--- a/libs/backends/dummy/dummy_audiobackend.h
+++ b/libs/backends/dummy/dummy_audiobackend.h
@@ -20,18 +20,17 @@
 #ifndef __libbackend_dummy_audiobackend_h__
 #define __libbackend_dummy_audiobackend_h__
 
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <map>
+#include <memory>
 #include <set>
 
-#include <stdint.h>
 #include <pthread.h>
 
 #include <ltc.h>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/natsort.h"
 #include "pbd/ringbuffer.h"
 #include "ardour/types.h"
diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h
index 59febab36e..8b7a96ba5f 100644
--- a/libs/backends/jack/jack_audiobackend.h
+++ b/libs/backends/jack/jack_audiobackend.h
@@ -21,14 +21,13 @@
 #ifndef __libardour_jack_audiobackend_h__
 #define __libardour_jack_audiobackend_h__
 
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <map>
+#include <memory>
 #include <set>
 
-#include <stdint.h>
-
-#include <boost/shared_ptr.hpp>
 
 #include "weak_libjack.h"
 
diff --git a/libs/backends/portaudio/portaudio_backend.h b/libs/backends/portaudio/portaudio_backend.h
index 55231aa90c..60babf74c3 100644
--- a/libs/backends/portaudio/portaudio_backend.h
+++ b/libs/backends/portaudio/portaudio_backend.h
@@ -21,15 +21,14 @@
 #ifndef __libbackend_portaudio_backend_h__
 #define __libbackend_portaudio_backend_h__
 
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>
 #include <set>
 
-#include <stdint.h>
 #include <pthread.h>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ardour/audio_backend.h"
 #include "ardour/dsp_load_calculator.h"
 #include "ardour/port_engine_shared.h"
diff --git a/libs/backends/portaudio/portaudio_io.h b/libs/backends/portaudio/portaudio_io.h
index 871cafb9c1..cfd6283d57 100644
--- a/libs/backends/portaudio/portaudio_io.h
+++ b/libs/backends/portaudio/portaudio_io.h
@@ -19,12 +19,11 @@
 #ifndef __libbackend_portaudio_pcmio_h__
 #define __libbackend_portaudio_pcmio_h__
 
+#include <cstdint>
 #include <map>
+#include <memory>
 #include <vector>
 #include <string>
-#include <boost/shared_ptr.hpp>
-
-#include <stdint.h>
 
 #include <portaudio.h>
 
diff --git a/libs/backends/portaudio/winmmemidi_io.h b/libs/backends/portaudio/winmmemidi_io.h
index 12def58c27..d482d7655c 100644
--- a/libs/backends/portaudio/winmmemidi_io.h
+++ b/libs/backends/portaudio/winmmemidi_io.h
@@ -21,12 +21,12 @@
 #define WINMME_MIDI_IO_H
 
 #include <map>
+#include <memory>
 #include <vector>
 #include <string>
 #include <stdint.h>
 #include <pthread.h>
 
-#include <boost/shared_ptr.hpp>
 #include "pbd/ringbuffer.h"
 
 #include "winmmemidi_input_device.h"
diff --git a/libs/backends/pulseaudio/pulseaudio_backend.h b/libs/backends/pulseaudio/pulseaudio_backend.h
index 813f8cd709..699f58d8ff 100644
--- a/libs/backends/pulseaudio/pulseaudio_backend.h
+++ b/libs/backends/pulseaudio/pulseaudio_backend.h
@@ -19,18 +19,17 @@
 #ifndef __libbackend_pulse_audiobackend_h__
 #define __libbackend_pulse_audiobackend_h__
 
+#include <cstdint>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include <pthread.h>
-#include <stdint.h>
 
 #include <pulse/pulseaudio.h>
 
-#include <boost/shared_ptr.hpp>
-
 #include "pbd/natsort.h"
 
 #include "ardour/audio_backend.h"
diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h
index 9832055cb9..d69447f042 100644
--- a/libs/canvas/canvas/image.h
+++ b/libs/canvas/canvas/image.h
@@ -20,8 +20,9 @@
 #ifndef __CANVAS_IMAGE__
 #define __CANVAS_IMAGE__
 
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
+#include <cstdint>
+#include <memory>
+
 #include <boost/shared_array.hpp>
 
 #include "canvas/visibility.h"
diff --git a/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h
index bd8f13ddd0..b4c03dc3eb 100644
--- a/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h
+++ b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h
@@ -23,10 +23,10 @@
 #define ardour_control_protocols_h
 
 #include <list>
+#include <memory>
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/signals.h"
 #include "pbd/stateful.h"
diff --git a/libs/evoral/evoral/Control.h b/libs/evoral/evoral/Control.h
index cf536afaec..02a797cfa8 100644
--- a/libs/evoral/evoral/Control.h
+++ b/libs/evoral/evoral/Control.h
@@ -23,7 +23,8 @@
 
 #include <set>
 #include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include "pbd/signals.h"
 
 #include "temporal/timeline.h"
diff --git a/libs/evoral/evoral/ControlSet.h b/libs/evoral/evoral/ControlSet.h
index 7990c43d1b..86be7f36c8 100644
--- a/libs/evoral/evoral/ControlSet.h
+++ b/libs/evoral/evoral/ControlSet.h
@@ -24,7 +24,8 @@
 
 #include <set>
 #include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <boost/utility.hpp>
 #include <glibmm/threads.h>
 #include "pbd/signals.h"
diff --git a/libs/evoral/evoral/Parameter.h b/libs/evoral/evoral/Parameter.h
index 672afec653..9c54f0c7b6 100644
--- a/libs/evoral/evoral/Parameter.h
+++ b/libs/evoral/evoral/Parameter.h
@@ -20,10 +20,10 @@
 #ifndef EVORAL_PARAMETER_HPP
 #define EVORAL_PARAMETER_HPP
 
-#include <string>
+#include <cstdint>
 #include <map>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <string>
 
 #include "evoral/visibility.h"
 #include "evoral/types.h"
diff --git a/libs/evoral/evoral/Sequence.h b/libs/evoral/evoral/Sequence.h
index baef3a6b38..7f27af4724 100644
--- a/libs/evoral/evoral/Sequence.h
+++ b/libs/evoral/evoral/Sequence.h
@@ -23,12 +23,13 @@
 #ifndef EVORAL_SEQUENCE_HPP
 #define EVORAL_SEQUENCE_HPP
 
-#include <vector>
+#include <list>
+#include <memory>
 #include <queue>
 #include <set>
-#include <list>
 #include <utility>
-#include <boost/shared_ptr.hpp>
+#include <vector>
+
 #include <glibmm/threads.h>
 
 #include "evoral/visibility.h"
diff --git a/libs/evoral/test/CurveTest.h b/libs/evoral/test/CurveTest.h
index 47815faf05..282139b254 100644
--- a/libs/evoral/test/CurveTest.h
+++ b/libs/evoral/test/CurveTest.h
@@ -1,6 +1,8 @@
+#include <memory>
+
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <boost/shared_ptr.hpp>
+
 #include "evoral/ControlList.h"
 
 class CurveTest : public CppUnit::TestFixture
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 9c99847cac..b472f04fc9 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -40,8 +40,6 @@ def configure(conf):
         autowaf.check_pkg(conf, 'libpbd-4', uselib_store='LIBPBD', atleast_version='4.0.0', mandatory=True)
 
     # Boost headers
-    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
-    autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
 
     conf.env['BUILD_TESTS'] = Options.options.build_tests
     conf.env['TEST_COVERAGE'] = Options.options.test_coverage
diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc
index f2314afcc6..8eb0a81e38 100644
--- a/libs/gtkmm2ext/actions.cc
+++ b/libs/gtkmm2ext/actions.cc
@@ -18,14 +18,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <cstdint>
 #include <cstring>
 #include <vector>
 #include <string>
 #include <list>
+#include <memory>
 #include <stack>
-#include <stdint.h>
 
-#include <boost/shared_ptr.hpp>
 
 #include <gtk/gtkaccelmap.h>
 #include <gtk/gtkuimanager.h>
diff --git a/libs/lua/LuaBridge/LuaBridge.h b/libs/lua/LuaBridge/LuaBridge.h
index 01f9e90b7d..e734cf7ffb 100644
--- a/libs/lua/LuaBridge/LuaBridge.h
+++ b/libs/lua/LuaBridge/LuaBridge.h
@@ -43,12 +43,12 @@
 #include <bitset>
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 #include <vector>
 
 #include <inttypes.h>
 #include <boost/type_traits.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include "lua/luastate.h"
 
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index cc49cf0335..e44a258196 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -47,10 +47,6 @@ def configure(conf):
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
 
-    # Boost headers
-    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
-    autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
-
 def build(bld):
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index 7a781c4d90..02d5462a48 100644
--- a/libs/pbd/pbd/controllable.h
+++ b/libs/pbd/pbd/controllable.h
@@ -23,6 +23,7 @@
 #ifndef __pbd_controllable_h__
 #define __pbd_controllable_h__
 
+#include <memory>
 #include <string>
 #include <set>
 
@@ -30,7 +31,6 @@
 #include "pbd/signals.h"
 #include <glibmm/threads.h>
 
-#include <boost/enable_shared_from_this.hpp>
 
 #include "pbd/statefuldestructible.h"
 
diff --git a/libs/pbd/pbd/stateful_diff_command.h b/libs/pbd/pbd/stateful_diff_command.h
index 5b3807aede..e015793f10 100644
--- a/libs/pbd/pbd/stateful_diff_command.h
+++ b/libs/pbd/pbd/stateful_diff_command.h
@@ -20,8 +20,7 @@
 #ifndef __pbd_stateful_diff_command_h__
 #define __pbd_stateful_diff_command_h__
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
 
 #include "pbd/command.h"
 #include "pbd/libpbd_visibility.h"
diff --git a/libs/pbd/pbd/xml++.h b/libs/pbd/pbd/xml++.h
index 31059db418..ddfddf31ab 100644
--- a/libs/pbd/pbd/xml++.h
+++ b/libs/pbd/pbd/xml++.h
@@ -32,14 +32,14 @@
  * Modified for Ardour and released under the same terms.
  */
 
+#include <cstdarg>
+#include <cstdio>
+#include <memory>
 #include <string>
 #include <vector>
-#include <cstdio>
-#include <cstdarg>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include <boost/shared_ptr.hpp>
 
 #include <glibmm/ustring.h>
 
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index bad6925f92..7294ad41f0 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -129,8 +129,6 @@ def configure(conf):
             define_name='HAVE_LOCALTIME_R', execute = False, mandatory=False)
 
     # Boost headers
-    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
-    autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
     if Options.options.dist_target == 'mingw':
         conf.check(compiler='cxx',
                    lib='ole32',
diff --git a/libs/surfaces/contourdesign/contourdesign.h b/libs/surfaces/contourdesign/contourdesign.h
index 7edffec469..3994b74a10 100644
--- a/libs/surfaces/contourdesign/contourdesign.h
+++ b/libs/surfaces/contourdesign/contourdesign.h
@@ -20,9 +20,10 @@
 #ifndef ardour_contourdesign_control_protocol_h
 #define ardour_contourdesign_control_protocol_h
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <boost/shared_ptr.hpp>
+
 #include <glibmm/main.h>
 
 #define ABSTRACT_UI_EXPORTS
diff --git a/libs/surfaces/faderport8/fp8_strip.h b/libs/surfaces/faderport8/fp8_strip.h
index 6195f46625..4779f0a245 100644
--- a/libs/surfaces/faderport8/fp8_strip.h
+++ b/libs/surfaces/faderport8/fp8_strip.h
@@ -19,8 +19,8 @@
 #ifndef _ardour_surfaces_fp8strip_h_
 #define _ardour_surfaces_fp8strip_h_
 
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
+#include <cstdint>
+#include <memory>
 
 #include "pbd/signals.h"
 #include "pbd/controllable.h"
diff --git a/libs/surfaces/maschine2/ui_knob.h b/libs/surfaces/maschine2/ui_knob.h
index 4bbfb8399b..703aa53d7d 100644
--- a/libs/surfaces/maschine2/ui_knob.h
+++ b/libs/surfaces/maschine2/ui_knob.h
@@ -19,7 +19,8 @@
 #ifndef _ardour_maschine2_knob_h_
 #define _ardour_maschine2_knob_h_
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <sigc++/trackable.h>
 
 #include <cairomm/refptr.h>
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index bbfd9ca96a..6a2f4ccbb4 100644
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -25,14 +25,14 @@
 #ifndef ardour_osc_h
 #define ardour_osc_h
 
+#include <bitset>
+#include <memory>
 #include <string>
 #include <vector>
-#include <bitset>
 
 #include <sys/time.h>
 #include <pthread.h>
 
-#include <boost/shared_ptr.hpp>
 
 #include <lo/lo.h>
 
diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h
index 2aefbbd95a..7ea0bf6570 100644
--- a/libs/surfaces/osc/osc_controllable.h
+++ b/libs/surfaces/osc/osc_controllable.h
@@ -19,8 +19,9 @@
 #ifndef __osc_osccontrollable_h__
 #define __osc_osccontrollable_h__
 
+#include <memory>
 #include <string>
-#include <boost/shared_ptr.hpp>
+
 #include <sigc++/sigc++.h>
 #include <lo/lo.h>
 
diff --git a/libs/surfaces/osc/osc_cue_observer.h b/libs/surfaces/osc/osc_cue_observer.h
index 0a1117fc11..cc8cd12070 100644
--- a/libs/surfaces/osc/osc_cue_observer.h
+++ b/libs/surfaces/osc/osc_cue_observer.h
@@ -20,7 +20,8 @@
 #define __osc_osccueobserver_h__
 
 #include <string>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <sigc++/sigc++.h>
 #include <lo/lo.h>
 
diff --git a/libs/surfaces/osc/osc_global_observer.h b/libs/surfaces/osc/osc_global_observer.h
index 19d35f08ae..c940f9e447 100644
--- a/libs/surfaces/osc/osc_global_observer.h
+++ b/libs/surfaces/osc/osc_global_observer.h
@@ -19,8 +19,9 @@
 #ifndef __osc_oscglobalobserver_h__
 #define __osc_oscglobalobserver_h__
 
+#include <memory>
 #include <string>
-#include <boost/shared_ptr.hpp>
+
 #include <sigc++/sigc++.h>
 #include <lo/lo.h>
 
diff --git a/libs/surfaces/osc/osc_route_observer.h b/libs/surfaces/osc/osc_route_observer.h
index 041e81ce84..f2d64151d2 100644
--- a/libs/surfaces/osc/osc_route_observer.h
+++ b/libs/surfaces/osc/osc_route_observer.h
@@ -20,9 +20,10 @@
 #ifndef __osc_oscrouteobserver_h__
 #define __osc_oscrouteobserver_h__
 
-#include <string>
 #include <bitset>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <string>
+
 #include <sigc++/sigc++.h>
 #include <lo/lo.h>
 
diff --git a/libs/surfaces/osc/osc_select_observer.h b/libs/surfaces/osc/osc_select_observer.h
index 41540c1e2e..825aa6f7ac 100644
--- a/libs/surfaces/osc/osc_select_observer.h
+++ b/libs/surfaces/osc/osc_select_observer.h
@@ -19,9 +19,10 @@
 #ifndef __osc_oscselectobserver_h__
 #define __osc_oscselectobserver_h__
 
-#include <string>
 #include <bitset>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <string>
+
 #include <sigc++/sigc++.h>
 #include <lo/lo.h>
 
diff --git a/libs/surfaces/push2/knob.h b/libs/surfaces/push2/knob.h
index 48dcc52384..5a4e9bcf60 100644
--- a/libs/surfaces/push2/knob.h
+++ b/libs/surfaces/push2/knob.h
@@ -19,7 +19,8 @@
 #ifndef __ardour_push2_knob_h__
 #define __ardour_push2_knob_h__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <sigc++/trackable.h>
 
 #include <cairomm/refptr.h>
diff --git a/libs/surfaces/websockets/feedback.h b/libs/surfaces/websockets/feedback.h
index bec5decb5a..a9d2df30f5 100644
--- a/libs/surfaces/websockets/feedback.h
+++ b/libs/surfaces/websockets/feedback.h
@@ -19,7 +19,8 @@
 #ifndef _ardour_surface_websockets_feedback_h_
 #define _ardour_surface_websockets_feedback_h_
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <boost/unordered_map.hpp>
 #include <glibmm/threads.h>
 
diff --git a/libs/waveview/waveview/wave_view.h b/libs/waveview/waveview/wave_view.h
index 61cf37f07d..8310706e41 100644
--- a/libs/waveview/waveview/wave_view.h
+++ b/libs/waveview/waveview/wave_view.h
@@ -21,8 +21,7 @@
 #ifndef _WAVEVIEW_WAVE_VIEW_H_
 #define _WAVEVIEW_WAVE_VIEW_H_
 
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include <glibmm/refptr.h>
 
diff --git a/libs/widgets/widgets/binding_proxy.h b/libs/widgets/widgets/binding_proxy.h
index 0e72c8e520..de656e9355 100644
--- a/libs/widgets/widgets/binding_proxy.h
+++ b/libs/widgets/widgets/binding_proxy.h
@@ -20,8 +20,8 @@
 #ifndef _WIDGETS_BINDING_PROXY_
 #define _WIDGETS_BINDING_PROXY_
 
+#include <memory>
 #include <string>
-#include <boost/shared_ptr.hpp>
 
 #include "pbd/signals.h"
 
diff --git a/libs/widgets/widgets/pane.h b/libs/widgets/widgets/pane.h
index 57a584e737..cabeb30c9b 100644
--- a/libs/widgets/widgets/pane.h
+++ b/libs/widgets/widgets/pane.h
@@ -20,11 +20,11 @@
 #ifndef _WIDGETS_PANE_H_
 #define _WIDGETS_PANE_H_
 
+#include <cstdint>
+#include <memory>
 #include <vector>
 #include <algorithm>
-#include <boost/shared_ptr.hpp>
 
-#include <stdint.h>
 
 #include <gdkmm/cursor.h>
 #include <gtkmm/container.h>
diff --git a/libs/widgets/widgets/slider_controller.h b/libs/widgets/widgets/slider_controller.h
index 4deae4b1ad..ba5c01c055 100644
--- a/libs/widgets/widgets/slider_controller.h
+++ b/libs/widgets/widgets/slider_controller.h
@@ -24,7 +24,7 @@
 #undef interface
 #endif
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/spinbutton.h>