diff --git a/components/rpc/ts_rpc/caller/linux/ts_rpc_caller_linux.h b/components/rpc/ts_rpc/caller/linux/ts_rpc_caller_linux.h
index 26c6ce8..0ee77c8 100644
--- a/components/rpc/ts_rpc/caller/linux/ts_rpc_caller_linux.h
+++ b/components/rpc/ts_rpc/caller/linux/ts_rpc_caller_linux.h
@@ -7,7 +7,7 @@
 #ifndef TS_RPC_CALLER_LINUX_H
 #define TS_RPC_CALLER_LINUX_H
 
-#include "components/rpc/common/caller/rpc_caller.h"
+#include "rpc_caller.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/service/locator/interface/service_locator.h b/components/service/locator/interface/service_locator.h
index 87f1f0d..ad01ec1 100644
--- a/components/service/locator/interface/service_locator.h
+++ b/components/service/locator/interface/service_locator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2020-2023, Arm Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -7,7 +7,7 @@
 #ifndef SERVICE_LOCATOR_H
 #define SERVICE_LOCATOR_H
 
-#include "components/rpc/common/caller/rpc_caller_session.h"
+#include "rpc_caller_session.h"
 
 /*
  * The service_locator puplic interface may be exported as a public interface to