diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c
index 8c27b6133..a914b4a20 100644
--- a/drivers/gpu/nvgpu/clk/clk_arb.c
+++ b/drivers/gpu/nvgpu/clk/clk_arb.c
@@ -28,6 +28,9 @@
 #include <linux/llist.h>
 #include <linux/uaccess.h>
 #include <linux/poll.h>
+#ifdef CONFIG_DEBUG_FS
+#include <linux/debugfs.h>
+#endif
 
 #include <nvgpu/bitops.h>
 #include <nvgpu/lock.h>
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index b6f6a97bb..8efb009a9 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -45,9 +45,6 @@ struct nvgpu_mem_sgt;
 #include <nvgpu/lock.h>
 #include <nvgpu/thread.h>
 #include <nvgpu/io.h>
-#ifdef CONFIG_DEBUG_FS
-#include <linux/debugfs.h>
-#endif
 
 #include <nvgpu/as.h>
 #include <nvgpu/log.h>
@@ -1239,9 +1236,6 @@ struct gk20a {
 	u32 tpc_fs_mask_user;
 
 	struct nvgpu_bios bios;
-#ifdef CONFIG_DEBUG_FS
-	struct debugfs_blob_wrapper bios_blob;
-#endif
 	bool bios_is_init;
 
 	struct nvgpu_clk_arb *clk_arb;
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c
index 3178ae532..a5a244e80 100644
--- a/drivers/gpu/nvgpu/gp106/bios_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c
@@ -31,9 +31,6 @@
 #include "gm20b/fifo_gm20b.h"
 #include "bios_gp106.h"
 #include "gp106/mclk_gp106.h"
-#ifdef CONFIG_DEBUG_FS
-#include "common/linux/os_linux.h"
-#endif
 
 #include <nvgpu/hw/gp106/hw_pwr_gp106.h>
 #include <nvgpu/hw/gp106/hw_mc_gp106.h>
@@ -187,10 +184,6 @@ out:
 int gp106_bios_init(struct gk20a *g)
 {
 	unsigned int i;
-#ifdef CONFIG_DEBUG_FS
-	struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
-	struct dentry *d;
-#endif
 	int err;
 
 	gk20a_dbg_fn("");
@@ -232,40 +225,24 @@ int gp106_bios_init(struct gk20a *g)
 			g->power_sensor_missing = true;
 	}
 
-#ifdef CONFIG_DEBUG_FS
-	g->bios_blob.data = g->bios.data;
-	g->bios_blob.size = g->bios.size;
-
-	d = debugfs_create_blob("bios", S_IRUGO, l->debugfs,
-			&g->bios_blob);
-	if (!d) {
-		err = -EINVAL;
-		nvgpu_err(g, "No debugfs?");
-		goto free_firmware;
-	}
-#endif
 	gk20a_dbg_fn("done");
 
 	err = gp106_bios_devinit(g);
 	if (err) {
 		nvgpu_err(g, "devinit failed");
-		goto free_debugfs;
+		goto free_firmware;
 	}
 
 	if (nvgpu_is_enabled(g, NVGPU_PMU_RUN_PREOS)) {
 		err = gp106_bios_preos(g);
 		if (err) {
 			nvgpu_err(g, "pre-os failed");
-			goto free_debugfs;
+			goto free_firmware;
 		}
 	}
 	g->bios_is_init = true;
 
 	return 0;
-free_debugfs:
-#ifdef CONFIG_DEBUG_FS
-	debugfs_remove(d);
-#endif
 free_firmware:
 	if (g->bios.data)
 		nvgpu_vfree(g, g->bios.data);
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
index 757503e43..e058b02fd 100644
--- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
@@ -27,6 +27,7 @@
 
 #include "gk20a/gk20a.h"
 #ifdef CONFIG_DEBUG_FS
+#include <linux/debugfs.h>
 #include "common/linux/os_linux.h"
 #endif
 #include "gp106/mclk_gp106.h"