9 files changed, 58 insertions, 51 deletions
diff --git a/src/VBox/ExtPacks/VBoxDTrace/.scm-settings b/src/VBox/ExtPacks/VBoxDTrace/.scm-settings
index d47525142bf..ab1181a2d4f 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/.scm-settings
+++ b/src/VBox/ExtPacks/VBoxDTrace/.scm-settings
@@ -4,15 +4,16 @@
 #
 
 #
-# Copyright (C) 2010-2022 Oracle Corporation
+# Copyright (C) 2010-2022 Oracle and/or its affiliates.
 #
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the Common
+# This file is part of VirtualBox base platform packages, as
+# available from http://www.virtualbox.org.
+#
+# The contents of this file are subject to the terms of the Common
 # Development and Distribution License Version 1.0 (CDDL) only, as it
-# comes in the "COPYING.CDDL" file of the VirtualBox OSE distribution.
-# VirtualBox OSE is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY of any kind.
+# comes in the "COPYING.CDDL" file of the VirtualBox distribution.
+#
+# SPDX-License-Identifier: CDDL-1.0
 #
 
 
diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
index 39c2db6cfc0..26ac3c9fe2d 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
@@ -6,15 +6,16 @@
 #
 
 #
-# Copyright (C) 2012-2022 Oracle Corporation
+# Copyright (C) 2012-2022 Oracle and/or its affiliates.
 #
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the Common
+# This file is part of VirtualBox base platform packages, as
+# available from http://www.virtualbox.org.
+#
+# The contents of this file are subject to the terms of the Common
 # Development and Distribution License Version 1.0 (CDDL) only, as it
-# comes in the "COPYING.CDDL" file of the VirtualBox OSE distribution.
-# VirtualBox OSE is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY of any kind.
+# comes in the "COPYING.CDDL" file of the VirtualBox distribution.
+#
+# SPDX-License-Identifier: CDDL-1.0
 #
 
 SUB_DEPTH = ../../../../
diff --git a/src/VBox/ExtPacks/VBoxDTrace/Samples/Hello.d b/src/VBox/ExtPacks/VBoxDTrace/Samples/Hello.d
index 51afa319664..778eadfed89 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/Samples/Hello.d
+++ b/src/VBox/ExtPacks/VBoxDTrace/Samples/Hello.d
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2022 Oracle Corporation
+ * Copyright (C) 2010-2022 Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp
index 8dca324e322..3a4062197b3 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp
+++ b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2022 Oracle Corporation
+ * Copyright (C) 2010-2022 Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp
index 411ce9db423..2c7bfd28a91 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp
+++ b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp
@@ -6,15 +6,16 @@
  */
 
 /*
- * Copyright (C) 2012-2022 Oracle Corporation
+ * Copyright (C) 2012-2022 Oracle and/or its affiliates.
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the Common
+ * This file is part of VirtualBox base platform packages, as
+ * available from http://www.virtualbox.org.
+ *
+ * The contents of this file are subject to the terms of the Common
  * Development and Distribution License Version 1.0 (CDDL) only, as it
- * comes in the "COPYING.CDDL" file of the VirtualBox OSE distribution.
- * VirtualBox OSE is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY of any kind.
+ * comes in the "COPYING.CDDL" file of the VirtualBox distribution.
+ *
+ * SPDX-License-Identifier: CDDL-1.0
  */
 
 
diff --git a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
index b8cd25661c2..2f1a5fccaa5 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
+++ b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
@@ -6,15 +6,16 @@
 ;
 
 ;
-; Copyright (C) 2012-2022 Oracle Corporation
+; Copyright (C) 2012-2022 Oracle and/or its affiliates.
 ;
-; This file is part of VirtualBox Open Source Edition (OSE), as
-; available from http://www.virtualbox.org. This file is free software;
-; you can redistribute it and/or modify it under the terms of the Common
+; This file is part of VirtualBox base platform packages, as
+; available from http://www.virtualbox.org.
+;
+; The contents of this file are subject to the terms of the Common
 ; Development and Distribution License Version 1.0 (CDDL) only, as it
-; comes in the "COPYING.CDDL" file of the VirtualBox OSE distribution.
-; VirtualBox OSE is distributed in the hope that it will be useful, but
-; WITHOUT ANY WARRANTY of any kind.
+; comes in the "COPYING.CDDL" file of the VirtualBox distribution.
+;
+; SPDX-License-Identifier: CDDL-1.0
 ;
 
 
diff --git a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp
index 218ae76e53e..ed2ca3ef3f5 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp
+++ b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp
@@ -5,15 +5,16 @@
  */
 
 /*
- * Copyright (C) 2016-2022 Oracle Corporation
+ * Copyright (C) 2016-2022 Oracle and/or its affiliates.
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the Common
+ * This file is part of VirtualBox base platform packages, as
+ * available from http://www.virtualbox.org.
+ *
+ * The contents of this file are subject to the terms of the Common
  * Development and Distribution License Version 1.0 (CDDL) only, as it
- * comes in the "COPYING.CDDL" file of the VirtualBox OSE distribution.
- * VirtualBox OSE is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY of any kind.
+ * comes in the "COPYING.CDDL" file of the VirtualBox distribution.
+ *
+ * SPDX-License-Identifier: CDDL-1.0
  */
 
 
diff --git a/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h b/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h
index 8828c6f16ef..8e78664bef6 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h
+++ b/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h
@@ -6,15 +6,16 @@
  */
 
 /*
- * Copyright (C) 2012-2022 Oracle Corporation
+ * Copyright (C) 2012-2022 Oracle and/or its affiliates.
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the Common
+ * This file is part of VirtualBox base platform packages, as
+ * available from http://www.virtualbox.org.
+ *
+ * The contents of this file are subject to the terms of the Common
  * Development and Distribution License Version 1.0 (CDDL) only, as it
- * comes in the "COPYING.CDDL" file of the VirtualBox OSE distribution.
- * VirtualBox OSE is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY of any kind.
+ * comes in the "COPYING.CDDL" file of the VirtualBox distribution.
+ *
+ * SPDX-License-Identifier: CDDL-1.0
  */
 
 #ifndef VBOX_INCLUDED_SRC_VBoxDTrace_include_VBoxDTraceLibCWrappers_h
diff --git a/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h b/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h
index 09646ee61c9..00ce75b22b4 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h
+++ b/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h
@@ -7,15 +7,16 @@
  */
 
 /*
- * Copyright (C) 2012-2022 Oracle Corporation
+ * Copyright (C) 2012-2022 Oracle and/or its affiliates.
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the Common
+ * This file is part of VirtualBox base platform packages, as
+ * available from http://www.virtualbox.org.
+ *
+ * The contents of this file are subject to the terms of the Common
  * Development and Distribution License Version 1.0 (CDDL) only, as it
- * comes in the "COPYING.CDDL" file of the VirtualBox OSE distribution.
- * VirtualBox OSE is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY of any kind.
+ * comes in the "COPYING.CDDL" file of the VirtualBox distribution.
+ *
+ * SPDX-License-Identifier: CDDL-1.0
  */
 
 #ifndef VBOX_INCLUDED_SRC_VBoxDTrace_include_VBoxDTraceTypes_h