diff --git a/src/complete.cpp b/src/complete.cpp
index d67fea1e6..65e98b5de 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -325,7 +325,7 @@ class completer_t {
 
     /// Table of completions conditions that have already been tested and the corresponding test
     /// results.
-    typedef std::unordered_map<wcstring, bool> condition_cache_t;
+    using condition_cache_t = std::unordered_map<wcstring, bool>;
     condition_cache_t condition_cache;
 
     enum complete_type_t { COMPLETE_DEFAULT, COMPLETE_AUTOSUGGEST };
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 778503d64..25335ea75 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -169,7 +169,7 @@ static highlight_role_t get_fallback(highlight_role_t role) {
 /// Returns:
 ///     false: the filesystem is not case insensitive
 ///     true: the file system is case insensitive
-typedef std::unordered_map<wcstring, bool> case_sensitivity_cache_t;
+using case_sensitivity_cache_t = std::unordered_map<wcstring, bool>;
 bool fs_is_case_insensitive(const wcstring &path, int fd,
                             case_sensitivity_cache_t &case_sensitivity_cache) {
     bool result = false;
diff --git a/src/proc.cpp b/src/proc.cpp
index a74584aba..7e30d6201 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -460,7 +460,7 @@ static wcstring truncate_command(const wcstring &cmd) {
 }
 
 /// Format information about job status for the user to look at.
-typedef enum { JOB_STOPPED, JOB_ENDED } job_status_t;
+using job_status_t = enum { JOB_STOPPED, JOB_ENDED };
 static void print_job_status(const job_t *j, job_status_t status) {
     const wchar_t *msg = L"Job %d, '%ls' has ended";  // this is the most common status msg
     if (status == JOB_STOPPED) msg = L"Job %d, '%ls' has stopped";