diff --git a/qemu/include/exec/exec-all.h b/qemu/include/exec/exec-all.h
index f04492c0..4b9cee43 100644
--- a/qemu/include/exec/exec-all.h
+++ b/qemu/include/exec/exec-all.h
@@ -17,8 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXEC_ALL_H_
-#define _EXEC_ALL_H_
+#ifndef EXEC_ALL_H
+#define EXEC_ALL_H
 
 #include "qemu-common.h"
 #include "exec/tb-context.h"
diff --git a/qemu/include/exec/tb-context.h b/qemu/include/exec/tb-context.h
index 449ec6e3..6680fc2f 100644
--- a/qemu/include/exec/tb-context.h
+++ b/qemu/include/exec/tb-context.h
@@ -17,8 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef QEMU_TB_CONTEXT_H_
-#define QEMU_TB_CONTEXT_H_
+#ifndef QEMU_TB_CONTEXT_H
+#define QEMU_TB_CONTEXT_H
 
 #include "qemu/thread.h"
 
diff --git a/qemu/include/exec/tb-hash-xx.h b/qemu/include/exec/tb-hash-xx.h
index 85b741d0..2c40b5c4 100644
--- a/qemu/include/exec/tb-hash-xx.h
+++ b/qemu/include/exec/tb-hash-xx.h
@@ -30,8 +30,9 @@
  * You can contact the author at :
  * - xxHash source repository : https://github.com/Cyan4973/xxHash
  */
-#ifndef EXEC_TB_HASH_XX
-#define EXEC_TB_HASH_XX
+
+#ifndef EXEC_TB_HASH_XX_H
+#define EXEC_TB_HASH_XX_H
 
 #include "qemu/bitops.h"
 
@@ -91,4 +92,4 @@ uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e)
     return h32;
 }
 
-#endif /* EXEC_TB_HASH_XX */
+#endif /* EXEC_TB_HASH_XX_H */
diff --git a/qemu/include/exec/tb-hash.h b/qemu/include/exec/tb-hash.h
index 88ccfd17..e645ff5e 100644
--- a/qemu/include/exec/tb-hash.h
+++ b/qemu/include/exec/tb-hash.h
@@ -17,8 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EXEC_TB_HASH
-#define EXEC_TB_HASH
+#ifndef EXEC_TB_HASH_H
+#define EXEC_TB_HASH_H
 
 #include "exec/exec-all.h"
 #include "exec/tb-hash-xx.h"
diff --git a/qemu/include/qemu/atomic.h b/qemu/include/qemu/atomic.h
index 4bcce927..6cd771e7 100644
--- a/qemu/include/qemu/atomic.h
+++ b/qemu/include/qemu/atomic.h
@@ -12,8 +12,8 @@
  * atomic primitive is meant to provide.
  */
 
-#ifndef __QEMU_ATOMIC_H
-#define __QEMU_ATOMIC_H 1
+#ifndef QEMU_ATOMIC_H
+#define QEMU_ATOMIC_H
 
 #include "qemu/compiler.h"
 
@@ -385,4 +385,4 @@ void _ReadWriteBarrier(void);
 #endif
 
 #endif /* __ATOMIC_RELAXED */
-#endif /* __QEMU_ATOMIC_H */
+#endif /* QEMU_ATOMIC_H */
diff --git a/qemu/include/qemu/mmap-alloc.h b/qemu/include/qemu/mmap-alloc.h
index 56388e68..14fbd3bf 100644
--- a/qemu/include/qemu/mmap-alloc.h
+++ b/qemu/include/qemu/mmap-alloc.h
@@ -1,5 +1,5 @@
-#ifndef QEMU_MMAP_ALLOC
-#define QEMU_MMAP_ALLOC
+#ifndef QEMU_MMAP_ALLOC_H
+#define QEMU_MMAP_ALLOC_H
 
 #include "qemu-common.h"
 
diff --git a/qemu/include/qemu/queue.h b/qemu/include/qemu/queue.h
index d433b901..c5336d98 100644
--- a/qemu/include/qemu/queue.h
+++ b/qemu/include/qemu/queue.h
@@ -37,8 +37,8 @@
  *      @(#)queue.h     8.5 (Berkeley) 8/20/94
  */
 
-#ifndef QEMU_SYS_QUEUE_H_
-#define QEMU_SYS_QUEUE_H_
+#ifndef QEMU_SYS_QUEUE_H
+#define QEMU_SYS_QUEUE_H
 
 /*
  * This file defines four types of data structures: singly-linked lists,
@@ -411,4 +411,4 @@ struct {                                                                \
 #define QTAILQ_PREV(elm, headname, field) \
         (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
 
-#endif  /* !QEMU_SYS_QUEUE_H_ */
+#endif /* QEMU_SYS_QUEUE_H */
diff --git a/qemu/include/qemu/thread-posix.h b/qemu/include/qemu/thread-posix.h
index 0de20dc7..05777209 100644
--- a/qemu/include/qemu/thread-posix.h
+++ b/qemu/include/qemu/thread-posix.h
@@ -1,5 +1,5 @@
-#ifndef __QEMU_THREAD_POSIX_H
-#define __QEMU_THREAD_POSIX_H 1
+#ifndef QEMU_THREAD_POSIX_H
+#define QEMU_THREAD_POSIX_H
 
 #include <pthread.h>
 #include <semaphore.h>
diff --git a/qemu/include/qemu/thread-win32.h b/qemu/include/qemu/thread-win32.h
index 03e79820..a6a10005 100644
--- a/qemu/include/qemu/thread-win32.h
+++ b/qemu/include/qemu/thread-win32.h
@@ -1,5 +1,5 @@
-#ifndef __QEMU_THREAD_WIN32_H
-#define __QEMU_THREAD_WIN32_H 1
+#ifndef QEMU_THREAD_WIN32_H
+#define QEMU_THREAD_WIN32_H
 
 #include <windows.h>
 
diff --git a/qemu/include/qemu/thread.h b/qemu/include/qemu/thread.h
index c5d25f61..50cf3099 100644
--- a/qemu/include/qemu/thread.h
+++ b/qemu/include/qemu/thread.h
@@ -1,5 +1,5 @@
-#ifndef __QEMU_THREAD_H
-#define __QEMU_THREAD_H 1
+#ifndef QEMU_THREAD_H
+#define QEMU_THREAD_H
 
 #include "unicorn/platform.h"
 
diff --git a/qemu/target-i386/svm.h b/qemu/target-i386/svm.h
index 188aa280..605ec65e 100644
--- a/qemu/target-i386/svm.h
+++ b/qemu/target-i386/svm.h
@@ -1,5 +1,5 @@
-#ifndef __SVM_H
-#define __SVM_H
+#ifndef SVM_H
+#define SVM_H
 
 #define TLB_CONTROL_DO_NOTHING 0
 #define TLB_CONTROL_FLUSH_ALL_ASID 1
diff --git a/qemu/target-mips/mips-defs.h b/qemu/target-mips/mips-defs.h
index 53b185eb..047554ee 100644
--- a/qemu/target-mips/mips-defs.h
+++ b/qemu/target-mips/mips-defs.h
@@ -1,5 +1,5 @@
-#if !defined (__QEMU_MIPS_DEFS_H__)
-#define __QEMU_MIPS_DEFS_H__
+#ifndef QEMU_MIPS_DEFS_H
+#define QEMU_MIPS_DEFS_H
 
 /* If we want to use host float regs... */
 //#define USE_HOST_FLOAT_REGS
@@ -88,4 +88,4 @@
    Note that we still maintain Count/Compare to match the host clock. */
 //#define MIPS_STRICT_STANDARD 1
 
-#endif /* !defined (__QEMU_MIPS_DEFS_H__) */
+#endif /* QEMU_MIPS_DEFS_H */