diff --git a/client/browseZeroConf/browse_bonjour.cpp b/client/browseZeroConf/browse_bonjour.cpp
index 61851be1..490fc920 100644
--- a/client/browseZeroConf/browse_bonjour.cpp
+++ b/client/browseZeroConf/browse_bonjour.cpp
@@ -27,7 +27,7 @@ struct DNSServiceRefDeleter
     }
 };
 
-typedef std::unique_ptr<DNSServiceRef, DNSServiceRefDeleter> DNSServiceHandle;
+using DNSServiceHandle = std::unique_ptr<DNSServiceRef, DNSServiceRefDeleter>;
 
 string BonjourGetError(DNSServiceErrorType error)
 {
diff --git a/client/browseZeroConf/browse_mdns.hpp b/client/browseZeroConf/browse_mdns.hpp
index 85912bfc..685366e3 100644
--- a/client/browseZeroConf/browse_mdns.hpp
+++ b/client/browseZeroConf/browse_mdns.hpp
@@ -28,10 +28,10 @@ public:
 
 #if defined(HAS_AVAHI)
 #include "browse_avahi.hpp"
-typedef BrowseAvahi BrowseZeroConf;
+using BrowseZeroConf = BrowseAvahi;
 #elif defined(HAS_BONJOUR)
 #include "browse_bonjour.hpp"
-typedef BrowseBonjour BrowseZeroConf;
+using BrowseZeroConf = BrowseBonjour;
 #endif
 
 #endif
diff --git a/client/player/oboe_player.hpp b/client/player/oboe_player.hpp
index 70101bf7..1f170abb 100644
--- a/client/player/oboe_player.hpp
+++ b/client/player/oboe_player.hpp
@@ -24,12 +24,10 @@
 
 #include "player.hpp"
 
-typedef int (*AndroidAudioCallback)(short* buffer, int num_samples);
 
-
-/// OpenSL Audio Player
+/// Android Oboe Audio Player
 /**
- * Player implementation for Oboe
+ * Player implementation for Android Oboe
  */
 class OboePlayer : public Player, public oboe::AudioStreamCallback
 {
diff --git a/server/config.hpp b/server/config.hpp
index c576780f..ac982c92 100644
--- a/server/config.hpp
+++ b/server/config.hpp
@@ -35,8 +35,8 @@ using json = nlohmann::json;
 struct ClientInfo;
 struct Group;
 
-typedef std::shared_ptr<ClientInfo> ClientInfoPtr;
-typedef std::shared_ptr<Group> GroupPtr;
+using ClientInfoPtr = std::shared_ptr<ClientInfo>;
+using GroupPtr = std::shared_ptr<Group>;
 
 
 template <typename T>
diff --git a/server/publishZeroConf/publish_mdns.hpp b/server/publishZeroConf/publish_mdns.hpp
index 35de2e95..de673bdd 100644
--- a/server/publishZeroConf/publish_mdns.hpp
+++ b/server/publishZeroConf/publish_mdns.hpp
@@ -35,10 +35,10 @@ protected:
 
 #if defined(HAS_AVAHI)
 #include "publish_avahi.hpp"
-typedef PublishAvahi PublishZeroConf;
+using PublishZeroConf = PublishAvahi;
 #elif defined(HAS_BONJOUR)
 #include "publish_bonjour.hpp"
-typedef PublishBonjour PublishZeroConf;
+using PublishZeroConf = PublishBonjour;
 #endif
 
 #endif
diff --git a/server/stream_session.hpp b/server/stream_session.hpp
index d5b4f3c3..f45e1668 100644
--- a/server/stream_session.hpp
+++ b/server/stream_session.hpp
@@ -79,8 +79,8 @@ public:
     }
 
     // Implement the ConstBufferSequence requirements.
-    typedef boost::asio::const_buffer value_type;
-    typedef const boost::asio::const_buffer* const_iterator;
+    using value_type = boost::asio::const_buffer;
+    using const_iterator = const boost::asio::const_buffer*;
     const boost::asio::const_buffer* begin() const
     {
         return &buffer_;
diff --git a/server/streamreader/airplay_stream.cpp b/server/streamreader/airplay_stream.cpp
index 7763aea8..bb2de7c3 100644
--- a/server/streamreader/airplay_stream.cpp
+++ b/server/streamreader/airplay_stream.cpp
@@ -34,7 +34,7 @@ namespace
 {
 string hex2str(string input)
 {
-    typedef unsigned char byte;
+    using byte = unsigned char;
     unsigned long x = strtoul(input.c_str(), nullptr, 16);
     byte a[] = {byte(x >> 24), byte(x >> 16), byte(x >> 8), byte(x), 0};
     return string((char*)a);