diff --git a/CMakeLists.txt b/CMakeLists.txt
index cced477b8003fda0c1099bfa8423001ccc6a7662..33b762edbe62d0c7adb622f1d4c3a6da01da2e33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,20 +59,21 @@ target_link_libraries(Vivy PRIVATE lua)
 
 # Headers related things
 target_include_directories(Vivy PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-target_precompile_headers(Vivy
-    PRIVATE
-        # Private Vivy headers
-        ${Vivy_INC}
-
-        # Qt headers
-        <QString>
-        <QList>
-        <QMap>
-        <QWidget>
-        <QIcon>
-
-        # STL headers
-        <memory>
+target_precompile_headers(Vivy PRIVATE
+    # Private Vivy headers
+    ${Vivy_INC}
+
+    # STL headers
+    <memory>
+    <vector>
+
+    # Qt headers
+    <QString>
+    <QList>
+    <QVector>
+    <QMap>
+    <QWidget>
+    <QIcon>
 )
 
 # More options and warnings
diff --git a/src/Lib/Ass/AssFactory.hh b/src/Lib/Ass/AssFactory.hh
index ccd227ee49fe492302e33d385f00efa422e12f12..f21fddb15a6b33a60917b0eb0371b4cd33592599 100644
--- a/src/Lib/Ass/AssFactory.hh
+++ b/src/Lib/Ass/AssFactory.hh
@@ -6,7 +6,7 @@
 #include "Line.hh"
 #include "AssPrivate.hh"
 
-#include <memory.h>
+#include <memory>
 #include <QFile>
 #include <QMap>
 #include <QVariant>
@@ -43,8 +43,8 @@ private:
     static inline const QStringList validSections = { sectionEvents, sectionScriptInfo,
                                                       sectionStyles };
 
-    static inline const QStringList intTypeFields = { "PlayResX", "PlayResY", "WrapStyle" };
-    static inline const QList<QPair<QString, QString>> checkedValues = {
+    static inline const QStringList intTypeFields{ "PlayResX", "PlayResY", "WrapStyle" };
+    static inline const QVector<QPair<QString, QString>> checkedValues{
         { "ScriptType", "v4.00+" },
         { "WrapStyle", "0" },
         // { "YCbCr Matrix", "TV.601" },
diff --git a/src/UI/AbstractDocumentView.hh b/src/UI/AbstractDocumentView.hh
index 0ce9a6e03a4957ca3e9f8b5e3018bff4f3af9b87..e73814ba43fd51bd424095a6378e1d57265dd027 100644
--- a/src/UI/AbstractDocumentView.hh
+++ b/src/UI/AbstractDocumentView.hh
@@ -1,5 +1,4 @@
-#ifndef VIVY_DOCUMENT_VIEW_H
-#define VIVY_DOCUMENT_VIEW_H
+#pragma once
 
 #ifndef __cplusplus
 #error "This is a C++ header"
@@ -56,5 +55,3 @@ private:
     const Type documentType;
 };
 }
-
-#endif // VIVY_DOCUMENT_VIEW_H
diff --git a/src/UI/PropertyModel.cc b/src/UI/PropertyModel.cc
index b32144f0ed5a76a8dce19077f348a5527ad1ed59..47308fa476f236532eaa12078efce9ae338754ea 100644
--- a/src/UI/PropertyModel.cc
+++ b/src/UI/PropertyModel.cc
@@ -79,7 +79,7 @@ PropertyModel::Item::getType() const noexcept
     return type;
 }
 
-const QList<PropertyModel::Item *>
+const QVector<PropertyModel::Item *>
 PropertyModel::Item::getChilds() const noexcept
 {
     return childs;
diff --git a/src/UI/PropertyModel.hh b/src/UI/PropertyModel.hh
index dea2cbca8ceef982d5cbdb7cb09c7899c036717b..c79f0aa831199e4b8726d6adcf37d6c76c734992 100644
--- a/src/UI/PropertyModel.hh
+++ b/src/UI/PropertyModel.hh
@@ -37,7 +37,7 @@ private:
 
         void appendChild(Item *) noexcept;
         Item *getChild(int row) const noexcept;
-        const QList<Item *> getChilds() const noexcept;
+        const QVector<Item *> getChilds() const noexcept;
         Item *getParent() const noexcept;
         int getChildCount() const noexcept;
         int getRow() const noexcept;
@@ -55,7 +55,7 @@ private:
         QString key{};
         QString value{};
         QJsonValue::Type type{ QJsonValue::Null };
-        QList<Item *> childs{};
+        QVector<Item *> childs{};
         Item *parent{ nullptr };
     };