diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index e3980c1f8..3d43c3f9c 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -254,7 +254,6 @@ nvgpu-y += \
 	hal/fifo/fifo_tu104.o \
 	hal/fifo/preempt_gk20a.o \
 	hal/fifo/usermode_tu104.o \
-	hal/fifo/pbdma_gp10b.o \
 	hal/fifo/pbdma_tu104.o \
 	hal/fifo/ramfc_gk20a.o \
 	hal/fifo/ramfc_gp10b.o \
@@ -275,9 +274,6 @@ nvgpu-y += \
 	hal/fifo/userd_gv11b.o \
 	hal/fifo/fifo_intr_gk20a.o \
 	hal/fifo/fifo_intr_gv100.o \
-	hal/fifo/mmu_fault_gk20a.o \
-	hal/fifo/mmu_fault_gm20b.o \
-	hal/fifo/mmu_fault_gp10b.o \
 	hal/fifo/ctxsw_timeout_gk20a.o \
 	hal/netlist/netlist_gp10b.o \
 	hal/netlist/netlist_gv100.o \
@@ -666,6 +662,10 @@ nvgpu-$(CONFIG_NVGPU_HAL_NON_FUSA) += \
 	hal/fifo/engine_status_gm20b.o \
 	hal/fifo/engines_gm20b.o \
 	hal/fifo/pbdma_gm20b.o \
+	hal/fifo/pbdma_gp10b.o \
+	hal/fifo/mmu_fault_gk20a.o \
+	hal/fifo/mmu_fault_gm20b.o \
+	hal/fifo/mmu_fault_gp10b.o \
 	hal/gr/config/gr_config_gm20b.o \
 	hal/gr/ctxsw_prog/ctxsw_prog_gm20b.o \
 	hal/gr/ctxsw_prog/ctxsw_prog_gm20b_dbg.o \
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index dc4b1e3bc..6bc2ce1ee 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -151,9 +151,7 @@ srcs += common/utils/enabled.c \
 	hal/fifo/runlist_fifo_gk20a.c \
 	hal/fifo/runlist_fifo_gv11b.c \
 	hal/fifo/runlist_ram_gk20a.c \
-	hal/fifo/pbdma_gp10b.c \
 	hal/fifo/userd_gk20a.c \
-	hal/fifo/mmu_fault_gp10b.c \
 	hal/sync/syncpt_cmdbuf_gv11b.c
 
 # Source files below are functionaly safe (FuSa) and must always be included.
@@ -294,6 +292,7 @@ srcs += hal/init/hal_gp10b.c \
 	hal/fifo/preempt_gk20a.c \
 	hal/fifo/engines_gm20b.c \
 	hal/fifo/pbdma_gm20b.c \
+	hal/fifo/pbdma_gp10b.c \
 	hal/fifo/engine_status_gm20b.c \
 	hal/fifo/ramfc_gk20a.c  \
 	hal/fifo/ramfc_gp10b.c  \
@@ -304,6 +303,7 @@ srcs += hal/init/hal_gp10b.c \
 	hal/fifo/fifo_intr_gk20a.c \
 	hal/fifo/mmu_fault_gk20a.c \
 	hal/fifo/mmu_fault_gm20b.c \
+	hal/fifo/mmu_fault_gp10b.c \
 	hal/fifo/ctxsw_timeout_gk20a.c \
 	hal/netlist/netlist_gm20b.c \
 	hal/netlist/netlist_gp10b.c \