diff --git a/Android.mk b/Android.mk
index 803f7d49f..79cb32643 100644
--- a/Android.mk
+++ b/Android.mk
@@ -96,6 +96,7 @@ LOCAL_SRC_FILES := $(patsubst %,host/xtest/%,$(srcs))
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/host/xtest \
 		$(LOCAL_PATH)/host/xtest/adbg/include \
+		$(LOCAL_PATH)/host/xtest/include/uapi \
 		$(LOCAL_PATH)/ta/include \
 		$(LOCAL_PATH)/ta/supp_plugin/include \
 		$(LOCAL_PATH)/ta/create_fail_test/include \
diff --git a/host/xtest/CMakeLists.txt b/host/xtest/CMakeLists.txt
index 0fb5f3ace..1aefcb404 100644
--- a/host/xtest/CMakeLists.txt
+++ b/host/xtest/CMakeLists.txt
@@ -129,6 +129,7 @@ target_include_directories(${PROJECT_NAME}
 	PRIVATE .
 	PRIVATE ../supp_plugin/include
 	PRIVATE adbg/include
+	PRIVATE include/uapi
 	PRIVATE ${OPTEE_TEST_SDK}/host_include
 	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
 	${GP_INCLUDES}
diff --git a/host/xtest/Makefile b/host/xtest/Makefile
index bd042d655..5959ed6d1 100644
--- a/host/xtest/Makefile
+++ b/host/xtest/Makefile
@@ -107,6 +107,7 @@ endif
 
 CFLAGS += -I./
 CFLAGS += -I./adbg/include
+CFLAGS += -I./include/uapi
 CFLAGS += -I../supp_plugin/include
 CFLAGS += -I$(out-dir)/xtest
 
diff --git a/host/xtest/include/uapi/linux/dma-heap.h b/host/xtest/include/uapi/linux/dma-heap.h
new file mode 100644
index 000000000..6f84fa08e
--- /dev/null
+++ b/host/xtest/include/uapi/linux/dma-heap.h
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * DMABUF Heaps Userspace API
+ *
+ * Copyright (C) 2011 Google, Inc.
+ * Copyright (C) 2019 Linaro Ltd.
+ */
+#ifndef _UAPI_LINUX_DMABUF_POOL_H
+#define _UAPI_LINUX_DMABUF_POOL_H
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/**
+ * DOC: DMABUF Heaps Userspace API
+ */
+
+/* Valid FD_FLAGS are O_CLOEXEC, O_RDONLY, O_WRONLY, O_RDWR */
+#define DMA_HEAP_VALID_FD_FLAGS (O_CLOEXEC | O_ACCMODE)
+
+/* Currently no heap flags */
+#define DMA_HEAP_VALID_HEAP_FLAGS (0)
+
+/**
+ * struct dma_heap_allocation_data - metadata passed from userspace for
+ *                                      allocations
+ * @len:		size of the allocation
+ * @fd:			will be populated with a fd which provides the
+ *			handle to the allocated dma-buf
+ * @fd_flags:		file descriptor flags used when allocating
+ * @heap_flags:		flags passed to heap
+ *
+ * Provided by userspace as an argument to the ioctl
+ */
+struct dma_heap_allocation_data {
+	__u64 len;
+	__u32 fd;
+	__u32 fd_flags;
+	__u64 heap_flags;
+};
+
+#define DMA_HEAP_IOC_MAGIC		'H'
+
+/**
+ * DOC: DMA_HEAP_IOCTL_ALLOC - allocate memory from pool
+ *
+ * Takes a dma_heap_allocation_data struct and returns it with the fd field
+ * populated with the dmabuf handle of the allocation.
+ */
+#define DMA_HEAP_IOCTL_ALLOC	_IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\
+				      struct dma_heap_allocation_data)
+
+#endif /* _UAPI_LINUX_DMABUF_POOL_H */