diff --git a/drivers/dma-buf/heaps/page_pool.c b/drivers/dma-buf/heaps/page_pool.c
index 7a270ea5eab0..8a75f2a7754d 100644
--- a/drivers/dma-buf/heaps/page_pool.c
+++ b/drivers/dma-buf/heaps/page_pool.c
@@ -8,12 +8,13 @@
  * Copyright (C) 2011 Google, Inc.
  */
 
-#include <linux/freezer.h>
+#include "page_pool.h"
+
 #include <linux/list.h>
-#include <linux/slab.h>
+#include <linux/shrinker.h>
+#include <linux/spinlock.h>
 #include <linux/swap.h>
 #include <linux/sched/signal.h>
-#include "page_pool.h"
 
 static LIST_HEAD(pool_list);
 static DEFINE_MUTEX(pool_list_lock);
diff --git a/drivers/dma-buf/heaps/page_pool.h b/drivers/dma-buf/heaps/page_pool.h
index bfdb78bd3363..891adee7491f 100644
--- a/drivers/dma-buf/heaps/page_pool.h
+++ b/drivers/dma-buf/heaps/page_pool.h
@@ -10,11 +10,8 @@
 #ifndef _DMABUF_PAGE_POOL_H
 #define _DMABUF_PAGE_POOL_H
 
-#include <linux/device.h>
-#include <linux/kref.h>
 #include <linux/mm_types.h>
-#include <linux/spinlock.h>
-#include <linux/shrinker.h>
+#include <linux/spinlock_types.h>
 #include <linux/types.h>
 
 /* page types we track in the pool */
@@ -29,7 +26,7 @@ enum {
  * struct dmabuf_page_pool - pagepool struct
  * @count[]:		array of number of pages of that type in the pool
  * @items[]:		array of list of pages of the specific type
- * @mutex:		lock protecting this struct and especially the count
+ * @lock:		lock protecting this struct and especially the count
  *			item list
  * @gfp_mask:		gfp_mask to use from alloc
  * @order:		order of pages in the pool