diff --git a/include/android/hardware/libhardware/include/hardware/camera3.h b/include/android/hardware/libhardware/include/hardware/camera3.h
index 49664dc3c..d89bc9304 100644
--- a/include/android/hardware/libhardware/include/hardware/camera3.h
+++ b/include/android/hardware/libhardware/include/hardware/camera3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2013 The Android Open Source Project
  *
diff --git a/include/android/hardware/libhardware/include/hardware/camera_common.h b/include/android/hardware/libhardware/include/hardware/camera_common.h
index 7658dd406..26df06987 100644
--- a/include/android/hardware/libhardware/include/hardware/camera_common.h
+++ b/include/android/hardware/libhardware/include/hardware/camera_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2012 The Android Open Source Project
  *
diff --git a/include/android/hardware/libhardware/include/hardware/fb.h b/include/android/hardware/libhardware/include/hardware/fb.h
index 9df94165b..9ea9a6e60 100644
--- a/include/android/hardware/libhardware/include/hardware/fb.h
+++ b/include/android/hardware/libhardware/include/hardware/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
diff --git a/include/android/hardware/libhardware/include/hardware/gralloc.h b/include/android/hardware/libhardware/include/hardware/gralloc.h
index ef86f9039..80da4cb8e 100644
--- a/include/android/hardware/libhardware/include/hardware/gralloc.h
+++ b/include/android/hardware/libhardware/include/hardware/gralloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
diff --git a/include/android/hardware/libhardware/include/hardware/hardware.h b/include/android/hardware/libhardware/include/hardware/hardware.h
index 74f57aa4c..10b73df71 100644
--- a/include/android/hardware/libhardware/include/hardware/hardware.h
+++ b/include/android/hardware/libhardware/include/hardware/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
diff --git a/include/android/metadata/camera_metadata_hidden.h b/include/android/metadata/camera_metadata_hidden.h
index 31f1ad19e..91b11e434 100644
--- a/include/android/metadata/camera_metadata_hidden.h
+++ b/include/android/metadata/camera_metadata_hidden.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright 2014 The Android Open Source Project
  *
diff --git a/include/android/metadata/system/camera_metadata.h b/include/android/metadata/system/camera_metadata.h
index 46e7ac000..1672b09ee 100644
--- a/include/android/metadata/system/camera_metadata.h
+++ b/include/android/metadata/system/camera_metadata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2012 The Android Open Source Project
  *
diff --git a/include/android/metadata/system/camera_metadata_tags.h b/include/android/metadata/system/camera_metadata_tags.h
index adf18b8f4..e0f2f5a37 100644
--- a/include/android/metadata/system/camera_metadata_tags.h
+++ b/include/android/metadata/system/camera_metadata_tags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2012 The Android Open Source Project
  *
diff --git a/include/android/metadata/system/camera_vendor_tags.h b/include/android/metadata/system/camera_vendor_tags.h
index 0bb542608..167ff7393 100644
--- a/include/android/metadata/system/camera_vendor_tags.h
+++ b/include/android/metadata/system/camera_vendor_tags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright 2014 The Android Open Source Project
  *
diff --git a/include/android/system/core/include/android/log.h b/include/android/system/core/include/android/log.h
index 1c171b7bf..dbad9dd18 100644
--- a/include/android/system/core/include/android/log.h
+++ b/include/android/system/core/include/android/log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2009 The Android Open Source Project
  *
diff --git a/include/android/system/core/include/cutils/compiler.h b/include/android/system/core/include/cutils/compiler.h
index 70f884a1e..efd1b1c36 100644
--- a/include/android/system/core/include/cutils/compiler.h
+++ b/include/android/system/core/include/cutils/compiler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2009 The Android Open Source Project
  *
diff --git a/include/android/system/core/include/cutils/native_handle.h b/include/android/system/core/include/cutils/native_handle.h
index 268c5d3f5..edd7888fe 100644
--- a/include/android/system/core/include/cutils/native_handle.h
+++ b/include/android/system/core/include/cutils/native_handle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2009 The Android Open Source Project
  *
diff --git a/include/android/system/core/include/system/camera.h b/include/android/system/core/include/system/camera.h
index 5d0873ac4..a1b68d054 100644
--- a/include/android/system/core/include/system/camera.h
+++ b/include/android/system/core/include/system/camera.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2011 The Android Open Source Project
  *
diff --git a/include/android/system/core/include/system/graphics.h b/include/android/system/core/include/system/graphics.h
index afd9f7bdb..909ffe68e 100644
--- a/include/android/system/core/include/system/graphics.h
+++ b/include/android/system/core/include/system/graphics.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2011 The Android Open Source Project
  *
diff --git a/include/android/system/core/include/system/window.h b/include/android/system/core/include/system/window.h
index 508ce00ba..2c9d6063f 100644
--- a/include/android/system/core/include/system/window.h
+++ b/include/android/system/core/include/system/window.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Apache-2.0 */
 /*
  * Copyright (C) 2011 The Android Open Source Project
  *