diff --git a/src/lib/arch/IArchMultithread.h b/src/lib/arch/IArchMultithread.h
index cc935b519..649f0feb4 100644
--- a/src/lib/arch/IArchMultithread.h
+++ b/src/lib/arch/IArchMultithread.h
@@ -61,7 +61,7 @@ class IArchMultithread : public IInterface
 {
 public:
   //! Type of thread entry point
-  typedef void *(*ThreadFunc)(void *);
+  using ThreadFunc = void *(*)(void *);
   //! Type of thread identifier
   using ThreadID = unsigned int;
   //! Types of signals
@@ -78,7 +78,7 @@ public:
     kNUM_SIGNALS
   };
   //! Type of signal handler function
-  typedef void (*SignalFunc)(ESignal, void *userData);
+  using SignalFunc = void (*)(ESignal, void *userData);
 
   //! @name manipulators
   //@{
diff --git a/src/lib/client/ServerProxy.h b/src/lib/client/ServerProxy.h
index 6b4411b89..771d6dba2 100644
--- a/src/lib/client/ServerProxy.h
+++ b/src/lib/client/ServerProxy.h
@@ -103,7 +103,7 @@ private:
   void checkMissedLanguages() const;
 
 private:
-  typedef EResult (ServerProxy::*MessageParser)(const uint8_t *);
+  using MessageParser = EResult (ServerProxy::*)(const uint8_t *);
 
   Client *m_client;
   deskflow::IStream *m_stream;
diff --git a/src/lib/deskflow/IApp.h b/src/lib/deskflow/IApp.h
index f79b7bd7d..45e18ad19 100644
--- a/src/lib/deskflow/IApp.h
+++ b/src/lib/deskflow/IApp.h
@@ -9,7 +9,7 @@
 
 #include "common/IInterface.h"
 
-typedef int (*StartupFunc)(int, char **);
+using StartupFunc = int (*)(int, char **);
 
 namespace deskflow {
 class ArgsBase;
diff --git a/src/lib/deskflow/KeyMap.h b/src/lib/deskflow/KeyMap.h
index 22a21cd78..6dcd1eee1 100644
--- a/src/lib/deskflow/KeyMap.h
+++ b/src/lib/deskflow/KeyMap.h
@@ -117,7 +117,7 @@ public:
   using ButtonToKeyMap = std::map<KeyButton, const KeyItem *>;
 
   //! Callback type for \c foreachKey
-  typedef void (*ForeachKeyCallback)(KeyID, int32_t group, KeyItem &, void *userData);
+  using ForeachKeyCallback = void (*)(KeyID, int32_t group, KeyItem &, void *userData);
 
   //! @name manipulators
   //@{
diff --git a/src/lib/net/TSocketMultiplexerMethodJob.h b/src/lib/net/TSocketMultiplexerMethodJob.h
index f8ad8c25b..de2bc536a 100644
--- a/src/lib/net/TSocketMultiplexerMethodJob.h
+++ b/src/lib/net/TSocketMultiplexerMethodJob.h
@@ -17,7 +17,7 @@ A socket multiplexer job class that invokes a member function.
 template <class T> class TSocketMultiplexerMethodJob : public ISocketMultiplexerJob
 {
 public:
-  typedef ISocketMultiplexerJob *(T::*Method)(ISocketMultiplexerJob *, bool, bool, bool);
+  using Method = ISocketMultiplexerJob *(T::*)(ISocketMultiplexerJob *, bool, bool, bool);
 
   //! run() invokes \c object->method(arg)
   TSocketMultiplexerMethodJob(T *object, Method method, ArchSocket socket, bool readable, bool writeable);
diff --git a/src/lib/platform/XWindowsUtil.h b/src/lib/platform/XWindowsUtil.h
index 9e14eb1a8..74386cb0b 100644
--- a/src/lib/platform/XWindowsUtil.h
+++ b/src/lib/platform/XWindowsUtil.h
@@ -23,7 +23,7 @@
 class XWindowsUtil
 {
 public:
-  typedef std::vector<KeySym> KeySyms;
+  using KeySyms = std::vector<KeySym>;
 
   //! Get property
   /*!
@@ -120,7 +120,7 @@ public:
   {
   public:
     //! Error handler type
-    typedef void (*ErrorHandler)(Display *, XErrorEvent *, void *userData);
+    using ErrorHandler = void (*)(Display *, XErrorEvent *, void *userData);
 
     /*!
     Ignore X11 errors.
@@ -151,7 +151,7 @@ public:
     static void saveHandler(Display *, XErrorEvent *, void *);
 
   private:
-    typedef int (*XErrorHandler)(Display *, XErrorEvent *);
+    using XErrorHandler = int (*)(Display *, XErrorEvent *);
 
     Display *m_display;
     ErrorHandler m_handler;
@@ -174,7 +174,7 @@ private:
   static void initKeyMaps();
 
 private:
-  typedef std::map<KeySym, uint32_t> KeySymMap;
+  using KeySymMap = std::map<KeySym, uint32_t>;
 
   static KeySymMap s_keySymToUCS4;
 };
diff --git a/src/lib/server/ClientProxy1_0.h b/src/lib/server/ClientProxy1_0.h
index e7af64629..69937862f 100644
--- a/src/lib/server/ClientProxy1_0.h
+++ b/src/lib/server/ClientProxy1_0.h
@@ -92,7 +92,7 @@ protected:
   ClientClipboard m_clipboard[kClipboardEnd];
 
 private:
-  typedef bool (ClientProxy1_0::*MessageParser)(const uint8_t *);
+  using MessageParser = bool (ClientProxy1_0::*)(const uint8_t *);
 
   ClientInfo m_info;
   double m_heartbeatAlarm;