Move elf_ops.h -> include/hw/elf_ops.h
+ qemu-thread.h -> include/qemu/thread.h
+ qemu-os-*.h -> include/sysemu/os-*.h
Change-Id: I68a58a817e54a7f607b34b7a9b34e38a685233ea
diff --git a/cpus.c b/cpus.c
index 40d6965..9d3ad5f 100644
--- a/cpus.c
+++ b/cpus.c
@@ -265,7 +265,7 @@
#else /* CONFIG_IOTHREAD */
-#include "qemu-thread.h"
+#include "qemu/thread.h"
QemuMutex qemu_global_mutex;
static QemuMutex qemu_fair_mutex;
diff --git a/elf_ops.h b/include/hw/elf_ops.h
similarity index 100%
rename from elf_ops.h
rename to include/hw/elf_ops.h
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 784cf08..949a39f 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -40,11 +40,11 @@
#include <assert.h>
#ifdef _WIN32
-#include "qemu-os-win32.h"
+#include "sysemu/os-win32.h"
#endif
#ifdef CONFIG_POSIX
-#include "qemu-os-posix.h"
+#include "sysemu/os-posix.h"
#endif
#ifndef O_LARGEFILE
diff --git a/qemu-thread.h b/include/qemu/thread.h
similarity index 100%
rename from qemu-thread.h
rename to include/qemu/thread.h
diff --git a/qemu-os-posix.h b/include/sysemu/os-posix.h
similarity index 100%
rename from qemu-os-posix.h
rename to include/sysemu/os-posix.h
diff --git a/qemu-os-win32.h b/include/sysemu/os-win32.h
similarity index 100%
rename from qemu-os-win32.h
rename to include/sysemu/os-win32.h
diff --git a/loader.c b/loader.c
index 9577f63..03c3366 100644
--- a/loader.c
+++ b/loader.c
@@ -281,7 +281,7 @@
#define elf_word uint32_t
#define elf_sword int32_t
#define bswapSZs bswap32s
-#include "elf_ops.h"
+#include "hw/elf_ops.h"
#undef elfhdr
#undef elf_phdr
@@ -301,7 +301,7 @@
#define elf_sword int64_t
#define bswapSZs bswap64s
#define SZ 64
-#include "elf_ops.h"
+#include "hw/elf_ops.h"
/* return < 0 if error, otherwise the number of bytes loaded in memory */
int load_elf(const char *filename, int64_t address_offset,
diff --git a/util/qemu-thread.c b/util/qemu-thread.c
index fbc78fe..47bd62e 100644
--- a/util/qemu-thread.c
+++ b/util/qemu-thread.c
@@ -17,7 +17,7 @@
#include <signal.h>
#include <stdint.h>
#include <string.h>
-#include "qemu-thread.h"
+#include "qemu/thread.h"
static void error_exit(int err, const char *msg)
{
