diff --git a/drivers/gpu/nvgpu/common/fifo/engines.c b/drivers/gpu/nvgpu/common/fifo/engines.c
index ecc01ed6f..4fbf79281 100644
--- a/drivers/gpu/nvgpu/common/fifo/engines.c
+++ b/drivers/gpu/nvgpu/common/fifo/engines.c
@@ -44,10 +44,6 @@
 #include <nvgpu/static_analysis.h>
 #include <nvgpu/gops_mc.h>
 
-#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
-#include "nvgpu_next_gpuid.h"
-#endif
-
 #define FECS_METHOD_WFI_RESTORE	0x80000U
 
 enum nvgpu_fifo_engine nvgpu_engine_enum_from_type(struct gk20a *g,
@@ -849,9 +845,6 @@ int nvgpu_engine_init_info(struct nvgpu_fifo *f)
 	info->pri_base = dev_info.pri_base;
 	info->engine_enum = engine_enum;
 	info->fault_id = dev_info.fault_id;
-#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
-	NVGPU_NEXT_INIT_GR_INFO(g, info, &dev_info);
-#endif
 
 	/* engine_id starts from 0 to NV_HOST_NUM_ENGINES */
 	f->active_engines_list[f->num_engines] = dev_info.engine_id;
diff --git a/drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c b/drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c
index 5bcf2e42b..93adc1828 100644
--- a/drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c
+++ b/drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c
@@ -31,10 +31,6 @@
 
 #include "engines_gp10b.h"
 
-#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
-#include "nvgpu_next_gpuid.h"
-#endif
-
 int gp10b_engine_init_ce_info(struct nvgpu_fifo *f)
 {
 	struct gk20a *g = f->g;
@@ -109,9 +105,6 @@ int gp10b_engine_init_ce_info(struct nvgpu_fifo *f)
 		info->inst_id  = dev_info.inst_id;
 		info->pri_base = dev_info.pri_base;
 		info->engine_id = dev_info.engine_id;
-#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
-		NVGPU_NEXT_INIT_GR_INFO(g, info, &dev_info);
-#endif
 
 		/* engine_id starts from 0 to NV_HOST_NUM_ENGINES */
 		f->active_engines_list[f->num_engines] =