diff --git a/drivers/gpu/nvgpu/include/nvgpu/fuse.h b/drivers/gpu/nvgpu/include/nvgpu/fuse.h
index 85ab99a31..547758c97 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/fuse.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/fuse.h
@@ -32,6 +32,10 @@ struct gk20a;
 #include <nvgpu/types.h>
 #include <nvgpu/errno.h>
 
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include "include/nvgpu/nvgpu_next_fuse.h"
+#endif
+
 #ifdef CONFIG_NVGPU_TEGRA_FUSE
 
 #ifdef CONFIG_NVGPU_NON_FUSA
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gops_fuse.h b/drivers/gpu/nvgpu/include/nvgpu/gops_fuse.h
index 5a4ac587b..807dd6170 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gops_fuse.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gops_fuse.h
@@ -32,6 +32,10 @@
  */
 struct gk20a;
 
+#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+struct nvgpu_fuse_feature_override_ecc;
+#endif
+
 /**
  * Fuse HAL operations.
  *