diff --git a/src/event/MaskMonitor.hxx b/src/event/MaskMonitor.hxx
index 0f722b5a9..e402ff804 100644
--- a/src/event/MaskMonitor.hxx
+++ b/src/event/MaskMonitor.hxx
@@ -34,7 +34,7 @@
 class MaskMonitor final {
 	InjectEvent event;
 
-	typedef BoundMethod<void(unsigned) noexcept> Callback;
+	using Callback = BoundMethod<void(unsigned) noexcept>;
 	const Callback callback;
 
 	std::atomic_uint pending_mask;
diff --git a/src/event/SignalMonitor.hxx b/src/event/SignalMonitor.hxx
index 912d357ef..f42bb8020 100644
--- a/src/event/SignalMonitor.hxx
+++ b/src/event/SignalMonitor.hxx
@@ -26,7 +26,7 @@ class EventLoop;
 
 #include "util/BindMethod.hxx"
 
-typedef BoundMethod<void() noexcept> SignalHandler;
+using SignalHandler = BoundMethod<void() noexcept>;
 
 /**
  * Initialise the signal monitor subsystem.
diff --git a/src/event/SocketEvent.hxx b/src/event/SocketEvent.hxx
index 2adc6dd2d..955a37aa1 100644
--- a/src/event/SocketEvent.hxx
+++ b/src/event/SocketEvent.hxx
@@ -75,7 +75,7 @@ public:
 	 */
 	static constexpr unsigned IMPLICIT_FLAGS = ERROR|HANGUP;
 
-	typedef std::make_signed<size_t>::type ssize_t;
+	using ssize_t = std::make_signed<size_t>::type;
 
 	SocketEvent(EventLoop &_loop, Callback _callback,
 		    SocketDescriptor _fd=SocketDescriptor::Undefined()) noexcept