diff --git a/aio-android.c b/aio-android.c
index 5735136..9b6035f 100644
--- a/aio-android.c
+++ b/aio-android.c
@@ -14,7 +14,7 @@
 #include "qemu-common.h"
 #include "block/block.h"
 #include "qemu/queue.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "android/iolooper.h"
 
 typedef struct AioHandler AioHandler;
diff --git a/aio.c b/aio.c
index ee4a9d6..b0ea242 100644
--- a/aio.c
+++ b/aio.c
@@ -14,7 +14,7 @@
 #include "qemu-common.h"
 #include "block/block.h"
 #include "qemu/queue.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 typedef struct AioHandler AioHandler;
 
diff --git a/gdbstub.c b/gdbstub.c
index 99171a3..efdf60a 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -37,7 +37,7 @@
 
 #define MAX_PACKET_LENGTH 4096
 
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "sysemu/kvm.h"
 
 
diff --git a/qemu_socket.h b/include/qemu/sockets.h
similarity index 100%
rename from qemu_socket.h
rename to include/qemu/sockets.h
diff --git a/migration-dummy-android.c b/migration-dummy-android.c
index c4335c8..c207733 100644
--- a/migration-dummy-android.c
+++ b/migration-dummy-android.c
@@ -17,7 +17,7 @@
 #include "buffered_file.h"
 #include "sysemu/sysemu.h"
 #include "block/block.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 //#define DEBUG_MIGRATION
 
diff --git a/migration-exec.c b/migration-exec.c
index be48261..086ba12 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "migration/migration.h"
 #include "sysemu/char.h"
 #include "sysemu/sysemu.h"
diff --git a/migration-tcp-android.c b/migration-tcp-android.c
index c4b0672..6894852 100644
--- a/migration-tcp-android.c
+++ b/migration-tcp-android.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "migration/migration.h"
 #include "sysemu/char.h"
 #include "sysemu/sysemu.h"
diff --git a/migration-tcp.c b/migration-tcp.c
index b36e165..d94d8e7 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "migration/migration.h"
 #include "sysemu/char.h"
 #include "sysemu/sysemu.h"
diff --git a/migration.c b/migration.c
index 1795538..cdcdd12 100644
--- a/migration.c
+++ b/migration.c
@@ -17,7 +17,7 @@
 #include "buffered_file.h"
 #include "sysemu/sysemu.h"
 #include "block/block.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 //#define DEBUG_MIGRATION
 
diff --git a/net/net-android.c b/net/net-android.c
index bc3d22c..5eca787 100644
--- a/net/net-android.c
+++ b/net/net-android.c
@@ -119,7 +119,7 @@
 #include "qemu/timer.h"
 #include "sysemu/char.h"
 #include "audio/audio.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "qemu/log.h"
 
 #if defined(CONFIG_SLIRP)
diff --git a/net/net.c b/net/net.c
index 58c4523..6e70691 100644
--- a/net/net.c
+++ b/net/net.c
@@ -117,7 +117,7 @@
 #include "qemu/timer.h"
 #include "sysemu/char.h"
 #include "audio/audio.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "qemu/log.h"
 
 #if defined(CONFIG_SLIRP)
diff --git a/qemu-char.c b/qemu-char.c
index b43635a..79af598 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -98,7 +98,7 @@
 #endif
 #endif
 
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 #define READ_BUF_LEN 4096
 
diff --git a/savevm.c b/savevm.c
index 0ecedb9..c55f00a 100644
--- a/savevm.c
+++ b/savevm.c
@@ -81,7 +81,7 @@
 #include "block/block.h"
 #include "audio/audio.h"
 #include "migration/migration.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "qemu/queue.h"
 #include "migration/qemu-file.h"
 #include "android/snapshot.h"
diff --git a/ui/vnc-android.c b/ui/vnc-android.c
index f58c240..1fe2544 100644
--- a/ui/vnc-android.c
+++ b/ui/vnc-android.c
@@ -26,7 +26,7 @@
 
 #include "vnc.h"
 #include "sysemu/sysemu.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "qemu/timer.h"
 #include "qemu/acl.h"
 
diff --git a/ui/vnc.c b/ui/vnc.c
index 32baaed..f2804d7 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -26,7 +26,7 @@
 
 #include "vnc.h"
 #include "sysemu/sysemu.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "qemu/timer.h"
 #include "qemu/acl.h"
 
diff --git a/util/osdep.c b/util/osdep.c
index 83c947e..a4e5098 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -64,7 +64,7 @@
 
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 int qemu_madvise(void *addr, size_t len, int advice)
 {
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index ebf12f9..b5e6886 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -29,7 +29,7 @@
 #include "config-host.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 void *qemu_oom_check(void *ptr)
 {
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 470b779..d5455da 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -29,7 +29,7 @@
 #include "config-host.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 void *qemu_oom_check(void *ptr)
 {
diff --git a/util/qemu-sockets-android.c b/util/qemu-sockets-android.c
index b07129b..132c1ca 100644
--- a/util/qemu-sockets-android.c
+++ b/util/qemu-sockets-android.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "qemu-common.h" /* for qemu_isdigit */
 
 #ifndef AI_ADDRCONFIG
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 13c0b93..aa1fefb 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "qemu-common.h" /* for qemu_isdigit */
 
 #ifndef AI_ADDRCONFIG
diff --git a/vl-android.c b/vl-android.c
index bd3cbcf..9daf3a2 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -234,7 +234,7 @@
 #include "android/trace.h"
 #endif
 
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 #if defined(CONFIG_SLIRP)
 #include "libslirp.h"
diff --git a/vl.c b/vl.c
index bd39488..5bbad00 100644
--- a/vl.c
+++ b/vl.c
@@ -165,7 +165,7 @@
 
 #include "exec/exec-all.h"
 
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 
 #if defined(CONFIG_SLIRP)
 #include "libslirp.h"