diff --git a/drivers/gpu/nvgpu/include/nvgpu/barrier.h b/drivers/gpu/nvgpu/include/nvgpu/barrier.h
index 7c944caf0..73118dc69 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/barrier.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/barrier.h
@@ -35,7 +35,7 @@
 #elif defined(NVGPU_HVRTOS)
 #include <nvgpu_hvrtos/barrier.h>
 #else
-#include <nvgpu_rmos/include/barrier.h>
+#include <nvgpu/qnx/barrier.h>
 #endif
 
 #define nvgpu_mb()	nvgpu_mb_impl()
diff --git a/drivers/gpu/nvgpu/include/nvgpu/log.h b/drivers/gpu/nvgpu/include/nvgpu/log.h
index adcc09e81..22bdeed1e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/log.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/log.h
@@ -30,7 +30,7 @@
 #elif defined(NVGPU_HVRTOS)
 #include <nvgpu_hvrtos/log.h>
 #else
-#include <nvgpu_rmos/include/log.h>
+#include <nvgpu/qnx/log.h>
 #endif
 
 #ifdef CONFIG_NVGPU_NON_FUSA
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
index e0ce021a3..6f2afda4f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
@@ -35,7 +35,7 @@
 #elif defined(NVGPU_HVRTOS)
 #include <nvgpu_hvrtos/nvgpu_mem.h>
 #else
-#include <nvgpu_rmos/include/nvgpu_mem.h>
+#include <nvgpu/qnx/nvgpu_mem.h>
 #endif
 
 /**
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pci.h b/drivers/gpu/nvgpu/include/nvgpu/pci.h
index b38465af0..ba38263c6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pci.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pci.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018-2022, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,7 +28,7 @@
 #elif defined(__NVGPU_POSIX__)
 #include <nvgpu/posix/pci.h>
 #elif defined(__QNX__)
-#include <nvgpu_rmos/include/pci.h>
+#include <nvgpu/qnx/pci.h>
 #else
 /*
  * In case someone tries to use this without implementing support!
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sim.h b/drivers/gpu/nvgpu/include/nvgpu/sim.h
index 6df8f9ab0..5be2b39fe 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/sim.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/sim.h
@@ -59,8 +59,8 @@ struct sim_nvgpu {
 #elif defined(__NVGPU_POSIX__) || defined(NVGPU_HVRTOS)
 /* Nothing for POSIX-nvgpu and nvgpu_hvrtos. */
 #else
-#include <nvgpu_rmos/include/sim.h>
-#include <nvgpu_rmos/include/sim_pci.h>
+#include <nvgpu/qnx/sim.h>
+#include <nvgpu/qnx/sim_pci.h>
 #endif
 int nvgpu_init_sim_support(struct gk20a *g);
 int nvgpu_init_sim_support_pci(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vm.h
index 3fb9859c7..854d141f6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vm.h
@@ -96,7 +96,7 @@ struct nvgpu_os_buffer;
 #include <nvgpu_hvrtos/vm.h>
 #else
 /* QNX include goes here. */
-#include <nvgpu_rmos/include/vm.h>
+#include <nvgpu/qnx/vm.h>
 #endif
 
 #define NVGPU_VM_NAME_LEN	32U