diff --git a/src/messagecontent/FileComponent.qml b/src/messagecontent/FileComponent.qml
index d236d0322..965426171 100644
--- a/src/messagecontent/FileComponent.qml
+++ b/src/messagecontent/FileComponent.qml
@@ -2,12 +2,13 @@
 // SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-3.0-only
 
+pragma ComponentBehavior: Bound
+
 import QtCore as Core
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 import QtQuick.Dialogs as Dialogs
-import Qt.labs.qmlmodels
 
 import org.kde.coreaddons
 import org.kde.kirigami as Kirigami
diff --git a/src/messagecontent/ReactionComponent.qml b/src/messagecontent/ReactionComponent.qml
index a094b3eac..f6c407f13 100644
--- a/src/messagecontent/ReactionComponent.qml
+++ b/src/messagecontent/ReactionComponent.qml
@@ -2,9 +2,10 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
-import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 
diff --git a/src/settings/EmoticonEditorPage.qml b/src/settings/EmoticonEditorPage.qml
index 6caecb8c3..7a11c3ae7 100644
--- a/src/settings/EmoticonEditorPage.qml
+++ b/src/settings/EmoticonEditorPage.qml
@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+pragma ComponentBehavior: Bound
+
 import QtCore as Core
 import QtQuick
 import QtQuick.Controls as QQC2
diff --git a/src/settings/NeoChatSecurityPage.qml b/src/settings/NeoChatSecurityPage.qml
index ee38844d0..63796e021 100644
--- a/src/settings/NeoChatSecurityPage.qml
+++ b/src/settings/NeoChatSecurityPage.qml
@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
diff --git a/src/settings/NetworkProxyPage.qml b/src/settings/NetworkProxyPage.qml
index 50164f2ea..cb18d81dc 100644
--- a/src/settings/NetworkProxyPage.qml
+++ b/src/settings/NetworkProxyPage.qml
@@ -11,6 +11,8 @@ import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.neochat
 
 FormCard.FormCardPage {
+    id: root
+
     title: i18nc("@title:window", "Proxy")
     property int currentType
     property bool proxyConfigChanged: false
diff --git a/src/timeline/AvatarFlow.qml b/src/timeline/AvatarFlow.qml
index 87fc1119b..e5b0a1200 100644
--- a/src/timeline/AvatarFlow.qml
+++ b/src/timeline/AvatarFlow.qml
@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
diff --git a/src/timeline/MessageDelegate.qml b/src/timeline/MessageDelegate.qml
index bdc6a4418..7f501924e 100644
--- a/src/timeline/MessageDelegate.qml
+++ b/src/timeline/MessageDelegate.qml
@@ -3,8 +3,6 @@
 
 import QtQuick
 import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-import Qt.labs.qmlmodels
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents