diff --git a/cmake/SVFConfig.cmake.in b/cmake/SVFConfig.cmake.in
index c635c78e4..8ed8917fa 100644
--- a/cmake/SVFConfig.cmake.in
+++ b/cmake/SVFConfig.cmake.in
@@ -71,11 +71,8 @@ message(STATUS "Found SVF Package:
         SVF_CXX_STANDARD:               ${SVF_CXX_STANDARD}
         SVF_ENABLE_EXCEPTIONS:          ${SVF_EABLE_EXCEPTIONS}")
 
-
-include(CMakeFindDependencyMacro)
-
-
-find_dependency(
+# Find Z3 and its include directory from the top-level include file; try from CMake package first
+find_package(
     Z3
     CONFIG
     HINTS
@@ -111,6 +108,8 @@ else()
     include_directories(SYSTEM ${Z3_INCLUDES})
 endif()
 
+include(CMakeFindDependencyMacro)
+
 find_dependency(
     LLVM
     CONFIG