diff --git a/openmp/tools/multiplex/ompt-multiplex.h b/openmp/tools/multiplex/ompt-multiplex.h
--- a/openmp/tools/multiplex/ompt-multiplex.h
+++ b/openmp/tools/multiplex/ompt-multiplex.h
@@ -120,7 +120,8 @@
 
 #if !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_THREAD_DATA) ||                  \
     !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_PARALLEL_DATA) ||                \
-    !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TASK_DATA)
+    !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TASK_DATA) ||                    \
+    !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TARGET_DATA)
 static ompt_multiplex_data_pair_t *
 ompt_multiplex_allocate_data_pair(ompt_data_t *data_pointer) {
   data_pointer->ptr = malloc(sizeof(ompt_multiplex_data_pair_t));
@@ -156,7 +157,8 @@
 }
 #endif //! defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_THREAD_DATA) ||
        //! !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_PARALLEL_DATA) ||
-       //! !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TASK_DATA)
+       //! !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TASK_DATA) ||
+       //! !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TARGET_DATA)
 
 static ompt_data_t *ompt_multiplex_get_own_thread_data(ompt_data_t *data) {
 #ifndef OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_THREAD_DATA
@@ -182,6 +184,17 @@
 #endif
 }
 
+
+static ompt_data_t *ompt_multiplex_get_own_target_data(ompt_data_t *data) {
+#ifndef OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TARGET_DATA
+  return ompt_multiplex_get_own_ompt_data(data);
+#else
+  return data;
+#endif
+}
+
+
+
 static ompt_data_t *ompt_multiplex_get_client_thread_data(ompt_data_t *data) {
 #ifndef OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_THREAD_DATA
   return ompt_multiplex_get_client_ompt_data(data);
@@ -206,6 +219,15 @@
 #endif
 }
 
+
+static ompt_data_t *ompt_multiplex_get_client_target_data(ompt_data_t *data) {
+#ifndef OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TARGET_DATA
+  return ompt_multiplex_get_own_ompt_data(data);
+#else
+  return OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TARGET_DATA(data);
+#endif
+}
+
 static void ompt_multiplex_callback_mutex_acquire(ompt_mutex_t kind,
                                                   unsigned int hint,
                                                   unsigned int impl,