diff --git a/qemu/exec.c b/qemu/exec.c
index 80ab72b3..6c6f3fc9 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -35,7 +35,7 @@
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #if defined(CONFIG_USER_ONLY)
-#include <qemu.h>
+#include "qemu.h"
 #endif
 #include "exec/cpu-all.h"
 
diff --git a/qemu/include/exec/helper-gen.h b/qemu/include/exec/helper-gen.h
index df3ea61b..49d01e7d 100644
--- a/qemu/include/exec/helper-gen.h
+++ b/qemu/include/exec/helper-gen.h
@@ -4,7 +4,7 @@
 #ifndef HELPER_GEN_H
 #define HELPER_GEN_H 1
 
-#include <exec/helper-head.h>
+#include "exec/helper-head.h"
 
 #define DEF_HELPER_FLAGS_0(name, flags, ret)                            \
 static inline void glue(gen_helper_, name)(TCGContext *tcg_ctx, dh_retvar_decl0(ret))        \
diff --git a/qemu/include/exec/helper-proto.h b/qemu/include/exec/helper-proto.h
index 828951c6..5c21c22f 100644
--- a/qemu/include/exec/helper-proto.h
+++ b/qemu/include/exec/helper-proto.h
@@ -4,7 +4,7 @@
 #ifndef HELPER_PROTO_H
 #define HELPER_PROTO_H 1
 
-#include <exec/helper-head.h>
+#include "exec/helper-head.h"
 
 #define DEF_HELPER_FLAGS_0(name, flags, ret) \
 dh_ctype(ret) HELPER(name) (void);
diff --git a/qemu/include/exec/helper-tcg.h b/qemu/include/exec/helper-tcg.h
index 5b12f316..6c6a4a9a 100644
--- a/qemu/include/exec/helper-tcg.h
+++ b/qemu/include/exec/helper-tcg.h
@@ -4,7 +4,7 @@
 #ifndef HELPER_TCG_H
 #define HELPER_TCG_H 1
 
-#include <exec/helper-head.h>
+#include "exec/helper-head.h"
 
 #define DEF_HELPER_FLAGS_0(NAME, FLAGS, ret) \
   { HELPER(NAME), #NAME, FLAGS, \
diff --git a/qemu/include/exec/tb-hash-xx.h b/qemu/include/exec/tb-hash-xx.h
index 9f3fc056..85b741d0 100644
--- a/qemu/include/exec/tb-hash-xx.h
+++ b/qemu/include/exec/tb-hash-xx.h
@@ -33,7 +33,7 @@
 #ifndef EXEC_TB_HASH_XX
 #define EXEC_TB_HASH_XX
 
-#include <qemu/bitops.h>
+#include "qemu/bitops.h"
 
 #define PRIME32_1   2654435761U
 #define PRIME32_2   2246822519U
diff --git a/qemu/include/qemu/thread-posix.h b/qemu/include/qemu/thread-posix.h
index 36f22721..0de20dc7 100644
--- a/qemu/include/qemu/thread-posix.h
+++ b/qemu/include/qemu/thread-posix.h
@@ -1,6 +1,7 @@
 #ifndef __QEMU_THREAD_POSIX_H
 #define __QEMU_THREAD_POSIX_H 1
-#include "pthread.h"
+
+#include <pthread.h>
 #include <semaphore.h>
 
 struct QemuThread {
diff --git a/qemu/include/qemu/thread-win32.h b/qemu/include/qemu/thread-win32.h
index 9f82ea23..03e79820 100644
--- a/qemu/include/qemu/thread-win32.h
+++ b/qemu/include/qemu/thread-win32.h
@@ -1,6 +1,7 @@
 #ifndef __QEMU_THREAD_WIN32_H
 #define __QEMU_THREAD_WIN32_H 1
-#include "windows.h"
+
+#include <windows.h>
 
 typedef struct QemuThreadData QemuThreadData;
 struct QemuThread {
diff --git a/qemu/target-arm/psci.c b/qemu/target-arm/psci.c
index 3b42a2d9..783aef8c 100644
--- a/qemu/target-arm/psci.c
+++ b/qemu/target-arm/psci.c
@@ -16,11 +16,11 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
-#include <cpu.h>
-#include <cpu-qom.h>
-#include <exec/helper-proto.h>
-#include <kvm-consts.h>
-#include <sysemu/sysemu.h>
+#include "cpu.h"
+#include "cpu-qom.h"
+#include "exec/helper-proto.h"
+#include "kvm-consts.h"
+#include "sysemu/sysemu.h"
 #include "internals.h"
 #include "exec/exec-all.h"
 
diff --git a/qemu/util/mmap-alloc.c b/qemu/util/mmap-alloc.c
index 33ee7f1c..00b2d8cd 100644
--- a/qemu/util/mmap-alloc.c
+++ b/qemu/util/mmap-alloc.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <qemu/mmap-alloc.h>
+#include "qemu/mmap-alloc.h"
 #include <sys/mman.h>
 
 void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared)
diff --git a/qemu/util/oslib-posix.c b/qemu/util/oslib-posix.c
index 23654de9..c02556fa 100644
--- a/qemu/util/oslib-posix.c
+++ b/qemu/util/oslib-posix.c
@@ -61,7 +61,7 @@
 #include <sys/sysctl.h>
 #endif
 
-#include <qemu/mmap-alloc.h>
+#include "qemu/mmap-alloc.h"
 
 void *qemu_oom_check(void *ptr)
 {