diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index 8da9eacb1..79cea30c9 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/list.h>
 #include <trace/events/gk20a.h>
 #include <linux/file.h>
 #include <linux/anon_inodes.h>
@@ -26,6 +25,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
+#include <nvgpu/list.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/debug_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 97bd1889e..74c4f6199 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -28,6 +28,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/list.h>
 
 #include "gk20a.h"
 #include "debug_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 98f7dde2d..b509c5c4c 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -15,7 +15,6 @@
 
 #include <linux/gk20a.h>
 
-#include <linux/list.h>
 #include <linux/version.h>
 
 #include <nvgpu/semaphore.h>
@@ -23,6 +22,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/list.h>
 
 #include "channel_sync_gk20a.h"
 #include "gk20a.h"
diff --git a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h
index 8e939e724..f197a918a 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h
@@ -14,7 +14,6 @@
 #ifndef SEMAPHORE_GK20A_H
 #define SEMAPHORE_GK20A_H
 
-#include <linux/list.h>
 #include <linux/delay.h>
 
 #include <nvgpu/log.h>
@@ -22,6 +21,7 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/kref.h>
+#include <nvgpu/list.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"