diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 3edaabb227..93b3f0cda3 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -743,7 +743,6 @@ target_include_directories(
     "${CMake_BINARY_DIR}/Source"
     "${CMake_SOURCE_DIR}/Source"
     "${CMake_SOURCE_DIR}/Source/LexerParser"
-    ${CMAKE_EXPAT_INCLUDES}
     ${CMAKE_TAR_INCLUDES}
     ${CMake_HAIKU_INCLUDE_DIRS}
   )
@@ -752,8 +751,8 @@ target_link_libraries(
   PUBLIC
     cmstd
     cmsys
+    EXPAT::EXPAT
     ZLIB::ZLIB
-    ${CMAKE_EXPAT_LIBRARIES}
     ${CMAKE_TAR_LIBRARIES}
     ${CMAKE_CURL_LIBRARIES}
     ${CMAKE_JSONCPP_LIBRARIES}
diff --git a/Source/Modules/CMakeBuildUtilities.cmake b/Source/Modules/CMakeBuildUtilities.cmake
index f217f9b9b9..dad4bc1e45 100644
--- a/Source/Modules/CMakeBuildUtilities.cmake
+++ b/Source/Modules/CMakeBuildUtilities.cmake
@@ -197,6 +197,7 @@ else()
   set(CMAKE_EXPAT_INCLUDES)
   set(CMAKE_EXPAT_LIBRARIES cmexpat)
   add_subdirectory(Utilities/cmexpat)
+  add_library(EXPAT::EXPAT ALIAS cmexpat)
   CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty")
 endif()