diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt

index f75af8458..f1fceb201 100644

--- a/3rdparty/CMakeLists.txt

+++ b/3rdparty/CMakeLists.txt

@@ -2,24 +2,14 @@ cmake_minimum_required (VERSION 3.5)

 add_subdirectory(fonts)

-SET(UTF8PROC_INSTALL OFF CACHE BOOL "Enable installation of utf8proc" FORCE)

-add_subdirectory(utf8proc)

-set_property(TARGET utf8proc PROPERTY FOLDER "3rdparty")

+find_library(utf8proc NAMES utf8proc)

 add_subdirectory(launchinfo)

 set_property(TARGET launchinfo PROPERTY FOLDER "3rdparty")

-add_subdirectory(fmt)

-set_property(TARGET fmt PROPERTY FOLDER "3rdparty")

+find_library(fmt NAMES fmt)

-SET(RE2_BUILD_TESTING OFF CACHE BOOL "enable testing for RE2" FORCE)

-add_subdirectory(re2 EXCLUDE_FROM_ALL)

-target_include_directories(re2 PUBLIC

-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/re2>

-)

-set_property(TARGET re2 PROPERTY FOLDER "3rdparty")

-set_property(TARGET re2 PROPERTY XCODE_ATTRIBUTE_GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS NO)	# -Wmissing-field-initializers

-set_property(TARGET re2 PROPERTY XCODE_ATTRIBUTE_WARNING_CFLAGS "-Wno-missing-field-initializers")

+find_library(re2 NAMES re2)

 add_subdirectory(EmbeddedJSONSignature)

 set_property(TARGET EmbeddedJSONSignature PROPERTY FOLDER "3rdparty")

diff --git a/lib/framework/wzstring.cpp b/lib/framework/wzstring.cpp

index fd0250993..bf87784dd 100644

--- a/lib/framework/wzstring.cpp

+++ b/lib/framework/wzstring.cpp

@@ -24,8 +24,8 @@

 #include <sstream>

 #include <iomanip>

 #include <limits>

-#include <utfcpp/source/utf8.h>

-#include <utf8proc/utf8proc.h>

+#include <utf8.h>

+#include <utf8proc.h>

 WzUniCodepoint WzUniCodepoint::fromASCII(unsigned char charLiteral)

 {

diff --git a/lib/netplay/CMakeLists.txt b/lib/netplay/CMakeLists.txt

index 22ab785ab..e979d2b4b 100644

--- a/lib/netplay/CMakeLists.txt

+++ b/lib/netplay/CMakeLists.txt

@@ -37,7 +37,7 @@ add_dependencies(netplay autorevision_netcodeversion)

 set_property(TARGET netplay PROPERTY FOLDER "lib")

 include(WZTargetConfiguration)

 WZ_TARGET_CONFIGURATION(netplay)

-target_link_libraries(netplay PRIVATE framework re2::re2)

+target_link_libraries(netplay PRIVATE framework re2)

 if(WZ_USE_IMPORTED_MINIUPNPC)

 	target_link_libraries(netplay PRIVATE imported-miniupnpc)

 else()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

index 71fab7462..1460e9f06 100644

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

@@ -103,7 +103,7 @@ endif()

 target_link_libraries(warzone2100 exception-handler gamelib wzmaplib ivis-opengl netplay sdl-backend framework sequence sound widget)

 target_link_libraries(warzone2100 launchinfo EmbeddedJSONSignature)

-target_link_libraries(warzone2100 fmt::fmt)

+target_link_libraries(warzone2100 fmt)

 if(ENABLE_NLS)

 	target_link_libraries(warzone2100 ${Intl_LIBRARIES})

 endif()

@@ -112,7 +112,7 @@ target_link_libraries(warzone2100 quickjs)

 include(IncludeFindCurl)

 target_link_libraries(warzone2100 CURL::libcurl)

-target_link_libraries(warzone2100 re2::re2)

+target_link_libraries(warzone2100 re2)

 find_package(SQLite3 3.14 REQUIRED)

 target_link_libraries(warzone2100 SQLite::SQLite3)