diff --git a/components/cxx/cxx_exception_stubs.cpp b/components/cxx/cxx_exception_stubs.cpp
index 01b6f5884d0..a652ace2e3f 100644
--- a/components/cxx/cxx_exception_stubs.cpp
+++ b/components/cxx/cxx_exception_stubs.cpp
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include <cstdlib>
 #include <cstdio>
 #include <exception>
diff --git a/components/cxx/cxx_guards.cpp b/components/cxx/cxx_guards.cpp
index 8580a26cc96..17d53b27efb 100644
--- a/components/cxx/cxx_guards.cpp
+++ b/components/cxx/cxx_guards.cpp
@@ -1,16 +1,8 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdlib.h>
 #include <assert.h>
diff --git a/components/cxx/test/test_cxx.cpp b/components/cxx/test/test_cxx.cpp
index 03ee89075e3..7050538b15d 100644
--- a/components/cxx/test/test_cxx.cpp
+++ b/components/cxx/test/test_cxx.cpp
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include <vector>
 #include <numeric>
 #include <stdexcept>
diff --git a/components/cxx/test/test_initialization.cpp b/components/cxx/test/test_initialization.cpp
index 6d5ced3061d..3c0a2f5367e 100644
--- a/components/cxx/test/test_initialization.cpp
+++ b/components/cxx/test/test_initialization.cpp
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include <vector>
 #include <numeric>
 #include <stdexcept>
diff --git a/components/cxx/test/test_rtti.cpp b/components/cxx/test/test_rtti.cpp
index c3174c93660..252b9ad8728 100644
--- a/components/cxx/test/test_rtti.cpp
+++ b/components/cxx/test/test_rtti.cpp
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include <typeinfo>
 #include "unity.h"
 
diff --git a/components/cxx/test/test_stack_check_cxx.cpp b/components/cxx/test/test_stack_check_cxx.cpp
index cb6e5a77018..86f179be28d 100644
--- a/components/cxx/test/test_stack_check_cxx.cpp
+++ b/components/cxx/test/test_stack_check_cxx.cpp
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include "unity.h"
 
 #if CONFIG_COMPILER_STACK_CHECK