diff --git a/msvc/unicorn/unicorn/unicorn.vcxproj b/msvc/unicorn/unicorn/unicorn.vcxproj
index 68f2536e..4e32f3dd 100644
--- a/msvc/unicorn/unicorn/unicorn.vcxproj
+++ b/msvc/unicorn/unicorn/unicorn.vcxproj
@@ -204,7 +204,6 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
-
@@ -227,6 +226,7 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
+
diff --git a/msvc/unicorn/unicorn/unicorn.vcxproj.filters b/msvc/unicorn/unicorn/unicorn.vcxproj.filters
index a72cba7f..a0da23fa 100644
--- a/msvc/unicorn/unicorn/unicorn.vcxproj.filters
+++ b/msvc/unicorn/unicorn/unicorn.vcxproj.filters
@@ -11,9 +11,6 @@
qemu
-
- qemu
-
qemu
@@ -44,6 +41,9 @@
qemu\util
+
+ qemu\util
+
qemu\util
diff --git a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
index 2091b138..b3f80110 100644
--- a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
+++ b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
@@ -32,7 +32,6 @@
-
@@ -55,6 +54,7 @@
+
diff --git a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters
index f7e1d747..e6a4a1d3 100644
--- a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters
+++ b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters
@@ -81,9 +81,6 @@
qemu
-
- qemu
-
qemu
@@ -177,6 +174,9 @@
qemu\util
+
+ qemu
+
qemu\util
diff --git a/qemu/Makefile.objs b/qemu/Makefile.objs
index f4e3193b..b78a4daa 100644
--- a/qemu/Makefile.objs
+++ b/qemu/Makefile.objs
@@ -28,7 +28,6 @@ endif
#######################################################################
# Target-independent parts used in system and user emulation
-common-obj-y += qemu-log.o
common-obj-y += tcg-runtime.o
common-obj-y += hw/
common-obj-y += qom/
diff --git a/qemu/util/Makefile.objs b/qemu/util/Makefile.objs
index de61e5f1..f2571884 100644
--- a/qemu/util/Makefile.objs
+++ b/qemu/util/Makefile.objs
@@ -8,4 +8,5 @@ util-obj-y += error.o
util-obj-y += crc32c.o
util-obj-y += host-utils.o
util-obj-y += getauxval.o
+util-obj-y += log.o
util-obj-y += range.o
diff --git a/qemu/qemu-log.c b/qemu/util/log.c
similarity index 100%
rename from qemu/qemu-log.c
rename to qemu/util/log.c