diff --git a/subprojects/Makefile b/subprojects/Makefile
index 0d8f0a04de00c..ce19917fbd499 100644
--- a/subprojects/Makefile
+++ b/subprojects/Makefile
@@ -1,6 +1,6 @@
 .PHONY: default all clean
 
-DEPS=sdb qjs
+DEPS=sdb qjs zydis
 
 ifeq ($(WANT_V35),1)
   DEPS += binaryninja
@@ -23,4 +23,22 @@ all: $(ALL)
 clean:
 	rm -rf $(ALL)
 
+ifeq (1,1)
 include *.mk
+else
+include sdb.mk
+ifeq ($(WANT_V35),1)
+  include binaryninja.mk
+endif
+ifeq ($(USE_CS4),1)
+  include capstone-v4.mk
+else ifeq ($(USE_CSNEXT),1)
+  include capstone-next.mk
+else
+  include capstone-v5.mk
+endif
+include qjs.mk
+
+include zydis.mk
+endif
+zydis: ${WRAP_wrap_file_directory}
diff --git a/subprojects/binaryninja.mk b/subprojects/binaryninja.mk
index 5a114dd25a402..0268bb7925abb 100644
--- a/subprojects/binaryninja.mk
+++ b/subprojects/binaryninja.mk
@@ -6,7 +6,7 @@ WRAP_wrap_git_directory:=binaryninja
 WRAP_wrap_git_patch_directory:=binaryninja
 WRAP_wrap_git_depth:=1
 
-.PHONY: binaryninja_clean binaryninja_all
+.PHONY: binaryninja binaryninja_clean binaryninja_all
 
 binaryninja:
 	if [ ! -d "binaryninja" -o "c40a5f04deec68d388b2072dc42b29141089f9ce" != "$(shell cd binaryninja 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "binaryninja"; ${MAKE} binaryninja_all; fi
diff --git a/subprojects/capstone-next.mk b/subprojects/capstone-next.mk
index d5adff3248d35..989620d040182 100644
--- a/subprojects/capstone-next.mk
+++ b/subprojects/capstone-next.mk
@@ -7,7 +7,11 @@ WRAP_wrap_git_directory:=capstone-next
 WRAP_wrap_git_diff_files:=capstone-next/capstone-patches/fix-x86-16.patch
 WRAP_wrap_git_depth:=1
 
+<<<<<<< HEAD
 .PHONY: capstone-next_clean capstone-next_all
+=======
+.PHONY: capstone-next capstone-next_clean capstone-next_all
+>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
 
 capstone-next:
 	if [ ! -d "capstone-next" -o "ccbc41d3dadb2953deed9e050abfae146876288d" != "$(shell cd capstone-next 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-next"; ${MAKE} capstone-next_all; fi
diff --git a/subprojects/capstone-v4.mk b/subprojects/capstone-v4.mk
index 315eba8cfb4e3..892dbc8a48197 100644
--- a/subprojects/capstone-v4.mk
+++ b/subprojects/capstone-v4.mk
@@ -7,7 +7,11 @@ WRAP_wrap_git_directory:=capstone-v4
 WRAP_wrap_git_diff_files:=capstone-v4/capstone-patches/v4/capstone-calloc.patch,capstone-v4/capstone-patches/v4/fix-x86-16.patch,capstone-v4/capstone-patches/v4/sparc-crash.patch,capstone-v4/capstone-patches/v4/sstream-null.patch
 WRAP_wrap_git_depth:=1
 
+<<<<<<< HEAD
 .PHONY: capstone-v4_clean capstone-v4_all
+=======
+.PHONY: capstone-v4 capstone-v4_clean capstone-v4_all
+>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
 
 capstone-v4:
 	if [ ! -d "capstone-v4" -o "d7e459d026b19d6c3a7b743bfc475d919ff03f74" != "$(shell cd capstone-v4 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-v4"; ${MAKE} capstone-v4_all; fi
diff --git a/subprojects/capstone-v5.mk b/subprojects/capstone-v5.mk
index 684c5779e656b..a1fc6030ef0bc 100644
--- a/subprojects/capstone-v5.mk
+++ b/subprojects/capstone-v5.mk
@@ -7,7 +7,11 @@ WRAP_wrap_git_directory:=capstone-v5
 WRAP_wrap_git_diff_files:=capstone-v5/capstone-patches/fix-x86-16.patch
 WRAP_wrap_git_depth:=1
 
+<<<<<<< HEAD
 .PHONY: capstone-v5_clean capstone-v5_all
+=======
+.PHONY: capstone-v5 capstone-v5_clean capstone-v5_all
+>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
 
 capstone-v5:
 	if [ ! -d "capstone-v5" -o "accf4df62f1fba6f92cae692985d27063552601c" != "$(shell cd capstone-v5 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-v5"; ${MAKE} capstone-v5_all; fi
diff --git a/subprojects/qjs.mk b/subprojects/qjs.mk
index fea0a4706085d..242a9845d06b1 100644
--- a/subprojects/qjs.mk
+++ b/subprojects/qjs.mk
@@ -6,7 +6,11 @@ WRAP_wrap_git_directory:=qjs
 WRAP_wrap_git_patch_directory:=qjs
 WRAP_wrap_git_depth:=1
 
+<<<<<<< HEAD
 .PHONY: qjs_clean qjs_all
+=======
+.PHONY: qjs qjs_clean qjs_all
+>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
 
 qjs:
 	if [ ! -d "qjs" -o "7238ee64dbc2fbdea044555cda8cda78785a93ed" != "$(shell cd qjs 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "qjs"; ${MAKE} qjs_all; fi
diff --git a/subprojects/sdb.mk b/subprojects/sdb.mk
index f697c3582aed5..bc6483a178eff 100644
--- a/subprojects/sdb.mk
+++ b/subprojects/sdb.mk
@@ -5,7 +5,11 @@ WRAP_wrap_git_revision:=2.2.0
 WRAP_wrap_git_directory:=sdb
 WRAP_wrap_git_depth:=1
 
+<<<<<<< HEAD
 .PHONY: sdb_clean sdb_all
+=======
+.PHONY: sdb sdb_clean sdb_all
+>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
 
 sdb:
 	if [ ! -d "sdb" -o "2.2.0" != "$(shell cd sdb 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "sdb"; ${MAKE} sdb_all; fi
diff --git a/subprojects/zydis.mk b/subprojects/zydis.mk
new file mode 100644
index 0000000000000..066d66effb022
--- /dev/null
+++ b/subprojects/zydis.mk
@@ -0,0 +1,20 @@
+# This file is autogenerated by acr-wrap
+
+WRAP_wrap_file_directory:=zydis-4.1.1
+WRAP_wrap_file_source_url:=https://github.com/zyantific/zydis/archive/refs/tags/v4.1.1.tar.gz
+WRAP_wrap_file_source_filename:=zydis-v4.1.1.tar.gz
+WRAP_wrap_file_source_hash:=943f91eb9ab2a8cc01ab9f8b785e769a273502071e0ee8011cdfcaad93947cec
+
+.PHONY: zydis-4.1.1_clean zydis-4.1.1_all
+
+zydis-4.1.1:
+	${MAKE} ${MAKE_FLAGS} zydis-4.1.1_all
+
+zydis-4.1.1_all:
+	curl -Lo zydis-v4.1.1.tar.gz https://github.com/zyantific/zydis/archive/refs/tags/v4.1.1.tar.gz
+	echo Check 943f91eb9ab2a8cc01ab9f8b785e769a273502071e0ee8011cdfcaad93947cec
+	tar xzf zydis-v4.1.1.tar.gz
+	cd zydis-4.1.1
+
+zydis-4.1.1_clean:
+	rm -rf zydis-4.1.1
diff --git a/subprojects/zydis.wrap b/subprojects/zydis.wrap
new file mode 100644
index 0000000000000..9c095ab544dcc
--- /dev/null
+++ b/subprojects/zydis.wrap
@@ -0,0 +1,5 @@
+[wrap-file]
+directory = zydis-4.1.1
+source_url = https://github.com/zyantific/zydis/archive/refs/tags/v4.1.1.tar.gz
+source_filename = zydis-v4.1.1.tar.gz
+source_hash = 943f91eb9ab2a8cc01ab9f8b785e769a273502071e0ee8011cdfcaad93947cec