diff --git a/source/blender/draw/engines/eevee_next/eevee_volume.cc b/source/blender/draw/engines/eevee_next/eevee_volume.cc
index 9cda42447b3..a60dc76480c 100644
--- a/source/blender/draw/engines/eevee_next/eevee_volume.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_volume.cc
@@ -1,4 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-FileCopyrightText: 2023 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 /** \file
  * \ingroup draw_engine
diff --git a/source/blender/draw/engines/eevee_next/eevee_volume.hh b/source/blender/draw/engines/eevee_next/eevee_volume.hh
index e520c7c716b..3a8aaf53c99 100644
--- a/source/blender/draw/engines/eevee_next/eevee_volume.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_volume.hh
@@ -1,4 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-FileCopyrightText: 2023 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 /** \file
  * \ingroup draw_engine
diff --git a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_volume_info.hh b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_volume_info.hh
index 0f1cf9ff4c9..64b67cfc78b 100644
--- a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_volume_info.hh
+++ b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_volume_info.hh
@@ -1,4 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-FileCopyrightText: 2023 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "gpu_shader_create_info.hh"
 
diff --git a/source/blender/io/usd/hydra/camera.cc b/source/blender/io/usd/hydra/camera.cc
index 6304f8549f0..2a178f42968 100644
--- a/source/blender/io/usd/hydra/camera.cc
+++ b/source/blender/io/usd/hydra/camera.cc
@@ -1,4 +1,5 @@
 /* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "camera.h"
diff --git a/source/blender/io/usd/hydra/camera.h b/source/blender/io/usd/hydra/camera.h
index be45386821d..f0d3c86c400 100644
--- a/source/blender/io/usd/hydra/camera.h
+++ b/source/blender/io/usd/hydra/camera.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/curves.cc b/source/blender/io/usd/hydra/curves.cc
index 7cbe64dabe1..0dc9fb6c0e8 100644
--- a/source/blender/io/usd/hydra/curves.cc
+++ b/source/blender/io/usd/hydra/curves.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "curves.h"
 
diff --git a/source/blender/io/usd/hydra/curves.h b/source/blender/io/usd/hydra/curves.h
index d38789a7c4e..d3d79564d56 100644
--- a/source/blender/io/usd/hydra/curves.h
+++ b/source/blender/io/usd/hydra/curves.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/hydra_scene_delegate.cc b/source/blender/io/usd/hydra/hydra_scene_delegate.cc
index e2e3b47de4c..e4415bf8432 100644
--- a/source/blender/io/usd/hydra/hydra_scene_delegate.cc
+++ b/source/blender/io/usd/hydra/hydra_scene_delegate.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "hydra_scene_delegate.h"
 
diff --git a/source/blender/io/usd/hydra/hydra_scene_delegate.h b/source/blender/io/usd/hydra/hydra_scene_delegate.h
index 719d77f4c87..641c55848f4 100644
--- a/source/blender/io/usd/hydra/hydra_scene_delegate.h
+++ b/source/blender/io/usd/hydra/hydra_scene_delegate.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/id.cc b/source/blender/io/usd/hydra/id.cc
index 5e4f93a6e61..6edefd06bd4 100644
--- a/source/blender/io/usd/hydra/id.cc
+++ b/source/blender/io/usd/hydra/id.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "id.h"
 
diff --git a/source/blender/io/usd/hydra/id.h b/source/blender/io/usd/hydra/id.h
index 55cff2c42d6..ffd117c51a3 100644
--- a/source/blender/io/usd/hydra/id.h
+++ b/source/blender/io/usd/hydra/id.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/image.cc b/source/blender/io/usd/hydra/image.cc
index a56a2b14412..7ff9852b85a 100644
--- a/source/blender/io/usd/hydra/image.cc
+++ b/source/blender/io/usd/hydra/image.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "image.h"
 
diff --git a/source/blender/io/usd/hydra/image.h b/source/blender/io/usd/hydra/image.h
index 05ae39f8f7d..a9331e4cee9 100644
--- a/source/blender/io/usd/hydra/image.h
+++ b/source/blender/io/usd/hydra/image.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/instancer.cc b/source/blender/io/usd/hydra/instancer.cc
index 93c5362cc06..517e7346fcd 100644
--- a/source/blender/io/usd/hydra/instancer.cc
+++ b/source/blender/io/usd/hydra/instancer.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "instancer.h"
 
diff --git a/source/blender/io/usd/hydra/instancer.h b/source/blender/io/usd/hydra/instancer.h
index 34f8079723c..64157772763 100644
--- a/source/blender/io/usd/hydra/instancer.h
+++ b/source/blender/io/usd/hydra/instancer.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/light.cc b/source/blender/io/usd/hydra/light.cc
index 5fcdafb22a8..3794fc13733 100644
--- a/source/blender/io/usd/hydra/light.cc
+++ b/source/blender/io/usd/hydra/light.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "light.h"
 
diff --git a/source/blender/io/usd/hydra/light.h b/source/blender/io/usd/hydra/light.h
index 80c440523fc..f8a4c1e4078 100644
--- a/source/blender/io/usd/hydra/light.h
+++ b/source/blender/io/usd/hydra/light.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/material.cc b/source/blender/io/usd/hydra/material.cc
index e17ac337852..5ad997a0c24 100644
--- a/source/blender/io/usd/hydra/material.cc
+++ b/source/blender/io/usd/hydra/material.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "material.h"
 
diff --git a/source/blender/io/usd/hydra/material.h b/source/blender/io/usd/hydra/material.h
index 7eed26df980..51c9a62a2e3 100644
--- a/source/blender/io/usd/hydra/material.h
+++ b/source/blender/io/usd/hydra/material.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/mesh.cc b/source/blender/io/usd/hydra/mesh.cc
index e13f8458664..f964cc15e16 100644
--- a/source/blender/io/usd/hydra/mesh.cc
+++ b/source/blender/io/usd/hydra/mesh.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <pxr/base/gf/vec2f.h>
 #include <pxr/base/tf/staticTokens.h>
diff --git a/source/blender/io/usd/hydra/mesh.h b/source/blender/io/usd/hydra/mesh.h
index c35ab102b45..e53582a3305 100644
--- a/source/blender/io/usd/hydra/mesh.h
+++ b/source/blender/io/usd/hydra/mesh.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/object.cc b/source/blender/io/usd/hydra/object.cc
index 60146f0597d..321f23fbfd3 100644
--- a/source/blender/io/usd/hydra/object.cc
+++ b/source/blender/io/usd/hydra/object.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "DEG_depsgraph_query.h"
 
diff --git a/source/blender/io/usd/hydra/object.h b/source/blender/io/usd/hydra/object.h
index 69f0b11e67d..c0ef7994268 100644
--- a/source/blender/io/usd/hydra/object.h
+++ b/source/blender/io/usd/hydra/object.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/usd_scene_delegate.cc b/source/blender/io/usd/hydra/usd_scene_delegate.cc
index 173041e3b1a..02f39d36841 100644
--- a/source/blender/io/usd/hydra/usd_scene_delegate.cc
+++ b/source/blender/io/usd/hydra/usd_scene_delegate.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "usd_scene_delegate.h"
 
diff --git a/source/blender/io/usd/hydra/usd_scene_delegate.h b/source/blender/io/usd/hydra/usd_scene_delegate.h
index ffd9a9da3b0..06bb73ad164 100644
--- a/source/blender/io/usd/hydra/usd_scene_delegate.h
+++ b/source/blender/io/usd/hydra/usd_scene_delegate.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2023 Blender Foundation */
+/* SPDX-FileCopyrightText: 2023 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/volume.cc b/source/blender/io/usd/hydra/volume.cc
index fd76e6d121f..792dc627fe6 100644
--- a/source/blender/io/usd/hydra/volume.cc
+++ b/source/blender/io/usd/hydra/volume.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <pxr/imaging/hd/bprim.h>
 #include <pxr/imaging/hd/tokens.h>
diff --git a/source/blender/io/usd/hydra/volume.h b/source/blender/io/usd/hydra/volume.h
index e8d486b343c..6227e2094a4 100644
--- a/source/blender/io/usd/hydra/volume.h
+++ b/source/blender/io/usd/hydra/volume.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/volume_modifier.cc b/source/blender/io/usd/hydra/volume_modifier.cc
index ca07e56318b..1a6be9e6a14 100644
--- a/source/blender/io/usd/hydra/volume_modifier.cc
+++ b/source/blender/io/usd/hydra/volume_modifier.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "volume_modifier.h"
 
diff --git a/source/blender/io/usd/hydra/volume_modifier.h b/source/blender/io/usd/hydra/volume_modifier.h
index 9e96edd1f9b..f6dca8135f6 100644
--- a/source/blender/io/usd/hydra/volume_modifier.h
+++ b/source/blender/io/usd/hydra/volume_modifier.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/io/usd/hydra/world.cc b/source/blender/io/usd/hydra/world.cc
index 6fce64bf1cd..94c428bd2d9 100644
--- a/source/blender/io/usd/hydra/world.cc
+++ b/source/blender/io/usd/hydra/world.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "world.h"
 
diff --git a/source/blender/io/usd/hydra/world.h b/source/blender/io/usd/hydra/world.h
index f8ad274372f..7fbf0daf5ee 100644
--- a/source/blender/io/usd/hydra/world.h
+++ b/source/blender/io/usd/hydra/world.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/render/hydra/engine.cc b/source/blender/render/hydra/engine.cc
index 6310b3611e6..1d4d0bb927b 100644
--- a/source/blender/render/hydra/engine.cc
+++ b/source/blender/render/hydra/engine.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "engine.h"
 
diff --git a/source/blender/render/hydra/engine.h b/source/blender/render/hydra/engine.h
index 7eaf9be36a4..82f56112abd 100644
--- a/source/blender/render/hydra/engine.h
+++ b/source/blender/render/hydra/engine.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/render/hydra/final_engine.cc b/source/blender/render/hydra/final_engine.cc
index e12b24608c1..7cd760ed015 100644
--- a/source/blender/render/hydra/final_engine.cc
+++ b/source/blender/render/hydra/final_engine.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "final_engine.h"
 
diff --git a/source/blender/render/hydra/final_engine.h b/source/blender/render/hydra/final_engine.h
index b61044aa4e5..d9c76317ada 100644
--- a/source/blender/render/hydra/final_engine.h
+++ b/source/blender/render/hydra/final_engine.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/render/hydra/light_tasks_delegate.cc b/source/blender/render/hydra/light_tasks_delegate.cc
index 0f4ef129572..4f954eb05f4 100644
--- a/source/blender/render/hydra/light_tasks_delegate.cc
+++ b/source/blender/render/hydra/light_tasks_delegate.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "light_tasks_delegate.h"
 #include "engine.h"
diff --git a/source/blender/render/hydra/light_tasks_delegate.h b/source/blender/render/hydra/light_tasks_delegate.h
index d1131392d1c..b75a945d83f 100644
--- a/source/blender/render/hydra/light_tasks_delegate.h
+++ b/source/blender/render/hydra/light_tasks_delegate.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/render/hydra/preview_engine.cc b/source/blender/render/hydra/preview_engine.cc
index 43af7f440d7..a2aa4cd684b 100644
--- a/source/blender/render/hydra/preview_engine.cc
+++ b/source/blender/render/hydra/preview_engine.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "preview_engine.h"
 
diff --git a/source/blender/render/hydra/preview_engine.h b/source/blender/render/hydra/preview_engine.h
index 776b8ecd016..11ff0ea2db1 100644
--- a/source/blender/render/hydra/preview_engine.h
+++ b/source/blender/render/hydra/preview_engine.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/render/hydra/python.cc b/source/blender/render/hydra/python.cc
index a415d9f958f..ba4810e7925 100644
--- a/source/blender/render/hydra/python.cc
+++ b/source/blender/render/hydra/python.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "final_engine.h"
 #include "preview_engine.h"
diff --git a/source/blender/render/hydra/render_task_delegate.cc b/source/blender/render/hydra/render_task_delegate.cc
index 72acf99a1bd..e91f425c270 100644
--- a/source/blender/render/hydra/render_task_delegate.cc
+++ b/source/blender/render/hydra/render_task_delegate.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "render_task_delegate.h"
 
diff --git a/source/blender/render/hydra/render_task_delegate.h b/source/blender/render/hydra/render_task_delegate.h
index 36e7b56b0f4..5a8e7004736 100644
--- a/source/blender/render/hydra/render_task_delegate.h
+++ b/source/blender/render/hydra/render_task_delegate.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/source/blender/render/hydra/viewport_engine.cc b/source/blender/render/hydra/viewport_engine.cc
index 9c67b7dd71c..bddd2baa5f3 100644
--- a/source/blender/render/hydra/viewport_engine.cc
+++ b/source/blender/render/hydra/viewport_engine.cc
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "viewport_engine.h"
 
diff --git a/source/blender/render/hydra/viewport_engine.h b/source/blender/render/hydra/viewport_engine.h
index 32d4fa73908..098b15dbaf2 100644
--- a/source/blender/render/hydra/viewport_engine.h
+++ b/source/blender/render/hydra/viewport_engine.h
@@ -1,5 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * SPDX-FileCopyrightText: 2011-2022 Blender Foundation */
+/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
diff --git a/tools/triage/gitea_utils.py b/tools/triage/gitea_utils.py
index ac3eb495791..bffbaffd509 100644
--- a/tools/triage/gitea_utils.py
+++ b/tools/triage/gitea_utils.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
+# SPDX-FileCopyrightText: 2023 Blender Foundation
+#
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# Simple module for inspecting gitea users, pulls and issues
+# Simple module for inspecting GITEA users, pulls and issues.
 
 import json
 import urllib.error
diff --git a/tools/triage/issues_needing_info.py b/tools/triage/issues_needing_info.py
index 5e8fe5b7de6..23606faeda5 100644
--- a/tools/triage/issues_needing_info.py
+++ b/tools/triage/issues_needing_info.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# SPDX-FileCopyrightText: 2023 Blender Foundation
+#
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 """
diff --git a/tools/triage/weekly_report.py b/tools/triage/weekly_report.py
index 918b73515cd..17852931c97 100644
--- a/tools/triage/weekly_report.py
+++ b/tools/triage/weekly_report.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# SPDX-FileCopyrightText: 2023 Blender Foundation
+#
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 """