diff --git a/src/http2.h b/src/http2.h
index 5749dade..9b7bf94b 100644
--- a/src/http2.h
+++ b/src/http2.h
@@ -61,7 +61,7 @@ struct Header {
   bool no_index;
 };
 
-typedef std::vector<Header> Headers;
+using Headers = std::vector<Header>;
 
 namespace http2 {
 
diff --git a/src/shrpx_downstream_queue.h b/src/shrpx_downstream_queue.h
index d327a05f..de06d33e 100644
--- a/src/shrpx_downstream_queue.h
+++ b/src/shrpx_downstream_queue.h
@@ -58,7 +58,7 @@ public:
     HostEntry();
   };
 
-  typedef std::map<std::string, HostEntry> HostEntryMap;
+  using HostEntryMap = std::map<std::string, HostEntry>;
 
   // conn_max_per_host == 0 means no limit for downstream connection.
   DownstreamQueue(size_t conn_max_per_host = 0, bool unified_host = true);