diff --git a/kernel/Kbuild b/kernel/Kbuild
index 4b76b0d..a83400f 100644
--- a/kernel/Kbuild
+++ b/kernel/Kbuild
@@ -1,5 +1,6 @@
 #
-# Copyright 2020,2022-2023 Arm Limited and/or its affiliates
+# SPDX-FileCopyrightText: Copyright 2020,2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # This program is free software and is provided to you under the terms of the
 # GNU General Public License version 2 as published by the Free Software
@@ -15,8 +16,8 @@
 # along with this program; if not, you can access it online at
 # http://www.gnu.org/licenses/gpl-2.0.html.
 #
-# SPDX-License-Identifier: GPL-2.0-only
-#
+
+ccflags-y += -Werror
 
 obj-$(CONFIG_ETHOSU) = ethosu.o
 
diff --git a/mailbox/Kbuild b/mailbox/Kbuild
index 7476fcb..599988d 100644
--- a/mailbox/Kbuild
+++ b/mailbox/Kbuild
@@ -1,5 +1,6 @@
 #
-# (C) COPYRIGHT 2020 ARM Limited. All rights reserved.
+# SPDX-FileCopyrightText: Copyright 2020,2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # This program is free software and is provided to you under the terms of the
 # GNU General Public License version 2 as published by the Free Software
@@ -15,8 +16,8 @@
 # along with this program; if not, you can access it online at
 # http://www.gnu.org/licenses/gpl-2.0.html.
 #
-# SPDX-License-Identifier: GPL-2.0-only
-#
+
+ccflags-y += -Werror
 
 obj-$(CONFIG_ARM_MHU) += arm_mhu.o
 
diff --git a/remoteproc/Kbuild b/remoteproc/Kbuild
index 8c4a967..ca9919c 100644
--- a/remoteproc/Kbuild
+++ b/remoteproc/Kbuild
@@ -1,5 +1,6 @@
 #
-# Copyright (c) 2020-2022 Arm Limited. All rights reserved.
+# SPDX-FileCopyrightText: Copyright 2020-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # This program is free software and is provided to you under the terms of the
 # GNU General Public License version 2 as published by the Free Software
@@ -15,8 +16,8 @@
 # along with this program; if not, you can access it online at
 # http://www.gnu.org/licenses/gpl-2.0.html.
 #
-# SPDX-License-Identifier: GPL-2.0-only
-#
+
+ccflags-y += -Werror
 
 obj-$(CONFIG_ARM_JUNO_FPGA_RESET) += juno_fpga_reset.o
 obj-$(CONFIG_ARM_ETHOSU_RPROC) += ethosu_remoteproc.o