diff --git a/userspace/units/gr/global_ctx/nvgpu-gr-global-ctx.c b/userspace/units/gr/global_ctx/nvgpu-gr-global-ctx.c
index f64816815..757cd1293 100644
--- a/userspace/units/gr/global_ctx/nvgpu-gr-global-ctx.c
+++ b/userspace/units/gr/global_ctx/nvgpu-gr-global-ctx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2020, 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"),
@@ -201,7 +201,6 @@ int test_gr_global_ctx_local_ctx_error_injection(struct unit_module *m,
 		struct gk20a *g, void *args)
 {
 	int err;
-	bool valid;
 	struct nvgpu_mem mem;
 	struct nvgpu_gr_global_ctx_local_golden_image *local_golden_image;
 	struct nvgpu_gr_global_ctx_local_golden_image *local_golden_image_bk;
@@ -249,6 +248,8 @@ int test_gr_global_ctx_local_ctx_error_injection(struct unit_module *m,
 	if (local_golden_image_bk == NULL) {
 		unit_return_fail(m, "failed to initialize local golden image");
 	}
+#ifdef CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION
+	bool valid;
 
 	/* Compare two images, they should match since both have zero's only */
 	valid = nvgpu_gr_global_ctx_compare_golden_images(g, true, local_golden_image,
@@ -271,6 +272,7 @@ int test_gr_global_ctx_local_ctx_error_injection(struct unit_module *m,
 	if (valid) {
 		unit_return_fail(m, "unexpected success");
 	}
+#endif
 
 	/* Cleanup */
 	nvgpu_gr_global_ctx_deinit_local_golden_image(g, local_golden_image);
diff --git a/userspace/units/gr/obj_ctx/nvgpu-gr-obj-ctx.c b/userspace/units/gr/obj_ctx/nvgpu-gr-obj-ctx.c
index c4f6df0af..12c683aab 100644
--- a/userspace/units/gr/obj_ctx/nvgpu-gr-obj-ctx.c
+++ b/userspace/units/gr/obj_ctx/nvgpu-gr-obj-ctx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2020, 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"),
@@ -298,8 +298,10 @@ int test_gr_obj_ctx_error_injection(struct unit_module *m,
 
 	/* gops.gr.init.load_sw_veid_bundle could be NULL */
 	g->ops.gr.init.load_sw_veid_bundle = NULL;
+#ifdef CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION
 	/* gops.gr.init.restore_stats_counter_bundle_data could be NULL */
 	g->ops.gr.init.restore_stats_counter_bundle_data = NULL;
+#endif
 
 	/* Fail 4th gops.gr.init.wait_idle */
 	g->ops.gr.init.wait_idle = test_gr_wait_idle;
diff --git a/userspace/units/mm/as/as.c b/userspace/units/mm/as/as.c
index b4b9886c7..a14ce17e3 100644
--- a/userspace/units/mm/as/as.c
+++ b/userspace/units/mm/as/as.c
@@ -36,6 +36,7 @@
 #include "hal/mm/gmmu/gmmu_gv11b.h"
 #include "hal/mm/mmu_fault/mmu_fault_gv11b.h"
 #include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gp10b.h"
 #include "hal/fb/fb_gv11b.h"
 #include "hal/fb/fb_mmu_fault_gv11b.h"
 #include "hal/fb/intr/fb_intr_gv11b.h"
diff --git a/userspace/units/mm/mm/mm.c b/userspace/units/mm/mm/mm.c
index 741f66bdb..f7d205443 100644
--- a/userspace/units/mm/mm/mm.c
+++ b/userspace/units/mm/mm/mm.c
@@ -41,6 +41,7 @@
 #include "hal/mm/gmmu/gmmu_gv11b.h"
 #include "hal/mm/mmu_fault/mmu_fault_gv11b.h"
 #include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gp10b.h"
 #include "hal/fb/fb_gv11b.h"
 #include "hal/fb/fb_mmu_fault_gv11b.h"
 #include "hal/fb/intr/fb_intr_gv11b.h"