diff --git a/drivers/gpu/nvgpu/common/as.c b/drivers/gpu/nvgpu/common/as.c
index f6fc3a065..d6dff9d46 100644
--- a/drivers/gpu/nvgpu/common/as.c
+++ b/drivers/gpu/nvgpu/common/as.c
@@ -27,8 +27,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/vm.h>
 #include <nvgpu/log2.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 /* dumb allocator... */
 static int generate_as_share_id(struct gk20a_as *as)
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
index 5178dcd0b..61fd12230 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
@@ -25,8 +25,8 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "bus_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_bus_gk20a.h>
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
index ef5fee8c3..5f6488f19 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
@@ -26,8 +26,8 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "bus_gm20b.h"
 
 #include <nvgpu/hw/gm20b/hw_bus_gm20b.h>
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
index 8aa75d8d3..cc1ca3907 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
@@ -23,9 +23,9 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
 #include "bus_gp10b.h"
-#include "gk20a/gk20a.h"
 
 #include <nvgpu/hw/gp10b/hw_bus_gp10b.h>
 
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gv100.c b/drivers/gpu/nvgpu/common/bus/bus_gv100.c
index eb0387e67..4b6544027 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gv100.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gv100.c
@@ -23,9 +23,9 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
 #include "bus_gv100.h"
-#include "gk20a/gk20a.h"
 
 #include <nvgpu/hw/gv100/hw_bus_gv100.h>
 
diff --git a/drivers/gpu/nvgpu/common/ce2.c b/drivers/gpu/nvgpu/common/ce2.c
index 342f046cd..4081b05f9 100644
--- a/drivers/gpu/nvgpu/common/ce2.c
+++ b/drivers/gpu/nvgpu/common/ce2.c
@@ -21,12 +21,12 @@
  */
 
 #include <nvgpu/types.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/ce2_gk20a.h"
 #include "gk20a/fence_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/ecc.c b/drivers/gpu/nvgpu/common/ecc.c
index b850f09e9..81ad37ae3 100644
--- a/drivers/gpu/nvgpu/common/ecc.c
+++ b/drivers/gpu/nvgpu/common/ecc.c
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 static void nvgpu_ecc_stat_add(struct gk20a *g, struct nvgpu_ecc_stat *stat)
 {
diff --git a/drivers/gpu/nvgpu/common/enabled.c b/drivers/gpu/nvgpu/common/enabled.c
index eaebe48c9..076605d73 100644
--- a/drivers/gpu/nvgpu/common/enabled.c
+++ b/drivers/gpu/nvgpu/common/enabled.c
@@ -22,8 +22,7 @@
 
 #include <nvgpu/enabled.h>
 #include <nvgpu/bitops.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int nvgpu_init_enabled_flags(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/common/falcon/falcon.c b/drivers/gpu/nvgpu/common/falcon/falcon.c
index 4535734ff..a0f88de30 100644
--- a/drivers/gpu/nvgpu/common/falcon/falcon.c
+++ b/drivers/gpu/nvgpu/common/falcon/falcon.c
@@ -22,8 +22,7 @@
 #include <nvgpu/lock.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/falcon.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 /* Dealy depends on memory size and pwr_clk
  * delay = MAX {IMEM_SIZE, DMEM_SIZE} * 64 + 1) / pwr_clk
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
index 00d0fba42..9a13eccae 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
@@ -26,8 +26,7 @@
 
 #include <nvgpu/sizes.h>
 #include <nvgpu/utils.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "fb_gm20b.h"
 
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gp106.c b/drivers/gpu/nvgpu/common/fb/fb_gp106.c
index 6dacceb5f..27fce8a74 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gp106.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gp106.c
@@ -20,14 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/io.h>
+#include <nvgpu/timers.h>
+#include <nvgpu/gk20a.h>
 
 #include "fb_gp10b.h"
 #include "fb_gp106.h"
 
-#include <nvgpu/io.h>
-#include <nvgpu/timers.h>
-
 #include <nvgpu/hw/gp106/hw_fb_gp106.h>
 
 #define HW_SCRUB_TIMEOUT_DEFAULT	100 /* usec */
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gp10b.c b/drivers/gpu/nvgpu/common/fb/fb_gp10b.c
index 45fc83730..ac5fbd9de 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gp10b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gp10b.c
@@ -1,7 +1,7 @@
 /*
  * GP10B FB
  *
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
 *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,8 +23,8 @@
  */
 
 #include <nvgpu/sizes.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "fb_gp10b.h"
 
 unsigned int gp10b_fb_compression_page_size(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c
index 4cae53127..967af51b3 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv100.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c
@@ -38,8 +38,7 @@
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/timers.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "fb_gv100.h"
 
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
index b3d8cdb9f..a03c7da72 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
@@ -33,9 +33,9 @@
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #include "gv11b/fifo_gv11b.h"
diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index 1613f5f66..680382a4a 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -43,10 +43,10 @@
 #include <nvgpu/os_sched.h>
 #include <nvgpu/log2.h>
 #include <nvgpu/ptimer.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/channel_sync.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/fence_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c
index 5a0beea91..5e218fbc0 100644
--- a/drivers/gpu/nvgpu/common/fifo/submit.c
+++ b/drivers/gpu/nvgpu/common/fifo/submit.c
@@ -20,6 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/ltc.h>
 #include <nvgpu/os_sched.h>
@@ -28,7 +29,6 @@
 
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/fence_gk20a.h"
 
 #include <trace/events/gk20a.h>
diff --git a/drivers/gpu/nvgpu/common/fuse/fuse_gm20b.c b/drivers/gpu/nvgpu/common/fuse/fuse_gm20b.c
index 0dba3542e..0f01f01af 100644
--- a/drivers/gpu/nvgpu/common/fuse/fuse_gm20b.c
+++ b/drivers/gpu/nvgpu/common/fuse/fuse_gm20b.c
@@ -26,8 +26,7 @@
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "fuse_gm20b.h"
 
diff --git a/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c b/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c
index 47dc49abc..f77031dfb 100644
--- a/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c
+++ b/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c
@@ -24,8 +24,7 @@
 
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "fuse_gp106.h"
 
diff --git a/drivers/gpu/nvgpu/common/fuse/fuse_gp10b.c b/drivers/gpu/nvgpu/common/fuse/fuse_gp10b.c
index 97570f9c5..81b97af59 100644
--- a/drivers/gpu/nvgpu/common/fuse/fuse_gp10b.c
+++ b/drivers/gpu/nvgpu/common/fuse/fuse_gp10b.c
@@ -26,8 +26,7 @@
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "fuse_gm20b.h"
 #include "fuse_gp10b.h"
diff --git a/drivers/gpu/nvgpu/common/io_common.c b/drivers/gpu/nvgpu/common/io_common.c
index e7041eb79..7c2954548 100644
--- a/drivers/gpu/nvgpu/common/io_common.c
+++ b/drivers/gpu/nvgpu/common/io_common.c
@@ -13,8 +13,7 @@
 
 #include <nvgpu/io.h>
 #include <nvgpu/types.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v)
 {
diff --git a/drivers/gpu/nvgpu/common/ltc/ltc.c b/drivers/gpu/nvgpu/common/ltc/ltc.c
index 3d85db3f2..c5a17253e 100644
--- a/drivers/gpu/nvgpu/common/ltc/ltc.c
+++ b/drivers/gpu/nvgpu/common/ltc/ltc.c
@@ -23,8 +23,8 @@
 #include <nvgpu/ltc.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/nvgpu_mem.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 int nvgpu_init_ltc_support(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c b/drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c
index eb321776b..f4d176cb0 100644
--- a/drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c
@@ -30,14 +30,13 @@
 #include <nvgpu/ltc.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/hw/gm20b/hw_mc_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_ltc_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_top_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_pri_ringmaster_gm20b.h>
 
-#include "gk20a/gk20a.h"
-
 #include "ltc_gm20b.h"
 
 int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
diff --git a/drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c b/drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c
index 4d11b44b1..73c258f1d 100644
--- a/drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c
@@ -29,12 +29,11 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h>
 
-#include "gk20a/gk20a.h"
-
 #include "ltc_gm20b.h"
 #include "ltc_gp10b.h"
 
diff --git a/drivers/gpu/nvgpu/common/ltc/ltc_gv11b.c b/drivers/gpu/nvgpu/common/ltc/ltc_gv11b.c
index 69c1ce02a..d20c963ad 100644
--- a/drivers/gpu/nvgpu/common/ltc/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/common/ltc/ltc_gv11b.c
@@ -23,7 +23,7 @@
  */
 
 #include <nvgpu/io.h>
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "ltc_gp10b.h"
 #include "ltc_gv11b.h"
diff --git a/drivers/gpu/nvgpu/common/mc/mc.c b/drivers/gpu/nvgpu/common/mc/mc.c
index 77416ef9c..9922a0d5f 100644
--- a/drivers/gpu/nvgpu/common/mc/mc.c
+++ b/drivers/gpu/nvgpu/common/mc/mc.c
@@ -24,8 +24,7 @@
 
 #include <nvgpu/io.h>
 #include <nvgpu/mc.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/hw/gm20b/hw_mc_gm20b.h>
 
diff --git a/drivers/gpu/nvgpu/common/mc/mc_gm20b.c b/drivers/gpu/nvgpu/common/mc/mc_gm20b.c
index 88666b1d4..c4e682ec4 100644
--- a/drivers/gpu/nvgpu/common/mc/mc_gm20b.c
+++ b/drivers/gpu/nvgpu/common/mc/mc_gm20b.c
@@ -27,8 +27,8 @@
 #include <nvgpu/unit.h>
 #include <nvgpu/io.h>
 #include <nvgpu/mc.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "mc_gm20b.h"
 
 #include <nvgpu/hw/gm20b/hw_mc_gm20b.h>
diff --git a/drivers/gpu/nvgpu/common/mc/mc_gp10b.c b/drivers/gpu/nvgpu/common/mc/mc_gp10b.c
index 3dce9a092..648884038 100644
--- a/drivers/gpu/nvgpu/common/mc/mc_gp10b.c
+++ b/drivers/gpu/nvgpu/common/mc/mc_gp10b.c
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 #include <nvgpu/io.h>
 #include <nvgpu/mc.h>
 
diff --git a/drivers/gpu/nvgpu/common/mc/mc_gv100.c b/drivers/gpu/nvgpu/common/mc/mc_gv100.c
index 28c034347..b67f9bbe0 100644
--- a/drivers/gpu/nvgpu/common/mc/mc_gv100.c
+++ b/drivers/gpu/nvgpu/common/mc/mc_gv100.c
@@ -25,8 +25,7 @@
 #include <nvgpu/types.h>
 #include <nvgpu/io.h>
 #include <nvgpu/mc.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "mc_gp10b.h"
 #include "mc_gv100.h"
diff --git a/drivers/gpu/nvgpu/common/mc/mc_gv11b.c b/drivers/gpu/nvgpu/common/mc/mc_gv11b.c
index fa4d4bfb8..35508bbec 100644
--- a/drivers/gpu/nvgpu/common/mc/mc_gv11b.c
+++ b/drivers/gpu/nvgpu/common/mc/mc_gv11b.c
@@ -25,8 +25,7 @@
 #include <nvgpu/types.h>
 #include <nvgpu/io.h>
 #include <nvgpu/mc.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "mc_gp10b.h"
 #include "mc_gv11b.h"
diff --git a/drivers/gpu/nvgpu/common/mm/comptags.c b/drivers/gpu/nvgpu/common/mm/comptags.c
index f62166480..cb0184c7a 100644
--- a/drivers/gpu/nvgpu/common/mm/comptags.c
+++ b/drivers/gpu/nvgpu/common/mm/comptags.c
@@ -23,8 +23,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/bitops.h>
 #include <nvgpu/comptags.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int gk20a_comptaglines_alloc(struct gk20a_comptag_allocator *allocator,
 			     u32 *offset, u32 len)
diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 02e32b20e..afbad75c6 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -32,8 +32,8 @@
 #include <nvgpu/vidmem.h>
 #include <nvgpu/sizes.h>
 #include <nvgpu/types.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #define __gmmu_dbg(g, attrs, fmt, args...)				\
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c
index 6c8f2cdf7..58a435c04 100644
--- a/drivers/gpu/nvgpu/common/mm/mm.c
+++ b/drivers/gpu/nvgpu/common/mm/mm.c
@@ -29,8 +29,7 @@
 #include <nvgpu/semaphore.h>
 #include <nvgpu/pramin.h>
 #include <nvgpu/enabled.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 /*
  * Attempt to find a reserved memory area to determine PTE size for the passed
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
index 68d68ad60..c49dcfd28 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
@@ -23,8 +23,8 @@
  */
 
 #include <nvgpu/allocator.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 u64 nvgpu_alloc_length(struct nvgpu_allocator *a)
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
index 5cfaded01..8f6bd66e5 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
@@ -25,9 +25,7 @@
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/vidmem.h>
-
-#include "gk20a/gk20a.h"
-
+#include <nvgpu/gk20a.h>
 /*
  * Make sure to use the right coherency aperture if you use this function! This
  * will not add any checks. If you want to simply use the default coherency then
diff --git a/drivers/gpu/nvgpu/common/mm/pd_cache.c b/drivers/gpu/nvgpu/common/mm/pd_cache.c
index a8ed10e7e..d9dc3db06 100644
--- a/drivers/gpu/nvgpu/common/mm/pd_cache.c
+++ b/drivers/gpu/nvgpu/common/mm/pd_cache.c
@@ -27,8 +27,8 @@
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/list.h>
 #include <nvgpu/log2.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #define pd_dbg(g, fmt, args...) nvgpu_log(g, gpu_dbg_pd_cache, fmt, ##args)
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c
index 3f5e0fbb9..06cf053bf 100644
--- a/drivers/gpu/nvgpu/common/mm/vidmem.c
+++ b/drivers/gpu/nvgpu/common/mm/vidmem.c
@@ -27,8 +27,8 @@
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/fence_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index 33587e5d5..1e6c46011 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -34,10 +34,9 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/sizes.h>
 #include <nvgpu/timers.h>
-
+#include <nvgpu/gk20a.h>
 #include <nvgpu/vgpu/vm.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 struct nvgpu_ctag_buffer_info {
diff --git a/drivers/gpu/nvgpu/common/mm/vm_area.c b/drivers/gpu/nvgpu/common/mm/vm_area.c
index ac4708afd..363995fbc 100644
--- a/drivers/gpu/nvgpu/common/mm/vm_area.c
+++ b/drivers/gpu/nvgpu/common/mm/vm_area.c
@@ -23,8 +23,8 @@
 #include <nvgpu/vm.h>
 #include <nvgpu/vm_area.h>
 #include <nvgpu/barrier.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 struct nvgpu_vm_area *nvgpu_vm_area_find(struct vm_gk20a *vm, u64 addr)
diff --git a/drivers/gpu/nvgpu/common/nvlink.c b/drivers/gpu/nvgpu/common/nvlink.c
index 966a14a11..8f0bf94a2 100644
--- a/drivers/gpu/nvgpu/common/nvlink.c
+++ b/drivers/gpu/nvgpu/common/nvlink.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gk20a/gk20a.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/nvlink.h>
 #include <nvgpu/enabled.h>
 
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c
index ffc9ec393..fe36ab871 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu.c
@@ -29,8 +29,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/utils.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 static int nvgpu_pg_init_task(void *arg);
 
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_debug.c b/drivers/gpu/nvgpu/common/pmu/pmu_debug.c
index 68a39432c..11f972b86 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_debug.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_debug.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,10 +25,9 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/dma.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 
-#include "gk20a/gk20a.h"
-
 void nvgpu_pmu_dump_elpg_stats(struct nvgpu_pmu *pmu)
 {
 	struct gk20a *g = pmu->g;
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
index c14164935..21d03306b 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
@@ -27,8 +27,7 @@
 #include <nvgpu/firmware.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/utils.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "boardobj/boardobj.h"
 #include "boardobj/boardobjgrp.h"
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c
index 01b91662f..6f1ca88ae 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c
@@ -27,8 +27,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/falcon.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 void nvgpu_pmu_seq_init(struct nvgpu_pmu *pmu)
 {
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c
index 12ab44224..57a4ea400 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c
@@ -25,8 +25,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 static u8 get_perfmon_id(struct nvgpu_pmu *pmu)
 {
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
index d2615b1a5..3d46298dc 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
@@ -26,8 +26,7 @@
 #include <nvgpu/barrier.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/utils.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 /* state transition :
  * OFF => [OFF_ON_PENDING optional] => ON_PENDING => ON => OFF
diff --git a/drivers/gpu/nvgpu/common/pramin.c b/drivers/gpu/nvgpu/common/pramin.c
index 26bf10381..289489cd1 100644
--- a/drivers/gpu/nvgpu/common/pramin.c
+++ b/drivers/gpu/nvgpu/common/pramin.c
@@ -25,8 +25,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/sizes.h>
 #include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 /*
  * This typedef is for functions that get called during the access_batched()
diff --git a/drivers/gpu/nvgpu/common/priv_ring/priv_ring_gm20b.c b/drivers/gpu/nvgpu/common/priv_ring/priv_ring_gm20b.c
index 41a5391df..e30d94f9b 100644
--- a/drivers/gpu/nvgpu/common/priv_ring/priv_ring_gm20b.c
+++ b/drivers/gpu/nvgpu/common/priv_ring/priv_ring_gm20b.c
@@ -20,8 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
-
+#include <nvgpu/gk20a.h>
 #include <nvgpu/log.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/enabled.h>
diff --git a/drivers/gpu/nvgpu/common/priv_ring/priv_ring_gp10b.c b/drivers/gpu/nvgpu/common/priv_ring/priv_ring_gp10b.c
index f8a136c6a..47403711f 100644
--- a/drivers/gpu/nvgpu/common/priv_ring/priv_ring_gp10b.c
+++ b/drivers/gpu/nvgpu/common/priv_ring/priv_ring_gp10b.c
@@ -22,13 +22,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
-
 #include <nvgpu/log.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_pri_ringstation_sys_gp10b.h>
diff --git a/drivers/gpu/nvgpu/common/ptimer/ptimer.c b/drivers/gpu/nvgpu/common/ptimer/ptimer.c
index 992ea3d6d..4f0b31315 100644
--- a/drivers/gpu/nvgpu/common/ptimer/ptimer.c
+++ b/drivers/gpu/nvgpu/common/ptimer/ptimer.c
@@ -22,8 +22,7 @@
 
 #include <nvgpu/ptimer.h>
 #include <nvgpu/timers.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int nvgpu_get_timestamps_zipper(struct gk20a *g,
 		u32 source_id, u32 count,
diff --git a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c b/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c
index eeb6e460b..cbbacac76 100644
--- a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c
+++ b/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c
@@ -22,8 +22,8 @@
 
 #include <nvgpu/log.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "ptimer_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_timer_gk20a.h>
diff --git a/drivers/gpu/nvgpu/common/semaphore.c b/drivers/gpu/nvgpu/common/semaphore.c
index 443217707..08297c1ab 100644
--- a/drivers/gpu/nvgpu/common/semaphore.c
+++ b/drivers/gpu/nvgpu/common/semaphore.c
@@ -29,8 +29,8 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/sizes.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #define pool_to_gk20a(p) ((p)->sema_sea->gk20a)
diff --git a/drivers/gpu/nvgpu/common/sim.c b/drivers/gpu/nvgpu/common/sim.c
index 618e8ffb0..8ad39b8cf 100644
--- a/drivers/gpu/nvgpu/common/sim.c
+++ b/drivers/gpu/nvgpu/common/sim.c
@@ -29,8 +29,7 @@
 #include <nvgpu/sim.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/bug.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int nvgpu_alloc_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem)
 {
diff --git a/drivers/gpu/nvgpu/common/sim_pci.c b/drivers/gpu/nvgpu/common/sim_pci.c
index 5f2344b40..cd7d90cae 100644
--- a/drivers/gpu/nvgpu/common/sim_pci.c
+++ b/drivers/gpu/nvgpu/common/sim_pci.c
@@ -28,8 +28,7 @@
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/bug.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 static inline u32 sim_msg_header_size(void)
 {
diff --git a/drivers/gpu/nvgpu/common/sync/channel_sync.c b/drivers/gpu/nvgpu/common/sync/channel_sync.c
index fa08a7d36..116e57010 100644
--- a/drivers/gpu/nvgpu/common/sync/channel_sync.c
+++ b/drivers/gpu/nvgpu/common/sync/channel_sync.c
@@ -29,11 +29,11 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/list.h>
 #include <nvgpu/nvhost.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/os_fence.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/channel_sync.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/fence_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/therm/therm.c b/drivers/gpu/nvgpu/common/therm/therm.c
index cfe8a2c1c..8c88ff0df 100644
--- a/drivers/gpu/nvgpu/common/therm/therm.c
+++ b/drivers/gpu/nvgpu/common/therm/therm.c
@@ -23,8 +23,7 @@
 #include <nvgpu/types.h>
 #include <nvgpu/log.h>
 #include <nvgpu/therm.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int nvgpu_init_therm_support(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/common/therm/therm_gm20b.c b/drivers/gpu/nvgpu/common/therm/therm_gm20b.c
index 023ec36ab..925f6951b 100644
--- a/drivers/gpu/nvgpu/common/therm/therm_gm20b.c
+++ b/drivers/gpu/nvgpu/common/therm/therm_gm20b.c
@@ -23,7 +23,7 @@
  */
 
 #include <nvgpu/io.h>
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "therm_gm20b.h"
 
diff --git a/drivers/gpu/nvgpu/common/therm/therm_gp106.c b/drivers/gpu/nvgpu/common/therm/therm_gp106.c
index b22cefeb7..b14906137 100644
--- a/drivers/gpu/nvgpu/common/therm/therm_gp106.c
+++ b/drivers/gpu/nvgpu/common/therm/therm_gp106.c
@@ -21,8 +21,7 @@
  */
 
 #include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "therm_gp106.h"
 #include "therm/thrmpmu.h"
diff --git a/drivers/gpu/nvgpu/common/therm/therm_gp10b.c b/drivers/gpu/nvgpu/common/therm/therm_gp10b.c
index 905ff178a..8b5371a9b 100644
--- a/drivers/gpu/nvgpu/common/therm/therm_gp10b.c
+++ b/drivers/gpu/nvgpu/common/therm/therm_gp10b.c
@@ -21,13 +21,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-#include "gk20a/gk20a.h"
-#include "therm_gp10b.h"
-
 #include <nvgpu/soc.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
+
+#include "therm_gp10b.h"
 
 #include <nvgpu/hw/gp10b/hw_therm_gp10b.h>
 
diff --git a/drivers/gpu/nvgpu/common/therm/therm_gv11b.c b/drivers/gpu/nvgpu/common/therm/therm_gv11b.c
index 419dd75e4..971848fb2 100644
--- a/drivers/gpu/nvgpu/common/therm/therm_gv11b.c
+++ b/drivers/gpu/nvgpu/common/therm/therm_gv11b.c
@@ -21,18 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-#include "gk20a/gk20a.h"
-#include "therm_gv11b.h"
-
 #include <nvgpu/soc.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
-
-#include <nvgpu/hw/gv11b/hw_therm_gv11b.h>
+#include <nvgpu/gk20a.h>
 
 #include "therm_gv11b.h"
 
+#include <nvgpu/hw/gv11b/hw_therm_gv11b.h>
+
 int gv11b_init_therm_setup_hw(struct gk20a *g)
 {
 	u32 v;
diff --git a/drivers/gpu/nvgpu/common/top/top_gv100.c b/drivers/gpu/nvgpu/common/top/top_gv100.c
index 138528a22..1a7137fb5 100644
--- a/drivers/gpu/nvgpu/common/top/top_gv100.c
+++ b/drivers/gpu/nvgpu/common/top/top_gv100.c
@@ -23,8 +23,8 @@
  */
 
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "top_gv100.h"
 
 #include <nvgpu/hw/gv100/hw_top_gv100.h>
diff --git a/drivers/gpu/nvgpu/common/vbios/bios.c b/drivers/gpu/nvgpu/common/vbios/bios.c
index 4e851b393..4d9f785c3 100644
--- a/drivers/gpu/nvgpu/common/vbios/bios.c
+++ b/drivers/gpu/nvgpu/common/vbios/bios.c
@@ -22,10 +22,9 @@
 
 #include <nvgpu/bios.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/hw/gp106/hw_gc6_gp106.h>
 
-#include "gk20a/gk20a.h"
-
 #define BIT_HEADER_ID 				0xb8ffU
 #define BIT_HEADER_SIGNATURE 			0x00544942U
 #define PCI_EXP_ROM_SIG 			0xaa55U
diff --git a/drivers/gpu/nvgpu/common/xve/xve_gp106.c b/drivers/gpu/nvgpu/common/xve/xve_gp106.c
index 29d978432..d5e5f7545 100644
--- a/drivers/gpu/nvgpu/common/xve/xve_gp106.c
+++ b/drivers/gpu/nvgpu/common/xve/xve_gp106.c
@@ -19,15 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-#include "gk20a/gk20a.h"
-#include "gp106/bios_gp106.h"
-
 #include <nvgpu/bug.h>
 #include <nvgpu/xve.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/gk20a.h>
+
+#include "gp106/bios_gp106.h"
 
 #include "xve_gp106.h"
 
diff --git a/drivers/gpu/nvgpu/common/xve/xve_gp106.h b/drivers/gpu/nvgpu/common/xve/xve_gp106.h
index 992f0c863..fcf506585 100644
--- a/drivers/gpu/nvgpu/common/xve/xve_gp106.h
+++ b/drivers/gpu/nvgpu/common/xve/xve_gp106.h
@@ -23,10 +23,9 @@
 #ifndef NVGPU_XVE_GP106_H
 #define NVGPU_XVE_GP106_H
 
-#include "gk20a/gk20a.h"
-
 #include <nvgpu/log2.h>
 #include <nvgpu/types.h>
+#include <nvgpu/gk20a.h>
 
 int gp106_init_xve_ops(struct gpu_ops *gops);