diff --git a/drivers/gpu/nvgpu/common/gr/gr_falcon_priv.h b/drivers/gpu/nvgpu/common/gr/gr_falcon_priv.h
index 03e37db5d..7c251b450 100644
--- a/drivers/gpu/nvgpu/common/gr/gr_falcon_priv.h
+++ b/drivers/gpu/nvgpu/common/gr/gr_falcon_priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2021, 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"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef GR_FALCON_PRIV_H
-#define GR_FALCON_PRIV_H
+#ifndef NVGPU_GR_FALCON_PRIV_H
+#define NVGPU_GR_FALCON_PRIV_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/nvgpu_mem.h>
@@ -209,4 +209,4 @@ struct nvgpu_gr_falcon {
 	struct nvgpu_gr_falcon_query_sizes sizes;
 };
 
-#endif /* GR_FALCON_PRIV_H */
+#endif /* NVGPU_GR_FALCON_PRIV_H */
diff --git a/drivers/gpu/nvgpu/common/gr/zbc_priv.h b/drivers/gpu/nvgpu/common/gr/zbc_priv.h
index 81dcfc25e..3fb615bf2 100644
--- a/drivers/gpu/nvgpu/common/gr/zbc_priv.h
+++ b/drivers/gpu/nvgpu/common/gr/zbc_priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2021, 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"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef GR_ZBC_H
-#define GR_ZBC_H
+#ifndef NVGPU_GR_ZBC_PRIV_H
+#define NVGPU_GR_ZBC_PRIV_H
 
 #include <nvgpu/gr/zbc.h>
 
@@ -85,5 +85,5 @@ struct nvgpu_gr_zbc {
 	u32 max_used_stencil_index; /* Max used stencil table index */
 };
 
-#endif /* GR_ZBC_H */
+#endif /* NVGPU_GR_ZBC_PRIV_H */
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h b/drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h
index dfe909c03..f7df68cf7 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2021, 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"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef NVGPU_INCLUDE_GR_CTX_H
-#define NVGPU_INCLUDE_GR_CTX_H
+#ifndef NVGPU_GR_CTX_H
+#define NVGPU_GR_CTX_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/nvgpu_mem.h>
@@ -612,4 +612,4 @@ bool nvgpu_gr_ctx_desc_dump_ctxsw_stats_on_channel_close(
 		struct nvgpu_gr_ctx_desc *gr_ctx_desc);
 #endif
 
-#endif /* NVGPU_INCLUDE_GR_CTX_H */
+#endif /* NVGPU_GR_CTX_H */