diff --git a/plat/xilinx/common/include/pm_client.h b/plat/xilinx/common/include/pm_client.h
new file mode 100644
index 0000000..e91bb8f
--- /dev/null
+++ b/plat/xilinx/common/include/pm_client.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * Contains APU specific macros and macros to be defined depending on
+ * the execution environment.
+ */
+
+#ifndef PM_CLIENT_H
+#define PM_CLIENT_H
+
+#include "pm_common.h"
+#include "pm_defs.h"
+
+/* Functions to be implemented by each PU */
+void pm_client_suspend(const struct pm_proc *proc, unsigned int state);
+void pm_client_abort_suspend(void);
+void pm_client_wakeup(const struct pm_proc *proc);
+
+/* Global variables to be set in pm_client.c */
+extern const struct pm_proc *primary_proc;
+
+#ifndef VERSAL_PLATFORM
+enum pm_ret_status set_ocm_retention(void);
+enum pm_ret_status pm_set_suspend_mode(uint32_t mode);
+const struct pm_proc *pm_get_proc_by_node(enum pm_node_id nid);
+#endif
+
+#endif /* PM_CLIENT_H */
diff --git a/plat/xilinx/versal/pm_service/pm_client.h b/plat/xilinx/versal/pm_service/pm_client.h
deleted file mode 100644
index 91f135c..0000000
--- a/plat/xilinx/versal/pm_service/pm_client.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2019, Xilinx, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/*
- * Contains APU specific macros and macros to be defined depending on
- * the execution environment.
- */
-
-#ifndef PM_CLIENT_H
-#define PM_CLIENT_H
-
-#include "pm_common.h"
-#include "pm_defs.h"
-
-/* Functions to be implemented by each PU */
-void pm_client_suspend(const struct pm_proc *proc, unsigned int state);
-void pm_client_wakeup(const struct pm_proc *proc);
-void pm_client_abort_suspend(void);
-
-/* Global variables to be set in pm_client.c */
-extern const struct pm_proc *primary_proc;
-
-#endif /* PM_CLIENT_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.h b/plat/xilinx/zynqmp/pm_service/pm_client.h
deleted file mode 100644
index adbb76f..0000000
--- a/plat/xilinx/zynqmp/pm_service/pm_client.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/*
- * Contains APU specific macros and macros to be defined depending on
- * the execution environment.
- */
-
-#ifndef PM_CLIENT_H
-#define PM_CLIENT_H
-
-#include "pm_common.h"
-#include "pm_defs.h"
-
-/* Functions to be implemented by each PU */
-void pm_client_suspend(const struct pm_proc *proc, unsigned int state);
-void pm_client_abort_suspend(void);
-void pm_client_wakeup(const struct pm_proc *proc);
-enum pm_ret_status set_ocm_retention(void);
-enum pm_ret_status pm_set_suspend_mode(uint32_t mode);
-const struct pm_proc *pm_get_proc_by_node(enum pm_node_id nid);
-
-/* Global variables to be set in pm_client.c */
-extern const struct pm_proc *primary_proc;
-
-#endif /* PM_CLIENT_H */