diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
index ce7fa6af3..f4972f11c 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
@@ -31,7 +31,7 @@
 #include "ioctl_channel.h"
 #include "os_linux.h"
 #ifdef CONFIG_TEGRA_19x_GPU
-#include "tsg_t19x.h"
+#include "common/linux/ioctl_tsg_t19x.h"
 #endif
 
 struct tsg_private {
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h
index 51bc1086f..5e2b9b821 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h
@@ -26,6 +26,9 @@
 #include <nvgpu/kref.h>
 #include <nvgpu/rwsem.h>
 
+#ifdef CONFIG_TEGRA_19x_GPU
+#include "tsg_t19x.h"
+#endif
 #define NVGPU_INVALID_TSG_ID (-1)
 
 struct channel_gk20a;
@@ -65,6 +68,9 @@ struct tsg_gk20a {
 	u32 runlist_id;
 	pid_t tgid;
 	struct nvgpu_mem *eng_method_buffers;
+#ifdef CONFIG_TEGRA_19x_GPU
+	struct tsg_t19x t19x;
+#endif
 };
 
 int gk20a_enable_tsg(struct tsg_gk20a *tsg);