diff --git a/kernel/include/fs/sysfs.hpp b/kernel/include/fs/sysfs.hpp
index c1a55838..c280a1c7 100644
--- a/kernel/include/fs/sysfs.hpp
+++ b/kernel/include/fs/sysfs.hpp
@@ -37,8 +37,8 @@ public:
     size_t rm(const path& file_path);
 };
 
-typedef std::string (*dynamic_fun_t)();
-typedef std::string (*dynamic_fun_data_t)(void* data);
+using dynamic_fun_t = std::string (*)();
+using dynamic_fun_data_t = std::string (*)(void*);
 
 void set_constant_value(const path& mount_point, const path& file_path, const std::string& value);
 void set_dynamic_value(const path& mount_point, const path& file_path, dynamic_fun_t fun);
diff --git a/tstl/include/pair.hpp b/tstl/include/pair.hpp
index 089de4f3..d1a2aa60 100644
--- a/tstl/include/pair.hpp
+++ b/tstl/include/pair.hpp
@@ -13,8 +13,8 @@ namespace std {
 template<typename T1, typename T2>
 class pair {
 public:
-    typedef T1 first_type;
-    typedef T2 second_type;
+    using first_type  = T1;
+    using second_type = T2;
 
     first_type first;
     second_type second;
diff --git a/tstl/include/unique_ptr.hpp b/tstl/include/unique_ptr.hpp
index 2282aac3..be566417 100644
--- a/tstl/include/unique_ptr.hpp
+++ b/tstl/include/unique_ptr.hpp
@@ -41,12 +41,12 @@ struct default_delete<T[]> {
 template <typename T, typename D = default_delete<T>>
 class unique_ptr {
 public:
-    typedef T* pointer_type;
-    typedef T element_type;
-    typedef D deleter_type;
+    using pointer_type = T*;
+    using element_type = T;
+    using deleter_type = D;
 
 private:
-    typedef tuple<pointer_type, deleter_type> data_impl;
+    using data_impl = tuple<pointer_type, deleter_type>;
 
     data_impl _data;
 
@@ -121,12 +121,12 @@ public:
 template <typename T, typename D>
 class unique_ptr<T[], D> {
 public:
-    typedef T* pointer_type;
-    typedef T element_type;
-    typedef D deleter_type;
+    using pointer_type = T*;
+    using element_type = T;
+    using deleter_type = D;
 
 private:
-    typedef tuple<pointer_type, deleter_type> data_impl;
+    using data_impl = tuple<pointer_type, deleter_type>;
 
     data_impl _data;