diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5e88ceb3..eeb8c8d12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,17 +420,15 @@ if(BUILD_LIBRARY)
     include_directories(${XLSXIO_INSTALL_DIR}/include)
     add_library(xlsxio_read STATIC IMPORTED)
     set_target_properties(xlsxio_read PROPERTIES IMPORTED_LOCATION ${XLSXIO_LIB})
-
-    include_directories(${LIBZIP_INSTALL_DIR}/include)
     add_library(zip STATIC IMPORTED)
     set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
-
-    include_directories(${LIBEXPAT_INSTALL_DIR}/include)
     add_library(expat STATIC IMPORTED)
     set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
 
     add_subdirectory(library)
     install(FILES LICENSE.rst docs/changelog.txt DESTINATION ${DFHACK_USERDOC_DESTINATION})
+
+    add_dependencies(dfhack xlsxio_project)
 endif()
 
 file(WRITE "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" ${DFHACK_SETARCH})
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 808bb4304..0b747c157 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -41,7 +41,6 @@ else()
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
-set(LIBEXPAT_INSTALL_DIR ${LIBEXPAT_INSTALL_DIR} PARENT_SCOPE)
 set(LIBEXPAT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${EXPAT_LIB_SUFFIX})
 set(LIBEXPAT_LIB ${LIBEXPAT_LIB} PARENT_SCOPE)
 ExternalProject_Add(libexpat_project
@@ -53,7 +52,6 @@ ExternalProject_Add(libexpat_project
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
-set(LIBZIP_INSTALL_DIR ${LIBZIP_INSTALL_DIR} PARENT_SCOPE)
 set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/libzip${LIB_SUFFIX})
 set(LIBZIP_LIB ${LIBZIP_LIB} PARENT_SCOPE)
 ExternalProject_Add(libzip_project