diff --git a/userspace/units/fifo/tsg/nvgpu-fifo-gv11b.c b/userspace/units/fifo/nvgpu-fifo-gv11b.c
similarity index 100%
rename from userspace/units/fifo/tsg/nvgpu-fifo-gv11b.c
rename to userspace/units/fifo/nvgpu-fifo-gv11b.c
diff --git a/userspace/units/fifo/tsg/nvgpu-fifo-gv11b.h b/userspace/units/fifo/nvgpu-fifo-gv11b.h
similarity index 100%
rename from userspace/units/fifo/tsg/nvgpu-fifo-gv11b.h
rename to userspace/units/fifo/nvgpu-fifo-gv11b.h
diff --git a/userspace/units/fifo/tsg/Makefile b/userspace/units/fifo/tsg/Makefile
index 93e765076..e127217ed 100644
--- a/userspace/units/fifo/tsg/Makefile
+++ b/userspace/units/fifo/tsg/Makefile
@@ -20,7 +20,7 @@
 
 .SUFFIXES:
 
-OBJS   = nvgpu-tsg.o nvgpu-fifo-gv11b.o
+OBJS   = nvgpu-tsg.o ../nvgpu-fifo-gv11b.o
 MODULE = nvgpu-tsg
 
 include ../../Makefile.units
diff --git a/userspace/units/fifo/tsg/nvgpu-tsg.c b/userspace/units/fifo/tsg/nvgpu-tsg.c
index b86e3d92d..e969d3572 100644
--- a/userspace/units/fifo/tsg/nvgpu-tsg.c
+++ b/userspace/units/fifo/tsg/nvgpu-tsg.c
@@ -36,7 +36,7 @@
 
 #include "hal/init/hal_gv11b.h"
 
-#include "nvgpu-fifo-gv11b.h"
+#include "../nvgpu-fifo-gv11b.h"
 
 struct test_tsg_args {
 	bool init_done;