diff --git a/repertory/librepertory/include/types/repertory.hpp b/repertory/librepertory/include/types/repertory.hpp
index 877c58d9..2973a6e3 100644
--- a/repertory/librepertory/include/types/repertory.hpp
+++ b/repertory/librepertory/include/types/repertory.hpp
@@ -23,26 +23,26 @@
 #define INCLUDE_TYPES_REPERTORY_HPP_
 
 namespace repertory {
-constexpr const auto max_time = 0xFFFFFFFFFFFFFFFFULL;
+inline constexpr const auto max_time{0xFFFFFFFFFFFFFFFFULL};
 
-const std::string META_ACCESSED = "accessed";
-const std::string META_ATTRIBUTES = "attributes";
-const std::string META_BACKUP = "backup";
-const std::string META_CHANGED = "changed";
-const std::string META_CREATION = "creation";
-const std::string META_DIRECTORY = "directory";
-const std::string META_GID = "gid";
-const std::string META_KEY = "key";
-const std::string META_MODE = "mode";
-const std::string META_MODIFIED = "modified";
-const std::string META_OSXFLAGS = "flags";
-const std::string META_PINNED = "pinned";
-const std::string META_SIZE = "size";
-const std::string META_SOURCE = "source";
-const std::string META_UID = "uid";
-const std::string META_WRITTEN = "written";
+inline constexpr const std::string META_ACCESSED{"accessed"};
+inline constexpr const std::string META_ATTRIBUTES{"attributes"};
+inline constexpr const std::string META_BACKUP{"backup"};
+inline constexpr const std::string META_CHANGED{"changed"};
+inline constexpr const std::string META_CREATION{"creation"};
+inline constexpr const std::string META_DIRECTORY{"directory"};
+inline constexpr const std::string META_GID{"gid"};
+inline constexpr const std::string META_KEY{"key"};
+inline constexpr const std::string META_MODE{"mode"};
+inline constexpr const std::string META_MODIFIED{"modified"};
+inline constexpr const std::string META_OSXFLAGS{"flags"};
+inline constexpr const std::string META_PINNED{"pinned"};
+inline constexpr const std::string META_SIZE{"size"};
+inline constexpr const std::string META_SOURCE{"source"};
+inline constexpr const std::string META_UID{"uid"};
+inline constexpr const std::string META_WRITTEN{"written"};
 
-const std::vector<std::string> META_USED_NAMES = {
+inline constexpr const std::array<std::string, 16U> META_USED_NAMES = {
     META_ACCESSED, META_ATTRIBUTES, META_BACKUP,   META_CHANGED,
     META_CREATION, META_DIRECTORY,  META_GID,      META_KEY,
     META_MODE,     META_MODIFIED,   META_OSXFLAGS, META_PINNED,