diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.h b/drivers/gpu/nvgpu/pmgr/pmgr.h
index 33daf8a92..9b142de00 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgr.h
+++ b/drivers/gpu/nvgpu/pmgr/pmgr.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PMGR_H_
-#define _PMGR_H_
+#ifndef NVGPU_PMGR_H
+#define NVGPU_PMGR_H
 
 #include "pwrdev.h"
 #include "pwrmonitor.h"
@@ -40,4 +40,4 @@ int pmgr_pwr_devices_get_current(struct gk20a *g, u32 *val);
 int pmgr_pwr_devices_get_voltage(struct gk20a *g, u32 *val);
 int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val);
 
-#endif
+#endif /* NVGPU_PMGR_H */
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.h b/drivers/gpu/nvgpu/pmgr/pmgrpmu.h
index 23062b13b..f4ffaef38 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.h
+++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PMGRPMU_H_
-#define _PMGRPMU_H_
+#ifndef NVGPU_PMGRPMU_H
+#define NVGPU_PMGRPMU_H
 
 #include <nvgpu/gk20a.h>
 
@@ -36,4 +36,4 @@ u32 pmgr_pmu_pwr_devices_query_blocking(
 		u32 pwr_dev_mask,
 		struct nv_pmu_pmgr_pwr_devices_query_payload *ppayload);
 
-#endif
+#endif /* NVGPU_PMGRPMU_H */
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.h b/drivers/gpu/nvgpu/pmgr/pwrdev.h
index 72cca1fbf..4bcf65a71 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrdev.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrdev.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PWRDEV_H_
-#define _PWRDEV_H_
+#ifndef NVGPU_PMGR_PWRDEV_H
+#define NVGPU_PMGR_PWRDEV_H
 
 #include "boardobj/boardobj.h"
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
@@ -57,4 +57,4 @@ struct pwr_device_ina3221 {
 
 int pmgr_device_sw_setup(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_PMGR_PWRDEV_H */
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
index da52b08a1..bf4c76f9e 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PWRMONITOR_H_
-#define _PWRMONITOR_H_
+#ifndef NVGPU_PMGR_PWRMONITOR_H
+#define NVGPU_PMGR_PWRMONITOR_H
 
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp.h"
@@ -66,4 +66,4 @@ struct pmgr_pwr_monitor {
 
 int pmgr_monitor_sw_setup(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_PMGR_PWRMONITOR_H */
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
index 12936a3e2..868bc2cbe 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PWRPOLICY_H_
-#define _PWRPOLICY_H_
+#ifndef NVGPU_PMGR_PWRPOLICY_H
+#define NVGPU_PMGR_PWRPOLICY_H
 
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp.h"
@@ -133,4 +133,4 @@ union pwr_policy_data_union {
 
 int pmgr_policy_sw_setup(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_PMGR_PWRPOLICY_H */