diff --git a/include/ticcutils/CommandLine.h b/include/ticcutils/CommandLine.h
index 989a4ed..e5bf190 100644
--- a/include/ticcutils/CommandLine.h
+++ b/include/ticcutils/CommandLine.h
@@ -107,7 +107,7 @@ namespace TiCC {
   class CL_Options {
     friend std::ostream& operator<<( std::ostream&, const CL_Options& );
   public:
-    typedef std::vector<CL_item>::const_iterator const_iterator;
+    using const_iterator = std::vector<CL_item>::const_iterator;
     CL_Options();
     CL_Options( const std::string&, const std::string& );
     void allow_args( const std::string& = "", const std::string& = "" );
diff --git a/include/ticcutils/Configuration.h b/include/ticcutils/Configuration.h
index 3329b0e..b6ef9f3 100644
--- a/include/ticcutils/Configuration.h
+++ b/include/ticcutils/Configuration.h
@@ -46,8 +46,8 @@ namespace TiCC {
   /// There is an implicit \b global section when the section is unnamed.
   class Configuration {
   public:
-    typedef std::map<std::string,std::string> ssMap;
-    typedef std::map<std::string, ssMap> sssMap;
+    using ssMap = std::map<std::string,std::string>;
+    using sssMap = std::map<std::string, ssMap>;
     Configuration();
     void merge( const Configuration&, bool = false );
     bool fill( const std::string& );
diff --git a/include/ticcutils/LogBuffer.h b/include/ticcutils/LogBuffer.h
index e6d207d..2186183 100644
--- a/include/ticcutils/LogBuffer.h
+++ b/include/ticcutils/LogBuffer.h
@@ -82,9 +82,7 @@ template <class charT, class traits = std::char_traits<charT> >
   basic_log_buffer& operator=( const basic_log_buffer& ) = delete;
 };
 
-typedef basic_log_buffer<char, std::char_traits<char> > LogBuffer;
-typedef basic_log_buffer<wchar_t, std::char_traits<wchar_t> > wLogBuffer;
-
+using LogBuffer = basic_log_buffer<char, std::char_traits<char>>;
 
 template <class charT, class traits >
 basic_log_buffer<charT,traits>::~basic_log_buffer(){