diff --git a/drivers/gpu/nvgpu/hal/mc/mc_gm20b.h b/drivers/gpu/nvgpu/hal/mc/mc_gm20b.h
index 709d67f66..75c32a249 100644
--- a/drivers/gpu/nvgpu/hal/mc/mc_gm20b.h
+++ b/drivers/gpu/nvgpu/hal/mc/mc_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-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"),
@@ -39,7 +39,9 @@ void gm20b_mc_enable(struct gk20a *g, u32 units);
 void gm20b_mc_disable(struct gk20a *g, u32 units);
 void gm20b_mc_reset(struct gk20a *g, u32 units);
 u32  gm20b_mc_reset_mask(struct gk20a *g, enum nvgpu_unit unit);
+#ifdef CONFIG_NVGPU_LS_PMU
 bool gm20b_mc_is_enabled(struct gk20a *g, enum nvgpu_unit unit);
+#endif
 
 #ifdef CONFIG_NVGPU_HAL_NON_FUSA
 void gm20b_mc_intr_mask(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/hal/mc/mc_gp10b.h b/drivers/gpu/nvgpu/hal/mc/mc_gp10b.h
index 7cb47922a..9f88e3572 100644
--- a/drivers/gpu/nvgpu/hal/mc/mc_gp10b.h
+++ b/drivers/gpu/nvgpu/hal/mc/mc_gp10b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-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"),
@@ -37,13 +37,18 @@ void mc_gp10b_isr_stall(struct gk20a *g);
 bool mc_gp10b_is_intr1_pending(struct gk20a *g,
 				      enum nvgpu_unit unit, u32 mc_intr_1);
 
+#ifdef CONFIG_NVGPU_NON_FUSA
 void mc_gp10b_log_pending_intrs(struct gk20a *g);
+#endif
 u32  mc_gp10b_intr_stall(struct gk20a *g);
 void mc_gp10b_intr_stall_pause(struct gk20a *g);
 void mc_gp10b_intr_stall_resume(struct gk20a *g);
 u32  mc_gp10b_intr_nonstall(struct gk20a *g);
 void mc_gp10b_intr_nonstall_pause(struct gk20a *g);
 void mc_gp10b_intr_nonstall_resume(struct gk20a *g);
+
+/** @cond DOXYGEN_SHOULD_SKIP_THIS */
 void mc_gp10b_ltc_isr(struct gk20a *g);
+/** @endcond DOXYGEN_SHOULD_SKIP_THIS */
 
 #endif
diff --git a/drivers/gpu/nvgpu/hal/mc/mc_gv11b.h b/drivers/gpu/nvgpu/hal/mc/mc_gv11b.h
index bd5188b51..989ff16d6 100644
--- a/drivers/gpu/nvgpu/hal/mc/mc_gv11b.h
+++ b/drivers/gpu/nvgpu/hal/mc/mc_gv11b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-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"),
@@ -27,9 +27,12 @@
 
 struct gk20a;
 
-bool gv11b_mc_is_intr_hub_pending(struct gk20a *g, u32 mc_intr_0);
 bool gv11b_mc_is_stall_and_eng_intr_pending(struct gk20a *g, u32 engine_id,
 			u32 *eng_intr_pending);
 bool gv11b_mc_is_mmu_fault_pending(struct gk20a *g);
 
+/** @cond DOXYGEN_SHOULD_SKIP_THIS */
+bool gv11b_mc_is_intr_hub_pending(struct gk20a *g, u32 mc_intr_0);
+/** @endcond DOXYGEN_SHOULD_SKIP_THIS */
+
 #endif
diff --git a/userspace/units/mc/nvgpu-mc.h b/userspace/units/mc/nvgpu-mc.h
index 09c8c79cc..e48b33309 100644
--- a/userspace/units/mc/nvgpu-mc.h
+++ b/userspace/units/mc/nvgpu-mc.h
@@ -176,7 +176,8 @@ int test_intr_stall(struct unit_module *m, struct gk20a *g, void *args);
  *
  * Test Type: Feature
  *
- * Targets: gops_mc.is_stall_and_eng_intr_pending, mc_gp10b_is_intr1_pending
+ * Targets: gops_mc.is_stall_and_eng_intr_pending,
+ *          gv11b_mc_is_stall_and_eng_intr_pending
  *
  * Input: test_setup_env must have been run.
  *