6 files changed, 33 insertions, 25 deletions
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index b755d8f2..7fbf9bdc 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -25,6 +25,7 @@
 
 #include <cstdint>
 #include <list>
+#include <memory>
 
 namespace ingen {
 namespace server {
@@ -57,13 +58,13 @@ public:
 private:
 	void build_child_events();
 
-	const Raul::Path       _path;
-	Properties             _properties;
-	ClientUpdate           _update;
-	GraphImpl*             _graph;
-	GraphImpl*             _parent;
-	MPtr<CompiledGraph>    _compiled_graph;
-	std::list<UPtr<Event>> _child_events;
+	const Raul::Path                  _path;
+	Properties                        _properties;
+	ClientUpdate                      _update;
+	GraphImpl*                        _graph;
+	GraphImpl*                        _parent;
+	MPtr<CompiledGraph>               _compiled_graph;
+	std::list<std::unique_ptr<Event>> _child_events;
 };
 
 } // namespace events
diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp
index f4ad278b..c556bbd9 100644
--- a/src/server/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -25,6 +25,7 @@
 
 #include <cstdint>
 #include <map>
+#include <memory>
 #include <utility>
 #include <vector>
 
@@ -61,16 +62,16 @@ private:
 	using IndexChange  = std::pair<uint32_t, uint32_t>;
 	using IndexChanges = std::map<Raul::Path, IndexChange>;
 
-	const ingen::Del        _msg;
-	Raul::Path              _path;
-	SPtr<BlockImpl>         _block; ///< Non-null iff a block
-	SPtr<DuplexPort>        _port; ///< Non-null iff a port
-	EnginePort*             _engine_port;
-	MPtr<GraphImpl::Ports>  _ports_array; ///< New (external) ports for Graph
-	MPtr<CompiledGraph>     _compiled_graph; ///< Graph's new process order
-	UPtr<DisconnectAll>     _disconnect_event;
-	Store::Objects          _removed_objects;
-	IndexChanges            _port_index_changes;
+	const ingen::Del               _msg;
+	Raul::Path                     _path;
+	SPtr<BlockImpl>                _block; ///< Non-null iff a block
+	SPtr<DuplexPort>               _port; ///< Non-null iff a port
+	EnginePort*                    _engine_port;
+	MPtr<GraphImpl::Ports>         _ports_array; ///< New (external) ports for Graph
+	MPtr<CompiledGraph>            _compiled_graph; ///< Graph's new process order
+	std::unique_ptr<DisconnectAll> _disconnect_event;
+	Store::Objects                 _removed_objects;
+	IndexChanges                   _port_index_changes;
 
 	std::vector<ControlBindings::Binding*> _removed_bindings;
 };
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index b5559d84..c4199262 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <memory>
 #include <vector>
 
 namespace ingen {
@@ -95,11 +96,11 @@ private:
 		LOADED_BUNDLE
 	};
 
-	using SetEvents = std::vector<UPtr<SetPortValue>>;
+	using SetEvents = std::vector<std::unique_ptr<SetPortValue>>;
 
 	void init();
 
-	UPtr<Event>               _create_event;
+	std::unique_ptr<Event>    _create_event;
 	SetEvents                 _set_events;
 	std::vector<SpecialType>  _types;
 	std::vector<SpecialType>  _remove_types;
diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index 4b5f6aea..d6a455c8 100644
--- a/src/server/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -22,6 +22,8 @@
 #include "PortImpl.hpp"
 #include "types.hpp"
 
+#include <memory>
+
 namespace ingen {
 namespace server {
 
@@ -67,7 +69,7 @@ public:
 private:
 	const ingen::Disconnect _msg;
 	GraphImpl*              _graph;
-	UPtr<Impl>              _impl;
+	std::unique_ptr<Impl>   _impl;
 	MPtr<CompiledGraph>     _compiled_graph;
 };
 
diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp
index 103c5b3c..d7eb1804 100644
--- a/src/server/events/Mark.cpp
+++ b/src/server/events/Mark.cpp
@@ -20,6 +20,7 @@
 #include "PreProcessContext.hpp"
 #include "UndoStack.hpp"
 
+#include <memory>
 #include <utility>
 
 namespace ingen {
@@ -47,9 +48,9 @@ Mark::Mark(Engine&                 engine,
 void
 Mark::mark(PreProcessContext&)
 {
-	const UPtr<UndoStack>& stack = ((_mode == Mode::UNDO)
-	                                ? _engine.redo_stack()
-	                                : _engine.undo_stack());
+	const std::unique_ptr<UndoStack>& stack = ((_mode == Mode::UNDO)
+	                                           ? _engine.redo_stack()
+	                                           : _engine.undo_stack());
 
 	switch (_type) {
 	case Type::BUNDLE_BEGIN:
diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp
index 9a60c15f..c855dbfb 100644
--- a/src/server/events/Undo.cpp
+++ b/src/server/events/Undo.cpp
@@ -46,8 +46,10 @@ Undo::Undo(Engine&                engine,
 bool
 Undo::pre_process(PreProcessContext&)
 {
-	const UPtr<UndoStack>& stack = _is_redo ? _engine.redo_stack() : _engine.undo_stack();
-	const Event::Mode      mode  = _is_redo ? Event::Mode::REDO    : Event::Mode::UNDO;
+	const std::unique_ptr<UndoStack>& stack =
+	    _is_redo ? _engine.redo_stack() : _engine.undo_stack();
+
+	const Event::Mode mode = _is_redo ? Event::Mode::REDO : Event::Mode::UNDO;
 
 	if (stack->empty()) {
 		return Event::pre_process_done(Status::NOT_FOUND);