diff --git a/include/async_resolve.hpp b/include/async_resolve.hpp
index ae73dd3..a43cf22 100644
--- a/include/async_resolve.hpp
+++ b/include/async_resolve.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include "dbus_singleton.hpp"
 #include "logging.hpp"
diff --git a/include/async_resp.hpp b/include/async_resp.hpp
index eafaaca..a767af7 100644
--- a/include/async_resp.hpp
+++ b/include/async_resp.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "http_response.hpp"
diff --git a/include/authentication.hpp b/include/authentication.hpp
index b423af2..9bb0351 100644
--- a/include/authentication.hpp
+++ b/include/authentication.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "cookies.hpp"
diff --git a/include/boost_formatters.hpp b/include/boost_formatters.hpp
index 0503d59..8563698 100644
--- a/include/boost_formatters.hpp
+++ b/include/boost_formatters.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include <boost/system/error_code.hpp>
diff --git a/include/cookies.hpp b/include/cookies.hpp
index e66eec8..439dbfb 100644
--- a/include/cookies.hpp
+++ b/include/cookies.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "http_response.hpp"
diff --git a/include/credential_pipe.hpp b/include/credential_pipe.hpp
index 2cc3dc8..5e9153e 100644
--- a/include/credential_pipe.hpp
+++ b/include/credential_pipe.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "logging.hpp"
diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp
index d774a5f..f468cc4 100644
--- a/include/dbus_monitor.hpp
+++ b/include/dbus_monitor.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include "app.hpp"
 #include "async_resp.hpp"
diff --git a/include/dbus_privileges.hpp b/include/dbus_privileges.hpp
index 355f877..ed08797 100644
--- a/include/dbus_privileges.hpp
+++ b/include/dbus_privileges.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "dbus_utility.hpp"
diff --git a/include/dbus_singleton.hpp b/include/dbus_singleton.hpp
index 2448636..2465c01 100644
--- a/include/dbus_singleton.hpp
+++ b/include/dbus_singleton.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include <sdbusplus/asio/connection.hpp>
 
diff --git a/include/dbus_utility.hpp b/include/dbus_utility.hpp
index be7efc2..3a6cfc7 100644
--- a/include/dbus_utility.hpp
+++ b/include/dbus_utility.hpp
@@ -1,18 +1,6 @@
-/*
-Copyright (c) 2018 Intel Corporation
-
-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-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+// SPDX-FileCopyrightText: Copyright 2018 Intel Corporation
 #pragma once
 
 #include "boost_formatters.hpp"
diff --git a/include/duplicatable_file_handle.hpp b/include/duplicatable_file_handle.hpp
index 6d2514e..9532312 100644
--- a/include/duplicatable_file_handle.hpp
+++ b/include/duplicatable_file_handle.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #include <boost/beast/core/file_posix.hpp>
 
 struct DuplicatableFileHandle
diff --git a/include/event_service_store.hpp b/include/event_service_store.hpp
index ffbb389..9dbb91f 100644
--- a/include/event_service_store.hpp
+++ b/include/event_service_store.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include "logging.hpp"
 
diff --git a/include/file_test_utilities.hpp b/include/file_test_utilities.hpp
index bd11a90..73d1359 100644
--- a/include/file_test_utilities.hpp
+++ b/include/file_test_utilities.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include <filesystem>
 #include <string>
diff --git a/include/forward_unauthorized.hpp b/include/forward_unauthorized.hpp
index bc3d609..07fb2b5 100644
--- a/include/forward_unauthorized.hpp
+++ b/include/forward_unauthorized.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include "http_request.hpp"
 #include "http_response.hpp"
diff --git a/include/google/google_service_root.hpp b/include/google/google_service_root.hpp
index 9b7a909..d17ee28 100644
--- a/include/google/google_service_root.hpp
+++ b/include/google/google_service_root.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "app.hpp"
diff --git a/include/hostname_monitor.hpp b/include/hostname_monitor.hpp
index 4eb31f1..cf017f5 100644
--- a/include/hostname_monitor.hpp
+++ b/include/hostname_monitor.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include "dbus_singleton.hpp"
 #include "dbus_utility.hpp"
diff --git a/include/http_utility.hpp b/include/http_utility.hpp
index 681afa1..6a5463d 100644
--- a/include/http_utility.hpp
+++ b/include/http_utility.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include <boost/spirit/home/x3.hpp>
diff --git a/include/human_sort.hpp b/include/human_sort.hpp
index d248cba..a4cdd48 100644
--- a/include/human_sort.hpp
+++ b/include/human_sort.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include <charconv>
diff --git a/include/ibm/management_console_rest.hpp b/include/ibm/management_console_rest.hpp
index 9d6f690..9d5f917 100644
--- a/include/ibm/management_console_rest.hpp
+++ b/include/ibm/management_console_rest.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "app.hpp"
diff --git a/include/ibm/utils.hpp b/include/ibm/utils.hpp
index 31f0a2e..43be7f6 100644
--- a/include/ibm/utils.hpp
+++ b/include/ibm/utils.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "logging.hpp"
diff --git a/include/image_upload.hpp b/include/image_upload.hpp
index 202adc6..4644300 100644
--- a/include/image_upload.hpp
+++ b/include/image_upload.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "app.hpp"
diff --git a/include/json_formatters.hpp b/include/json_formatters.hpp
index ae72a08..e074316 100644
--- a/include/json_formatters.hpp
+++ b/include/json_formatters.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include <nlohmann/json.hpp>
diff --git a/include/json_html_serializer.hpp b/include/json_html_serializer.hpp
index a4bcdcb..95fab04 100644
--- a/include/json_html_serializer.hpp
+++ b/include/json_html_serializer.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "http_response.hpp"
diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp
index fd56da1..a8866e7 100644
--- a/include/kvm_websocket.hpp
+++ b/include/kvm_websocket.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include "app.hpp"
 #include "async_resp.hpp"
diff --git a/include/login_routes.hpp b/include/login_routes.hpp
index 7675066..f322a4c 100644
--- a/include/login_routes.hpp
+++ b/include/login_routes.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "app.hpp"
diff --git a/include/multipart_parser.hpp b/include/multipart_parser.hpp
index 3c60995..19d09f4 100644
--- a/include/multipart_parser.hpp
+++ b/include/multipart_parser.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "http_request.hpp"
diff --git a/include/obmc_console.hpp b/include/obmc_console.hpp
index 15c44de..ee45f3d 100644
--- a/include/obmc_console.hpp
+++ b/include/obmc_console.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include "app.hpp"
 #include "async_resp.hpp"
diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index 1b5bba6..c88fc8d 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -1,18 +1,6 @@
-/*
-Copyright (c) 2018 Intel Corporation
-
-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-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+// SPDX-FileCopyrightText: Copyright 2018 Intel Corporation
 
 #pragma once
 #include "app.hpp"
diff --git a/include/ossl_random.hpp b/include/ossl_random.hpp
index 70e5ed0..440a2c1 100644
--- a/include/ossl_random.hpp
+++ b/include/ossl_random.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "logging.hpp"
diff --git a/include/pam_authenticate.hpp b/include/pam_authenticate.hpp
index 7e970f0..7afe952 100644
--- a/include/pam_authenticate.hpp
+++ b/include/pam_authenticate.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include <security/pam_appl.h>
diff --git a/include/persistent_data.hpp b/include/persistent_data.hpp
index 0cdedcd..5aa5976 100644
--- a/include/persistent_data.hpp
+++ b/include/persistent_data.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "event_service_store.hpp"
diff --git a/include/security_headers.hpp b/include/security_headers.hpp
index f48a22a..590b34b 100644
--- a/include/security_headers.hpp
+++ b/include/security_headers.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "bmcweb_config.h"
diff --git a/include/sessions.hpp b/include/sessions.hpp
index e42542b..17c2278 100644
--- a/include/sessions.hpp
+++ b/include/sessions.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "logging.hpp"
diff --git a/include/ssl_key_handler.hpp b/include/ssl_key_handler.hpp
index 7670bcb..dbc2720 100644
--- a/include/ssl_key_handler.hpp
+++ b/include/ssl_key_handler.hpp
@@ -1,4 +1,5 @@
-
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 
 #pragma once
 
diff --git a/include/str_utility.hpp b/include/str_utility.hpp
index 8ac54b9..12e51f8 100644
--- a/include/str_utility.hpp
+++ b/include/str_utility.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include <algorithm>
diff --git a/include/user_monitor.hpp b/include/user_monitor.hpp
index 73f6303..530b00f 100644
--- a/include/user_monitor.hpp
+++ b/include/user_monitor.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 #include "dbus_singleton.hpp"
 #include "dbus_utility.hpp"
diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp
index 56a0d9a..e668960 100644
--- a/include/vm_websocket.hpp
+++ b/include/vm_websocket.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "app.hpp"
diff --git a/include/webassets.hpp b/include/webassets.hpp
index b43366a..075c995 100644
--- a/include/webassets.hpp
+++ b/include/webassets.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include "app.hpp"
diff --git a/include/webroutes.hpp b/include/webroutes.hpp
index ec1bb23..f3a4902 100644
--- a/include/webroutes.hpp
+++ b/include/webroutes.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 #include <boost/container/flat_set.hpp>
diff --git a/include/webserver_run.hpp b/include/webserver_run.hpp
index 300d68d..e083225 100644
--- a/include/webserver_run.hpp
+++ b/include/webserver_run.hpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #pragma once
 
 int run();