diff --git a/drivers/gpu/nvgpu/include/nvgpu/ecc.h b/drivers/gpu/nvgpu/include/nvgpu/ecc.h
index a2a614471..c2ae11d9d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/ecc.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/ecc.h
@@ -172,6 +172,9 @@ struct nvgpu_ecc {
 		struct nvgpu_ecc_stat **sm_icache_ecc_corrected_err_count;
 		/** SM icache uncorrected error count. */
 		struct nvgpu_ecc_stat **sm_icache_ecc_uncorrected_err_count;
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include "include/nvgpu/gr/nvgpu_next_gr_ecc.h"
+#endif
 
 		/** GCC l1.5-cache corrected error count. */
 		struct nvgpu_ecc_stat *gcc_l15_ecc_corrected_err_count;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h
index a151e7d6f..8b99c2a81 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_err.h
@@ -704,4 +704,8 @@ void nvgpu_report_mmu_err(struct gk20a *g, u32 hw_unit,
 void gr_intr_report_ctxsw_error(struct gk20a *g, u32 err_type, u32 chid,
 		u32 mailbox_value);
 
+#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include "include/nvgpu/nvgpu_next_err.h"
+#endif
+
 #endif /* NVGPU_NVGPU_ERR_H */