diff --git a/application/argumentparser.h b/application/argumentparser.h
index dd4df22..f79e63f 100644
--- a/application/argumentparser.h
+++ b/application/argumentparser.h
@@ -54,9 +54,9 @@ class Argument;
 class ArgumentParser;
 class ArgumentReader;
 
-typedef std::initializer_list<Argument *> ArgumentInitializerList;
-typedef std::vector<Argument *> ArgumentVector;
-typedef std::function<bool(Argument *)> ArgumentPredicate;
+using ArgumentInitializerList = std::initializer_list<Argument *>;
+using ArgumentVector = std::vector<Argument *>;
+using ArgumentPredicate = std::function<bool(Argument *)>;
 
 /*!
  * \brief The UnknownArgumentBehavior enum specifies the behavior of the argument parser when an unknown
diff --git a/conversion/stringconversion.h b/conversion/stringconversion.h
index 8e3f8e1..a99ba75 100644
--- a/conversion/stringconversion.h
+++ b/conversion/stringconversion.h
@@ -35,8 +35,8 @@ struct CPP_UTILITIES_EXPORT StringDataDeleter {
 /*!
  * \brief Type used to return string encoding conversion result.
  */
-typedef std::pair<std::unique_ptr<char[], StringDataDeleter>, std::size_t> StringData;
-//typedef std::pair<std::unique_ptr<char>, std::size_t> StringData; // might work too
+using StringData = std::pair<std::unique_ptr<char[], StringDataDeleter>, std::size_t>;
+//using StringData = std::pair<std::unique_ptr<char>, std::size_t>; // might work too
 
 CPP_UTILITIES_EXPORT StringData convertString(
     const char *fromCharset, const char *toCharset, const char *inputBuffer, std::size_t inputBufferSize, float outputBufferSizeFactor = 1.0f);