diff --git a/payloads/libpayload/include/arm/arch/barrier.h b/payloads/libpayload/include/arm/arch/barrier.h
index c2cdbff149..80c0919221 100644
--- a/payloads/libpayload/include/arm/arch/barrier.h
+++ b/payloads/libpayload/include/arm/arch/barrier.h
@@ -33,7 +33,7 @@
  *
  */
 
-#ifndef __ARCH_BARRIER_H_
+#ifndef __ARCH_BARRIER_H__
 #define __ARCH_BARRIER_H__
 
 #include <arch/cache.h>
diff --git a/payloads/libpayload/include/arm64/arch/barrier.h b/payloads/libpayload/include/arm64/arch/barrier.h
index 0aa445f2b1..26983e08b2 100644
--- a/payloads/libpayload/include/arm64/arch/barrier.h
+++ b/payloads/libpayload/include/arm64/arch/barrier.h
@@ -33,7 +33,7 @@
  *
  */
 
-#ifndef __ARCH_BARRIER_H_
+#ifndef __ARCH_BARRIER_H__
 #define __ARCH_BARRIER_H__
 
 #include <arch/cache.h>
diff --git a/payloads/libpayload/include/x86/arch/barrier.h b/payloads/libpayload/include/x86/arch/barrier.h
index 9539c25df2..dc75f1ab88 100644
--- a/payloads/libpayload/include/x86/arch/barrier.h
+++ b/payloads/libpayload/include/x86/arch/barrier.h
@@ -27,7 +27,7 @@
  *
  */
 
-#ifndef __ARCH_BARRIER_H_
+#ifndef __ARCH_BARRIER_H__
 #define __ARCH_BARRIER_H__
 
 #define mb()