diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index 727192979..c73b49403 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -809,7 +809,7 @@ static const struct dev_pm_ops gk20a_pm_ops = {
 };
 #endif
 
-int gk20a_pm_init(struct device *dev)
+static int gk20a_pm_init(struct device *dev)
 {
 	struct gk20a *g = get_gk20a(dev);
 	int err = 0;
diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
index 5f25271f8..52ef08e4a 100644
--- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
@@ -19,6 +19,7 @@
 #include <nvgpu/soc.h>
 
 #include "gk20a.h"
+#include "bus_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_bus_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
index 4a76bd6b2..5aae14f26 100644
--- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
@@ -1,7 +1,7 @@
 /*
  * GK20A memory interface
  *
- * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-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,
@@ -72,7 +72,7 @@ static unsigned int gk20a_fb_compressible_page_size(struct gk20a *g)
 	return SZ_64K;
 }
 
-bool gk20a_fb_debug_mode_enabled(struct gk20a *g)
+static bool gk20a_fb_debug_mode_enabled(struct gk20a *g)
 {
 	u32 debug_ctrl = gk20a_readl(g, fb_mmu_debug_ctrl_r());
 	return fb_mmu_debug_ctrl_debug_v(debug_ctrl) ==
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
index 4bd8f8160..70b688f6d 100644
--- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
@@ -22,6 +22,7 @@
 #include <nvgpu/bug.h>
 
 #include "gk20a.h"
+#include "ltc_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_ltc_gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
index ae500409a..8b811cbef 100644
--- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
@@ -162,7 +162,7 @@ static int gm20b_fb_vpr_info_fetch_wait(struct gk20a *g,
 	return -ETIMEDOUT;
 }
 
-int gm20b_fb_vpr_info_fetch(struct gk20a *g)
+static int gm20b_fb_vpr_info_fetch(struct gk20a *g)
 {
 	if (gm20b_fb_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT)) {
 		return -ETIME;
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index fbeed3c2a..33198c23f 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -36,6 +36,7 @@
 #include "debug_gm20b.h"
 #include "cde_gm20b.h"
 #include "therm_gm20b.h"
+#include "hal_gm20b.h"
 
 #include <nvgpu/bug.h>
 
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 33f0c4836..2127badbb 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -26,6 +26,7 @@
 #include <nvgpu/hw/gm20b/hw_pri_ringmaster_gm20b.h>
 
 #include "gk20a/ltc_common.c"
+#include "ltc_gm20b.h"
 
 static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
 {
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c
index dcb7e5456..5be7062d8 100644
--- a/drivers/gpu/nvgpu/gp106/fb_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/fb_gp106.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-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,
@@ -14,6 +14,8 @@
 #include "gk20a/gk20a.h"
 #include "gp10b/fb_gp10b.h"
 
+#include "fb_gp106.h"
+
 #include <nvgpu/hw/gp106/hw_fb_gp106.h>
 
 #define HW_SCRUB_TIMEOUT_DEFAULT	100 /* usec */
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 3f64283af..eeb1bdd62 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -51,6 +51,8 @@
 #include "gp106/fb_gp106.h"
 #include "gp106/gp106_gating_reglist.h"
 
+#include "hal_gp106.h"
+
 #include <nvgpu/bug.h>
 
 #include <nvgpu/hw/gp106/hw_proj_gp106.h>
diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
index aa6b543a5..06cd94f22 100644
--- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
@@ -1,7 +1,7 @@
 /*
  * GP10B FB
  *
- * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-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,
@@ -16,6 +16,7 @@
 #include "gk20a/gk20a.h"
 #include "gm20b/fb_gm20b.h"
 #include "gk20a/kind_gk20a.h"
+#include "fb_gp10b.h"
 
 #include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h>
 
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index 1d3ad2759..133582cd7 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -42,6 +42,7 @@
 #include "gm20b/clk_gm20b.h"
 
 #include "gp10b.h"
+#include "hal_gp10b.h"
 
 #include <nvgpu/bug.h>
 
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
index 9ca5f46eb..e65e3d060 100644
--- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
@@ -24,6 +24,7 @@
 #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h>
 
 #include "gk20a/ltc_common.c"
+#include "ltc_gp10b.h"
 
 static int gp10b_determine_L2_size_bytes(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/tegra/linux/clk.c b/drivers/gpu/nvgpu/tegra/linux/clk.c
index e1d715b9b..876bac91f 100644
--- a/drivers/gpu/nvgpu/tegra/linux/clk.c
+++ b/drivers/gpu/nvgpu/tegra/linux/clk.c
@@ -18,6 +18,7 @@
 
 #include <linux/clk.h>
 
+#include "clk.h"
 #include "gk20a/gk20a.h"
 
 static unsigned long nvgpu_linux_clk_get_rate(struct gk20a *g, u32 api_domain)