diff --git a/patches/core/0008-Quote-ADB_VERSION-in-adb.cpp.patch b/patches/core/0008-Quote-ADB_VERSION-in-adb.cpp.patch
deleted file mode 100644
index 83723b5..0000000
--- a/patches/core/0008-Quote-ADB_VERSION-in-adb.cpp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 06cb515fc4e52bdbb67c43938f4aed4bcfb47f9d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Tue, 27 Feb 2018 17:51:52 +0100
-Subject: [PATCH] Quote ADB_VERSION in adb.cpp
-
----
- adb/adb.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/adb/adb.cpp b/adb/adb.cpp
-index c791c7b6c..a62d368a2 100644
---- a/adb/adb.cpp
-+++ b/adb/adb.cpp
-@@ -66,7 +66,7 @@ std::string adb_version() {
-         "Android Debug Bridge version %d.%d.%d\n"
-         "Version %s\n"
-         "Installed as %s\n",
--        ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, ADB_VERSION,
-+        ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, "ADB_VERSION",
-         android::base::GetExecutablePath().c_str());
- }
- 
diff --git a/patches/core/0010-Quote-FASTBOOT_VERSION-in-fastboot.cpp.patch b/patches/core/0010-Quote-FASTBOOT_VERSION-in-fastboot.cpp.patch
deleted file mode 100644
index eccda42..0000000
--- a/patches/core/0010-Quote-FASTBOOT_VERSION-in-fastboot.cpp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bc175b337d0e61e6bec624f816d53694596d4b0d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Feb 2018 20:24:57 +0100
-Subject: [PATCH] Quote FASTBOOT_VERSION in fastboot.cpp
-
----
- fastboot/fastboot.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
-index e89586f15..097eba551 100644
---- a/fastboot/fastboot.cpp
-+++ b/fastboot/fastboot.cpp
-@@ -1604,7 +1604,7 @@ int main(int argc, char **argv)
-                 setvbuf(stdout, nullptr, _IONBF, 0);
-                 setvbuf(stderr, nullptr, _IONBF, 0);
-             } else if (strcmp("version", longopts[longindex].name) == 0) {
--                fprintf(stdout, "fastboot version %s\n", FASTBOOT_VERSION);
-+                fprintf(stdout, "fastboot version %s\n", "FASTBOOT_VERSION");
-                 fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str());
-                 return 0;
-             } else if (strcmp("slot", longopts[longindex].name) == 0) {
diff --git a/vendor/CMakeLists.adb.txt b/vendor/CMakeLists.adb.txt
index 9066579..4634bbe 100644
--- a/vendor/CMakeLists.adb.txt
+++ b/vendor/CMakeLists.adb.txt
@@ -95,7 +95,7 @@ add_executable(adb
 	  core/adb/adb_auth_host.cpp
 	  core/adb/shell_service_protocol.cpp)
 
-target_compile_definitions(adb PRIVATE -DADB_VERSION=${ANDROID_VERSION})
+target_compile_definitions(adb PRIVATE -DADB_VERSION="${ANDROID_VERSION}")
 target_include_directories(adb PRIVATE
 	core/include core/base/include core/adb
 	core/libcrypto_utils/include boringssl/include)
diff --git a/vendor/CMakeLists.fastboot.txt b/vendor/CMakeLists.fastboot.txt
index b4a54d2..ed96d44 100644
--- a/vendor/CMakeLists.fastboot.txt
+++ b/vendor/CMakeLists.fastboot.txt
@@ -108,6 +108,7 @@ target_include_directories(fastboot PRIVATE
 	extras/ext4_utils/include extras/f2fs_utils
 	core/libziparchive/include core/mkbootimg/include/bootimg)
 target_compile_definitions(fastboot PRIVATE
+	-DFASTBOOT_VERSION="${ANDROID_VERSION}"
 	-D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS
 	-DANDROID_MKE2FS_NAME="${ANDROID_MKE2FS_NAME}")
 target_link_libraries(fastboot