std::shared_ptr

129 files changed, 317 insertions, 347 deletions

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 748bd72d0..1cb167c95 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -37,12 +37,12 @@ using std::cout;
 using std::list;
 using std::vector;
 using std::pair;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 8f7151b1b..a94e98e32 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -25,7 +25,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class AudioPlot;
@@ -35,7 +34,7 @@ class Film;
 class AudioDialog : public wxDialog
 {
 public:
-	AudioDialog (wxWindow* parent, boost::shared_ptr<Film> film, boost::weak_ptr<FilmViewer> viewer, boost::shared_ptr<Content> content = boost::shared_ptr<Content>());
+	AudioDialog (wxWindow* parent, std::shared_ptr<Film> film, std::weak_ptr<FilmViewer> viewer, std::shared_ptr<Content> content = std::shared_ptr<Content>());
 
 	bool Show (bool show = true);
 
@@ -52,13 +51,13 @@ private:
 	void setup_statistics ();
 	void show_or_hide_channel_checkboxes ();
 
-	boost::shared_ptr<AudioAnalysis> _analysis;
-	boost::weak_ptr<Film> _film;
-	boost::weak_ptr<FilmViewer> _viewer;
+	std::shared_ptr<AudioAnalysis> _analysis;
+	std::weak_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _viewer;
 	/** content to analyse, or 0 to analyse all the film's content */
-	boost::weak_ptr<Content> _content;
+	std::weak_ptr<Content> _content;
 	int _channels;
-	boost::shared_ptr<const Playlist> _playlist;
+	std::shared_ptr<const Playlist> _playlist;
 	wxStaticText* _cursor;
 	AudioPlot* _plot;
 	wxStaticText* _sample_peak;
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 01cd7738b..04a468416 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -47,7 +47,7 @@ using std::max;
 using std::vector;
 using std::pair;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 2809ce44a..bf73798da 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -43,8 +43,8 @@ using std::cout;
 using std::string;
 using std::list;
 using std::pair;
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index f7161f10a..aee352a55 100644
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -38,7 +38,7 @@ public:
 	void film_changed (Film::Property);
 	void film_content_changed (int);
 	void content_selection_changed ();
-	void set_film (boost::shared_ptr<Film>);
+	void set_film (std::shared_ptr<Film>);
 
 private:
 	void show_clicked ();
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 74c10348e..682abe432 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -37,8 +37,8 @@ using std::min;
 using std::map;
 using boost::bind;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 989f15edc..27d76b6db 100644
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -24,7 +24,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <vector>
 
@@ -34,9 +33,9 @@ class FilmViewer;
 class AudioPlot : public wxPanel
 {
 public:
-	explicit AudioPlot (wxWindow *, boost::weak_ptr<FilmViewer> viewer);
+	explicit AudioPlot (wxWindow *, std::weak_ptr<FilmViewer> viewer);
 
-	void set_analysis (boost::shared_ptr<AudioAnalysis>);
+	void set_analysis (std::shared_ptr<AudioAnalysis>);
 	void set_channel_visible (int c, bool v);
 	void set_type_visible (int t, bool v);
 	void set_smoothing (int);
@@ -79,8 +78,8 @@ private:
 	void mouse_leave (wxMouseEvent& ev);
 	void search (std::map<int, PointList> const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const;
 
-	boost::weak_ptr<FilmViewer> _viewer;
-	boost::shared_ptr<AudioAnalysis> _analysis;
+	std::weak_ptr<FilmViewer> _viewer;
+	std::shared_ptr<AudioAnalysis> _analysis;
 	bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
 	bool _type_visible[AudioPoint::COUNT];
 	int _smoothing;
diff --git a/src/wx/batch_job_view.cc b/src/wx/batch_job_view.cc
index 038e8b228..07e330c4c 100644
--- a/src/wx/batch_job_view.cc
+++ b/src/wx/batch_job_view.cc
@@ -25,7 +25,7 @@
 #include <wx/button.h>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BatchJobView::BatchJobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
 	: JobView (job, parent, container, table)
diff --git a/src/wx/batch_job_view.h b/src/wx/batch_job_view.h
index 40dceff31..688e6c374 100644
--- a/src/wx/batch_job_view.h
+++ b/src/wx/batch_job_view.h
@@ -23,7 +23,7 @@
 class BatchJobView : public JobView
 {
 public:
-	BatchJobView (boost::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
+	BatchJobView (std::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
 
 private:
 	int insert_position () const;
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 7411fa153..71fc15272 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -32,8 +32,8 @@ using std::max;
 using std::cout;
 using std::pair;
 using std::make_pair;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 4117de263..1f0e450ff 100644
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -35,8 +35,8 @@ public:
 	explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
 	void clear ();
-	void update_tracks (boost::shared_ptr<const Film> film);
-	void set_butler (boost::weak_ptr<Butler>);
+	void update_tracks (std::shared_ptr<const Film> film);
+	void set_butler (std::weak_ptr<Butler>);
 
 private:
 	void shown (wxShowEvent);
@@ -51,6 +51,6 @@ private:
 	bool _current_in_lines;
 	std::vector<wxString> _lines;
 	std::vector<DCPTextTrack> _tracks;
-	boost::weak_ptr<Butler> _butler;
+	std::weak_ptr<Butler> _butler;
 	wxTimer _timer;
 };
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 3c59dbeed..46bf77a8e 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -34,8 +34,8 @@
 
 using std::string;
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::bind;
 using dcp::locale_convert;
 
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 2319754f0..0d341ba73 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -34,7 +34,7 @@ using std::make_pair;
 using std::map;
 using boost::bind;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::function;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index a698b252a..b2ebbe605 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -114,8 +114,8 @@ public:
 		wxWindow* parent,
 		wxString title,
 		int border,
-		boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> set,
-		boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> get,
+		boost::function<void (std::shared_ptr<dcp::CertificateChain>)> set,
+		boost::function<std::shared_ptr<const dcp::CertificateChain> (void)> get,
 		boost::function<bool (void)> nag_alter
 		);
 
@@ -145,8 +145,8 @@ private:
 	wxStaticText* _private_key_bad;
 	wxSizer* _sizer;
 	wxBoxSizer* _button_sizer;
-	boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> _set;
-	boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> _get;
+	boost::function<void (std::shared_ptr<dcp::CertificateChain>)> _set;
+	boost::function<std::shared_ptr<const dcp::CertificateChain> (void)> _get;
 	boost::function<bool (void)> _nag_alter;
 };
 
diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc
index d170032a4..a33ffed90 100644
--- a/src/wx/content_advanced_dialog.cc
+++ b/src/wx/content_advanced_dialog.cc
@@ -42,9 +42,9 @@ DCPOMATIC_ENABLE_WARNINGS
 using std::string;
 using std::vector;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/content_advanced_dialog.h b/src/wx/content_advanced_dialog.h
index b01669bac..6eaaa2e2d 100644
--- a/src/wx/content_advanced_dialog.h
+++ b/src/wx/content_advanced_dialog.h
@@ -23,7 +23,7 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <vector>
 
 
@@ -34,7 +34,7 @@ class Filter;
 class ContentAdvancedDialog : public wxDialog
 {
 public:
-	ContentAdvancedDialog (wxWindow* parent, boost::shared_ptr<Content> content);
+	ContentAdvancedDialog (wxWindow* parent, std::shared_ptr<Content> content);
 
 private:
 	void ignore_video_changed (wxCommandEvent& ev);
@@ -44,7 +44,7 @@ private:
 	void set_video_frame_rate ();
 	void video_frame_rate_changed ();
 
-	boost::shared_ptr<Content> _content;
+	std::shared_ptr<Content> _content;
 
 	wxStaticText* _filters;
 	wxButton* _filters_button;
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 3c3b1ed3a..57c6afeb3 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -50,9 +50,9 @@ using std::cout;
 using std::vector;
 using std::exception;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -357,9 +357,9 @@ ContentMenu::find_missing ()
 			bind (
 				&ContentMenu::maybe_found_missing,
 				this,
-				boost::weak_ptr<Job> (j),
-				boost::weak_ptr<Content> (_content.front ()),
-				boost::weak_ptr<Content> (i)
+				std::weak_ptr<Job> (j),
+				std::weak_ptr<Content> (_content.front ()),
+				std::weak_ptr<Content> (i)
 				)
 			);
 
diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 756c1675a..7743d0712 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -24,8 +24,7 @@
 #include "timeline_content_view.h"
 #include "lib/types.h"
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
 
 class Film;
 class Job;
@@ -36,7 +35,7 @@ class ContentMenu : public boost::noncopyable
 public:
 	explicit ContentMenu (wxWindow* p);
 
-	void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
+	void popup (std::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
 
 private:
 	void repeat ();
@@ -49,13 +48,13 @@ private:
 	void ov ();
 	void set_dcp_settings ();
 	void remove ();
-	void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
+	void maybe_found_missing (std::weak_ptr<Job>, std::weak_ptr<Content>, std::weak_ptr<Content>);
 	void cpl_selected (wxCommandEvent& ev);
 
 	wxMenu* _menu;
 	wxMenu* _cpl_menu;
 	/** Film that we are working with; set up by popup() */
-	boost::weak_ptr<Film> _film;
+	std::weak_ptr<Film> _film;
 	wxWindow* _parent;
 	bool _pop_up_open;
 	ContentList _content;
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 1a15d241d..7114e8337 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -57,9 +57,9 @@ using std::cout;
 using std::vector;
 using std::max;
 using std::exception;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index df5c58ebd..6a9ef3f4a 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -22,7 +22,6 @@
 #include "lib/types.h"
 #include "lib/film.h"
 #include <wx/splitter.h>
-#include <boost/shared_ptr.hpp>
 #include <list>
 
 class wxNotebook;
@@ -66,15 +65,15 @@ private:
 class ContentPanel : public boost::noncopyable
 {
 public:
-	ContentPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+	ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
-	boost::shared_ptr<Film> film () const {
+	std::shared_ptr<Film> film () const {
 		return _film;
 	}
 
-	void set_film (boost::shared_ptr<Film>);
+	void set_film (std::shared_ptr<Film>);
 	void set_general_sensitivity (bool s);
-	void set_selection (boost::weak_ptr<Content>);
+	void set_selection (std::weak_ptr<Content>);
 	void set_selection (ContentList cl);
 
 	void film_changed (Film::Property p);
@@ -100,7 +99,7 @@ public:
 	bool remove_clicked (bool hotkey);
 	void timeline_clicked ();
 
-	boost::weak_ptr<FilmViewer> film_viewer () const {
+	std::weak_ptr<FilmViewer> film_viewer () const {
 		return _film_viewer;
 	}
 
@@ -144,8 +143,8 @@ private:
 	wxNotebook* _parent;
 	wxWindow* _last_selected_tab;
 
-	boost::shared_ptr<Film> _film;
-	boost::weak_ptr<FilmViewer> _film_viewer;
+	std::shared_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _film_viewer;
 	bool _generally_sensitive;
 	bool _ignore_deselect;
 	bool _no_check_selection;
diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc
index 7dcc6f8f1..bf1f67ace 100644
--- a/src/wx/content_properties_dialog.cc
+++ b/src/wx/content_properties_dialog.cc
@@ -31,8 +31,8 @@ using std::string;
 using std::list;
 using std::pair;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<const Film> film, shared_ptr<Content> content)
 	: TableDialog (parent, _("Content Properties"), 2, 1, false)
diff --git a/src/wx/content_properties_dialog.h b/src/wx/content_properties_dialog.h
index 5d0cd4630..9faccb4b7 100644
--- a/src/wx/content_properties_dialog.h
+++ b/src/wx/content_properties_dialog.h
@@ -20,7 +20,6 @@
 
 #include "table_dialog.h"
 #include "lib/user_property.h"
-#include <boost/shared_ptr.hpp>
 #include <list>
 #include <map>
 
@@ -31,7 +30,7 @@ class UserProperty;
 class ContentPropertiesDialog : public TableDialog
 {
 public:
-	ContentPropertiesDialog (wxWindow* parent, boost::shared_ptr<const Film> film, boost::shared_ptr<Content> content);
+	ContentPropertiesDialog (wxWindow* parent, std::shared_ptr<const Film> film, std::shared_ptr<Content> content);
 
 private:
 	void maybe_add_group (std::map<UserProperty::Category, std::list<UserProperty> > const & groups, UserProperty::Category category);
diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 1a92c0dcd..b4ba55175 100644
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -29,7 +29,7 @@
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h
index cb59f38dd..08c61c25f 100644
--- a/src/wx/content_sub_panel.h
+++ b/src/wx/content_sub_panel.h
@@ -26,7 +26,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
 
 class ContentPanel;
 class Content;
@@ -50,7 +49,7 @@ public:
 
 protected:
 
-	void setup_refer_button (wxCheckBox* button, wxStaticText* note, boost::shared_ptr<DCPContent> dcp, bool can_reference, wxString cannot) const;
+	void setup_refer_button (wxCheckBox* button, wxStaticText* note, std::shared_ptr<DCPContent> dcp, bool can_reference, wxString cannot) const;
 	virtual void add_to_grid () = 0;
 
 	ContentPanel* _parent;
diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index da3ca6b6b..67a9a3fa5 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -35,10 +35,10 @@
 using std::string;
 using std::cout;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
 ContentView::ContentView (wxWindow* parent)
diff --git a/src/wx/content_view.h b/src/wx/content_view.h
index 3f4a65ab1..0bbfffaa7 100644
--- a/src/wx/content_view.h
+++ b/src/wx/content_view.h
@@ -23,8 +23,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <vector>
 
 class Content;
@@ -35,14 +33,14 @@ class ContentView : public wxListCtrl, public ContentStore
 public:
 	ContentView (wxWindow* parent);
 
-	boost::shared_ptr<Content> selected () const;
+	std::shared_ptr<Content> selected () const;
 	void update ();
 
-	boost::shared_ptr<Content> get (std::string digest) const;
+	std::shared_ptr<Content> get (std::string digest) const;
 
 private:
-	void add (boost::shared_ptr<Content> content);
+	void add (std::shared_ptr<Content> content);
 
-	boost::weak_ptr<Film> _film;
-	std::vector<boost::shared_ptr<Content> > _content;
+	std::weak_ptr<Film> _film;
+	std::vector<std::shared_ptr<Content> > _content;
 };
diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 6505d08da..d38609cb4 100644
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -60,7 +60,7 @@ public:
 		wxWindow* parent,
 		T* wrapped,
 		int property,
-		boost::function<boost::shared_ptr<S> (Content*)> part,
+		boost::function<std::shared_ptr<S> (Content*)> part,
 		boost::function<U (S*)> model_getter,
 		boost::function<void (S*, U)> model_setter,
 		boost::function<void ()> view_changed,
@@ -90,7 +90,7 @@ public:
 		return _wrapped;
 	}
 
-	typedef std::vector<boost::shared_ptr<Content> > List;
+	typedef std::vector<std::shared_ptr<Content> > List;
 
 	/** Set the content that this control is working on (i.e. the selected content) */
 	void set_content (List content)
@@ -214,7 +214,7 @@ private:
 	wxButton* _button;
 	List _content;
 	int _property;
-	boost::function<boost::shared_ptr<S> (Content *)> _part;
+	boost::function<std::shared_ptr<S> (Content *)> _part;
 	boost::function<U (S*)> _model_getter;
 	boost::function<void (S*, U)> _model_setter;
 	boost::function<void ()> _view_changed;
@@ -238,7 +238,7 @@ public:
 		wxWindow* parent,
 		wxSpinCtrl* wrapped,
 		int property,
-		boost::function<boost::shared_ptr<S> (Content *)> part,
+		boost::function<std::shared_ptr<S> (Content *)> part,
 		boost::function<int (S*)> getter,
 		boost::function<void (S*, int)> setter,
 		boost::function<void ()> view_changed = boost::function<void ()>()
@@ -266,7 +266,7 @@ public:
 		wxWindow* parent,
 		wxSpinCtrlDouble* wrapped,
 		int property,
-		boost::function<boost::shared_ptr<S> (Content *)> part,
+		boost::function<std::shared_ptr<S> (Content *)> part,
 		boost::function<double (S*)> getter,
 		boost::function<void (S*, double)> setter,
 		boost::function<void ()> view_changed = boost::function<void ()>()
@@ -294,7 +294,7 @@ public:
 		wxWindow* parent,
 		wxChoice* wrapped,
 		int property,
-		boost::function<boost::shared_ptr<S> (Content *)> part,
+		boost::function<std::shared_ptr<S> (Content *)> part,
 		boost::function<U (S*)> getter,
 		boost::function<void (S*, U)> setter,
 		boost::function<U (int)> view_to_model,
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 1a03ba568..5364e1614 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -49,9 +49,9 @@ using std::cout;
 using std::make_pair;
 using std::exception;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/controls.h b/src/wx/controls.h
index 1d6273af6..a2c80b809 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -28,7 +28,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class FilmViewer;
@@ -49,18 +48,18 @@ class Controls : public wxPanel
 public:
 	Controls (
 		wxWindow* parent,
-		boost::shared_ptr<FilmViewer>,
+		std::shared_ptr<FilmViewer>,
 		bool editor_controls = true
 		);
 
 	virtual void log (wxString) {}
-	virtual void set_film (boost::shared_ptr<Film> film);
+	virtual void set_film (std::shared_ptr<Film> film);
 
 	virtual void play () {};
 	virtual void stop () {};
 	void seek (int slider);
 
-	boost::shared_ptr<Film> film () const;
+	std::shared_ptr<Film> film () const;
 	void back_frame ();
 	void forward_frame ();
 
@@ -72,9 +71,9 @@ protected:
 
 	wxSizer* _v_sizer;
 	wxBoxSizer* _button_sizer;
-	boost::shared_ptr<Film> _film;
+	std::shared_ptr<Film> _film;
 	wxSlider* _slider;
-	boost::shared_ptr<FilmViewer> _viewer;
+	std::shared_ptr<FilmViewer> _viewer;
 	boost::optional<std::string> _active_job;
 
 private:
@@ -91,13 +90,13 @@ private:
 	void timecode_clicked ();
 	void active_jobs_changed (boost::optional<std::string>);
 	dcpomatic::DCPTime nudge_amount (wxKeyboardState& ev);
-	void image_changed (boost::weak_ptr<PlayerVideo>);
+	void image_changed (std::weak_ptr<PlayerVideo>);
 	void outline_content_changed ();
 	void eye_changed ();
 	void update_position ();
 	void film_change (ChangeType, Film::Property);
 
-	typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
+	typedef std::pair<std::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
 
 	bool _slider_being_moved;
 
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 1687704ec..972b30bac 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -58,8 +58,8 @@ using std::pair;
 using std::max;
 using std::make_pair;
 using boost::lexical_cast;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 465104c74..cce97a2dc 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -19,7 +19,6 @@
 */
 
 #include "lib/config.h"
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
 class wxNotebook;
@@ -45,9 +44,9 @@ class Ratio;
 class DCPPanel : public boost::noncopyable
 {
 public:
-	DCPPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+	DCPPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
-	void set_film (boost::shared_ptr<Film>);
+	void set_film (std::shared_ptr<Film>);
 	void set_general_sensitivity (bool);
 
 	void film_changed (int);
@@ -152,7 +151,7 @@ private:
 	InteropMetadataDialog* _interop_metadata_dialog;
 	SMPTEMetadataDialog* _smpte_metadata_dialog;
 
-	boost::shared_ptr<Film> _film;
-	boost::weak_ptr<FilmViewer> _viewer;
+	std::shared_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _viewer;
 	bool _generally_sensitive;
 };
diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc
index 5b89d28fa..fe97cf642 100644
--- a/src/wx/dkdm_dialog.cc
+++ b/src/wx/dkdm_dialog.cc
@@ -46,7 +46,7 @@ using std::cout;
 using std::vector;
 using std::make_pair;
 using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 using boost::optional;
 #if BOOST_VERSION >= 106100
diff --git a/src/wx/dkdm_dialog.h b/src/wx/dkdm_dialog.h
index f6f29f852..4235de511 100644
--- a/src/wx/dkdm_dialog.h
+++ b/src/wx/dkdm_dialog.h
@@ -20,7 +20,6 @@
 
 #include "wx_util.h"
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
 #include <map>
 
 class Film;
@@ -34,14 +33,14 @@ struct CPLSummary;
 class DKDMDialog : public wxDialog
 {
 public:
-	DKDMDialog (wxWindow *, boost::shared_ptr<const Film> film);
+	DKDMDialog (wxWindow *, std::shared_ptr<const Film> film);
 
 private:
 	void setup_sensitivity ();
 	void make_clicked ();
 	bool confirm_overwrite (boost::filesystem::path path);
 
-	boost::weak_ptr<const Film> _film;
+	std::weak_ptr<const Film> _film;
 	RecipientsPanel* _recipients;
 	KDMTimingPanel* _timing;
 	KDMCPLPanel* _cpl;
diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc
index d8645ff97..762ed7b7e 100644
--- a/src/wx/dkdm_output_panel.cc
+++ b/src/wx/dkdm_output_panel.cc
@@ -44,7 +44,7 @@ using std::string;
 using std::list;
 using std::exception;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::function;
 
 
diff --git a/src/wx/dkdm_output_panel.h b/src/wx/dkdm_output_panel.h
index 4f0ad12b6..57a941818 100644
--- a/src/wx/dkdm_output_panel.h
+++ b/src/wx/dkdm_output_panel.h
@@ -41,7 +41,7 @@ public:
 
 	boost::filesystem::path directory () const;
 
-	std::pair<boost::shared_ptr<Job>, int> make (
+	std::pair<std::shared_ptr<Job>, int> make (
 		std::list<KDMWithMetadataPtr > kdms,
 		std::string name,
 		boost::function<bool (boost::filesystem::path)> confirm_overwrite
diff --git a/src/wx/email_dialog.cc b/src/wx/email_dialog.cc
index 854a130c6..4d3ae4fe1 100644
--- a/src/wx/email_dialog.cc
+++ b/src/wx/email_dialog.cc
@@ -22,7 +22,7 @@
 #include "wx_util.h"
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 EmailDialog::EmailDialog (wxWindow* parent)
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index c0d383821..ce91c3cc4 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -38,8 +38,8 @@
 using std::cout;
 using std::string;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 0382ef9d4..a5232d2e5 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -41,9 +41,9 @@ class FilmViewer;
 class FilmEditor : public wxPanel
 {
 public:
-	FilmEditor (wxWindow *, boost::weak_ptr<FilmViewer> viewer);
+	FilmEditor (wxWindow *, std::weak_ptr<FilmViewer> viewer);
 
-	void set_film (boost::shared_ptr<Film>);
+	void set_film (std::shared_ptr<Film>);
 	void first_shown ();
 
 	boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
@@ -55,7 +55,7 @@ public:
 		return _content_panel;
 	}
 
-	boost::shared_ptr<Film> film () const {
+	std::shared_ptr<Film> film () const {
 		return _film;
 	}
 
@@ -73,5 +73,5 @@ private:
 	DCPPanel* _dcp_panel;
 
 	/** The film we are editing */
-	boost::shared_ptr<Film> _film;
+	std::shared_ptr<Film> _film;
 };
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 920ca3a10..cc25ccdd5 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -65,9 +65,9 @@ using std::list;
 using std::bad_alloc;
 using std::make_pair;
 using std::exception;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::weak_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 15d6bfaf5..909bf0ac7 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -63,13 +63,13 @@ public:
 
 	void show_closed_captions ();
 
-	void set_film (boost::shared_ptr<Film>);
-	boost::shared_ptr<Film> film () const {
+	void set_film (std::shared_ptr<Film>);
+	std::shared_ptr<Film> film () const {
 		return _film;
 	}
 
 	void seek (dcpomatic::DCPTime t, bool accurate);
-	void seek (boost::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
+	void seek (std::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
 	void seek_by (dcpomatic::DCPTime by, bool accurate);
 	/** @return our `playhead' position; this may not lie exactly on a frame boundary */
 	dcpomatic::DCPTime position () const {
@@ -122,20 +122,20 @@ public:
 	bool pad_black () const {
 		return _pad_black;
 	}
-	boost::shared_ptr<Butler> butler () const {
+	std::shared_ptr<Butler> butler () const {
 		return _butler;
 	}
 	ClosedCaptionsDialog* closed_captions_dialog () const {
 		return _closed_captions_dialog;
 	}
 	void finished ();
-	void image_changed (boost::shared_ptr<PlayerVideo> video);
+	void image_changed (std::shared_ptr<PlayerVideo> video);
 
 	bool pending_idle_get () const {
 		return _idle_get;
 	}
 
-	boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>)> ImageChanged;
+	boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
 	boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
 	boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
 	/** While playing back we reached the end of the film (emitted from GUI thread) */
@@ -162,8 +162,8 @@ private:
 
 	bool quick_refresh ();
 
-	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<Player> _player;
+	std::shared_ptr<Film> _film;
+	std::shared_ptr<Player> _player;
 
 	VideoView* _video_view;
 	bool _coalesce_player_changes;
@@ -177,7 +177,7 @@ private:
 	unsigned int _audio_block_size;
 	bool _playing;
 	int _suspended;
-	boost::shared_ptr<Butler> _butler;
+	std::shared_ptr<Butler> _butler;
 
 	std::list<Frame> _latency_history;
 	/** Mutex to protect _latency_history */
diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 66f8ab0e4..8ff6cf13e 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -32,7 +32,7 @@
 using std::list;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_ptr<TextContent> caption)
diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h
index 260e74c3d..0ef3658cf 100644
--- a/src/wx/fonts_dialog.h
+++ b/src/wx/fonts_dialog.h
@@ -23,8 +23,6 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/filesystem.hpp>
 
 class Content;
@@ -33,7 +31,7 @@ class TextContent;
 class FontsDialog : public wxDialog
 {
 public:
-	FontsDialog (wxWindow* parent, boost::shared_ptr<Content>, boost::shared_ptr<TextContent> caption);
+	FontsDialog (wxWindow* parent, std::shared_ptr<Content>, std::shared_ptr<TextContent> caption);
 
 private:
 	void setup ();
@@ -41,8 +39,8 @@ private:
 	void selection_changed ();
 	void edit_clicked ();
 
-	boost::weak_ptr<Content> _content;
-	boost::weak_ptr<TextContent> _caption;
+	std::weak_ptr<Content> _content;
+	std::weak_ptr<TextContent> _caption;
 	wxListCtrl* _fonts;
 	wxButton* _edit;
 };
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index c41236096..f376d9682 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -68,7 +68,7 @@ using std::pair;
 using std::make_pair;
 using std::map;
 using boost::bind;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::function;
 using boost::optional;
 #if BOOST_VERSION >= 106100
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 0d79a7562..969264c27 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -49,7 +49,7 @@
 #endif
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 675b324fc..d8ee65da6 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -28,7 +28,6 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/util.h>
 #include <boost/atomic.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #undef None
@@ -55,7 +54,7 @@ public:
 	}
 
 private:
-	void set_image (boost::shared_ptr<const Image> image);
+	void set_image (std::shared_ptr<const Image> image);
 	void set_image_and_draw ();
 	void draw (Position<int> inter_position, dcp::Size inter_size);
 	void thread ();
@@ -81,5 +80,5 @@ private:
 	boost::atomic<bool> _playing;
 	boost::atomic<bool> _one_shot;
 
-	boost::shared_ptr<wxTimer> _timer;
+	std::shared_ptr<wxTimer> _timer;
 };
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 9ceefda4a..78aa237e1 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -35,15 +35,15 @@ using std::max;
 using std::vector;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 
-HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
+HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok)
 	: wxDialog (parent, wxID_ANY, _("Hints"))
 	, _film (film)
 	, _hints (0)
@@ -82,7 +82,7 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
 
 	_text->GetCaret()->Hide ();
 
-	boost::shared_ptr<Film> locked_film = _film.lock ();
+	std::shared_ptr<Film> locked_film = _film.lock ();
 	if (locked_film) {
 		_film_change_connection = locked_film->Change.connect (boost::bind (&HintsDialog::film_change, this, _1));
 		_film_content_change_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1));
@@ -101,7 +101,7 @@ HintsDialog::film_change (ChangeType type)
 	_text->Clear ();
 	_current.clear ();
 
-	boost::shared_ptr<Film> film = _film.lock ();
+	std::shared_ptr<Film> film = _film.lock ();
 	if (!film) {
 		return;
 	}
diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h
index 87dcf1953..4c4449a26 100644
--- a/src/wx/hints_dialog.h
+++ b/src/wx/hints_dialog.h
@@ -23,7 +23,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class wxRichTextCtrl;
@@ -33,7 +32,7 @@ class Hints;
 class HintsDialog : public wxDialog
 {
 public:
-	HintsDialog (wxWindow* parent, boost::weak_ptr<Film>, bool ok);
+	HintsDialog (wxWindow* parent, std::weak_ptr<Film>, bool ok);
 
 private:
 	void film_change (ChangeType);
@@ -45,7 +44,7 @@ private:
 	void finished ();
 	void progress (std::string m);
 
-	boost::weak_ptr<Film> _film;
+	std::weak_ptr<Film> _film;
 	wxGauge* _gauge;
 	wxStaticText* _gauge_message;
 	wxRichTextCtrl* _text;
diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc
index bfc177a58..7976e6d44 100644
--- a/src/wx/interop_metadata_dialog.cc
+++ b/src/wx/interop_metadata_dialog.cc
@@ -28,8 +28,8 @@
 
 using std::string;
 using std::vector;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/interop_metadata_dialog.h b/src/wx/interop_metadata_dialog.h
index 189e28e2b..6e4eea40e 100644
--- a/src/wx/interop_metadata_dialog.h
+++ b/src/wx/interop_metadata_dialog.h
@@ -22,8 +22,6 @@
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <vector>
 
 class Film;
@@ -34,7 +32,7 @@ class RatingDialog;
 class InteropMetadataDialog : public wxDialog
 {
 public:
-	InteropMetadataDialog (wxWindow* parent, boost::weak_ptr<Film> film);
+	InteropMetadataDialog (wxWindow* parent, std::weak_ptr<Film> film);
 
 private:
 	std::vector<dcp::Rating> ratings () const;
@@ -43,7 +41,7 @@ private:
 	void setup_sensitivity ();
 	void subtitle_language_changed (dcp::LanguageTag tag);
 
-	boost::weak_ptr<Film> _film;
+	std::weak_ptr<Film> _film;
 	wxCheckBox* _enable_subtitle_language;
 	LanguageTagWidget* _subtitle_language;
 	EditableList<dcp::Rating, RatingDialog>* _ratings;
diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc
index 652b85d47..2dcd85d3a 100644
--- a/src/wx/isdcf_metadata_dialog.cc
+++ b/src/wx/isdcf_metadata_dialog.cc
@@ -26,7 +26,7 @@
 #include <wx/sizer.h>
 #include <wx/spinctrl.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** @param parent Parent window.
  *  @param dm Initial ISDCF metadata.
diff --git a/src/wx/isdcf_metadata_dialog.h b/src/wx/isdcf_metadata_dialog.h
index b1ecb5a36..986449247 100644
--- a/src/wx/isdcf_metadata_dialog.h
+++ b/src/wx/isdcf_metadata_dialog.h
@@ -21,7 +21,6 @@
 #include "table_dialog.h"
 #include "lib/isdcf_metadata.h"
 #include <wx/textctrl.h>
-#include <boost/shared_ptr.hpp>
 
 class wxSpinCtrl;
 class Film;
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index a0430ca81..3c0f44675 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -39,8 +39,8 @@ using std::list;
 using std::map;
 using std::min;
 using std::cout;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::bind;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index 2e471532f..392d7504c 100644
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -22,16 +22,19 @@
  *  @brief Class which is a wxPanel for showing the progress of jobs.
  */
 
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
 #include <list>
+#include <memory>
+
 
 class Job;
 class JobView;
 
+
 /** @class JobManagerView
  *  @brief Class which is a wxPanel for showing the progress of jobs.
  */
@@ -41,15 +44,15 @@ public:
 	JobManagerView (wxWindow *, bool batch);
 
 private:
-	void job_added (boost::weak_ptr<Job>);
+	void job_added (std::weak_ptr<Job>);
 	void periodic ();
 	void replace ();
 	void job_list_changed ();
 
 	wxPanel* _panel;
 	wxFlexGridSizer* _table;
-	boost::shared_ptr<wxTimer> _timer;
+	std::shared_ptr<wxTimer> _timer;
 	bool _batch;
 
-	std::list<boost::shared_ptr<JobView> > _job_records;
+	std::list<std::shared_ptr<JobView> > _job_records;
 };
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 4f925873d..52c975bee 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -36,9 +36,9 @@
 
 using std::string;
 using std::min;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 
 JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
 	: _job (job)
diff --git a/src/wx/job_view.h b/src/wx/job_view.h
index d58a90831..19f746b01 100644
--- a/src/wx/job_view.h
+++ b/src/wx/job_view.h
@@ -22,7 +22,6 @@
 #define DCPOMATIC_JOB_VIEW_H
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class Job;
@@ -40,7 +39,7 @@ class wxCheckBox;
 class JobView : public boost::noncopyable
 {
 public:
-	JobView (boost::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
+	JobView (std::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
 	virtual ~JobView () {}
 
 	virtual int insert_position () const = 0;
@@ -51,14 +50,14 @@ public:
 	void insert (int pos);
 	void detach ();
 
-	boost::shared_ptr<Job> job () const {
+	std::shared_ptr<Job> job () const {
 		return _job;
 	}
 
 protected:
 	virtual void finished ();
 
-	boost::shared_ptr<Job> _job;
+	std::shared_ptr<Job> _job;
 	wxFlexGridSizer* _table;
 	/** sizer for buttons (cancel, details, pause etc.) */
 	wxBoxSizer* _buttons;
diff --git a/src/wx/job_view_dialog.cc b/src/wx/job_view_dialog.cc
index a49818cc8..455998c5c 100644
--- a/src/wx/job_view_dialog.cc
+++ b/src/wx/job_view_dialog.cc
@@ -22,7 +22,7 @@
 #include "normal_job_view.h"
 #include "lib/job.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 JobViewDialog::JobViewDialog (wxWindow* parent, wxString title, shared_ptr<Job> job)
 	: TableDialog (parent, title, 4, 0, false)
diff --git a/src/wx/job_view_dialog.h b/src/wx/job_view_dialog.h
index 54a6c1636..b72ad298d 100644
--- a/src/wx/job_view_dialog.h
+++ b/src/wx/job_view_dialog.h
@@ -18,9 +18,10 @@
 
 */
 
+
 #include "table_dialog.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
+
 
 class JobView;
 class Job;
@@ -28,13 +29,13 @@ class Job;
 class JobViewDialog : public TableDialog
 {
 public:
-	JobViewDialog (wxWindow* parent, wxString title, boost::shared_ptr<Job> job);
+	JobViewDialog (wxWindow* parent, wxString title, std::shared_ptr<Job> job);
 	~JobViewDialog ();
 
 private:
 	void periodic ();
 
 	JobView* _view;
-	boost::weak_ptr<Job> _job;
-	boost::shared_ptr<wxTimer> _timer;
+	std::weak_ptr<Job> _job;
+	std::shared_ptr<wxTimer> _timer;
 };
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 9ff290822..666701168 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -48,7 +48,7 @@ using std::cout;
 using std::vector;
 using std::make_pair;
 using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 using boost::optional;
 #if BOOST_VERSION >= 106100
diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index a240ec1b6..ea504f842 100644
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -21,7 +21,6 @@
 #include "wx_util.h"
 #include <dcp/types.h>
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <map>
 
@@ -40,14 +39,14 @@ struct CPLSummary;
 class KDMDialog : public wxDialog
 {
 public:
-	KDMDialog (wxWindow *, boost::shared_ptr<const Film> film);
+	KDMDialog (wxWindow *, std::shared_ptr<const Film> film);
 
 private:
 	void setup_sensitivity ();
 	void make_clicked ();
 	bool confirm_overwrite (boost::filesystem::path path);
 
-	boost::weak_ptr<const Film> _film;
+	std::weak_ptr<const Film> _film;
 	ScreensPanel* _screens;
 	KDMTimingPanel* _timing;
 	KDMCPLPanel* _cpl;
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 961a27fc2..c08a76732 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -48,7 +48,7 @@ using std::string;
 using std::list;
 using std::exception;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::function;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 0281b26d0..cc4453d02 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -51,7 +51,7 @@ public:
 		return _forensic_mark_audio_up_to;
 	}
 
-	std::pair<boost::shared_ptr<Job>, int> make (
+	std::pair<std::shared_ptr<Job>, int> make (
 		std::list<KDMWithMetadataPtr > screen_kdms,
 		std::string name,
 		boost::function<bool (boost::filesystem::path)> confirm_overwrite
diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index 245dee2db..2d2fc81f6 100644
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -29,7 +29,6 @@
 #include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <iostream>
 #include <iterator>
@@ -42,8 +41,8 @@ using std::pair;
 using std::string;
 using std::vector;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index c8529f108..31789af2c 100644
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -33,8 +33,8 @@
 
 using std::cout;
 using boost::bind;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
 using dcpomatic::DCPTime;
 
diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h
index e2c261873..a3f3532e5 100644
--- a/src/wx/markers_dialog.h
+++ b/src/wx/markers_dialog.h
@@ -18,13 +18,14 @@
 
 */
 
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <list>
+#include <memory>
+
 
 class Marker;
 class Film;
@@ -33,9 +34,9 @@ class FilmViewer;
 class MarkersDialog : public wxDialog
 {
 public:
-	MarkersDialog (wxWindow* parent, boost::weak_ptr<Film> film, boost::weak_ptr<FilmViewer> viewer);
+	MarkersDialog (wxWindow* parent, std::weak_ptr<Film> film, std::weak_ptr<FilmViewer> viewer);
 
 private:
-	std::list<boost::shared_ptr<Marker> > _markers;
-	boost::weak_ptr<Film> _film;
+	std::list<std::shared_ptr<Marker> > _markers;
+	std::weak_ptr<Film> _film;
 };
diff --git a/src/wx/monitor_dialog.cc b/src/wx/monitor_dialog.cc
index db6b71b48..933f2f42a 100644
--- a/src/wx/monitor_dialog.cc
+++ b/src/wx/monitor_dialog.cc
@@ -25,7 +25,7 @@
 
 using std::string;
 using dcp::locale_convert;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 MonitorDialog::MonitorDialog (wxWindow* parent)
diff --git a/src/wx/move_to_dialog.cc b/src/wx/move_to_dialog.cc
index 266f44264..b4b6e3ae3 100644
--- a/src/wx/move_to_dialog.cc
+++ b/src/wx/move_to_dialog.cc
@@ -24,7 +24,7 @@
 #include <boost/foreach.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcpomatic;
 
diff --git a/src/wx/move_to_dialog.h b/src/wx/move_to_dialog.h
index 3c6f3d064..61520a71f 100644
--- a/src/wx/move_to_dialog.h
+++ b/src/wx/move_to_dialog.h
@@ -20,7 +20,6 @@
 
 #include "table_dialog.h"
 #include "lib/dcpomatic_time.h"
-#include <boost/weak_ptr.hpp>
 #include <boost/optional.hpp>
 
 class Film;
@@ -29,11 +28,11 @@ class wxSpinCtrl;
 class MoveToDialog : public TableDialog
 {
 public:
-	MoveToDialog (wxWindow* parent, boost::optional<dcpomatic::DCPTime> position, boost::shared_ptr<const Film> film);
+	MoveToDialog (wxWindow* parent, boost::optional<dcpomatic::DCPTime> position, std::shared_ptr<const Film> film);
 
 	dcpomatic::DCPTime position () const;
 
 private:
-	boost::weak_ptr<const Film> _film;
+	std::weak_ptr<const Film> _film;
 	wxSpinCtrl* _reel;
 };
diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index a4c881039..5b989bdb5 100644
--- a/src/wx/nag_dialog.cc
+++ b/src/wx/nag_dialog.cc
@@ -24,7 +24,7 @@
 #include "check_box.h"
 #include <boost/foreach.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc
index ada0596c8..6c9c08fa7 100644
--- a/src/wx/normal_job_view.cc
+++ b/src/wx/normal_job_view.cc
@@ -23,7 +23,7 @@
 #include "lib/job.h"
 #include <wx/wx.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 NormalJobView::NormalJobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
 	: JobView (job, parent, container, table)
diff --git a/src/wx/normal_job_view.h b/src/wx/normal_job_view.h
index b9d6327a0..ea1a014f4 100644
--- a/src/wx/normal_job_view.h
+++ b/src/wx/normal_job_view.h
@@ -25,7 +25,7 @@ class wxSizer;
 class NormalJobView : public JobView
 {
 public:
-	NormalJobView (boost::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
+	NormalJobView (std::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
 
 	void setup ();
 
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 7af429326..3158b279c 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -65,7 +65,7 @@ using std::pair;
 using std::make_pair;
 using std::map;
 using boost::bind;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::function;
 using boost::optional;
 #if BOOST_VERSION >= 106100
diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc
index 9a569c00c..f0eaa59bb 100644
--- a/src/wx/player_information.cc
+++ b/src/wx/player_information.cc
@@ -30,9 +30,9 @@
 
 using std::cout;
 using std::string;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 
 /* This should be even */
diff --git a/src/wx/player_information.h b/src/wx/player_information.h
index ae3e13429..0dd6c4ad0 100644
--- a/src/wx/player_information.h
+++ b/src/wx/player_information.h
@@ -23,14 +23,13 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <boost/scoped_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 
 class FilmViewer;
 
 class PlayerInformation : public wxPanel
 {
 public:
-	PlayerInformation (wxWindow* parent, boost::weak_ptr<FilmViewer> viewer);
+	PlayerInformation (wxWindow* parent, std::weak_ptr<FilmViewer> viewer);
 
 	void triggered_update ();
 
@@ -38,7 +37,7 @@ private:
 
 	void periodic_update ();
 
-	boost::weak_ptr<FilmViewer> _viewer;
+	std::weak_ptr<FilmViewer> _viewer;
 	wxSizer* _sizer;
 	wxStaticText** _dcp;
 	wxStaticText* _dropped;
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index 72ec7ad1f..56ff5f40d 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -40,8 +40,8 @@ using std::string;
 using std::cout;
 using std::exception;
 using std::sort;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcpomatic;
 
diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h
index 4f144834a..b0d04f4cb 100644
--- a/src/wx/playlist_controls.h
+++ b/src/wx/playlist_controls.h
@@ -26,16 +26,16 @@ class DCPContent;
 class PlaylistControls : public Controls
 {
 public:
-	PlaylistControls (wxWindow* parent, boost::shared_ptr<FilmViewer> viewer);
+	PlaylistControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer);
 
 	void log (wxString s);
-	void set_film (boost::shared_ptr<Film> film);
+	void set_film (std::shared_ptr<Film> film);
 
 	/** This is so that we can tell our parent player to reset the film
 	    when we have created one from a SPL.  We could call a method
 	    in the player's DOMFrame but we don't have that in a header.
 	*/
-	boost::signals2::signal<void (boost::weak_ptr<Film>)> ResetFilm;
+	boost::signals2::signal<void (std::weak_ptr<Film>)> ResetFilm;
 
 	void play ();
 	void stop ();
@@ -62,7 +62,7 @@ private:
 	bool can_do_next ();
 	void deselect_playlist ();
 
-	boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (boost::shared_ptr<DCPContent> dcp);
+	boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (std::shared_ptr<DCPContent> dcp);
 
 	wxButton* _play_button;
 	wxButton* _pause_button;
diff --git a/src/wx/recipient_dialog.h b/src/wx/recipient_dialog.h
index 3f0946b22..39ba5915e 100644
--- a/src/wx/recipient_dialog.h
+++ b/src/wx/recipient_dialog.h
@@ -24,7 +24,6 @@
 #include "lib/screen.h"
 #include <dcp/certificate.h>
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 
 class Progress;
diff --git a/src/wx/recipients_panel.cc b/src/wx/recipients_panel.cc
index 8bb78750e..086eac3e4 100644
--- a/src/wx/recipients_panel.cc
+++ b/src/wx/recipients_panel.cc
@@ -33,7 +33,7 @@ using std::cout;
 using std::map;
 using std::string;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcpomatic;
 
diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h
index b33b7ebc8..d224eed1b 100644
--- a/src/wx/recipients_panel.h
+++ b/src/wx/recipients_panel.h
@@ -25,7 +25,6 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>
@@ -40,12 +39,12 @@ public:
 
 	void setup_sensitivity ();
 
-	std::list<boost::shared_ptr<DKDMRecipient> > recipients () const;
+	std::list<std::shared_ptr<DKDMRecipient> > recipients () const;
 	boost::signals2::signal<void ()> RecipientsChanged;
 
 private:
 	void add_recipients ();
-	void add_recipient (boost::shared_ptr<DKDMRecipient>);
+	void add_recipient (std::shared_ptr<DKDMRecipient>);
 	void add_recipient_clicked ();
 	void edit_recipient_clicked ();
 	void remove_recipient_clicked ();
@@ -60,7 +59,7 @@ private:
 	wxButton* _remove_recipient;
 	wxTreeItemId _root;
 
-	typedef std::map<wxTreeItemId, boost::shared_ptr<DKDMRecipient> > RecipientMap;
+	typedef std::map<wxTreeItemId, std::shared_ptr<DKDMRecipient> > RecipientMap;
 	RecipientMap _recipients;
 	RecipientMap _selected;
 
diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc
index 981d13f31..8ec275b4e 100644
--- a/src/wx/report_problem_dialog.cc
+++ b/src/wx/report_problem_dialog.cc
@@ -28,7 +28,7 @@
 #include <wx/sizer.h>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** @param parent Parent window.
  *  @param film Film that we are working on, or 0.
diff --git a/src/wx/report_problem_dialog.h b/src/wx/report_problem_dialog.h
index 651087907..b12bece61 100644
--- a/src/wx/report_problem_dialog.h
+++ b/src/wx/report_problem_dialog.h
@@ -18,11 +18,13 @@
 
 */
 
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/dialog.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 
 class wxTextCtrl;
 class wxFlexGridSizer;
@@ -32,12 +34,12 @@ class Film;
 class ReportProblemDialog : public wxDialog
 {
 public:
-	ReportProblemDialog (wxWindow* parent, boost::shared_ptr<Film> film = boost::shared_ptr<Film>());
+	ReportProblemDialog (wxWindow* parent, std::shared_ptr<Film> film = std::shared_ptr<Film>());
 
 	void report ();
 
 private:
-	boost::shared_ptr<Film> _film;
+	std::shared_ptr<Film> _film;
 
 	wxSizer* _overall_sizer;
 	wxFlexGridSizer* _table;
diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 913480d76..6665ef398 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -22,7 +22,6 @@
 #include "lib/screen.h"
 #include <dcp/certificate.h>
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 
 class Progress;
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index d39b6688d..ee88d0178 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -34,7 +34,7 @@ using std::cout;
 using std::map;
 using std::string;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcpomatic;
 
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 69d74b13b..35d935bea 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -24,7 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>
@@ -41,15 +40,15 @@ public:
 	explicit ScreensPanel (wxWindow* parent);
 	~ScreensPanel ();
 
-	std::list<boost::shared_ptr<dcpomatic::Screen> > screens () const;
+	std::list<std::shared_ptr<dcpomatic::Screen> > screens () const;
 	void setup_sensitivity ();
 
 	boost::signals2::signal<void ()> ScreensChanged;
 
 private:
 	void add_cinemas ();
-	boost::optional<wxTreeItemId> add_cinema (boost::shared_ptr<Cinema>);
-	boost::optional<wxTreeItemId> add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<dcpomatic::Screen>);
+	boost::optional<wxTreeItemId> add_cinema (std::shared_ptr<Cinema>);
+	boost::optional<wxTreeItemId> add_screen (std::shared_ptr<Cinema>, std::shared_ptr<dcpomatic::Screen>);
 	void add_cinema_clicked ();
 	void edit_cinema_clicked ();
 	void remove_cinema_clicked ();
@@ -70,8 +69,8 @@ private:
 	wxButton* _remove_screen;
 	wxTreeItemId _root;
 
-	typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap;
-	typedef std::map<wxTreeItemId, boost::shared_ptr<dcpomatic::Screen> > ScreenMap;
+	typedef std::map<wxTreeItemId, std::shared_ptr<Cinema> > CinemaMap;
+	typedef std::map<wxTreeItemId, std::shared_ptr<dcpomatic::Screen> > ScreenMap;
 
 	CinemaMap _cinemas;
 	ScreenMap _screens;
diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc
index 4c10c8f6b..ceaeff289 100644
--- a/src/wx/self_dkdm_dialog.cc
+++ b/src/wx/self_dkdm_dialog.cc
@@ -49,10 +49,10 @@ using std::pair;
 using std::cout;
 using std::vector;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 
-SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
+SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, std::shared_ptr<const Film> film)
 	: wxDialog (parent, wxID_ANY, _("Make DKDM for DCP-o-matic"))
 {
 	/* Main sizer */
diff --git a/src/wx/self_dkdm_dialog.h b/src/wx/self_dkdm_dialog.h
index f49749a69..20c138c41 100644
--- a/src/wx/self_dkdm_dialog.h
+++ b/src/wx/self_dkdm_dialog.h
@@ -24,7 +24,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <map>
 
@@ -36,7 +35,7 @@ class DirPickerCtrl;
 class SelfDKDMDialog : public wxDialog
 {
 public:
-	SelfDKDMDialog (wxWindow *, boost::shared_ptr<const Film>);
+	SelfDKDMDialog (wxWindow *, std::shared_ptr<const Film>);
 
 	boost::filesystem::path cpl () const;
 
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 51fe4302c..5761222c6 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -23,7 +23,7 @@
 #include "wx_util.h"
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 ServerDialog::ServerDialog (wxWindow* parent)
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 2b86ea688..342829471 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -32,7 +32,7 @@
 using std::max;
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index 93b9c6e3d..31756b5d8 100644
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -42,7 +42,7 @@ public:
 	NextFrameResult display_next_frame (bool non_blocking);
 
 private:
-	void set_image (boost::shared_ptr<const Image> image) {
+	void set_image (std::shared_ptr<const Image> image) {
 		_image = image;
 	}
 
@@ -51,7 +51,7 @@ private:
 	void timer ();
 
 	wxPanel* _panel;
-	boost::shared_ptr<const Image> _image;
+	std::shared_ptr<const Image> _image;
 	wxTimer _timer;
 	Position<int> _inter_position;
 	dcp::Size _inter_size;
diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 87be156f5..c44e38146 100644
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -32,8 +32,8 @@
 using std::string;
 using std::vector;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index 0f9c436b9..171507acf 100644
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -25,8 +25,6 @@
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <vector>
 
 
@@ -39,7 +37,7 @@ class LanguageTagWidget;
 class SMPTEMetadataDialog : public wxDialog, public WeakFilm
 {
 public:
-	SMPTEMetadataDialog (wxWindow* parent, boost::weak_ptr<Film> film);
+	SMPTEMetadataDialog (wxWindow* parent, std::weak_ptr<Film> film);
 
 private:
 	std::vector<dcp::Rating> ratings () const;
diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc
index e73e2f6f6..c78844ca1 100644
--- a/src/wx/standard_controls.cc
+++ b/src/wx/standard_controls.cc
@@ -23,7 +23,7 @@
 #include <wx/wx.h>
 #include <wx/tglbtn.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 StandardControls::StandardControls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
 	: Controls (parent, viewer, editor_controls)
diff --git a/src/wx/standard_controls.h b/src/wx/standard_controls.h
index 143624126..eac47726b 100644
--- a/src/wx/standard_controls.h
+++ b/src/wx/standard_controls.h
@@ -23,7 +23,7 @@
 class StandardControls : public Controls
 {
 public:
-	StandardControls (wxWindow* parent, boost::shared_ptr<FilmViewer> viewer, bool editor_controls);
+	StandardControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer, bool editor_controls);
 
 	void play ();
 	void stop ();
diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 46edacd97..69ee61966 100644
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -39,9 +39,9 @@ DCPOMATIC_ENABLE_WARNINGS
 
 using std::map;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index b0dd8d307..299b3c70a 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -24,7 +24,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class wxRadioButton;
@@ -41,7 +40,7 @@ class Job;
 class SubtitleAppearanceDialog : public wxDialog
 {
 public:
-	SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<const Film> film, boost::shared_ptr<Content> content, boost::shared_ptr<TextContent> caption);
+	SubtitleAppearanceDialog (wxWindow* parent, std::shared_ptr<const Film> film, std::shared_ptr<Content> content, std::shared_ptr<TextContent> caption);
 
 	void apply ();
 
@@ -53,7 +52,7 @@ private:
 	void active_jobs_changed (boost::optional<std::string> last);
 	void add_colours ();
 
-	boost::weak_ptr<const Film> _film;
+	std::weak_ptr<const Film> _film;
 	wxCheckBox* _force_colour;
 	wxColourPickerCtrl* _colour;
 	wxCheckBox* _force_effect;
@@ -73,14 +72,14 @@ private:
 	wxStaticText* _finding;
 	wxFlexGridSizer* _colour_table;
 
-	boost::shared_ptr<Content> _content;
-	boost::shared_ptr<TextContent> _caption;
-	boost::shared_ptr<FFmpegSubtitleStream> _stream;
+	std::shared_ptr<Content> _content;
+	std::shared_ptr<TextContent> _caption;
+	std::shared_ptr<FFmpegSubtitleStream> _stream;
 
 	boost::signals2::scoped_connection _content_connection;
 	boost::signals2::scoped_connection _job_manager_connection;
 
-	boost::weak_ptr<Job> _job;
+	std::weak_ptr<Job> _job;
 
 	static int const NONE;
 	static int const OUTLINE;
diff --git a/src/wx/system_information_dialog.cc b/src/wx/system_information_dialog.cc
index 2d9044f6b..968cd5740 100644
--- a/src/wx/system_information_dialog.cc
+++ b/src/wx/system_information_dialog.cc
@@ -32,8 +32,8 @@
 #endif
 
 using std::string;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
 
 SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr<FilmViewer> weak_viewer)
 	: TableDialog (parent, _("System information"), 2, 1, false)
diff --git a/src/wx/system_information_dialog.h b/src/wx/system_information_dialog.h
index 63c70fba5..5b9efa234 100644
--- a/src/wx/system_information_dialog.h
+++ b/src/wx/system_information_dialog.h
@@ -18,14 +18,16 @@
 
 */
 
+
 #include "table_dialog.h"
-#include <boost/weak_ptr.hpp>
+#include <memory>
+
 
 class FilmViewer;
 
 class SystemInformationDialog : public TableDialog
 {
 public:
-	SystemInformationDialog (wxWindow* parent, boost::weak_ptr<FilmViewer> viewer);
+	SystemInformationDialog (wxWindow* parent, std::weak_ptr<FilmViewer> viewer);
 
 };
diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index b21d33ce5..5b54fa35b 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -49,9 +49,9 @@ using std::vector;
 using std::string;
 using std::list;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using boost::bind;
 
 /** @param t Original text type of the content, if known */
@@ -512,10 +512,10 @@ TextPanel::setup_sensitivity ()
 	ContentList sel = _parent->selected_text ();
 	BOOST_FOREACH (shared_ptr<Content> i, sel) {
 		/* These are the content types that could include subtitles */
-		shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (i);
-		shared_ptr<const StringTextFileContent> sc = boost::dynamic_pointer_cast<const StringTextFileContent> (i);
-		shared_ptr<const DCPContent> dc = boost::dynamic_pointer_cast<const DCPContent> (i);
-		shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (i);
+		shared_ptr<const FFmpegContent> fc = std::dynamic_pointer_cast<const FFmpegContent> (i);
+		shared_ptr<const StringTextFileContent> sc = std::dynamic_pointer_cast<const StringTextFileContent> (i);
+		shared_ptr<const DCPContent> dc = std::dynamic_pointer_cast<const DCPContent> (i);
+		shared_ptr<const DCPSubtitleContent> dsc = std::dynamic_pointer_cast<const DCPSubtitleContent> (i);
 		if (fc) {
 			if (!fc->text.empty()) {
 				++ffmpeg_subs;
diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index cd0890e3d..f35f39cbe 100644
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -101,8 +101,8 @@ private:
 	int _outline_subtitles_row;
 	int _ccap_track_row;
 
-	boost::weak_ptr<Content> _analysis_content;
+	std::weak_ptr<Content> _analysis_content;
 	boost::signals2::scoped_connection _analysis_finished_connection;
-	boost::shared_ptr<SubtitleAnalysis> _analysis;
+	std::shared_ptr<SubtitleAnalysis> _analysis;
 	bool _loading_analysis;
 };
diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 491df7b3b..b4b2baae2 100644
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -31,10 +31,10 @@
 #include "lib/text_decoder.h"
 
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index d360838a8..b44742b63 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -24,8 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <wx/listctrl.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 
 class Decoder;
 class FilmViewer;
@@ -36,11 +34,11 @@ class TextView : public wxDialog
 public:
 	TextView (
 		wxWindow *,
-		boost::shared_ptr<Film>,
-		boost::shared_ptr<Content> content,
-		boost::shared_ptr<TextContent> caption,
-		boost::shared_ptr<Decoder>,
-		boost::weak_ptr<FilmViewer> viewer
+		std::shared_ptr<Film>,
+		std::shared_ptr<Content> content,
+		std::shared_ptr<TextContent> caption,
+		std::shared_ptr<Decoder>,
+		std::weak_ptr<FilmViewer> viewer
 		);
 
 private:
@@ -53,6 +51,6 @@ private:
 	boost::optional<FrameRateChange> _frc;
 	boost::optional<int> _last_count;
 	std::vector<dcpomatic::ContentTime> _start_times;
-	boost::weak_ptr<Content> _content;
-	boost::weak_ptr<FilmViewer> _film_viewer;
+	std::weak_ptr<Content> _content;
+	std::weak_ptr<FilmViewer> _film_viewer;
 };
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 7b9758feb..054eac734 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -39,7 +39,6 @@
 #include "lib/video_content.h"
 #include "lib/atmos_mxf_content.h"
 #include <wx/graphics.h>
-#include <boost/weak_ptr.hpp>
 #include <boost/foreach.hpp>
 #include <list>
 #include <iterator>
@@ -50,9 +49,9 @@ using std::cout;
 using std::min;
 using std::max;
 using std::abs;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
 using namespace dcpomatic;
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 44a897371..b532e74e3 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -24,8 +24,6 @@
 #include "lib/rect.h"
 #include "lib/film.h"
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class Film;
@@ -39,9 +37,9 @@ class FilmViewer;
 class Timeline : public wxPanel
 {
 public:
-	Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+	Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
-	boost::shared_ptr<const Film> film () const;
+	std::shared_ptr<const Film> film () const;
 
 	void force_redraw (dcpomatic::Rect<int> const &);
 
@@ -106,7 +104,7 @@ private:
 	void zoom_all ();
 	void update_playhead ();
 
-	boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
+	std::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
 	TimelineContentViewList selected_views () const;
 	ContentList selected_content () const;
 	void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::DCPTime>& nearest_distance) const;
@@ -114,18 +112,18 @@ private:
 	wxScrolledCanvas* _labels_canvas;
 	wxScrolledCanvas* _main_canvas;
 	ContentPanel* _content_panel;
-	boost::weak_ptr<Film> _film;
-	boost::weak_ptr<FilmViewer> _viewer;
+	std::weak_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _viewer;
 	TimelineViewList _views;
-	boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
-	boost::shared_ptr<TimelineReelsView> _reels_view;
-	boost::shared_ptr<TimelineLabelsView> _labels_view;
+	std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
+	std::shared_ptr<TimelineReelsView> _reels_view;
+	std::shared_ptr<TimelineLabelsView> _labels_view;
 	int _tracks;
 	boost::optional<double> _pixels_per_second;
 	bool _left_down;
 	wxPoint _down_point;
 	boost::optional<wxPoint> _zoom_point;
-	boost::shared_ptr<TimelineContentView> _down_view;
+	std::shared_ptr<TimelineContentView> _down_view;
 	dcpomatic::DCPTime _down_view_position;
 	bool _first_move;
 	ContentMenu _menu;
diff --git a/src/wx/timeline_atmos_content_view.cc b/src/wx/timeline_atmos_content_view.cc
index 45a8fccd0..f982921ed 100644
--- a/src/wx/timeline_atmos_content_view.cc
+++ b/src/wx/timeline_atmos_content_view.cc
@@ -20,7 +20,7 @@
 
 #include "timeline_atmos_content_view.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** @class TimelineAtmosContentView
  *  @brief Timeline view for AtmosContent.
diff --git a/src/wx/timeline_atmos_content_view.h b/src/wx/timeline_atmos_content_view.h
index 1e33c5fb2..05f4352eb 100644
--- a/src/wx/timeline_atmos_content_view.h
+++ b/src/wx/timeline_atmos_content_view.h
@@ -26,7 +26,7 @@
 class TimelineAtmosContentView : public TimelineContentView
 {
 public:
-	TimelineAtmosContentView (Timeline& tl, boost::shared_ptr<Content> c);
+	TimelineAtmosContentView (Timeline& tl, std::shared_ptr<Content> c);
 
 private:
 	bool active () const {
diff --git a/src/wx/timeline_audio_content_view.cc b/src/wx/timeline_audio_content_view.cc
index 3ae0fdb45..d26c40252 100644
--- a/src/wx/timeline_audio_content_view.cc
+++ b/src/wx/timeline_audio_content_view.cc
@@ -24,8 +24,8 @@
 #include "lib/util.h"
 
 using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** @class TimelineAudioContentView
  *  @brief Timeline view for AudioContent.
diff --git a/src/wx/timeline_audio_content_view.h b/src/wx/timeline_audio_content_view.h
index bede1dcda..d5a966ad5 100644
--- a/src/wx/timeline_audio_content_view.h
+++ b/src/wx/timeline_audio_content_view.h
@@ -26,7 +26,7 @@
 class TimelineAudioContentView : public TimelineContentView
 {
 public:
-	TimelineAudioContentView (Timeline& tl, boost::shared_ptr<Content> c);
+	TimelineAudioContentView (Timeline& tl, std::shared_ptr<Content> c);
 
 private:
 	bool active () const {
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 2af1c28ac..2f2b7e3ed 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -26,7 +26,7 @@
 #include <boost/foreach.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 2573e3cb3..fcc068064 100644
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -37,13 +37,13 @@ class Content;
 class TimelineContentView : public TimelineView
 {
 public:
-	TimelineContentView (Timeline& tl, boost::shared_ptr<Content> c);
+	TimelineContentView (Timeline& tl, std::shared_ptr<Content> c);
 
 	dcpomatic::Rect<int> bbox () const;
 
 	void set_selected (bool s);
 	bool selected () const;
-	boost::shared_ptr<Content> content () const;
+	std::shared_ptr<Content> content () const;
 	void set_track (int t);
 	void unset_track ();
 	boost::optional<int> track () const;
@@ -55,7 +55,7 @@ public:
 
 protected:
 
-	boost::weak_ptr<Content> _content;
+	std::weak_ptr<Content> _content;
 
 private:
 
@@ -69,6 +69,6 @@ private:
 	boost::signals2::scoped_connection _content_connection;
 };
 
-typedef std::vector<boost::shared_ptr<TimelineContentView> > TimelineContentViewList;
+typedef std::vector<std::shared_ptr<TimelineContentView> > TimelineContentViewList;
 
 #endif
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 261177e36..563c31f70 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -32,8 +32,8 @@
 using std::list;
 using std::cout;
 using std::string;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 77dfede50..97ddca964 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -18,8 +18,6 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <wx/wx.h>
 #include "timeline.h"
 
@@ -28,7 +26,7 @@ class Playlist;
 class TimelineDialog : public wxDialog
 {
 public:
-	TimelineDialog (ContentPanel *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+	TimelineDialog (ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
 	void set_selection (ContentList selection);
 
@@ -36,7 +34,7 @@ private:
 	void film_change (ChangeType type, Film::Property);
 	void tool_clicked (wxCommandEvent& id);
 
-	boost::weak_ptr<Film> _film;
+	std::weak_ptr<Film> _film;
 	Timeline _timeline;
 	wxToolBar* _toolbar;
 	boost::signals2::scoped_connection _film_changed_connection;
diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/timeline_text_content_view.cc
index 1345ea5e4..722a9f30a 100644
--- a/src/wx/timeline_text_content_view.cc
+++ b/src/wx/timeline_text_content_view.cc
@@ -22,7 +22,7 @@
 #include "lib/text_content.h"
 #include "lib/content.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c, shared_ptr<TextContent> caption)
 	: TimelineContentView (tl, c)
diff --git a/src/wx/timeline_text_content_view.h b/src/wx/timeline_text_content_view.h
index 055c84143..98aea6316 100644
--- a/src/wx/timeline_text_content_view.h
+++ b/src/wx/timeline_text_content_view.h
@@ -29,12 +29,12 @@ class TextContent;
 class TimelineTextContentView : public TimelineContentView
 {
 public:
-	TimelineTextContentView (Timeline& tl, boost::shared_ptr<Content>, boost::shared_ptr<TextContent>);
+	TimelineTextContentView (Timeline& tl, std::shared_ptr<Content>, std::shared_ptr<TextContent>);
 
 private:
 	bool active () const;
 	wxColour background_colour () const;
 	wxColour foreground_colour () const;
 
-	boost::shared_ptr<TextContent> _caption;
+	std::shared_ptr<TextContent> _caption;
 };
diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/timeline_video_content_view.cc
index db1520190..b0f4b4f5d 100644
--- a/src/wx/timeline_video_content_view.cc
+++ b/src/wx/timeline_video_content_view.cc
@@ -22,8 +22,8 @@
 #include "lib/video_content.h"
 #include "timeline_video_content_view.h"
 
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
 
 TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr<Content> c)
 	: TimelineContentView (tl, c)
diff --git a/src/wx/timeline_video_content_view.h b/src/wx/timeline_video_content_view.h
index c32424d59..2269a2930 100644
--- a/src/wx/timeline_video_content_view.h
+++ b/src/wx/timeline_video_content_view.h
@@ -26,7 +26,7 @@
 class TimelineVideoContentView : public TimelineContentView
 {
 public:
-	TimelineVideoContentView (Timeline& tl, boost::shared_ptr<Content> c);
+	TimelineVideoContentView (Timeline& tl, std::shared_ptr<Content> c);
 
 private:
 	bool active () const;
diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h
index d94e10124..bfd1de8b7 100644
--- a/src/wx/timeline_view.h
+++ b/src/wx/timeline_view.h
@@ -53,6 +53,6 @@ private:
 	dcpomatic::Rect<int> _last_paint_bbox;
 };
 
-typedef std::vector<boost::shared_ptr<TimelineView> > TimelineViewList;
+typedef std::vector<std::shared_ptr<TimelineView> > TimelineViewList;
 
 #endif
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 195887a29..82aaadedd 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -50,9 +50,9 @@ DCPOMATIC_ENABLE_WARNINGS
 using std::cout;
 using std::string;
 using std::set;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index d413361d4..251acc9b5 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -27,7 +27,7 @@ class FilmViewer;
 class TimingPanel : public ContentSubPanel
 {
 public:
-	TimingPanel (ContentPanel *, boost::weak_ptr<FilmViewer> viewer);
+	TimingPanel (ContentPanel *, std::weak_ptr<FilmViewer> viewer);
 
 	void film_changed (Film::Property);
 	void film_content_changed (int);
@@ -47,7 +47,7 @@ private:
 	void setup_sensitivity ();
 	void add_to_grid ();
 
-	boost::weak_ptr<FilmViewer> _viewer;
+	std::weak_ptr<FilmViewer> _viewer;
 
 	wxStaticText* _h_label;
 	wxStaticText* _m_label;
diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index 6432d21c7..bf78113d9 100644
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -29,7 +29,7 @@ DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job)
 	: wxDialog (parent, wxID_ANY, _("DCP verification"))
diff --git a/src/wx/verify_dcp_dialog.h b/src/wx/verify_dcp_dialog.h
index b67c1dfc7..2d3bac24f 100644
--- a/src/wx/verify_dcp_dialog.h
+++ b/src/wx/verify_dcp_dialog.h
@@ -31,7 +31,7 @@ class VerifyDCPJob;
 class VerifyDCPDialog : public wxDialog
 {
 public:
-	VerifyDCPDialog (wxWindow* parent, boost::shared_ptr<VerifyDCPJob> job);
+	VerifyDCPDialog (wxWindow* parent, std::shared_ptr<VerifyDCPJob> job);
 
 private:
 	wxRichTextCtrl* _text;
diff --git a/src/wx/verify_dcp_progress_dialog.cc b/src/wx/verify_dcp_progress_dialog.cc
index dfe496e58..030a9810d 100644
--- a/src/wx/verify_dcp_progress_dialog.cc
+++ b/src/wx/verify_dcp_progress_dialog.cc
@@ -25,13 +25,12 @@
 #include "lib/job.h"
 #include "lib/job_manager.h"
 #include <wx/evtloop.h>
-#include <boost/shared_ptr.hpp>
 #include <string>
 
 
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 static int const max_file_name_length = 80;
diff --git a/src/wx/verify_dcp_progress_dialog.h b/src/wx/verify_dcp_progress_dialog.h
index 7dd0c7495..0f1526afe 100644
--- a/src/wx/verify_dcp_progress_dialog.h
+++ b/src/wx/verify_dcp_progress_dialog.h
@@ -18,11 +18,12 @@
 
 */
 
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 
 class Job;
@@ -37,7 +38,7 @@ class VerifyDCPProgressDialog : public wxDialog
 public:
 	VerifyDCPProgressDialog (wxWindow* parent, wxString title);
 
-	bool run (boost::shared_ptr<Job> job);
+	bool run (std::shared_ptr<Job> job);
 
 private:
 	void cancel ();
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 8841005fa..5fcd527b8 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -51,8 +51,8 @@ using std::pair;
 using std::cout;
 using std::list;
 using std::set;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
 using namespace dcpomatic;
diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 7805a1fb3..42a7fe58b 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -26,7 +26,7 @@
 #include <boost/optional.hpp>
 
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 VideoView::VideoView (FilmViewer* viewer)
diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index e5fbb671d..3b596197e 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -25,7 +25,6 @@
 #include "lib/timer.h"
 #include "lib/types.h"
 #include "lib/exception_store.h"
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 #include <boost/noncopyable.hpp>
@@ -61,7 +60,7 @@ public:
 	virtual NextFrameResult display_next_frame (bool) = 0;
 
 	void clear ();
-	bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size player_video_container_size);
+	bool reset_metadata (std::shared_ptr<const Film> film, dcp::Size player_video_container_size);
 
 	/** Emitted from the GUI thread when our display changes in size */
 	boost::signals2::signal<void()> Sized;
@@ -133,7 +132,7 @@ protected:
 		return _length;
 	}
 
-	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
+	std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _player_video;
 	}
@@ -156,7 +155,7 @@ private:
 	/** Mutex protecting all the state in this class */
 	mutable boost::mutex _mutex;
 
-	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
+	std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
 	int _video_frame_rate;
 	/** length of the film we are playing, or 0 if there is none */
 	dcpomatic::DCPTime _length;
diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index e61043cc1..bc68fa6c2 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -28,8 +28,8 @@
 
 using std::cout;
 using boost::bind;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/video_waveform_dialog.h b/src/wx/video_waveform_dialog.h
index 252720f60..25bd462ae 100644
--- a/src/wx/video_waveform_dialog.h
+++ b/src/wx/video_waveform_dialog.h
@@ -18,11 +18,13 @@
 
 */
 
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/weak_ptr.hpp>
+#include <memory>
+
 
 class VideoWaveformPlot;
 class FilmViewer;
@@ -31,7 +33,7 @@ class Film;
 class VideoWaveformDialog : public wxDialog
 {
 public:
-	VideoWaveformDialog (wxWindow* parent, boost::weak_ptr<const Film> film, boost::weak_ptr<FilmViewer> viewer);
+	VideoWaveformDialog (wxWindow* parent, std::weak_ptr<const Film> film, std::weak_ptr<FilmViewer> viewer);
 
 private:
 	void shown (wxShowEvent &);
@@ -39,7 +41,7 @@ private:
 	void contrast_changed ();
 	void mouse_moved (int x1, int x2, int y1, int y2);
 
-	boost::weak_ptr<FilmViewer> _viewer;
+	std::weak_ptr<FilmViewer> _viewer;
 	VideoWaveformPlot* _plot;
 	wxChoice* _component;
 	wxSlider* _contrast;
diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index edec4d6eb..cf07a2ea7 100644
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -36,8 +36,8 @@ using std::cout;
 using std::min;
 using std::max;
 using std::string;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h
index f107f0399..037ff0cbf 100644
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -22,8 +22,6 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
 namespace dcp {
@@ -38,7 +36,7 @@ class FilmViewer;
 class VideoWaveformPlot : public wxPanel
 {
 public:
-	VideoWaveformPlot (wxWindow* parent, boost::weak_ptr<const Film> film, boost::weak_ptr<FilmViewer> viewer);
+	VideoWaveformPlot (wxWindow* parent, std::weak_ptr<const Film> film, std::weak_ptr<FilmViewer> viewer);
 
 	void set_enabled (bool e);
 	void set_component (int c);
@@ -55,12 +53,12 @@ private:
 	void paint ();
 	void sized (wxSizeEvent &);
 	void create_waveform ();
-	void set_image (boost::shared_ptr<PlayerVideo>);
+	void set_image (std::shared_ptr<PlayerVideo>);
 	void mouse_moved (wxMouseEvent &);
 
-	boost::weak_ptr<const Film> _film;
-	boost::shared_ptr<dcp::OpenJPEGImage> _image;
-	boost::shared_ptr<const Image> _waveform;
+	std::weak_ptr<const Film> _film;
+	std::shared_ptr<dcp::OpenJPEGImage> _image;
+	std::shared_ptr<const Image> _waveform;
 	bool _dirty;
 	bool _enabled;
 	int _component;
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 7948dd13c..5d02d27bf 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -44,7 +44,7 @@ DCPOMATIC_ENABLE_WARNINGS
 using std::string;
 using std::vector;
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using dcp::locale_convert;
 using namespace dcpomatic;