diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index a58635675..5a50b843b 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -24,7 +24,6 @@
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
 #include <linux/nvhost.h>
 #endif
-#include <linux/sort.h>
 
 #include <nvgpu/dma.h>
 #include <nvgpu/timers.h>
@@ -33,6 +32,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/atomic.h>
+#include <nvgpu/sort.h>
 
 #include "gk20a.h"
 #include "debug_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 96ec7f6e5..8489816e0 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -25,7 +25,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/firmware.h>
 #include <linux/nvhost.h>
-#include <linux/sort.h>
 #include <trace/events/gk20a.h>
 
 #include <nvgpu/dma.h>
@@ -34,6 +33,7 @@
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/log.h>
 #include <nvgpu/bsearch.h>
+#include <nvgpu/sort.h>
 
 #include "gk20a.h"
 #include "kind_gk20a.h"
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sort.h b/drivers/gpu/nvgpu/include/nvgpu/sort.h
new file mode 100644
index 000000000..70e0f47ff
--- /dev/null
+++ b/drivers/gpu/nvgpu/include/nvgpu/sort.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_SORT_H__
+#define __NVGPU_SORT_H__
+
+#ifdef __KERNEL__
+#include <linux/sort.h>
+#endif
+
+#endif
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c
index 8e229f4c7..9fd80144a 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.c
+++ b/drivers/gpu/nvgpu/volt/volt_dev.c
@@ -11,8 +11,7 @@
  * more details.
  */
 
-#include <linux/sort.h>
-
+#include <nvgpu/sort.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/bios.h>
 #include <nvgpu/kmem.h>