diff --git a/drivers/dma-buf/rk_heaps/rk-cma-heap.c b/drivers/dma-buf/rk_heaps/rk-cma-heap.c
index 37ac163ec12c..47ee96121504 100644
--- a/drivers/dma-buf/rk_heaps/rk-cma-heap.c
+++ b/drivers/dma-buf/rk_heaps/rk-cma-heap.c
@@ -28,6 +28,25 @@
 
 #include "rk-dma-heap.h"
 
+struct rk_cma_heap {
+	struct rk_dma_heap *heap;
+	struct cma *cma;
+};
+
+struct rk_cma_heap_buffer {
+	struct rk_cma_heap *heap;
+	struct list_head attachments;
+	struct mutex lock;
+	unsigned long len;
+	struct page *cma_pages;
+	struct page **pages;
+	pgoff_t pagecount;
+	int vmap_cnt;
+	void *vaddr;
+	phys_addr_t phys;
+	bool attached;
+};
+
 struct rk_cma_heap_attachment {
 	struct device *dev;
 	struct sg_table table;
diff --git a/drivers/dma-buf/rk_heaps/rk-dma-heap.h b/drivers/dma-buf/rk_heaps/rk-dma-heap.h
index b9ee2fc0d002..afdf6bcfc385 100644
--- a/drivers/dma-buf/rk_heaps/rk-dma-heap.h
+++ b/drivers/dma-buf/rk_heaps/rk-dma-heap.h
@@ -26,25 +26,6 @@
 
 #define RK_DMA_HEAP_NAME_LEN 16
 
-struct rk_cma_heap {
-	struct rk_dma_heap *heap;
-	struct cma *cma;
-};
-
-struct rk_cma_heap_buffer {
-	struct rk_cma_heap *heap;
-	struct list_head attachments;
-	struct mutex lock;
-	unsigned long len;
-	struct page *cma_pages;
-	struct page **pages;
-	pgoff_t pagecount;
-	int vmap_cnt;
-	void *vaddr;
-	phys_addr_t phys;
-	bool attached;
-};
-
 struct rk_vmap_pfn_data {
 	unsigned long	pfn; /* first pfn of contiguous */
 	pgprot_t	prot;