diff --git a/qemu/target/riscv/pmp.h b/qemu/target/riscv/pmp.h
index e3953c88..66790950 100644
--- a/qemu/target/riscv/pmp.h
+++ b/qemu/target/riscv/pmp.h
@@ -19,8 +19,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _RISCV_PMP_H_
-#define _RISCV_PMP_H_
+#ifndef RISCV_PMP_H
+#define RISCV_PMP_H
 
 typedef enum {
     PMP_READ  = 1 << 0,
diff --git a/qemu/target/sparc/asi.h b/qemu/target/sparc/asi.h
index d4e6ac94..d2db8b10 100644
--- a/qemu/target/sparc/asi.h
+++ b/qemu/target/sparc/asi.h
@@ -1,5 +1,5 @@
-#ifndef _SPARC_ASI_H
-#define _SPARC_ASI_H
+#ifndef SPARC_ASI_H
+#define SPARC_ASI_H
 
 /* asi.h:  Address Space Identifier values for the sparc.
  *
@@ -309,4 +309,4 @@
                       * implicit, little-endian
                       */
 
-#endif /* _SPARC_ASI_H */
+#endif /* SPARC_ASI_H */