diff --git a/src/spicy/spicyz/CMakeLists.txt b/src/spicy/spicyz/CMakeLists.txt
index e68bd224e9..e8844c1ad8 100644
--- a/src/spicy/spicyz/CMakeLists.txt
+++ b/src/spicy/spicyz/CMakeLists.txt
@@ -10,16 +10,20 @@ set_target_properties(spicyz PROPERTIES CXX_EXTENSIONS OFF)
 
 target_include_directories(spicyz PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
-if (BINARY_PACKAGING_MODE)
-    # Ensure we link against the HILTI/Spicy toolchain libraries (should be
-    # default, but isn't set here for some reason).
-    set(HAVE_TOOLCHAIN ON)
-
-    hilti_link_object_libraries_in_tree(spicyz PRIVATE)
-    spicy_link_object_libraries_in_tree(spicyz PRIVATE)
+if (SPICY_ROOT_DIR)
+    target_link_libraries(spicyz PRIVATE hilti spicy)
 else ()
-    hilti_link_libraries_in_tree(spicyz PRIVATE)
-    spicy_link_libraries_in_tree(spicyz PRIVATE)
+    if (BINARY_PACKAGING_MODE)
+        # Ensure we link against the HILTI/Spicy toolchain libraries (should be
+        # default, but isn't set here for some reason).
+        set(HAVE_TOOLCHAIN ON)
+
+        hilti_link_object_libraries_in_tree(spicyz PRIVATE)
+        spicy_link_object_libraries_in_tree(spicyz PRIVATE)
+    else ()
+        hilti_link_libraries_in_tree(spicyz PRIVATE)
+        spicy_link_libraries_in_tree(spicyz PRIVATE)
+    endif ()
 endif ()
 
 prefer_configured_spicy_include_dirs(spicyz)
diff --git a/src/spicy/spicyz/driver.cc b/src/spicy/spicyz/driver.cc
index b905ac3242..fbb13959eb 100644
--- a/src/spicy/spicyz/driver.cc
+++ b/src/spicy/spicyz/driver.cc
@@ -13,13 +13,13 @@
 
 #include <hilti/ast/declarations/type.h>
 #include <hilti/compiler/init.h>
+#include <hilti/compiler/plugin.h>
 
 #include <spicy/ast/types/unit.h>
 #include <spicy/ast/visitor.h>
 #include <spicy/autogen/config.h>
 #include <spicy/compiler/init.h>
 
-#include "compiler/plugin.h"
 #include "config.h"
 #include "glue-compiler.h"