diff --git a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj
index 65e53ffc..9c8eba9e 100644
--- a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj
+++ b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj
@@ -73,7 +73,9 @@
+
+
{2A7F483F-CD19-4F84-BBDA-B6A1865E2773}
diff --git a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters
index 8467aeca..6014ff4e 100644
--- a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters
+++ b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters
@@ -134,6 +134,9 @@
tcg
+
+ tcg
+
tcg\i386
@@ -145,5 +148,6 @@
+
\ No newline at end of file
diff --git a/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj b/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj
index 6b387f0d..993fc4c8 100644
--- a/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj
+++ b/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj
@@ -73,7 +73,9 @@
+
+
{340D86A5-E53C-490B-880A-8EB1F5BDE947}
diff --git a/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj.filters b/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj.filters
index 39d22d56..9aeb903d 100644
--- a/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj.filters
+++ b/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj.filters
@@ -134,6 +134,9 @@
tcg
+
+ tcg
+
tcg\i386
@@ -145,5 +148,6 @@
+
\ No newline at end of file
diff --git a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj
index a429a802..c6083248 100644
--- a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj
+++ b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj
@@ -69,7 +69,9 @@
+
+
{F67EB1EA-DCFA-4758-A2AA-4B570BA78036}
diff --git a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters
index 157e6e65..20c7a45f 100644
--- a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters
+++ b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters
@@ -88,6 +88,7 @@
+
fpu
@@ -97,6 +98,9 @@
tcg
+
+ tcg
+
tcg\i386
diff --git a/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj
index 83794393..3efc1688 100644
--- a/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj
+++ b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj
@@ -69,7 +69,9 @@
+
+
{740F3007-7BF0-4C0C-8FA5-2587C794EF31}
diff --git a/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj.filters b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj.filters
index c85b4489..5180b182 100644
--- a/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj.filters
+++ b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj.filters
@@ -122,6 +122,9 @@
tcg
+
+ tcg
+
tcg\i386
@@ -133,5 +136,6 @@
+
\ No newline at end of file
diff --git a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj
index bf31fdd0..eb10c510 100644
--- a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj
+++ b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj
@@ -54,7 +54,9 @@
+
+
diff --git a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters
index f3487108..b0fef614 100644
--- a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters
+++ b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters
@@ -77,6 +77,9 @@
tcg
+
+ tcg
+
tcg\i386
@@ -88,6 +91,7 @@
+
hw\m68k
diff --git a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj
index aab9da0a..113dd594 100644
--- a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj
+++ b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj
@@ -71,7 +71,9 @@
+
+
{63050112-E486-4396-B5E4-303C3BC12D39}
diff --git a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters
index 893a2551..93cbdc1c 100644
--- a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters
+++ b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters
@@ -76,6 +76,7 @@
+
fpu
@@ -85,6 +86,9 @@
tcg
+
+ tcg
+
tcg\i386
diff --git a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj
index 7840cf7a..ff9922ee 100644
--- a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj
+++ b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj
@@ -71,7 +71,9 @@
+
+
{4A9F9353-DB63-460A-BB1C-9CB519DFD414}
diff --git a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters
index c5aac694..097b0d2b 100644
--- a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters
+++ b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters
@@ -76,6 +76,7 @@
+
fpu
@@ -94,6 +95,9 @@
tcg
+
+ tcg
+
tcg\i386
diff --git a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj
index bdc6b68d..d253035a 100644
--- a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj
+++ b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj
@@ -71,7 +71,9 @@
+
+
{4478909E-6983-425C-9D9F-558CF258E61E}
diff --git a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters
index 88aa508a..76923ecc 100644
--- a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters
+++ b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters
@@ -76,6 +76,7 @@
+
fpu
@@ -94,6 +95,9 @@
tcg
+
+ tcg
+
tcg\i386
diff --git a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj
index e4d09c67..0ac21424 100644
--- a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj
+++ b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj
@@ -71,7 +71,9 @@
+
+
{006A7908-ABF3-4D18-BC35-0A29E39B95F9}
diff --git a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters
index 3ec346fb..63d2f775 100644
--- a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters
+++ b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters
@@ -93,6 +93,9 @@
tcg
+
+ tcg
+
tcg\i386
@@ -124,5 +127,6 @@
target-mips
+
\ No newline at end of file
diff --git a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj
index bb494d64..1be82df3 100644
--- a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj
+++ b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj
@@ -64,7 +64,9 @@
+
+
{698C2D54-475C-446F-B879-F629BBEF75FE}
diff --git a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters
index 95458e1d..adb37f8d 100644
--- a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters
+++ b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters
@@ -74,6 +74,9 @@
tcg
+
+ tcg
+
tcg\i386
@@ -85,6 +88,7 @@
+
hw\sparc
diff --git a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj
index db7afe44..a607df12 100644
--- a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj
+++ b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj
@@ -65,7 +65,9 @@
+
+
{8804AD29-E398-480C-AC0F-98EC1B7A51CB}
diff --git a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters
index cf669e84..220ce049 100644
--- a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters
+++ b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters
@@ -107,10 +107,14 @@
tcg
+
+ tcg
+
tcg\i386
+
diff --git a/msvc/unicorn/unicorn/unicorn.vcxproj b/msvc/unicorn/unicorn/unicorn.vcxproj
index 338cc9fa..6a3fb2f2 100644
--- a/msvc/unicorn/unicorn/unicorn.vcxproj
+++ b/msvc/unicorn/unicorn/unicorn.vcxproj
@@ -196,8 +196,6 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
-
-
@@ -288,8 +286,6 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
-
-
diff --git a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
index 6728bc81..50b50153 100644
--- a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
+++ b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj
@@ -23,7 +23,6 @@
-
@@ -101,8 +100,6 @@
-
-
diff --git a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj
index e195ef5c..fd550ee9 100644
--- a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj
+++ b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj
@@ -56,6 +56,7 @@
+
@@ -77,7 +78,9 @@
+
+
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}
diff --git a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters
index 2ee64ced..56a50494 100644
--- a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters
+++ b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters
@@ -94,6 +94,7 @@
+
fpu
@@ -112,6 +113,9 @@
target-i386
+
+ target-i386
+
target-i386
@@ -154,6 +158,9 @@
tcg
+
+ tcg
+
tcg