diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 74c4f6199..90efc658f 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -19,7 +19,6 @@
 #include <linux/kthread.h>
 #include <trace/events/gk20a.h>
 #include <linux/dma-buf.h>
-#include <linux/circ_buf.h>
 
 #include <nvgpu/semaphore.h>
 #include <nvgpu/timers.h>
@@ -29,6 +28,7 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/list.h>
+#include <nvgpu/circ_buf.h>
 
 #include "gk20a.h"
 #include "debug_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
index 1598fe502..94f07701e 100644
--- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
@@ -13,7 +13,6 @@
 
 #include <asm/barrier.h>
 #include <linux/kthread.h>
-#include <linux/circ_buf.h>
 #include <linux/wait.h>
 #include <linux/ktime.h>
 #include <linux/debugfs.h>
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index b5bf34bb3..7d509a4a7 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -13,13 +13,13 @@
 
 #include <asm/barrier.h>
 #include <linux/kthread.h>
-#include <linux/circ_buf.h>
 #include <linux/debugfs.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/hashtable.h>
+#include <nvgpu/circ_buf.h>
 
 #include "ctxsw_trace_gk20a.h"
 #include "fecs_trace_gk20a.h"
diff --git a/drivers/gpu/nvgpu/include/nvgpu/circ_buf.h b/drivers/gpu/nvgpu/include/nvgpu/circ_buf.h
new file mode 100644
index 000000000..1b40a642f
--- /dev/null
+++ b/drivers/gpu/nvgpu/include/nvgpu/circ_buf.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#ifndef __NVGPU_CIRC_BUF_H__
+#define __NVGPU_CIRC_BUF_H__
+
+#ifdef __KERNEL__
+#include <linux/circ_buf.h>
+#endif
+
+#endif