diff --git a/drivers/gpu/nvgpu/hal/ltc/ltc_gm20b.h b/drivers/gpu/nvgpu/hal/ltc/ltc_gm20b.h
index 14a8521b1..da8f26582 100644
--- a/drivers/gpu/nvgpu/hal/ltc/ltc_gm20b.h
+++ b/drivers/gpu/nvgpu/hal/ltc/ltc_gm20b.h
@@ -28,7 +28,6 @@
 #include <nvgpu/types.h>
 
 struct gk20a;
-struct gr_gk20a;
 
 u64 gm20b_determine_L2_size_bytes(struct gk20a *g);
 #ifdef CONFIG_NVGPU_GRAPHICS
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 0df52d8b5..9445f7827 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -60,7 +60,9 @@ struct nvgpu_netlist_vars;
 struct netlist_av_list;
 struct netlist_aiv_list;
 struct netlist_av64_list;
+#ifdef CONFIG_NVGPU_FECS_TRACE
 struct nvgpu_gr_fecs_trace;
+#endif
 struct nvgpu_gr_isr_data;
 struct nvgpu_gpu_ctxsw_trace_entry;
 struct nvgpu_cpu_time_correlation_sample;
@@ -100,11 +102,9 @@ struct nvgpu_fecs_method_op;
 struct nvgpu_mem;
 struct gk20a_cs_snapshot_client;
 struct dbg_session_gk20a;
-struct gk20a_ctxsw_ucode_info;
 struct ctxsw_buf_offset_map_entry;
 struct nvgpu_dbg_reg_op;
 struct gk20a_cs_snapshot;
-struct nvgpu_preemption_modes_rec;
 struct nvgpu_gr_ctx;
 struct nvgpu_fecs_host_intr_status;
 struct nvgpu_fecs_ecc_status;