Simplify patching existing files

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>
diff --git a/host/xtest/xtest_test.c b/host/xtest/xtest_test.c
index 8fae19b..85f16cd 100644
--- a/host/xtest/xtest_test.c
+++ b/host/xtest/xtest_test.c
@@ -21,6 +21,10 @@
 #include <ta_storage.h>
 #include <enc_fs_key_manager_test.h>
 #include <tee_api_defines.h>
+#ifdef CFG_GP_TESTSUITE_ENABLE
+#include <tee_api_types.h>
+#include <TTA_DS_protocol.h>
+#endif
 
 ADBG_ENUM_TABLE_DEFINE_BEGIN(TEEC_Result)
 ADBG_ENUM_TABLE_ENTRY(TEEC_SUCCESS),
@@ -74,4 +78,6 @@
 const TEEC_UUID sims_test_ta_uuid = TA_SIMS_TEST_UUID;
 const TEEC_UUID storage_ta_uuid = TA_STORAGE_UUID;
 const TEEC_UUID enc_fs_key_manager_test_ta_uuid = ENC_FS_KEY_MANAGER_TEST_UUID;
-
+#ifdef CFG_GP_TESTSUITE_ENABLE
+const TEEC_UUID gp_tta_ds_uuid = TA_TTA_DS_UUID;
+#endif